~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,11 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
18	20	ObjectUI,
19	21	Runnable,
20	22	ActionListener,
..	..	@@ -22,6 +24,350 @@
22	24	DragGestureListener, DragSourceListener, DropTargetListener,
23	25	ItemListener // ListSelectionListener
24	26	{
	27	+
	28	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	29	+ {
	30	+ cButton skyboxButton;
	31	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
	33	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
	35	+ skyboxButton.addActionListener(new ActionListener()
	36	+ {
	37	+ @Override
	38	+ public void actionPerformed(ActionEvent e)
	39	+ {
	40	+ ChangeSkybox(path);
	41	+ }
	42	+ });
	43	+ }
	44	+
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
	61	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	62	+ {
	63	+ cGridBag tab0 = new cGridBag().setVertical(true);
	64	+
	65	+ tab0.setName("Urban");
	66	+ skyboxpanel.add(tab0);
	67	+
	68	+ cGridBag row0 = new cGridBag();
	69	+ cGridBag row1 = new cGridBag();
	70	+ cGridBag row2 = new cGridBag();
	71	+ cGridBag row3 = new cGridBag();
	72	+ cGridBag row4 = new cGridBag();
	73	+ cGridBag row5 = new cGridBag();
	74	+ cGridBag row6 = new cGridBag();
	75	+
	76	+ AddSkyboxButton("default", "", row0);
	77	+ //AddSkyboxButton("default", "cornell", row0);
	78	+ AddSkyboxButton("penguins", "dust", row0);
	79	+ AddSkyboxButton("penguins", "tropic", row0);
	80	+ AddSkyboxButton("penguins", "yonder", row0);
	81	+
	82	+ AddSkyboxButton("default", "uffizi", row1);
	83	+ AddSkyboxButton("bridge", "Bridge", row1);
	84	+ AddSkyboxButton("bridge", "Bridge2", row1);
	85	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	86	+
	87	+ AddSkyboxButton("urban", "Parliament", row2);
	88	+ AddSkyboxButton("urban", "Roundabout", row2);
	89	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	90	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	91	+
	92	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	93	+ AddSkyboxButton("urban", "UnionSquare", row3);
	94	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	95	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	96	+
	97	+ AddSkyboxButton("park", "Buddha", row4);
	98	+ AddSkyboxButton("park", "CNTower2", row4);
	99	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	100	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	101	+
	102	+ AddSkyboxButton("park", "Park", row5);
	103	+ AddSkyboxButton("park", "Pond", row5);
	104	+ AddSkyboxButton("park", "Skansen", row5);
	105	+ AddSkyboxButton("park", "Skansen2", row5);
	106	+
	107	+ AddSkyboxButton("park", "Skansen3", row6);
	108	+ AddSkyboxButton("park", "Skansen4", row6);
	109	+ AddSkyboxButton("park", "Skansen5", row6);
	110	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	111	+
	112	+ tab0.add(row0);
	113	+ tab0.add(row1);
	114	+ tab0.add(row2);
	115	+ tab0.add(row3);
	116	+ tab0.add(row4);
	117	+ tab0.add(row5);
	118	+ tab0.add(row6);
	119	+
	120	+ for (int i=5; --i>=0;)
	121	+ {
	122	+ //oe.toolboxPanel.Return();
	123	+ //tab0.add(new cGridBag());
	124	+ }
	125	+ }
	126	+
	127	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	128	+ {
	129	+ cGridBag tab0 = new cGridBag().setVertical(true);
	130	+
	131	+ tab0.setName("Nature");
	132	+ skyboxpanel.add(tab0);
	133	+
	134	+ cGridBag row0 = new cGridBag();
	135	+ cGridBag row1 = new cGridBag();
	136	+ cGridBag row2 = new cGridBag();
	137	+ cGridBag row3 = new cGridBag();
	138	+ cGridBag row4 = new cGridBag();
	139	+ cGridBag row5 = new cGridBag();
	140	+ cGridBag row6 = new cGridBag();
	141	+
	142	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	143	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	144	+ AddSkyboxButton("beach", "PalmTrees", row0);
	145	+ AddSkyboxButton("beach", "Tenerife", row0);
	146	+
	147	+ AddSkyboxButton("beach", "Tenerife2", row1);
	148	+ AddSkyboxButton("beach", "Tenerife3", row1);
	149	+ AddSkyboxButton("field", "FishPond", row1);
	150	+ AddSkyboxButton("field", "Footballfield", row1);
	151	+
	152	+ AddSkyboxButton("field", "Meadow", row2);
	153	+ AddSkyboxButton("field", "Sorsele", row2);
	154	+ AddSkyboxButton("field", "Sorsele2", row2);
	155	+ AddSkyboxButton("field", "Sorsele3", row2);
	156	+
	157	+ AddSkyboxButton("forest", "Brudslojan", row3);
	158	+ AddSkyboxButton("forest", "Langholmen2", row3);
	159	+ AddSkyboxButton("forest", "Plants", row3);
	160	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	161	+
	162	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	163	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	164	+ AddSkyboxButton("mountain", "Teide", row4);
	165	+ AddSkyboxButton("park", "Tantolunden4", row4);
	166	+
	167	+ AddSkyboxButton("park", "Stairs", row5);
	168	+ AddSkyboxButton("default", "skycube", row6);
	169	+ AddSkyboxButton("rocky", "Langholmen", row5);
	170	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	171	+
	172	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	173	+ AddSkyboxButton("default", "CloudyHills", row6);
	174	+ AddSkyboxButton("daz", "Autumn", row6);
	175	+ AddSkyboxButton("daz", "MountainTrail", row6);
	176	+ /*
	177	+Autumn
	178	+Greenlands
	179	+MountainTrail
	180	+Oasis
	181	+TheRock
	182	+TopOfTheWorld
	183	+Winter
	184	+ */
	185	+
	186	+ tab0.add(row0);
	187	+ tab0.add(row1);
	188	+ tab0.add(row2);
	189	+ tab0.add(row3);
	190	+ tab0.add(row4);
	191	+ tab0.add(row5);
	192	+ tab0.add(row6);
	193	+
	194	+ for (int i=5; --i>=0;)
	195	+ {
	196	+ //oe.toolboxPanel.Return();
	197	+ //tab0.add(new cGridBag());
	198	+ }
	199	+ }
	200	+
	201	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	202	+ {
	203	+ cGridBag tab0 = new cGridBag().setVertical(true);
	204	+
	205	+ tab0.setName("Night");
	206	+ skyboxpanel.add(tab0);
	207	+
	208	+ cGridBag row0 = new cGridBag();
	209	+ cGridBag row1 = new cGridBag();
	210	+ cGridBag row2 = new cGridBag();
	211	+ cGridBag row3 = new cGridBag();
	212	+ cGridBag row4 = new cGridBag();
	213	+ cGridBag row5 = new cGridBag();
	214	+ cGridBag row6 = new cGridBag();
	215	+
	216	+ AddSkyboxButton("night", "NightPath", row0);
	217	+ AddSkyboxButton("night", "PondNight", row0);
	218	+ AddSkyboxButton("night", "Powerlines", row0);
	219	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	220	+
	221	+ AddSkyboxButton("urban", "CNTower", row1);
	222	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	223	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	224	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	225	+
	226	+ AddSkyboxButton("penguins", "kenon_star", row2);
	227	+ AddSkyboxButton("persson", "corona", row2);
	228	+ AddSkyboxButton("persson", "spaceskybox", row2);
	229	+ AddSkyboxButton("indoors", "Vasa", row2);
	230	+
	231	+ AddSkyboxButton("winter", "Backyard", row3);
	232	+ AddSkyboxButton("winter", "Creek", row3);
	233	+ AddSkyboxButton("winter", "FootballField3", row3);
	234	+ AddSkyboxButton("winter", "Forest", row3);
	235	+
	236	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	237	+ AddSkyboxButton("winter", "House", row4);
	238	+ AddSkyboxButton("winter", "IceLake", row4);
	239	+ AddSkyboxButton("winter", "IceRiver", row4);
	240	+
	241	+ AddSkyboxButton("winter", "Park3", row5);
	242	+ AddSkyboxButton("winter", "PondWinter", row5);
	243	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	244	+ AddSkyboxButton("winter", "Vindelalven", row5);
	245	+
	246	+ AddSkyboxButton("daz", "TheRock", row6);
	247	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	248	+ AddSkyboxButton("daz", "Winter", row6);
	249	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	250	+
	251	+ tab0.add(row0);
	252	+ tab0.add(row1);
	253	+ tab0.add(row2);
	254	+ tab0.add(row3);
	255	+ tab0.add(row4);
	256	+ tab0.add(row5);
	257	+ tab0.add(row6);
	258	+
	259	+ for (int i=5; --i>=0;)
	260	+ {
	261	+ //oe.toolboxPanel.Return();
	262	+ //tab0.add(new cGridBag());
	263	+ }
	264	+ }
	265	+
	266	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	267	+ {
	268	+ cGridBag tab0 = new cGridBag().setVertical(true);
	269	+
	270	+ tab0.setName("Others");
	271	+ skyboxpanel.add(tab0);
	272	+
	273	+ cGridBag row0 = new cGridBag();
	274	+ cGridBag row1 = new cGridBag();
	275	+ cGridBag row2 = new cGridBag();
	276	+ cGridBag row3 = new cGridBag();
	277	+ cGridBag row4 = new cGridBag();
	278	+ cGridBag row5 = new cGridBag();
	279	+ cGridBag row6 = new cGridBag();
	280	+
	281	+ AddSkyboxButton("mayhem", "afterrain", row0);
	282	+ AddSkyboxButton("mayhem", "aqua4", row0);
	283	+ AddSkyboxButton("mayhem", "aqua9", row0);
	284	+ AddSkyboxButton("mayhem", "flame", row0);
	285	+
	286	+ AddSkyboxButton("mayhem", "h2s", row1);
	287	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	288	+ AddSkyboxButton("mayhem", "scorched", row1);
	289	+ AddSkyboxButton("penguins", "desertdawn", row1);
	290	+
	291	+ AddSkyboxButton("persson", "Citadella", row2);
	292	+ AddSkyboxButton("persson", "Citadella2", row2);
	293	+ AddSkyboxButton("persson", "clouds1", row2);
	294	+ AddSkyboxButton("penguins", "wrath", row2);
	295	+
	296	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	297	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	298	+ AddSkyboxButton("indoors", "DallasW", row3);
	299	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	300	+
	301	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	302	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	303	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	304	+ AddSkyboxButton("persson", "redeclipse", row4);
	305	+
	306	+ AddSkyboxButton("daz", "Greenlands", row5);
	307	+ AddSkyboxButton("daz", "Oasis", row5);
	308	+ AddSkyboxButton("elyvisions", "arch3", row5);
	309	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	310	+
	311	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	312	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	313	+ AddSkyboxButton("elyvisions", "heaven", row6);
	314	+ AddSkyboxButton("elyvisions", "hot", row6);
	315	+
	316	+ tab0.add(row0);
	317	+ tab0.add(row1);
	318	+ tab0.add(row2);
	319	+ tab0.add(row3);
	320	+ tab0.add(row4);
	321	+ tab0.add(row5);
	322	+ tab0.add(row6);
	323	+
	324	+ for (int i=5; --i>=0;)
	325	+ {
	326	+ //oe.toolboxPanel.Return();
	327	+ //tab0.add(new cGridBag());
	328	+ }
	329	+ }
	330	+
	331	+ public void ChangeSkybox(String skybox)
	332	+ {
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
	358	+ }
	359	+
	360	+ public void ChangeTexture(String texture)
	361	+ {
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	369	+ }
	370	+
25	371	//ObjEditor objEditor;
26	372	public void closeUI2()
27	373	{
..	..	@@ -59,6 +405,16 @@
59	405	this.copy = this.group = group;
60	406	//selectees = this.group.selectees;
61	407
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
	417	+
62	418	if(ui)
63	419	SetupUI(objEditor);
64	420	}
..	..	@@ -73,17 +429,29 @@
73	429	this.copy = this.group = copy;
74	430	//selectees = this.group.selectees;
75	431
76		- SetupMenu2(objEditor);
	432	+ SetupMenu2(this); //objEditor);
77	433	SetupUI2(objEditor);
78	434	objEditor.SetupUI(true);
79	435	SetupViews(objEditor);
80	436
81	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	438	+
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
82	446	}
83	447
84	448	void CloneSelection(boolean supports)
85	449	{
86		- // Object3D keep = GraphreeD.clipboard;
	450	+ if (Globals.REPLACEONMAKE)
	451	+ Save();
	452	+ boolean keep = Globals.REPLACEONMAKE;
	453	+ Globals.REPLACEONMAKE = false;
	454	+ // Object3D keep = GrafreeD.clipboard;
87	455	//Object3D obj;
88	456	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	457	{
..	..	@@ -93,18 +461,19 @@
93	461
94	462	makeSomething(clone, i==group.selection.size()-1);
95	463	}
	464	+ Globals.REPLACEONMAKE = keep;
96	465	}
97	466
98	467	void CloneClipboard(boolean supports)
99	468	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	469	+ assert(Grafreed.clipboard.parent == null);
	470	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	471	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	472	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	473	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	474	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	475	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	476	+ Grafreed.clipboard.get(0).parent = keepparent;
108	477	}
109	478
110	479	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -114,11 +483,16 @@
114	483
115	484	Object3D parent = obj.parent;
116	485	obj.parent = null;
	486	+
117	487	// Object3D support = obj.support;
118	488	// obj.support = null;
119	489	if (!supports)
120	490	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	491	+
	492	+ Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
122	496	obj.parent = parent;
123	497	// obj.support = support;
124	498	// clone.support = support; // aout 2013
..	..	@@ -147,58 +521,155 @@
147	521
148	522	//JTextField nameField;
149	523
150		- void SetupMenu2(ObjEditor oe)
	524	+ void SetupMenu2(GroupEditor oe)
151	525	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	526	+ oe.jTree = new cTree();
	527	+
163	528	Menu menu;
164	529	oe.menuBar.add(menu = new Menu("Edit"));
165	530	//editItem = menu.add(new MenuItem("Edit"));
166	531	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	532	+
	533	+// undoItem = menu.add(new MenuItem("Undo"));
	534	+// undoItem.addActionListener(this);
	535	+// redoItem = menu.add(new MenuItem("Redo"));
	536	+// redoItem.addActionListener(this);
	537	+// menu.add("-");
	538	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	539	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	542	cloneItem.addActionListener(this);
	543	+ //if (Globals.ADVANCED)
	544	+ {
172	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	546	cloneSupportItem.addActionListener(this);
	547	+ }
	548	+ oe.jTree.popup.addSeparator();
174	549	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	551	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	553	copyItem.addActionListener(this);
179	554	pasteItem = menu.add(new MenuItem("Paste"));
180	555	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	556	+
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	560	+ pasteIntoItem.addActionListener(this);
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	562	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	564	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
	571	+
	572	+ if (Globals.ADVANCED)
	573	+ {
	574	+ // Deletes the cameras...
189	575	clearAllItem = menu.add(new MenuItem("Clear All"));
190	576	clearAllItem.addActionListener(this);
	577	+ }
	578	+
	579	+ menuBar.add(cameraMenu = new Menu("View"));
	580	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	581	+ //zBufferItem.addActionListener(this);
	582	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	583	+ //normalLensItem.addActionListener(this);
	584	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	585	+ restoreCameraItem.addActionListener(this);
	586	+
	587	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	588	+// toggleFullScreenItem.addItemListener(this);
	589	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	590	+// cameraMenu.add("-");
	591	+//
	592	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	593	+// toggleTextureItem.addItemListener(this);
	594	+// toggleTextureItem.setState(CameraPane.textureon);
	595	+//
	596	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	597	+// toggleSwitchItem.addItemListener(this);
	598	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	599	+
	600	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	601	+ toggleHandleItem.addItemListener(this);
	602	+ toggleHandleItem.setState(CameraPane.HANDLES);
	603	+
	604	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	605	+ togglePaintItem.addItemListener(this);
	606	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	607	+
	608	+ if (Globals.ADVANCED)
	609	+ {
	610	+ cameraMenu.add("-");
	611	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	612	+ toggleLiveItem.addItemListener(this);
	613	+ toggleLiveItem.setState(Globals.isLIVE());
191	614
	615	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	616	+ stepItem.addActionListener(this);
	617	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	618	+ // toggleDLItem.addItemListener(this);
	619	+ // toggleDLItem.setState(false);
	620	+
	621	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	622	+ toggleRenderItem.addItemListener(this);
	623	+ toggleRenderItem.setState(!CameraPane.frozen);
	624	+
	625	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	626	+ toggleDebugItem.addItemListener(this);
	627	+ toggleDebugItem.setState(Globals.DEBUG);
	628	+
	629	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	630	+ toggleFrustumItem.addItemListener(this);
	631	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	632	+
	633	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	634	+ toggleFootContactItem.addItemListener(this);
	635	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	636	+
	637	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	638	+ toggleTimelineItem.addItemListener(this);
	639	+ }
	640	+
	641	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	642	+// toggleRootItem.addItemListener(this);
	643	+// toggleRootItem.setState(false);
	644	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	645	+// animationItem.addItemListener(this);
	646	+// animationItem.setState(CameraPane.ANIMATION);
	647	+ cameraMenu.add("-");
	648	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	649	+ editCameraItem.addActionListener(this);
	650	+
	651	+ if (Globals.ADVANCED)
	652	+ {
	653	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	654	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	655	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	656	+ oe.cameraMenu.add("-");
	657	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	658	+ openWindowItem.addActionListener(this);
	659	+ lookAtItem.addActionListener(this);
	660	+ //lookFromItem.addActinoListener(this);
	661	+ //switchViewItem.addActionListener(this);
	662	+ }
	663	+
192	664	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	665	+ if (Globals.ADVANCED)
	666	+ {
197	667	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	668	revertMeshItem.addActionListener(this);
199	669	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	670	resetreferencesItem.addActionListener(this);
201	671	menu.add("-");
	672	+ }
202	673	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	674	overwriteGeoItem.addActionListener(this);
204	675	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +681,118 @@
210	681	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	682	overwriteUVItem.addActionListener(this);
212	683	menu.add("-");
	684	+ if (Globals.ADVANCED)
	685	+ {
213	686	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	687	generateMeshItem.addActionListener(this);
215	688	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	689	poseMeshItem.addActionListener(this);
217	690	menu.add("-");
	691	+ }
218	692	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	693	resetsupportItem.addActionListener(this);
220	694	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	695	linkverticesItem.addActionListener(this);
	696	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	697	+ relinkverticesItem.addActionListener(this);
	698	+
	699	+ if (Globals.ADVANCED)
	700	+ {
222	701	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	702	setMasterItem.addActionListener(this);
	703	+ }
224	704
225		- oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
230	707	backItem = menu.add(new MenuItem("Back"));
231	708	backItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	709	+ frontItem = menu.add(new MenuItem("Front"));
	710	+ frontItem.addActionListener(this);
	711	+// compositeItem = menu.add(new MenuItem("Composite"));
	712	+// compositeItem.addActionListener(this);
	713	+
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
	717	+ if (Globals.ADVANCED)
	718	+ {
	719	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	720	+ hideItem.addActionListener(this);
	721	+ }
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	723	+ ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
	729	+
	730	+// menu.add("-");
	731	+//
	732	+// switchItem = menu.add(new MenuItem("Switch node"));
	733	+// switchItem.addActionListener(this);
	734	+ if (Globals.ADVANCED)
	735	+ {
241	736	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	737	switchGeoItem.addActionListener(this);
243	738	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	739	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	740	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	741	morphItem.addActionListener(this);
	742	+
	743	+ menu.add("-");
	744	+ physicsItem = menu.add(new MenuItem("Physics"));
	745	+ physicsItem.addActionListener(this);
	746	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	747	+ frameselectorItem.addActionListener(this);
247	748	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	749	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	750	+ }
251	751
252	752	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	753	+// textureItem = menu.add(new MenuItem("Texture"));
	754	+// textureItem.addActionListener(this);
	755	+ billboardItem = menu.add(new MenuItem("Billboard"));
	756	+ billboardItem.addActionListener(this);
255	757	csgItem = menu.add(new MenuItem("CSG"));
256	758	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	759	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	760	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	761	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	762	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	763	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	764	shadowZItem.addActionListener(this);
	765	+
	766	+ attributeItem = menu.add(new MenuItem("Attribute"));
	767	+ attributeItem.addActionListener(this);
	768	+ if (Globals.ADVANCED)
	769	+ {
	770	+ menu.add("-");
263	771	linkerItem = menu.add(new MenuItem("Linker"));
264	772	linkerItem.addActionListener(this);
265	773	templateItem = menu.add(new MenuItem("Template"));
266	774	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	775	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	776	pointflowItem.addActionListener(this);
	777	+ }
271	778	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
274	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	787	resetTransformItem.addActionListener(this);
276	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	789	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	791	+ resetCentroidXZItem.addActionListener(this);
	792	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	793	+ transformGeometryItem.addActionListener(this);
	794	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	795	+ transformChildrenItem.addActionListener(this);
280	796
281	797	oe.menuBar.add(menu = new Menu("Geometry"));
282	798	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +801,13 @@
285	801	genNormalsORGANItem.addActionListener(this);
286	802	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	803	genNormalsCADItem.addActionListener(this);
	804	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	805	+ genNormalsMESHItem.addActionListener(this);
	806	+ //if (Globals.ADVANCED)
	807	+ {
	808	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	809	+ genNormalsMINEItem.addActionListener(this);
	810	+ }
288	811	stripifyItem = menu.add(new MenuItem("Stripify"));
289	812	stripifyItem.addActionListener(this);
290	813	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,31 +829,52 @@
306	829	reduce34MeshItem.addActionListener(this);
307	830	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	831	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	832	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	833	clipMeshItem.addActionListener(this);
	834	+
	835	+ if (Globals.ADVANCED)
	836	+ {
	837	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	838	+ smoothMeshItem.addActionListener(this);
	839	+ }
313	840
314	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
315	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	845	clearMaterialsItem.addActionListener(this);
	846	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	847	+ resetAllItem.addActionListener(this);
	848	+ stepAllItem = menu.add(new MenuItem("Step All"));
	849	+ stepAllItem.addActionListener(this);
317	850	menu.add("-");
318	851	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	852	liveleavesItem.addActionListener(this);
320	853	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	854	unliveleavesItem.addActionListener(this);
	855	+ if (Globals.ADVANCED)
	856	+ {
322	857	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	858	supportleavesItem.addActionListener(this);
324	859	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	860	unsupportleavesItem.addActionListener(this);
	861	+ }
326	862	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	863	hideleavesItem.addActionListener(this);
328	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
329	865	showleavesItem.addActionListener(this);
330		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
331	867	markleavesItem.addActionListener(this);
332		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
333	869	unmarkleavesItem.addActionListener(this);
	870	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	871	+ rewindleavesItem.addActionListener(this);
	872	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	873	+ unrewindleavesItem.addActionListener(this);
	874	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	875	+ randomleavesItem.addActionListener(this);
	876	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	877	+ unrandomleavesItem.addActionListener(this);
334	878	menu.add("-");
335	879	flipVItem = menu.add(new MenuItem("Flip V"));
336	880	flipVItem.addActionListener(this);
..	..	@@ -356,53 +900,140 @@
356	900	attachBumpItem.addActionListener(this);
357	901	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	902	pigmentBumpItem.addActionListener(this);
	903	+ //embedTexturesItem
359	904	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	905	detachPigmentItem.addActionListener(this);
361	906	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	907	detachBumpItem.addActionListener(this);
	908	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	909	+ embedTexturesItem.addActionListener(this);
	910	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	911	+ deEmbedTexturesItem.addActionListener(this);
363	912	menu.add("-");
364	913	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	914	sortbysizeItem.addActionListener(this);
366	915	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	916	sortbynameItem.addActionListener(this);
368	917	menu.add("-");
	918	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	919	+ shareGeometriesItem.addActionListener(this);
	920	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	921	+ mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
	925	+ if (Globals.ADVANCED)
	926	+ {
	927	+ // Pretty much the same as duplicate and clone.
369	928	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	929	extractGeometriesItem.addActionListener(this);
371	930	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	931	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	932	+ }
377	933
378	934	oe.menuBar.add(menu = new Menu("Insert"));
379	935	buildCreateMenu(menu);
380	936
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	937	oe.menuBar.add(menu = new Menu("Tools"));
393	938	buildToolsMenu(menu);
394	939	}
395	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
	1019	+
396	1020	void SetupUI2(ObjEditor oe)
397	1021	{
	1022	+ // June 2019
	1023	+ if (oe == null)
	1024	+ {
	1025	+ //super.SetupUI2(this);
	1026	+ //return;
	1027	+ }
	1028	+
	1029	+ if (copy != group)
	1030	+ {
	1031	+ //super.SetupUI2(this);
	1032	+ }
	1033	+
398	1034	//new Exception().printStackTrace();
399	1035
400	1036	oe.radioPanel = new JPanel(new GridBagLayout());
401		- oe.aConstraints.weightx = 1;
402		- oe.aConstraints.weighty = 0;
403		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
404		- oe.aConstraints.gridwidth = 100;
405		- oe.aConstraints.gridheight = 1;
406	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1038
408	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1054,271 @@
423	1054	oe.radioPanel.add(dummyButton);
424	1055	oe.buttonGroup.add(dummyButton);
425	1056	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1057	+ cGridBag versionManagerPanel = new cGridBag();
	1058	+
	1059	+ versionManagerPanel.preferredHeight = 4;
429	1060
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1061	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1062	+
	1063	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ //minButton.setToolTipText("Minimize window");
	1065	+ //minButton.addActionListener(this);
	1066	+
	1067	+ if (Globals.ADVANCED)
	1068	+ {
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
	1072	+ }
	1073	+
	1074	+ cButton gcButton;
	1075	+
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ screenfitButton.setToolTipText("Screen fit");
	1119	+ screenfitButton.addActionListener(this);
	1120	+
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1122	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1123	+ restoreCameraButton.addActionListener(this);
	1124	+
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1126	+ saveVersionButton.setToolTipText("Duplicate current version");
	1127	+ saveVersionButton.addActionListener(this);
	1128	+
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1130	+ deleteVersionButton.setToolTipText("Delete current version");
	1131	+ deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
	1133	+
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1135	+ previousVersionButton.setToolTipText("Previous version");
	1136	+ previousVersionButton.addActionListener(this);
	1137	+ previousVersionButton.setEnabled(false);
	1138	+
	1139	+ cGridBag updown = new cGridBag().setVertical(true);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1141	+ restoreButton.setToolTipText("Undo (restore current version)");
	1142	+ restoreButton.addActionListener(this);
	1143	+ restoreButton.setEnabled(false);
	1144	+
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1146	+ replaceButton.setToolTipText("Save (replace current version)");
	1147	+ replaceButton.addActionListener(this);
	1148	+ replaceButton.setEnabled(false);
	1149	+
	1150	+ versionManagerPanel.add(updown);
	1151	+
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1153	+ nextVersionButton.setToolTipText("Next version");
	1154	+ nextVersionButton.addActionListener(this);
	1155	+ nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
	1160	+
	1161	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1162	+ liveCB.setToolTipText("Enable animation");
431	1163	liveCB.addItemListener(this);
432	1164
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	1165	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1166	+ fastCB.setToolTipText("Fast mode");
451	1167	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
	1168	+
	1169	+ //oe.toolboxPanel.Return();
	1170	+
	1171	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1172	+// trackCB.setToolTipText("Enable tracking");
	1173	+// trackCB.addItemListener(this);
458	1174
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	1175	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1176	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	1177
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516		-
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
519		- twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	1178	+ if (Globals.ADVANCED)
	1179	+ {
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1181	+ snapobjectButton.addActionListener(this);
	1182	+ snapobjectButton.setToolTipText("Snap Object");
	1183	+
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
521	1185	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
523		- sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
525		- threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
527		- sevenButton.addActionListener(this);
528		- //
	1186	+ fourButton.setToolTipText("Show control panel only");
	1187	+ }
529	1188
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1189	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1190	+
	1191	+
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1193	+ rootButton.setToolTipText("Open selection in new tab");
531	1194	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1195	+
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1197	+ closeButton.setToolTipText("Close tab");
534	1198	closeButton.addActionListener(this);
535	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1200	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	1201
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1202	+ cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
	1204	+
	1205	+ // INSERT
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
	1208	+ gridButton.addActionListener(this);
	1209	+
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ boxButton.setToolTipText("Create box");
	1212	+ boxButton.addActionListener(this);
	1213	+
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1215	+ superButton.setToolTipText("Create superellipsoid");
	1216	+ superButton.addActionListener(this);
	1217	+
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
	1231	+ {
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1233	+ kleinButton.setToolTipText("Create Klein bottle");
	1234	+ kleinButton.addActionListener(this);
	1235	+ }
	1236	+
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1238	+ particlesButton.setToolTipText("Create particle system");
	1239	+ particlesButton.addActionListener(this);
	1240	+
	1241	+ oe.toolboxPanel.add(row1);
	1242	+
	1243	+ cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
	1245	+
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ groupButton.setToolTipText("Create group");
	1248	+ groupButton.addActionListener(this);
	1249	+
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ compositeButton.setToolTipText("Create composite");
	1252	+ compositeButton.addActionListener(this);
	1253	+
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ switchButton.setToolTipText("Create item switcher");
	1256	+ switchButton.addActionListener(this);
	1257	+
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ loopButton.setToolTipText("Create loop");
	1260	+ loopButton.addActionListener(this);
	1261	+
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ textureButton.setToolTipText("Create texture");
	1264	+ textureButton.addActionListener(this);
	1265	+
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ overlayButton.setToolTipText("Create overlay");
	1268	+ overlayButton.addActionListener(this);
	1269	+
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1271	+ lightButton.setToolTipText("Create light");
	1272	+ lightButton.addActionListener(this);
	1273	+
	1274	+ oe.toolboxPanel.add(row2);
	1275	+
	1276	+ cGridBag textures = new cGridBag();
	1277	+
	1278	+ CreateTexturePanel(textures);
	1279	+
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
	1290	+
	1291	+ // EDIT panel
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ editButton.setToolTipText("Pin selection controls");
	1294	+ editButton.addActionListener(this);
	1295	+
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1297	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1298	uneditButton.addActionListener(this);
548	1299
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1300	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1301	+ allParamsButton.setToolTipText("Show all controls");
561	1302	allParamsButton.addActionListener(this);
562	1303
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
568		- unselectButton.addActionListener(this);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
	1306	+ clearPanelButton.addActionListener(this);
569	1307
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
	1311	+
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1313	+ flashSelectionButton.setToolTipText("Highlight selection");
	1314	+ flashSelectionButton.addActionListener(this);
	1315	+
	1316	+ editCommandsPanel.preferredHeight = 1;
	1317	+
	1318	+ SetPinStates(false);
	1319	+// oe.treePanel.add(commandsPanel);
	1320	+// oe.treePanel.Return();
	1321	+
570	1322	// oe.aConstraints.gridx += 1;
571	1323	// oe.aConstraints.weighty = 0;
572	1324	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1330,35 @@
578	1330	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1331	// gcButton.addActionListener(this);
580	1332
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	1333	+ cGridBag jSPPanel = new cGridBag();
	1334	+
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
	1337	+ JScrollPane jSP;
592	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1339	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1340	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	1341
	1342	+ oe.treePanel.add(jSPPanel);
	1343	+ oe.treePanel.Return();
	1344	+
	1345	+ oe.treePanel.add(versionManagerPanel);
	1346	+ oe.treePanel.Return();
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
	1351	+
	1352	+// mainPanel.setDividerLocation(0.1); //1.0);
	1353	+ mainPanel.setResizeWeight(0.4);
	1354	+
615	1355	//jList.addListSelectionListener(this);
616	1356	oe.jTree.addTreeSelectionListener(this);
617	1357	//jTree.setRootVisible(false);
618	1358	//jTree.setEditable(true);
619	1359	oe.jTree.setDragEnabled(true);
620	1360	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1361	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1362
623	1363	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1364
..	..	@@ -630,47 +1370,203 @@
630	1370	dgr.addDragGestureListener(this);
631	1371	}catch(Exception e) {}
632	1372	*/
633		- radio.layout = sevenButton;
	1373	+ radio.layout = threeButton; // sixButton;
634	1374	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1375	}
	1376	+
	1377	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1378	+ {
	1379	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1380	+ colorCB.setToolTipText("Copy color when dropped");
	1381	+ colorCB.addItemListener(this);
	1382	+
	1383	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1384	+ materialCB.setToolTipText("Copy material when dropped");
	1385	+ materialCB.addItemListener(this);
	1386	+
	1387	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1388	+ textureCB.setToolTipText("Copy texture when dropped");
	1389	+ textureCB.addItemListener(this);
	1390	+
	1391	+ panel.Return();
	1392	+
	1393	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1394	+ boxCB.setToolTipText("Display bounding boxes");
	1395	+ boxCB.addItemListener(this);
	1396	+
	1397	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1398	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1399	+ zoomBoxCB.addItemListener(this);
	1400	+
	1401	+ if (true) // Globals.ADVANCED)
	1402	+ {
	1403	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1404	+// supportCB.setToolTipText("Enable rigging");
	1405	+// supportCB.addItemListener(this);
	1406	+
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
	1408	+ freezeCB.setToolTipText("Fast moving camera");
	1409	+ freezeCB.addItemListener(this);
	1410	+
	1411	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1412	+ // localCB.addItemListener(this);
	1413	+
	1414	+ panel.Return();
	1415	+
	1416	+ if (Globals.ADVANCED)
	1417	+ {
	1418	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1419	+ crowdCB.setToolTipText("Used for crowds");
	1420	+ crowdCB.addItemListener(this);
	1421	+ }
	1422	+
	1423	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1424	+ smoothCB.setToolTipText("Snapping delay");
	1425	+ smoothCB.addItemListener(this);
	1426	+
	1427	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1428	+// slowCB.setToolTipText("Smooth interpolation");
	1429	+// slowCB.addItemListener(this);
	1430	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1431	+ minshaderCB.setToolTipText("Minimal fast shader");
	1432	+ minshaderCB.addItemListener(this);
	1433	+
	1434	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1435	+// speakerMocapCB.addItemListener(this);
	1436	+
	1437	+ if (false)
	1438	+ {
	1439	+ // handled in scripts
	1440	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1441	+ speakerCameraCB.addItemListener(this);
	1442	+
	1443	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1444	+ speakerFocusCB.addItemListener(this);
	1445	+
	1446	+ panel.Return();
	1447	+ }
	1448	+
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
	1454	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1455	+// debugCB.addItemListener(this);
	1456	+
	1457	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1458	+ trackCB.setToolTipText("Enable tracking target");
	1459	+ trackCB.addItemListener(this);
	1460	+
	1461	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1462	+ oeilCB.setToolTipText("Move camera when tracking");
	1463	+ oeilCB.addItemListener(this);
	1464	+
	1465	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1466	+ shadowCB.setToolTipText("When live compute shadows");
	1467	+ shadowCB.addItemListener(this);
	1468	+
	1469	+ panel.Return();
	1470	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1471	+ toggleTextureCB.setToolTipText("Load textures");
	1472	+ toggleTextureCB.addItemListener(this);
	1473	+
	1474	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1475	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1476	+ toggleSwitchCB.addItemListener(this);
	1477	+
	1478	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1479	+ autokeepCB.setToolTipText("On structure change");
	1480	+ autokeepCB.addItemListener(this);
	1481	+
	1482	+ panel.Return();
	1483	+ if (Globals.ADVANCED)
	1484	+ {
	1485	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1486	+ lookAtCB.setToolTipText("Look-at target");
	1487	+ lookAtCB.addItemListener(this);
	1488	+ }
	1489	+
	1490	+ }
	1491	+
	1492	+ cGridBag fill = new cGridBag();
	1493	+ fill.preferredHeight = 200;
	1494	+ cGridBag fill2 = new cGridBag();
	1495	+ fill2.preferredHeight = 200;
	1496	+ cGridBag fill3 = new cGridBag();
	1497	+ fill3.preferredHeight = 200;
	1498	+
	1499	+ panel.add(fill);
	1500	+ panel.add(fill2);
	1501	+ panel.add(fill3);
	1502	+
	1503	+ }
636	1504
637	1505	void EditObject(Object3D obj)
638	1506	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
	1515	+ cRadio radioButton = new cRadio(obj.name);
	1516	+
	1517	+ // June 2019. Patch to avoid bug with transparency.
	1518	+ radioButton.hadMaterial = obj.material != null;
	1519	+ if (!radioButton.hadMaterial)
	1520	+ {
	1521	+ obj.material = new cMaterial();
	1522	+ }
	1523	+
	1524	+ radioButton.SetObject(obj);
	1525	+ radioButton.layout = threeButton; // sixButton;
	1526	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1527	+ radioButton.addActionListener(this);
	1528	+ radioPanel.add(radioButton);
	1529	+ buttonGroup.add(radioButton);
	1530	+ radioButton.doClick();
647	1531	}
	1532	+
648	1533	void SetupViews(ObjEditor oe)
649	1534	{
	1535	+ theFrame = this;
	1536	+
650	1537	oe.SetupViews();
651	1538
	1539	+ if (Globals.DEBUG)
652	1540	System.out.println("SetupViews");
653	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
654	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
655	1543	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1544	}
657	1545
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1546	+ cToggleButton liveCB;
	1547	+ cCheckBox supportCB;
	1548	+ cCheckBox localCB;
	1549	+ cCheckBox crowdCB;
	1550	+ cCheckBox smoothCB;
	1551	+ cCheckBox minshaderCB;
	1552	+
	1553	+ cToggleButton fastCB;
	1554	+ cCheckBox slowCB;
	1555	+ cCheckBox boxCB;
	1556	+ cCheckBox zoomBoxCB;
	1557	+ cCheckBox freezeCB;
	1558	+ //cToggleButton trackCB;
	1559	+ cCheckBox trackCB;
	1560	+ cCheckBox smoothfocusCB;
668	1561	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1562	+ cCheckBox speakerCameraCB;
	1563	+ cCheckBox speakerFocusCB;
	1564	+ cCheckBox debugCB;
	1565	+
	1566	+ cCheckBox oeilCB;
	1567	+ cCheckBox shadowCB;
	1568	+ cCheckBox autokeepCB;
	1569	+ cCheckBox lookAtCB;
674	1570
675	1571	// static int COLOR = 1;
676	1572	// static int MATERIAL = 2;
..	..	@@ -678,9 +1574,9 @@
678	1574
679	1575	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1576
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1577	+ cCheckBox colorCB;
	1578	+ cCheckBox materialCB;
	1579	+ cCheckBox textureCB;
684	1580
685	1581	public void itemStateChanged(ItemEvent e)
686	1582	{
..	..	@@ -705,10 +1601,10 @@
705	1601	dropAttributes \|= Object3D.TEXTURE;
706	1602	else
707	1603	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1604	+ } else if(e.getSource() == liveCB)
710	1605	{
711	1606	cameraView.ToggleLive();
	1607	+ refreshContents(false);
712	1608	}
713	1609	else if(e.getSource() == supportCB)
714	1610	{
..	..	@@ -724,6 +1620,12 @@
724	1620	{
725	1621	cameraView.ToggleInertia();
726	1622	cameraView.repaint();
	1623	+ }
	1624	+ else if(e.getSource() == minshaderCB)
	1625	+ {
	1626	+ Globals.MINSHADER ^= true;
	1627	+ cameraView.programInitialized = false;
	1628	+ cameraView.repaint();
727	1629	}
728	1630	else if(e.getSource() == localCB)
729	1631	{
..	..	@@ -743,6 +1645,10 @@
743	1645	Recompile();
744	1646	cameraView.repaint();
745	1647	// refreshContents();
	1648	+ }
	1649	+ else if(e.getSource() == zoomBoxCB)
	1650	+ {
	1651	+ cameraView.ToggleZoomBoxMode();
746	1652	}
747	1653	else if(e.getSource() == smoothfocusCB)
748	1654	{
..	..	@@ -769,6 +1675,18 @@
769	1675	{
770	1676	cameraView.ToggleOeil();
771	1677	}
	1678	+ else if(e.getSource() == shadowCB)
	1679	+ {
	1680	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == freezeCB)
	1683	+ {
	1684	+ Globals.FREEZEONMOVE ^= true;
	1685	+ }
	1686	+ else if(e.getSource() == autokeepCB)
	1687	+ {
	1688	+ Globals.REPLACEONMAKE ^= true;
	1689	+ }
772	1690	else if(e.getSource() == lookAtCB)
773	1691	{
774	1692	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1703,8 @@
785	1703
786	1704	/**/
787	1705	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1706	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1707	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1708	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1709	// We can't move the root node or an empty selection
791	1710	return;
..	..	@@ -848,8 +1767,6 @@
848	1767	}
849	1768	}
850	1769
851		- String string = (String) object;
852		-
853	1770	System.out.println("Transfer = " + object + "; drop : " + target);
854	1771	// if( object instanceof java.io.File[])
855	1772	// {
..	..	@@ -857,7 +1774,11 @@
857	1774	// objEditor.DropFile((java.io.File[]) object, true);
858	1775	// return;
859	1776	// }
860		- if (string.charAt(0) == '/')
	1777	+
	1778	+ String string = object.toString();
	1779	+
	1780	+ // File path for Mac and Windows
	1781	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1782	{
862	1783	// file(s)
863	1784	String[] names = string.split("\n");
..	..	@@ -884,7 +1805,7 @@
884	1805
885	1806	flashIt = false;
886	1807	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1808	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1809	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1810
890	1811	if (group.selection.size() == 1)
..	..	@@ -900,23 +1821,33 @@
900	1821
901	1822	assert target == objEditor.jTree;
902	1823	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1824	+ Object3D destinationLeaf;
903	1825	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1826	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1827	} catch (Exception e) {
906	1828	System.out.println("destinationPath : " + destinationPath);
907	1829	return;
908	1830	}
909	1831
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1832	+ for (int i=group.selection.size(); --i>=0;)
911	1833	{
	1834	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1835	+
	1836	+ // Cannot move into itself
	1837	+ if (child == destinationLeaf)
	1838	+ return;
	1839	+ }
	1840	+
	1841	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1842	+// {
912	1843	loadClipboard(true);
913	1844	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1845	+ pasteInto(false, false);
	1846	+// } else {
	1847	+// loadClipboard(false);
	1848	+// objEditor.jTree.setSelectionPath(destinationPath);
	1849	+// pasteInto(false, false); // true); // ???
	1850	+// }
920	1851	}
921	1852	public void dropActionChanged(DropTargetDragEvent dtde)
922	1853	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1903,12 @@
972	1903	TreePath path;
973	1904
974	1905	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
976	1912	}
977	1913
978	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1957,107 @@
1021	1957	{
1022	1958	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1959	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1960	+// gridItem = menu.add(new MenuItem("Grid"));
	1961	+// gridItem.addActionListener(this);
	1962	+// rectoidItem = menu.add(new MenuItem("Box"));
	1963	+// rectoidItem.addActionListener(this);
	1964	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1965	+// ellipsoidItem.addActionListener(this);
	1966	+// coneItem = menu.add(new MenuItem("Cone"));
	1967	+// coneItem.addActionListener(this);
	1968	+// torusItem = menu.add(new MenuItem("Torus"));
	1969	+// torusItem.addActionListener(this);
	1970	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1971	+// superItem.addActionListener(this);
	1972	+
	1973	+ cameraItem = menu.add(new MenuItem("Camera"));
	1974	+ cameraItem.addActionListener(this);
	1975	+
	1976	+ if (!Globals.ADVANCED)
	1977	+ {
	1978	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1979	+ kleinItem.addActionListener(this);
	1980	+ }
	1981	+
	1982	+// particleItem = menu.add(new MenuItem("Particle system"));
	1983	+// particleItem.addActionListener(this);
	1984	+ if (Globals.ADVANCED)
	1985	+ {
1038	1986	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1987	ragdollItem.addActionListener(this);
1040	1988	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1989	ragdoll2Item.addActionListener(this);
	1990	+ }
1042	1991	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1992	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1993	meshItem.addActionListener(this);
1045	1994	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1995	// meshGroupItem.addActionListener(this);
	1996	+ if (Globals.ADVANCED)
	1997	+ {
1047	1998	springItem = menu.add(new MenuItem("Spring"));
1048	1999	springItem.addActionListener(this);
1049	2000	flagItem = menu.add(new MenuItem("Flag"));
1050	2001	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	2002	blobItem = menu.add(new MenuItem("Blob"));
1056	2003	blobItem.addActionListener(this);
1057	2004	latheItem = menu.add(new MenuItem("Lathe"));
1058	2005	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	2006	+ }
	2007	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	2008	+ bezierItem.addActionListener(this);
	2009	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2010	+// overlayItem.addActionListener(this);
	2011	+// lightItem = menu.add(new MenuItem("Light"));
	2012	+// lightItem.addActionListener(this);
1061	2013	menu.add("-");
1062	2014	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	2015	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	2016	+// loopItem = menu.add(new MenuItem("Loop"));
	2017	+// loopItem.addActionListener(this);
1066	2018	doubleItem = menu.add(new MenuItem("Fork"));
1067	2019	doubleItem.addActionListener(this);
	2020	+ if (Globals.ADVANCED)
	2021	+ {
1068	2022	tripleItem = menu.add(new MenuItem("Trident"));
1069	2023	tripleItem.addActionListener(this);
	2024	+ }
1070	2025	}
1071	2026
1072	2027	void buildToolsMenu(Menu menu)
1073	2028	{
1074	2029	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	2030	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	2031	+ animationItem.setState(Globals.ANIMATION);
	2032	+
	2033	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2034	+ archiveItem.addActionListener(this);
1077	2035
1078	2036	menu.add("-");
1079	2037	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2038	parseverticesItem.addActionListener(this);
1081	2039	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2040	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2041	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2042	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2043	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2044	reduceMorphItem.addActionListener(this);
1089	2045	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2046	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2047	menu.add("-");
1095		-
1096	2048	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2049	memoryItem.addActionListener(this);
	2050	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2051	+ computeAOItem.addActionListener(this);
	2052	+
	2053	+ if (Globals.ADVANCED)
	2054	+ {
	2055	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2056	+ mirrorItem.addActionListener(this);
	2057	+ menu.add("-");
1098	2058	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2059	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2060	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2061	dumpItem.addActionListener(this);
1102	2062	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2063	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2066,8 @@
1106	2066	resetParentItem.addActionListener(this);
1107	2067	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2068	repairParentItem.addActionListener(this);
	2069	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2070	+ repairShadowItem.addActionListener(this);
1109	2071	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2072	invariantsItem.addActionListener(this);
1111	2073	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2075,7 @@
1113	2075	menu.add("-");
1114	2076	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2077	editScriptItem.addActionListener(this);
	2078	+ }
1116	2079	}
1117	2080
1118	2081	void ScreenFit()
..	..	@@ -1126,7 +2089,7 @@
1126	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1127	2090	objEditor.ScreenFit(obj, false);
1128	2091
1129		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1130	2093	refreshContents();
1131	2094	}
1132	2095
..	..	@@ -1163,7 +2126,7 @@
1163	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1164	2127	}
1165	2128
1166		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1167	2130
1168	2131	shadow.toParent = LA.newMatrix();
1169	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1177,24 +2140,24 @@
1177	2140	switch(axis)
1178	2141	{
1179	2142	case 0 :
1180		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1181		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1182		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1183		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1184	2147	norm = cVector.X;
1185	2148	break;
1186	2149	case 1 :
1187		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1188		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1189		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1190		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1191	2154	norm = cVector.Y;
1192	2155	break;
1193	2156	case 2 :
1194		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1195		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1196		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1197		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1198	2161	norm = cVector.Z;
1199	2162	break;
1200	2163	}
..	..	@@ -1235,9 +2198,38 @@
1235	2198	shadow.material = new cMaterial(obj.material);
1236	2199	shadow.material.diffuse = 0.0001f;
1237	2200	shadow.material.specular = 0.0001f;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
1238	2206
1239	2207	makeSomething(shadow);
1240	2208	}
	2209	+
	2210	+ private void ClearUnpinned()
	2211	+ {
	2212	+ //for (Object3D obj : listUI)
	2213	+ for (int i=listUI.size(); --i>=0;)
	2214	+ {
	2215	+ Object3D obj = listUI.elementAt(i);
	2216	+ if (!obj.pinned)
	2217	+ {
	2218	+ obj.CloseUI();
	2219	+ listUI.remove(i);
	2220	+ }
	2221	+ }
	2222	+ }
	2223	+
	2224	+ private void EditElement(Object3D elem, boolean newWindow)
	2225	+ {
	2226	+ // if (!(elem instanceof Composite))
	2227	+ // newWindow = false;
	2228	+ listUI.add(elem);
	2229	+ elem.openEditWindow(this, newWindow); //, false);
	2230	+ System.out.println("edit : " + elem);
	2231	+ elem.editWindow.refreshContents(true); // ? new
	2232	+ }
1241	2233
1242	2234	/**
1243	2235	* applyExample
..	..	@@ -1441,9 +2433,9 @@
1441	2433
1442	2434	void Overwrite(int mask)
1443	2435	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2437	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2438	+ Object3D content = Grafreed.clipboard.get(0);
1447	2439
1448	2440	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2441	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2458,7 @@
1466	2458	//
1467	2459	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2460	{
	2461	+ Object source = event.getSource();
1469	2462	/*
1470	2463	if (event.getSource() == nameField)
1471	2464	{
..	..	@@ -1477,11 +2470,11 @@
1477	2470	}
1478	2471	else
1479	2472	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2473	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2474	{
1482	2475	ScreenFit();
1483	2476	} else
1484		- if (event.getSource() == switchItem)
	2477	+ if (source == switchViewItem)
1485	2478	{
1486	2479	cVector v1 = new cVector();
1487	2480	cVector v2 = new cVector();
..	..	@@ -1490,11 +2483,11 @@
1490	2483	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2484	objEditor.cameraView.repaint();
1492	2485	} else
1493		- if (event.getSource() == rectoidItem)
	2486	+ if (source == rectoidItem \|\| source == boxButton)
1494	2487	{
1495	2488	makeSomething(new Box());
1496	2489	} else
1497		- if (event.getSource() == particleItem)
	2490	+ if (source == particleItem \|\| source == particlesButton)
1498	2491	{
1499	2492	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2493	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2508,9 @@
1515	2508	applyExample(particleGeom, "SMOKE");
1516	2509	makeSomething(particleGeom);
1517	2510	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2511	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2512	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2513	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2514
1522	2515	ragdoll.toParent = LA.newMatrix();
1523	2516	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2528,7 @@
1535	2528	} else
1536	2529	/*
1537	2530	*/
1538		- if (event.getSource() == heightFieldItem)
	2531	+ if (source == heightFieldItem)
1539	2532	{
1540	2533	Object3D obj = new Object3D();
1541	2534
..	..	@@ -1573,27 +2566,31 @@
1573	2566
1574	2567	makeSomething(obj);
1575	2568	} else
1576		- if (event.getSource() == gridItem)
	2569	+ if (source == gridItem \|\| source == gridButton)
1577	2570	{
1578	2571	makeSomething(new Grid());
1579	2572	} else
1580		- if (event.getSource() == ellipsoidItem)
	2573	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2574	{
1582	2575	makeSomething(new Sphere());
1583	2576	} else
1584		- if (event.getSource() == coneItem)
	2577	+ if (source == coneItem \|\| source == coneButton)
1585	2578	{
1586	2579	makeSomething(new Cone());
1587	2580	} else
1588		- if (event.getSource() == torusItem)
	2581	+ if (source == torusItem \|\| source == torusButton)
1589	2582	{
1590	2583	makeSomething(new Torus());
1591	2584	} else
1592		- if (event.getSource() == superItem)
	2585	+ if (source == superItem \|\| source == superButton)
1593	2586	{
1594	2587	makeSomething(new Superellipsoid());
1595	2588	} else
1596		- if (event.getSource() == blobItem)
	2589	+ if (source == kleinItem \|\| source == kleinButton)
	2590	+ {
	2591	+ makeSomething(new Klein());
	2592	+ } else
	2593	+ if (source == blobItem)
1597	2594	{
1598	2595	Blob blob = new Blob();
1599	2596	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2598,15 @@
1601	2598	//blob.retile();
1602	2599	makeSomething(blob);
1603	2600	} else
1604		- if (event.getSource() == latheItem)
	2601	+ if (source == latheItem)
1605	2602	{
1606	2603	makeSomething(new Lathe());
1607	2604	} else
1608		- if (event.getSource() == bezierItem)
	2605	+ if (source == bezierItem)
1609	2606	{
1610	2607	makeSomething(new BezierSurface());
1611	2608	} else
1612		- if (event.getSource() == checkerItem)
	2609	+ if (source == overlayItem \|\| source == overlayButton)
1613	2610	{
1614	2611	/*
1615	2612	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2621,7 @@
1624	2621	*/
1625	2622	makeSomething(new Checker());
1626	2623	} else
1627		- if (event.getSource() == meshItem)
	2624	+ if (source == meshItem)
1628	2625	{
1629	2626	Object3D itemtomake = new Object3D();
1630	2627	Object3D child;
..	..	@@ -1645,35 +2642,52 @@
1645	2642	makeSomething(child);
1646	2643	}
1647	2644	} else
1648		- if (event.getSource() == springItem)
	2645	+ if (source == springItem)
1649	2646	{
1650	2647	cSpring s = new cSpring();
1651	2648	s.setup();
1652	2649	makeSomething(s);
1653	2650	} else
1654		- if (event.getSource() == flagItem)
	2651	+ if (source == flagItem)
1655	2652	{
1656	2653	cSpring s = new cFlag();
1657	2654	s.setup();
1658	2655	makeSomething(s);
1659	2656	} else
1660		- if (event.getSource() == lightItem)
	2657	+ if (source == lightItem \|\| source == lightButton)
1661	2658	{
1662	2659	makeSomething(new Light());
1663	2660	} else
1664		- if (event.getSource() == csgItem)
	2661	+// if (source == skybox1Button \|\|
	2662	+// source == skybox2Button \|\|
	2663	+// source == skybox3Button \|\|
	2664	+// source == skybox4Button \|\|
	2665	+// source == skybox5Button \|\|
	2666	+// source == skybox6Button \|\|
	2667	+// source == skybox7Button \|\|
	2668	+// source == skybox11Button \|\|
	2669	+// source == skybox12Button \|\|
	2670	+// source == skybox13Button \|\|
	2671	+// source == skybox14Button \|\|
	2672	+// source == skybox15Button \|\|
	2673	+// source == skybox16Button \|\|
	2674	+// source == skybox17Button)
	2675	+// {
	2676	+// ChangeSkybox(source);
	2677	+// } else
	2678	+ if (source == csgItem)
1665	2679	{
1666	2680	group(new CSG());
1667	2681	} else
1668		- if (event.getSource() == templateItem)
	2682	+ if (source == templateItem)
1669	2683	{
1670	2684	group(new cTemplate());
1671	2685	} else
1672		- if (event.getSource() == attributeItem)
	2686	+ if (source == attributeItem)
1673	2687	{
1674	2688	makeSomething(new Attribute());
1675	2689	} else
1676		- if (event.getSource() == pointflowItem)
	2690	+ if (source == pointflowItem)
1677	2691	{
1678	2692	makeSomething(new PointFlow());
1679	2693	} else
..	..	@@ -1685,7 +2699,7 @@
1685	2699	} else
1686	2700	*/
1687	2701
1688		- if (event.getSource() == superLoopItem)
	2702	+ if (source == superLoopItem)
1689	2703	{
1690	2704	Composite g = new cGroup();
1691	2705	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2721,38 @@
1707	2721
1708	2722	group(g);
1709	2723	} else
1710		- if (event.getSource() == loopItem)
	2724	+ if (source == loopItem \|\| source == loopButton)
1711	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
1712	2728	Composite csg = new GroupLeaf();
1713		- csg.count = 5;
1714	2729	group(csg);
1715		- Composite child = new cGroup();
1716		- csg.addChild(child);
1717		- child.addChild(csg);
1718		- } else
1719		- if (event.getSource() == doubleItem)
1720		- {
1721		- Composite csg = new GroupLeaf();
1722	2730	csg.count = 5;
1723		- group(csg);
1724		- Composite child = new cGroup();
	2731	+ Composite child = new cGroup("Branch");
1725	2732	csg.addChild(child);
1726	2733	child.addChild(csg);
1727		- child = new cGroup();
1728		- csg.addChild(child);
1729		- child.addChild(csg);
	2734	+ }
1730	2735	} else
1731		- if (event.getSource() == tripleItem)
	2736	+ if (source == doubleItem)
1732	2737	{
1733		- Composite csg = new GroupLeaf();
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
	2740	+ Composite csg = new GroupLeaf("Fork");
	2741	+ group(csg);
	2742	+ csg.count = 5;
	2743	+ Composite child = new cGroup("Branch A");
	2744	+ csg.addChild(child);
	2745	+ child.addChild(csg);
	2746	+ child = new cGroup("Branch B");
	2747	+ csg.addChild(child);
	2748	+ child.addChild(csg);
	2749	+ }
	2750	+ } else
	2751	+ if (source == tripleItem)
	2752	+ {
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
	2755	+ Composite csg = new GroupLeaf("Trident");
1734	2756	csg.count = 4;
1735	2757	group(csg);
1736	2758	Composite child = new cGroup();
..	..	@@ -1742,74 +2764,119 @@
1742	2764	child = new cGroup();
1743	2765	csg.addChild(child);
1744	2766	child.addChild(csg);
	2767	+ }
1745	2768	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2769	+ if (source == computeAOItem)
1748	2770	{
1749		- ImportGFD();
	2771	+ Globals.drawMode = CameraPane.OCCLUSION;
	2772	+ cameraView.repaint();
1750	2773	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2774	+ if (source == recompileItem)
1769	2775	{
1770	2776	Recompile();
1771	2777	refreshContents();
1772	2778	} else
1773		- if (event.getSource() == editScriptItem)
	2779	+ if (source == editScriptItem)
1774	2780	{
1775	2781	OpenDialog();
1776	2782	refreshContents();
1777	2783	} else
1778		- if (event.getSource() == invariantsItem)
	2784	+ if (source == invariantsItem)
1779	2785	{
1780	2786	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2787	+ Grafreed.grafreed.universe.invariants();
1782	2788	} else
1783		- if (event.getSource() == memoryItem)
	2789	+ if (source == memoryItem)
1784	2790	{
1785	2791	//System.out.println("Invariants:");
1786	2792	PrintMemory();
1787	2793	} else
1788		- if (event.getSource() == pathItem)
	2794	+ if (source == pathItem)
1789	2795	{
1790	2796	PrintPath();
1791	2797	} else
1792		- if (event.getSource() == analyzeItem)
	2798	+ if (source == analyzeItem)
1793	2799	{
1794	2800	AnalyzeObject();
1795	2801	} else
1796		- if (event.getSource() == dumpItem)
	2802	+ if (source == dumpItem)
1797	2803	{
1798	2804	DumpObject();
1799	2805	} else
1800		- if (event.getSource() == screenfitButton)
	2806	+ if (source == minButton)
1801	2807	{
1802		- //Reload(lastConverter, lastFilename, true);
	2808	+ Minimize();
	2809	+ } else
	2810	+ if (source == maxButton)
	2811	+ {
	2812	+ Maximize();
	2813	+ } else
	2814	+ if (source == fullScreenButton)
	2815	+ {
	2816	+ ToggleFullScreen();
	2817	+ } else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
	2830	+ if (source == previousVersionButton)
	2831	+ {
	2832	+ // Go to previous version
	2833	+ //if (!Undo())
	2834	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2835	+ PreviousVersion();
	2836	+ } else
	2837	+ if (source == restoreButton)
	2838	+ {
	2839	+ // Restore current version
	2840	+ Restore();
	2841	+ //restoreButton.setEnabled(false);
	2842	+ } else
	2843	+ if (source == replaceButton)
	2844	+ {
	2845	+ // Overwrite current version
	2846	+ Replace();
	2847	+ //replaceButton.setEnabled(false);
	2848	+ } else
	2849	+ if (source == nextVersionButton)
	2850	+ {
	2851	+ // Go to next version
	2852	+ NextVersion();
	2853	+ } else
	2854	+ if (source == saveVersionButton)
	2855	+ {
	2856	+ // Save a new version
	2857	+ if (!DuplicateVersion()) //true))
	2858	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2859	+ } else
	2860	+ if (source == deleteVersionButton)
	2861	+ {
	2862	+ // Delete a new version
	2863	+ DeleteVersion();
	2864	+ } else
	2865	+ if (source == oneStepButton)
	2866	+ {
	2867	+ Globals.ONESTEP = true;
	2868	+ cameraView.repaint();
	2869	+ } else
	2870	+ if (source == screenfitButton)
	2871	+ {
1803	2872	ScreenFit();
1804	2873	} else
1805		- if (event.getSource() == screenfitpointButton)
	2874	+ if (source == screenfitpointButton)
1806	2875	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2876	ScreenFitPoint();
1809	2877	} else
1810		- if (event.getSource() == snapobjectButton)
	2878	+ if (source == snapobjectButton)
1811	2879	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2880	SnapObject();
1814	2881	} else
1815	2882	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2885,13 @@
1818	2885	// Recompile();
1819	2886	// refreshContents();
1820	2887	// } else
1821		- if (event.getSource() == gcButton)
	2888	+ if (source == gcButton)
1822	2889	{
1823	2890	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2891	System.gc();
1825	2892	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2893	} else
1827		- if (event.getSource() == editLeafItem)
	2894	+ if (source == editLeafItem)
1828	2895	{
1829	2896	Object3D obj;
1830	2897	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2905,78 @@
1838	2905	}
1839	2906	refreshContents(true);
1840	2907	} else
1841		- if (event.getSource() == openWindowItem)
	2908	+ if (source == openWindowItem)
1842	2909	{
1843	2910	EditSelection(true);
1844	2911	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2912	+ if (source == cutItem \|\| source == clearButton)
1846	2913	{
1847	2914	loadClipboard(true);
1848	2915	} else
1849		- if (event.getSource() == duplicateItem)
	2916	+ if (source == undoItem)
1850	2917	{
1851		- Object3D keep = GraphreeD.clipboard;
	2918	+ PreviousVersion();
	2919	+ } else
	2920	+ if (source == redoItem)
	2921	+ {
	2922	+ NextVersion();
	2923	+ } else
	2924	+ if (source == duplicateItem)
	2925	+ {
	2926	+ Object3D keep = Grafreed.clipboard;
1852	2927	loadClipboard(false);
1853	2928	paste(false);
1854		- GraphreeD.clipboard = keep;
	2929	+ Grafreed.clipboard = keep;
1855	2930	} else
1856		- if (event.getSource() == cloneItem)
	2931	+ if (source == cloneItem)
1857	2932	{
1858	2933	CloneSelection(false);
1859	2934	} else
1860		- if (event.getSource() == cloneSupportItem)
	2935	+ if (source == cloneSupportItem)
1861	2936	{
1862	2937	CloneSelection(true);
1863	2938	} else
1864		- if (event.getSource() == copyItem)
	2939	+ if (source == copyItem)
1865	2940	{
1866	2941	loadClipboard(false);
1867	2942	} else
1868		- if (event.getSource() == pasteItem)
	2943	+ if (source == pasteItem)
1869	2944	{
1870	2945	paste(false);
1871	2946	} else
1872		- if (event.getSource() == pasteLinkItem)
	2947	+ if (source == pasteIntoItem)
1873	2948	{
1874		- pasteInto(false);
	2949	+ pasteInto(true, false);
1875	2950	} else
1876		- if (event.getSource() == pasteCloneItem)
	2951	+ if (source == pasteLinkItem)
1877	2952	{
1878		- pasteInto(true);
	2953	+ pasteInto(false, false);
1879	2954	} else
1880		- if (event.getSource() == pasteExpandItem)
	2955	+ if (source == pasteCloneItem)
	2956	+ {
	2957	+ pasteInto(true, true);
	2958	+ } else
	2959	+ if (source == pasteExpandItem)
1881	2960	{
1882	2961	paste(true);
1883	2962	} else
1884		- if (event.getSource() == synchronizeItem)
	2963	+ if (source == synchronizeItem)
1885	2964	{
1886	2965	Overwrite(Object3D.TRANSFORM);
1887	2966	} else
1888		- if (event.getSource() == overwriteNameItem)
	2967	+ if (source == overwriteNameItem)
1889	2968	{
1890	2969	Overwrite(Object3D.NAME);
1891	2970	} else
1892		- if (event.getSource() == overwriteUVItem)
	2971	+ if (source == overwriteUVItem)
1893	2972	{
1894	2973	Overwrite(Object3D.UV);
1895	2974	} else
1896		- if (event.getSource() == overwriteMatItem)
	2975	+ if (source == overwriteMatItem)
1897	2976	{
	2977	+ /* july 2015
1898	2978	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2979	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2980	else
1901	2981	{
1902	2982	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2988,16 @@
1908	2988	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2989	}
1910	2990	}
	2991	+ */
	2992	+
	2993	+ Overwrite(dropAttributes);
1911	2994	}
1912		- if (event.getSource() == overwriteGeoItem)
	2995	+ if (source == overwriteGeoItem)
1913	2996	{
1914	2997	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2998	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2999	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	3000	+// Object3D content = GrafreeD.clipboard.get(0);
1918	3001	//
1919	3002	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	3003	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +3009,7 @@
1926	3009	// refreshContents();
1927	3010	// }
1928	3011	} else
1929		- if (event.getSource() == generateMeshItem)
	3012	+ if (source == generateMeshItem)
1930	3013	{
1931	3014	//if (group.selection.size() == 1)
1932	3015	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +3020,7 @@
1937	3020	ResetModel();
1938	3021	refreshContents();
1939	3022	} else
1940		- if (event.getSource() == extractGeometriesItem)
	3023	+ if (source == extractGeometriesItem)
1941	3024	{
1942	3025	boolean one = false;
1943	3026
..	..	@@ -1964,7 +3047,7 @@
1964	3047	ResetModel();
1965	3048	refreshContents();
1966	3049	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	3050	+ if (source == cloneGeometriesItem)
1968	3051	{
1969	3052	boolean one = false;
1970	3053
..	..	@@ -1990,32 +3073,37 @@
1990	3073	ResetModel();
1991	3074	refreshContents();
1992	3075	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3076	+ if (source == shareGeometriesItem)
1994	3077	{
1995	3078	boolean one = false;
1996	3079
1997	3080	if (group.selection.size() == 1)
1998	3081	one = true;
1999	3082
	3083	+ Object3D merge = null;
	3084	+
2000	3085	Object3D content = new cGroup();
2001	3086
2002	3087	for (int i=0; i<group.selection.size(); i++)
2003	3088	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3089	+ merge = new Merge(group.selection.get(i));
2005	3090
2006	3091	if (one)
2007		- makeSomething(sel, false);
	3092	+ makeSomething(merge, false);
2008	3093	else
2009		- content.addChild(sel);
	3094	+ content.addChild(merge);
2010	3095	}
2011	3096
2012	3097	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3098	+ makeSomething(content, true);
	3099	+ else
	3100	+ {
	3101	+ ResetModel();
	3102	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3103	+ refreshContents();
	3104	+ }
2017	3105	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3106	+ if (source == mergeGeometriesItem)
2019	3107	{
2020	3108	boolean one = false;
2021	3109
..	..	@@ -2045,11 +3133,11 @@
2045	3133	ResetModel();
2046	3134	refreshContents();
2047	3135	} else
2048		- if (event.getSource() == linkverticesItem)
	3136	+ if (source == linkverticesItem)
2049	3137	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3138	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3139	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3140	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3141	//
2054	3142	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3143	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3146,48 @@
2058	3146	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3147	// refreshContents();
2060	3148	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3149	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3150	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3151	+ Object3D content = Grafreed.clipboard.get(0);
2064	3152
2065	3153	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3154	content = ((cGroup)content).get(0);
2067	3155
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3156	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3157	for (int i=0; i<group.selection.size(); i++)
2070	3158	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3159	+ boolean random = CameraPane.SWITCH;
	3160	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3161	group.selection.get(i).linkVerticesThis(content);
2074	3162	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3163	+ CameraPane.SWITCH = random;
2076	3164	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3165	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3166	refreshContents();
2079	3167	}
2080	3168	} else
2081		- if (event.getSource() == resetsupportItem)
	3169	+ if (source == resetsupportItem)
2082	3170	{
2083	3171	for (int i=0; i<group.selection.size(); i++)
2084	3172	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3173	+ boolean random = CameraPane.SWITCH;
	3174	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3175	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3176	+ CameraPane.SWITCH = random;
2089	3177	}
2090	3178
2091	3179	refreshContents();
2092	3180	} else
2093		- if (event.getSource() == resetreferencesItem)
	3181	+ if (source == relinkverticesItem)
	3182	+ {
	3183	+ boolean random = CameraPane.SWITCH;
	3184	+ CameraPane.SWITCH = false; // parse all random nodes
	3185	+ group.selection.RelinkToSupport();
	3186	+ CameraPane.SWITCH = random;
	3187	+
	3188	+ refreshContents();
	3189	+ } else
	3190	+ if (source == resetreferencesItem)
2094	3191	{
2095	3192	for (int i=0; i<group.selection.size(); i++)
2096	3193	{
..	..	@@ -2099,11 +3196,11 @@
2099	3196
2100	3197	refreshContents();
2101	3198	} else
2102		- if (event.getSource() == setMasterItem)
	3199	+ if (source == setMasterItem)
2103	3200	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3201	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3202	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3203	+ Object3D content = Grafreed.clipboard.get(0);
2107	3204
2108	3205	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3206	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3209,13 @@
2112	3209	refreshContents();
2113	3210	}
2114	3211	} else
2115		- if (event.getSource() == poseMeshItem)
	3212	+ if (source == poseMeshItem)
2116	3213	{
2117	3214	if (group.selection.size() == 1)
2118	3215	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3216	+ if (Grafreed.clipboard.size() == 1)
2120	3217	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3218	+ Object3D content = Grafreed.clipboard.get(0);
2122	3219
2123	3220	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3221	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3228,19 @@
2131	3228	}
2132	3229
2133	3230	} else
2134		- if (event.getSource() == revertMeshItem)
	3231	+ if (source == revertMeshItem)
2135	3232	{
2136	3233	RevertMeshes();
2137	3234	} else
2138		- if (event.getSource() == resetMeshItem)
	3235	+ if (source == resetAllItem)
2139	3236	{
2140	3237	ResetAll();
2141	3238	} else
2142		- if (event.getSource() == stepAllItem)
	3239	+ if (source == stepAllItem)
2143	3240	{
2144	3241	StepAll();
2145	3242	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3243	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3244	{
2148	3245	//int indices[] = jList.getSelectedIndices();
2149	3246	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3248,46 @@
2151	3248
2152	3249	ClearSelection(false);
2153	3250	} else
2154		- if (event.getSource() == clearAllItem)
	3251	+ if (source == clearAllItem)
2155	3252	{
2156	3253	ClearSelection(true);
2157	3254	} else
2158		- if (event.getSource() == grabItem)
	3255	+ if (source == grabItem \|\| source == groupButton)
2159	3256	{
2160		- group(new cGroup(), true);
	3257	+ group(new cGroup(), false); // true);
2161	3258	} else
2162		- if (event.getSource() == frontItem)
	3259	+ if (source == hideItem)
	3260	+ {
	3261	+ group(new HiddenObject());
	3262	+ } else
	3263	+ if (source == frontItem)
2163	3264	{
2164	3265	front();
2165	3266	} else
2166		- if (event.getSource() == backItem)
	3267	+ if (source == backItem)
2167	3268	{
2168	3269	back();
2169	3270	} else
2170		- if (event.getSource() == cameraItem)
	3271	+ if (source == cameraItem)
2171	3272	{
2172	3273	makeSomething(new Camera());
2173	3274	} else
2174		- if (event.getSource() == compositeItem)
	3275	+ if (source == compositeItem \|\| source == compositeButton)
2175	3276	{
2176	3277	group(new Composite());
2177	3278	} else
2178		- if (event.getSource() == randomItem)
	3279	+ if (source == switchItem \|\| source == switchButton)
2179	3280	{
2180	3281	RandomNode random = new RandomNode();
2181	3282	group(random);
2182	3283	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3284	+ random.name = random.get(0).name + "Switch";
2184	3285	} else
2185		- if (event.getSource() == physicsItem)
	3286	+ if (source == physicsItem)
2186	3287	{
2187	3288	group(new PhysicsNode());
2188	3289	} else
2189		- if (event.getSource() == frameselectorItem)
	3290	+ if (source == frameselectorItem)
2190	3291	{
2191	3292	for (int i=0; i<group.selection.size(); i++)
2192	3293	{
..	..	@@ -2198,7 +3299,7 @@
2198	3299	ResetModel();
2199	3300	refreshContents();
2200	3301	} else
2201		- if (event.getSource() == switchGeoItem)
	3302	+ if (source == switchGeoItem)
2202	3303	{
2203	3304	for (int i=0; i<group.selection.size(); i++)
2204	3305	{
..	..	@@ -2210,7 +3311,7 @@
2210	3311	ResetModel();
2211	3312	refreshContents();
2212	3313	} else
2213		- if (event.getSource() == switchTransfoItem)
	3314	+ if (source == switchTransfoItem)
2214	3315	{
2215	3316	for (int i=0; i<group.selection.size(); i++)
2216	3317	{
..	..	@@ -2222,7 +3323,7 @@
2222	3323	ResetModel();
2223	3324	refreshContents();
2224	3325	} else
2225		- if (event.getSource() == morphItem)
	3326	+ if (source == morphItem)
2226	3327	{
2227	3328	for (int i=0; i<group.selection.size(); i++)
2228	3329	{
..	..	@@ -2234,7 +3335,7 @@
2234	3335	ResetModel();
2235	3336	refreshContents();
2236	3337	} else
2237		- if (event.getSource() == scriptNodeItem)
	3338	+ if (source == scriptNodeItem)
2238	3339	{
2239	3340	boolean atleastone = false;
2240	3341
..	..	@@ -2273,195 +3374,280 @@
2273	3374	}
2274	3375	}
2275	3376	} else
2276		- if (event.getSource() == linkerItem)
	3377	+ if (source == linkerItem)
2277	3378	{
2278	3379	group(new cLinker());
2279	3380	} else
2280		- if (event.getSource() == textureItem)
	3381	+ if (source == textureItem \|\| source == textureButton)
2281	3382	{
2282	3383	group(new TextureNode());
2283	3384	} else
2284		- if (event.getSource() == shadowXItem)
	3385	+ if (source == billboardItem)
	3386	+ {
	3387	+ group(new BillboardNode());
	3388	+ } else
	3389	+ if (source == shadowXItem)
2285	3390	{
2286	3391	CastShadow(0);
2287	3392	} else
2288		- if (event.getSource() == shadowYItem)
	3393	+ if (source == shadowYItem)
2289	3394	{
2290	3395	CastShadow(1);
2291	3396	} else
2292		- if (event.getSource() == shadowZItem)
	3397	+ if (source == shadowZItem)
2293	3398	{
2294	3399	CastShadow(2);
2295	3400	} else
2296		- if (event.getSource() == ungroupItem)
	3401	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3402	{
2298		- ungroup();
	3403	+ boolean canUngroup = true;
	3404	+
	3405	+ for (int i=0; i<group.selection.size(); i++)
	3406	+ {
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
	3410	+ {
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
	3420	+ break;
	3421	+ }
	3422	+ }
	3423	+
	3424	+ if (canUngroup)
	3425	+ {
	3426	+ for (int i=0; i<group.selection.size(); i++)
	3427	+ {
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
	3431	+ }
	3432	+
	3433	+ ClearSelection(false);
	3434	+
	3435	+ refreshContents();
	3436	+ }
2299	3437	} else
2300		- if (event.getSource() == genUVItem)
	3438	+ if (source == genUVItem)
2301	3439	{
2302	3440	GenUV();
2303	3441	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3442	+ if (source == genNormalsCADItem)
2305	3443	{
2306	3444	GenNormals(true);
2307	3445	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3446	+ if (source == genNormalsMESHItem)
	3447	+ {
	3448	+ GenNormalsMESH();
	3449	+ } else
	3450	+ if (source == genNormalsORGANItem)
2309	3451	{
2310	3452	GenNormals(false);
2311	3453	} else
2312		- if (event.getSource() == stripifyItem)
	3454	+ if (source == genNormalsMINEItem)
	3455	+ {
	3456	+ GenNormalsMINE();
	3457	+ } else
	3458	+ if (source == stripifyItem)
2313	3459	{
2314	3460	Stripify();
2315	3461	} else
2316		- if (event.getSource() == unstripifyItem)
	3462	+ if (source == unstripifyItem)
2317	3463	{
2318	3464	Unstripify();
2319	3465	} else
2320		- if (event.getSource() == trimItem)
	3466	+ if (source == trimItem)
2321	3467	{
2322	3468	Trim();
2323	3469	} else
2324		- if (event.getSource() == untrimItem)
	3470	+ if (source == untrimItem)
2325	3471	{
2326	3472	Untrim();
2327	3473	} else
2328		- if (event.getSource() == clearColorsItem)
	3474	+ if (source == clearColorsItem)
2329	3475	{
2330	3476	ClearColors();
2331	3477	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3478	+ if (source == clearMaterialsItem)
2333	3479	{
2334	3480	ClearMaterials();
2335	3481	} else
2336		- if (event.getSource() == liveleavesItem)
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
	3485	+ } else
	3486	+ if (source == liveleavesItem)
2337	3487	{
2338	3488	LiveLeaves(true);
2339	3489	} else
2340		- if (event.getSource() == unliveleavesItem)
	3490	+ if (source == unliveleavesItem)
2341	3491	{
2342	3492	LiveLeaves(false);
2343	3493	} else
2344		- if (event.getSource() == supportleavesItem)
	3494	+ if (source == supportleavesItem)
2345	3495	{
2346	3496	SupportLeaves(true);
2347	3497	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3498	+ if (source == unsupportleavesItem)
2349	3499	{
2350	3500	SupportLeaves(false);
2351	3501	} else
2352		- if (event.getSource() == hideleavesItem)
	3502	+ if (source == hideleavesItem)
2353	3503	{
2354	3504	HideLeaves(true);
2355	3505	} else
2356		- if (event.getSource() == showleavesItem)
	3506	+ if (source == showleavesItem)
2357	3507	{
2358	3508	HideLeaves(false);
2359	3509	} else
2360		- if (event.getSource() == markleavesItem)
	3510	+ if (source == markleavesItem)
2361	3511	{
2362	3512	MarkLeaves(true);
2363	3513	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3514	+ if (source == unmarkleavesItem)
2365	3515	{
2366	3516	MarkLeaves(false);
2367	3517	} else
2368		- if (event.getSource() == flipVItem)
	3518	+ if (source == rewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(true);
	3521	+ } else
	3522	+ if (source == unrewindleavesItem)
	3523	+ {
	3524	+ RewindLeaves(false);
	3525	+ } else
	3526	+ if (source == randomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(true);
	3529	+ } else
	3530	+ if (source == unrandomleavesItem)
	3531	+ {
	3532	+ RandomLeaves(false);
	3533	+ } else
	3534	+ if (source == flipVItem)
2369	3535	{
2370	3536	FlipV(true);
2371	3537	} else
2372		- if (event.getSource() == unflipVItem)
	3538	+ if (source == unflipVItem)
2373	3539	{
2374	3540	FlipV(false);
2375	3541	} else
2376		- if (event.getSource() == lowTexturesItem)
	3542	+ if (source == lowTexturesItem)
2377	3543	{
2378	3544	SetTexRes(0);
2379	3545	} else
2380		- if (event.getSource() == normalTexturesItem)
	3546	+ if (source == normalTexturesItem)
2381	3547	{
2382	3548	SetTexRes(1);
2383	3549	} else
2384		- if (event.getSource() == highTexturesItem)
	3550	+ if (source == highTexturesItem)
2385	3551	{
2386	3552	SetTexRes(2);
2387	3553	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3554	+ if (source == veryhighTexturesItem)
2389	3555	{
2390	3556	SetTexRes(3);
2391	3557	} else
2392		- if (event.getSource() == maxTexturesItem)
	3558	+ if (source == maxTexturesItem)
2393	3559	{
2394	3560	SetTexRes(4);
2395	3561	} else
2396		- if (event.getSource() == panoTexturesItem)
	3562	+ if (source == panoTexturesItem)
2397	3563	{
2398	3564	SetTexRes(5);
2399	3565	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3566	+ if (source == reverseNormalsItem)
2401	3567	{
2402	3568	ReverseNormals();
2403	3569	} else
2404		- if (event.getSource() == parseverticesItem)
	3570	+ if (source == parseverticesItem)
2405	3571	{
2406	3572	ParseVertices();
2407	3573	} else
2408		- if (event.getSource() == textureFieldItem)
	3574	+ if (source == textureFieldItem)
2409	3575	{
2410	3576	TextureVertices();
2411	3577	} else
2412		- if (event.getSource() == alignItem)
	3578	+ if (source == alignItem)
2413	3579	{
2414	3580	Align();
2415	3581	} else
2416		- if (event.getSource() == mirrorItem)
	3582	+ if (source == mirrorItem)
2417	3583	{
2418	3584	MirrorPoses();
2419	3585	} else
2420		- if (event.getSource() == reduceMorphItem)
	3586	+ if (source == reduceMorphItem)
2421	3587	{
2422	3588	MeshReduction(false);
2423	3589	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3590	+ if (source == reduce34MorphItem)
2425	3591	{
2426	3592	MeshReduction(true);
2427	3593	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3594	+ if (source == reverseTrianglesItem)
2429	3595	{
2430	3596	ReverseTriangles();
2431	3597	} else
2432		- if (event.getSource() == reduceMeshItem)
	3598	+ if (source == reduceMeshItem)
2433	3599	{
2434	3600	ReduceMesh(false);
2435	3601	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3602	+ if (source == reduce34MeshItem)
2437	3603	{
2438	3604	ReduceMesh(true);
2439	3605	} else
2440		- if (event.getSource() == increaseMeshItem)
	3606	+ if (source == increaseMeshItem)
2441	3607	{
2442	3608	IncreaseMesh();
2443	3609	} else
2444		- if (event.getSource() == clipMeshItem)
	3610	+ if (source == clipMeshItem)
2445	3611	{
2446	3612	ClipMesh();
2447	3613	} else
2448		- if (event.getSource() == smoothMeshItem)
	3614	+ if (source == smoothMeshItem)
2449	3615	{
2450	3616	SmoothMesh();
2451	3617	} else
2452		- if (event.getSource() == transformgeometryItem)
	3618	+ if (source == transformGeometryItem)
2453	3619	{
2454	3620	TransformGeometry();
2455	3621	} else
2456		- if (event.getSource() == resetTransformItem)
	3622	+ if (source == transformChildrenItem)
	3623	+ {
	3624	+ TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
	3637	+ } else
	3638	+ if (source == resetTransformItem)
2457	3639	{
2458	3640	ResetTransform();
2459	3641	} else
2460		- if (event.getSource() == resetCentroidItem)
	3642	+ if (source == resetCentroidItem)
2461	3643	{
2462		- ResetCentroid();
	3644	+ ResetCentroid(true);
2463	3645	} else
2464		- if (event.getSource() == resetParentItem)
	3646	+ if (source == resetCentroidXZItem)
	3647	+ {
	3648	+ ResetCentroid(false);
	3649	+ } else
	3650	+ if (source == resetParentItem)
2465	3651	{
2466	3652	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3653	{
..	..	@@ -2471,7 +3657,7 @@
2471	3657
2472	3658	refreshContents();
2473	3659	} else
2474		- if (event.getSource() == repairParentItem)
	3660	+ if (source == repairParentItem)
2475	3661	{
2476	3662	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3663	{
..	..	@@ -2485,7 +3671,21 @@
2485	3671
2486	3672	refreshContents();
2487	3673	} else
2488		- if (event.getSource() == sortbysizeItem)
	3674	+ if (source == repairShadowItem)
	3675	+ {
	3676	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3677	+ {
	3678	+ Object3D obj = (Object3D)e.nextElement();
	3679	+ obj.RepairShadow();
	3680	+// for (int i=0; i<obj.size(); i++)
	3681	+// {
	3682	+// obj.get(i).parent = obj;
	3683	+// }
	3684	+ }
	3685	+
	3686	+ refreshContents();
	3687	+ } else
	3688	+ if (source == sortbysizeItem)
2489	3689	{
2490	3690	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3691	{
..	..	@@ -2497,7 +3697,7 @@
2497	3697	ResetModel();
2498	3698	refreshContents();
2499	3699	} else
2500		- if (event.getSource() == sortbynameItem)
	3700	+ if (source == sortbynameItem)
2501	3701	{
2502	3702	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3703	{
..	..	@@ -2509,7 +3709,7 @@
2509	3709	ResetModel();
2510	3710	refreshContents();
2511	3711	} else
2512		- if (event.getSource() == attachPigmentItem)
	3712	+ if (source == attachPigmentItem)
2513	3713	{
2514	3714	String texture = GetFile("Attach pigment");
2515	3715	Object3D obj;
..	..	@@ -2521,7 +3721,7 @@
2521	3721
2522	3722	refreshContents();
2523	3723	} else
2524		- if (event.getSource() == detachPigmentItem)
	3724	+ if (source == detachPigmentItem)
2525	3725	{
2526	3726	Object3D obj;
2527	3727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3732,7 @@
2532	3732
2533	3733	refreshContents();
2534	3734	} else
2535		- if (event.getSource() == attachBumpItem)
	3735	+ if (source == attachBumpItem)
2536	3736	{
2537	3737	String texture = GetFile("Attach bump");
2538	3738	Object3D obj;
..	..	@@ -2544,18 +3744,18 @@
2544	3744
2545	3745	refreshContents();
2546	3746	} else
2547		- if (event.getSource() == detachBumpItem)
	3747	+ if (source == detachBumpItem)
2548	3748	{
2549	3749	Object3D obj;
2550	3750	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3751	{
2552	3752	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3753	+ obj.ResetBumpTexture();
2554	3754	}
2555	3755
2556	3756	refreshContents();
2557	3757	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3758	+ if (source == pigmentBumpItem)
2559	3759	{
2560	3760	Object3D obj;
2561	3761	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3766,233 @@
2566	3766
2567	3767	refreshContents();
2568	3768	} else
2569		- if (event.getSource() == flashSelectionButton)
	3769	+ if (source == embedTexturesItem)
	3770	+ {
	3771	+ Object3D obj;
	3772	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3773	+ {
	3774	+ obj = (Object3D)e.nextElement();
	3775	+ obj.EmbedTextures(true);
	3776	+ }
	3777	+
	3778	+ refreshContents();
	3779	+ } else
	3780	+ if (source == deEmbedTexturesItem)
	3781	+ {
	3782	+ Object3D obj;
	3783	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3784	+ {
	3785	+ obj = (Object3D)e.nextElement();
	3786	+ obj.EmbedTextures(false);
	3787	+ }
	3788	+
	3789	+ CameraPane.texturepigment.clear();
	3790	+ CameraPane.texturebump.clear();
	3791	+
	3792	+ refreshContents();
	3793	+ } else
	3794	+ if (source == flashSelectionButton)
2570	3795	{
2571	3796	CameraPane.flash = true;
2572	3797	refreshContents();
2573	3798	} else
2574		- if (event.getSource() == oneButton)
	3799	+ if (source == oneButton)
2575	3800	{
2576	3801	} else
2577		- if (event.getSource() == twoButton)
	3802	+ if (source == twoButton)
2578	3803	{
2579	3804	radio.layout = twoButton;
2580		- // bug
2581		- //gridPanel.setDividerLocation(1.0);
2582		- //bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3805	+
	3806	+ if (CameraPane.FULLSCREEN)
	3807	+ fullscreenLayout = radio.layout;
	3808	+
	3809	+ Show3DView();
	3810	+
	3811	+ cameraView.requestFocusInWindow();
	3812	+
	3813	+// refreshContents(true);
	3814	+//
	3815	+// try
	3816	+// {
	3817	+// java.awt.Robot bot = new java.awt.Robot();
	3818	+// int mask = InputEvent.BUTTON1_MASK;
	3819	+// bot.mouseMove(100, 100);
	3820	+// bot.mousePress(mask);
	3821	+// bot.mouseRelease(mask);
	3822	+// }
	3823	+// catch (Exception e)
	3824	+// {
	3825	+//
	3826	+// }
	3827	+
2607	3828	} else
2608		- if (event.getSource() == threeButton)
	3829	+ if (source == threeButton)
2609	3830	{
2610	3831	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3832	+
	3833	+ if (CameraPane.FULLSCREEN)
	3834	+ fullscreenLayout = radio.layout;
	3835	+
	3836	+// bigThree.remove(scenePanel);
	3837	+// bigThree.remove(centralPanel);
	3838	+// bigThree.remove(XYZPanel);
	3839	+// aWindowConstraints.gridx = 0;
	3840	+// aWindowConstraints.gridy = 0;
	3841	+// aWindowConstraints.gridwidth = 1;
	3842	+// // aConstraints.gridheight = 3;
	3843	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3844	+// aWindowConstraints.weightx = 0;
	3845	+// aWindowConstraints.weighty = 1;
	3846	+// //bigThree.add(jtp, aWindowConstraints);
	3847	+// aWindowConstraints.weightx = 1;
	3848	+// aWindowConstraints.gridwidth = 3;
	3849	+// // aConstraints.gridheight = 3;
	3850	+// aWindowConstraints.gridx = 1;
	3851	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3852	+// bigThree.add(centralPanel, aWindowConstraints);
	3853	+// aWindowConstraints.weightx = 0;
	3854	+// aWindowConstraints.gridx = 4;
	3855	+// aWindowConstraints.gridwidth = 1;
	3856	+// // aConstraints.gridheight = 3;
	3857	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3858	+// bigThree.add(XYZPanel, aWindowConstraints);
	3859	+// bigThree.validate();
	3860	+// scenePanel.setVisible(false);
	3861	+// centralPanel.setVisible(true);
	3862	+// XYZPanel.setVisible(true);
	3863	+ bigThree.ClearUI();
	3864	+ bigThree.add(scenePanel);
	3865	+ bigThree.add(centralPanel);
	3866	+ bigThree.FlushUI();
	3867	+
	3868	+ cameraView.requestFocusInWindow();
2635	3869	} else
2636		- if (event.getSource() == fourButton)
	3870	+ if (source == fourButton)
2637	3871	{
2638	3872	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3873	+
	3874	+ if (CameraPane.FULLSCREEN)
	3875	+ fullscreenLayout = radio.layout;
	3876	+
	3877	+// bigThree.remove(scenePanel);
	3878	+// bigThree.remove(centralPanel);
	3879	+// bigThree.remove(XYZPanel);
	3880	+// aWindowConstraints.gridx = 0;
	3881	+// aWindowConstraints.gridy = 0;
	3882	+// aWindowConstraints.gridwidth = 1;
	3883	+// // aWindowConstraints.gridheight = 3;
	3884	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3885	+// aWindowConstraints.weightx = 1;
	3886	+// aWindowConstraints.weighty = 1;
	3887	+// bigThree.add(scenePanel, aWindowConstraints);
	3888	+// aWindowConstraints.weightx = 1;
	3889	+// aWindowConstraints.gridwidth = 3;
	3890	+// // aConstraints.gridheight = 3;
	3891	+// aWindowConstraints.gridx = 1;
	3892	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3893	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3894	+// aWindowConstraints.weightx = 0;
	3895	+// aWindowConstraints.gridx = 4;
	3896	+// aWindowConstraints.gridwidth = 1;
	3897	+// // aWindowConstraints.gridheight = 3;
	3898	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3899	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3900	+// bigThree.validate();
	3901	+// scenePanel.setVisible(true);
	3902	+// centralPanel.setVisible(false);
	3903	+// XYZPanel.setVisible(false);
	3904	+ bigThree.ClearUI();
	3905	+ bigThree.add(scenePanel);
	3906	+ bigThree.FlushUI();
	3907	+
	3908	+ cameraView.requestFocusInWindow();
2663	3909	} else
2664		- if (event.getSource() == sixButton)
	3910	+ if (source == sixButton)
2665	3911	{
2666	3912	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3913	+
	3914	+ if (CameraPane.FULLSCREEN)
	3915	+ fullscreenLayout = radio.layout;
	3916	+
	3917	+// bigThree.remove(scenePanel);
	3918	+// bigThree.remove(centralPanel);
	3919	+// bigThree.remove(XYZPanel);
	3920	+// aWindowConstraints.gridx = 0;
	3921	+// aWindowConstraints.gridy = 0;
	3922	+// aWindowConstraints.gridwidth = 1;
	3923	+// // aConstraints.gridheight = 3;
	3924	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3925	+// aWindowConstraints.weightx = 0;
	3926	+// aWindowConstraints.weighty = 1;
	3927	+// bigThree.add(scenePanel, aWindowConstraints);
	3928	+// aWindowConstraints.weightx = 1;
	3929	+// aWindowConstraints.gridwidth = 3;
	3930	+// // aWindowConstraints.gridheight = 3;
	3931	+// aWindowConstraints.gridx = 1;
	3932	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3933	+// bigThree.add(centralPanel, aWindowConstraints);
	3934	+// aWindowConstraints.weightx = 0;
	3935	+// aWindowConstraints.gridx = 4;
	3936	+// aWindowConstraints.gridwidth = 1;
	3937	+// // aWindowConstraints.gridheight = 3;
	3938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3939	+// //bigThree.add(XYZPanel, aConstraints);
	3940	+// bigThree.validate();
	3941	+// scenePanel.setVisible(true);
	3942	+// centralPanel.setVisible(true);
	3943	+// XYZPanel.setVisible(false);
	3944	+ bigThree.ClearUI();
	3945	+ bigThree.add(centralPanel);
	3946	+ bigThree.add(scenePanel);
	3947	+ bigThree.FlushUI();
	3948	+
	3949	+ cameraView.requestFocusInWindow();
2691	3950	} else
2692		- if (event.getSource() == sevenButton)
	3951	+ if (source == sevenButton)
2693	3952	{
2694	3953	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3954	+
	3955	+ if (CameraPane.FULLSCREEN)
	3956	+ fullscreenLayout = radio.layout;
	3957	+
	3958	+// bigThree.remove(scenePanel);
	3959	+// bigThree.remove(centralPanel);
	3960	+// bigThree.remove(XYZPanel);
	3961	+// aWindowConstraints.gridx = 0;
	3962	+// aWindowConstraints.gridy = 0;
	3963	+// aWindowConstraints.gridwidth = 1;
	3964	+// // aWindowConstraints.gridheight = 3;
	3965	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3966	+// aWindowConstraints.weightx = 0;
	3967	+// aWindowConstraints.weighty = 1;
	3968	+// bigThree.add(scenePanel, aWindowConstraints);
	3969	+// aWindowConstraints.weightx = 1;
	3970	+// aWindowConstraints.gridwidth = 3;
	3971	+// // aWindowConstraints.gridheight = 3;
	3972	+// aWindowConstraints.gridx = 1;
	3973	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3974	+// bigThree.add(centralPanel, aWindowConstraints);
	3975	+// aWindowConstraints.weightx = 0;
	3976	+// aWindowConstraints.gridx = 4;
	3977	+// aWindowConstraints.gridwidth = 1;
	3978	+// // aConstraints.gridheight = 3;
	3979	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3980	+// bigThree.add(XYZPanel, aWindowConstraints);
	3981	+// bigThree.validate();
	3982	+// scenePanel.setVisible(true);
	3983	+// centralPanel.setVisible(true);
	3984	+// XYZPanel.setVisible(true);
	3985	+ bigThree.ClearUI();
	3986	+ bigThree.add(scenePanel);
	3987	+ bigThree.add(centralPanel);
	3988	+ bigThree.add(XYZPanel);
	3989	+ bigThree.FlushUI();
	3990	+
	3991	+ cameraView.requestFocusInWindow();
2719	3992	} else
2720		- if (event.getSource() == rootButton)
	3993	+ if (source == rootButton)
2721	3994	{
	3995	+ Replace();
2722	3996	Object3D obj;
2723	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3998	{
..	..	@@ -2727,66 +4001,88 @@
2727	4001	EditObject(obj);
2728	4002	}
2729	4003
	4004	+ cameraView.requestFocusInWindow();
2730	4005	refreshContents(true);
2731	4006	} else
2732		- if (event.getSource() == closeButton)
	4007	+ if (source == closeButton)
2733	4008	{
2734	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
2735	4013	cRadio ab;
2736	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	4015	{
2738	4016	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4017	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	4018	{
	4019	+ // Patch to avoid bug with transparency.
	4020	+ if (!ab.hadMaterial)
	4021	+ {
	4022	+ ab.object.material = null;
	4023	+ }
	4024	+
2741	4025	buttonGroup.remove(ab);
2742	4026	radioPanel.remove(ab);
2743	4027
2744		- ab.GetObject().editWindow = null;
	4028	+ //ab.GetObject().editWindow = null;
	4029	+ ab.GetObject().manipWindow = null;
2745	4030	// ab.GetObject().objectUI = null; // ?????????
2746	4031
2747	4032	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	4033	break;
2749	4034	}
2750	4035	}
	4036	+
	4037	+ cameraView.requestFocusInWindow();
2751	4038	refreshContents(true);
2752	4039	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4040	+ if (source == editItem \|\| source == editButton)
2754	4041	{
	4042	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4043	+ {
	4044	+ Object3D child = (Object3D)e.nextElement();
	4045	+ child.pinned = true;
	4046	+ }
	4047	+
2755	4048	EditSelection(false);
2756	4049	} else
2757		- if (event.getSource() == uneditButton)
	4050	+ if (source == uneditButton)
2758	4051	{
2759	4052	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	4053	{
2761	4054	Object3D child = (Object3D)e.nextElement();
2762	4055	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4056	+ child.pinned = false;
2764	4057	child.CloseUI();
2765	4058	listUI.remove(child);
	4059	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	4060
2767		- child.editWindow = null; // ???????????
	4061	+ //child.editWindow = null; // ???????????
2768	4062	}
2769		- objEditor.ctrlPanel.revalidate();
	4063	+ objEditor.ctrlPanel.FlushUI();
2770	4064	//objEditor.jTree.clearSelection();
2771	4065	//objEditor.ResetSliders();
2772	4066	refreshContents(true);
2773	4067	} else
2774		- if (event.getSource() == clearPanelButton)
	4068	+ if (source == clearPanelButton)
2775	4069	{
2776	4070	assert(copy == group);
2777	4071	//copy.ClearUI();
2778	4072	for (Object3D obj : listUI)
2779	4073	{
	4074	+ obj.pinned = false;
2780	4075	obj.CloseUI();
2781	4076	}
2782	4077	listUI.clear();
	4078	+ SetPinStates(group.selection.size() > 0);
2783	4079	refreshContents(true);
2784	4080	} else
2785		- if (event.getSource() == allParamsButton)
	4081	+ if (source == allParamsButton)
2786	4082	{
2787	4083	assert(copy == group);
2788	4084
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4085	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4086
2791	4087	for (Object3D obj : listUI)
2792	4088	{
..	..	@@ -2803,19 +4099,22 @@
2803	4099
2804	4100	refreshContents(true);
2805	4101	} else
2806		- if (event.getSource() == unselectButton)
	4102	+ if (source == unselectButton)
2807	4103	{
2808	4104	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4105	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4106	objEditor.ResetSliders();
2811	4107	refreshContents(true);
2812	4108	} else
2813		- if(event.getSource() instanceof cRadio)
	4109	+ if(source instanceof cRadio)
2814	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
2815	4114	group.parent = keepparent;
2816	4115	group.attributes = 0;
2817	4116	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4117	+ /cRadio/ radio = (cRadio)source;
2819	4118	Object3D obj = radio.GetObject();
2820	4119	System.out.println("Edit " + obj);
2821	4120	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4134,8 @@
2835	4134	}
2836	4135
2837	4136	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4137	+
	4138	+ //Globals.theRenderer.object = group;
2839	4139	if(!useclient)
2840	4140	{
2841	4141	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4144,81 @@
2844	4144	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4145	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4146	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4147	+ //cameraView.lighttouched = true;
	4148	+ Globals.lighttouched = true;
2848	4149	topView.object = group;
2849	4150	frontView.object = group;
2850	4151	sideView.object = group;
2851	4152	}
2852		- group.editWindow = this;
	4153	+
	4154	+// fix "+" issue
	4155	+ //group.editWindow = this;
	4156	+ group.manipWindow = this;
	4157	+
2853	4158	/*
2854	4159	currentLayout = radio.layout;
2855	4160	if (currentLayout == null)
2856	4161	currentLayout = sevenButton;
2857	4162	*/
2858	4163	radio.layout.doClick();
	4164	+
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
	4191	+ ClearUnpinned();
	4192	+
	4193	+ //Grafreed.Assert(group != null);
	4194	+ //Grafreed.Assert(group.selection != null);
	4195	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4196	+ if (group.selection == null \|\| group.selection.size() == 1)
	4197	+ EditSelection(false);
2859	4198	keepparent = group.parent;
2860	4199	// PARENT = NULL or not???
2861	4200	//group.parent = null; // ROOT
2862	4201	//group.attributes = -1;
2863	4202	ResetModel();
	4203	+
	4204	+ cameraView.requestFocusInWindow();
2864	4205	refreshContents(true);
2865		- }
	4206	+ } else if (event.getSource() == editCameraItem)
	4207	+ {
	4208	+ cameraView.ProtectCamera();
	4209	+ cameraView.requestFocusInWindow();
	4210	+ cameraView.repaint();
	4211	+ return;
	4212	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4213	+ {
	4214	+ cameraView.RevertCamera();
	4215	+ cameraView.requestFocusInWindow();
	4216	+ cameraView.repaint();
	4217	+ return;
	4218	+ // } else if (event.getSource() == textureButton)
	4219	+ // {
	4220	+ // return; // true;
	4221	+ }
2866	4222	else
2867	4223	{
2868	4224	//return super.action(event, arg);
..	..	@@ -2871,7 +4227,6 @@
2871	4227	}
2872	4228
2873	4229	boolean useclient = false;
2874		- cRadio radio;
2875	4230
2876	4231	void ToggleRoot()
2877	4232	{
..	..	@@ -2880,7 +4235,7 @@
2880	4235	if (useclient)
2881	4236	{
2882	4237	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4238	+ Globals.lighttouched = true;
2884	4239	//topView.object = client;
2885	4240	//frontView.object = client;
2886	4241	//sideView.object = client;
..	..	@@ -2888,7 +4243,7 @@
2888	4243	else
2889	4244	{
2890	4245	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4246	+ Globals.lighttouched = true;
2892	4247	//topView.object = group;
2893	4248	//frontView.object = group;
2894	4249	//sideView.object = group;
..	..	@@ -2923,10 +4278,69 @@
2923	4278	refreshContents();
2924	4279	}
2925	4280
	4281	+ void TransformChildren()
	4282	+ {
	4283	+ Object3D obj;
	4284	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4285	+ {
	4286	+ obj = (Object3D)e.nextElement();
	4287	+ obj.KeepTextureMatrices();
	4288	+ obj.TransformChildren();
	4289	+ obj.RestoreTextureMatrices();
	4290	+
	4291	+// if (obj.parent == null)
	4292	+// {
	4293	+// System.out.println("NULL PARENT!");
	4294	+// new Exception().printStackTrace();
	4295	+// }
	4296	+// else
	4297	+// TouchTransform(obj);
	4298	+// //obj.parent.Touch();
	4299	+ }
	4300	+
	4301	+ refreshContents();
	4302	+ }
	4303	+
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
2926	4315
2927	4316	void ResetTransform()
2928	4317	{
2929	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
2930	4344	}
2931	4345
2932	4346	void ResetTransform(int mask)
..	..	@@ -2939,42 +4353,8 @@
2939	4353	if (obj.toParent == null)
2940	4354	continue;
2941	4355
2942		- if (mask == -1)
2943		- {
2944		- if (obj instanceof Camera) // jan 2014
2945		- {
2946		- LA.matIdentity(obj.toParent);
2947		- LA.matIdentity(obj.fromParent);
2948		- }
2949		- else
2950		- {
2951		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
2952		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
2953		- }
2954		- TouchTransform(obj);
2955		- continue;
2956		- }
2957		- if ((mask&2) != 0) // Scale
2958		- {
2959		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
2960		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
2961		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
2962		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
2963		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
2964		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
2965		- }
2966		- if ((mask&4) != 0) // Rotation
2967		- {
2968		- // ?
2969		- }
2970		- if ((mask&1) != 0) // Translation
2971		- {
2972		- if (obj.toParent != null)
2973		- {
2974		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
2975		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
2976		- }
2977		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
2978	4358	if (obj.parent == null)
2979	4359	{
2980	4360	System.out.println("NULL PARENT!");
..	..	@@ -3035,7 +4415,7 @@
3035	4415	refreshContents();
3036	4416	}
3037	4417
3038		- void ResetCentroid()
	4418	+ void ResetCentroid(boolean full)
3039	4419	{
3040	4420	Object3D obj;
3041	4421	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4430,16 @@
3050	4430	LA.matIdentity(Object3D.mat);
3051	4431	obj.getBounds(minima, maxima, false);
3052	4432	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4433	+ if (full)
	4434	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4435	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4436	obj.TransformMesh(Object3D.mat);
	4437	+
3056	4438	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4439	+ if (full)
	4440	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4441	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4442	+
3059	4443	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4444	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4445	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4468,8 @@
3084	4468
3085	4469	int size = obj.MemorySize();
3086	4470
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4471	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4472	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4473	}
3089	4474	}
3090	4475	catch (Exception e)
..	..	@@ -3121,9 +4506,9 @@
3121	4506	obj = (Object3D)e.nextElement();
3122	4507
3123	4508	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4509	+ Grafreed.AnalyzeObject(obj);
3125	4510	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4511	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4512
3128	4513	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4514	}
..	..	@@ -3165,6 +4550,20 @@
3165	4550	void GenNormals(boolean crease)
3166	4551	{
3167	4552	group.GenNormalsS(crease);
	4553	+
	4554	+ refreshContents();
	4555	+ }
	4556	+
	4557	+ void GenNormalsMESH()
	4558	+ {
	4559	+ group.GenNormalsMeshS();
	4560	+
	4561	+ refreshContents();
	4562	+ }
	4563	+
	4564	+ void GenNormalsMINE()
	4565	+ {
	4566	+ group.selection.GenNormalsMINE();
3168	4567
3169	4568	refreshContents();
3170	4569	}
..	..	@@ -3250,7 +4649,7 @@
3250	4649	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4650	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4651	//
3253		-// g.add(GraphreeD.clipboard);
	4652	+// g.add(GrafreeD.clipboard);
3254	4653	//
3255	4654	// buffer.add(g);
3256	4655	// }
..	..	@@ -3269,8 +4668,8 @@
3269	4668	// nodes = new Object3D();
3270	4669	// vertices = new Vector<Vertex>();
3271	4670	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4671	+// boolean epsequal = GrafreeD.epsequal;
	4672	+// GrafreeD.epsequal = true;
3274	4673	//
3275	4674	// for (int i=0; i<group.selection.size(); i++)
3276	4675	// {
..	..	@@ -3311,7 +4710,7 @@
3311	4710	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4711	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4712	//
3314		-// g.add(GraphreeD.clipboard);
	4713	+// g.add(GrafreeD.clipboard);
3315	4714	//
3316	4715	// buffer.add(g);
3317	4716	// }
..	..	@@ -3319,7 +4718,7 @@
3319	4718	// makeSomething(buffer, i==group.selection.size()-1);
3320	4719	// }
3321	4720	//
3322		-// GraphreeD.epsequal = epsequal;
	4721	+// GrafreeD.epsequal = epsequal;
3323	4722	//
3324	4723	// //buffer = null;
3325	4724	// temprep = null;
..	..	@@ -3330,8 +4729,8 @@
3330	4729
3331	4730	void ParseVertices()
3332	4731	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4732	+ boolean epsequal = Grafreed.epsequal;
	4733	+ Grafreed.epsequal = true;
3335	4734
3336	4735	for (int i=0; i<group.selection.size(); i++)
3337	4736	{
..	..	@@ -3356,7 +4755,7 @@
3356	4755	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4756	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4757
3359		- g.add(GraphreeD.clipboard);
	4758	+ g.add(Grafreed.clipboard);
3360	4759
3361	4760	buffer.add(g);
3362	4761	}
..	..	@@ -3371,7 +4770,7 @@
3371	4770	makeSomething(buffer, i==group.selection.size()-1);
3372	4771	}
3373	4772
3374		- GraphreeD.epsequal = epsequal;
	4773	+ Grafreed.epsequal = epsequal;
3375	4774
3376	4775	refreshContents();
3377	4776	}
..	..	@@ -3389,7 +4788,16 @@
3389	4788	String pigment = Object3D.GetPigment(tex);
3390	4789	//String bump = Object3D.GetBump(tex);
3391	4790
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4791	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4792	+
	4793	+ try
	4794	+ {
	4795	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4796	+ }
	4797	+ catch (Exception e)
	4798	+ {
	4799	+ System.err.println("FAIL: " + node);
	4800	+ }
3393	4801
3394	4802	double s = v.s;
3395	4803
..	..	@@ -3416,7 +4824,7 @@
3416	4824	scale /= 3;
3417	4825
3418	4826	scale /= 0xFF;
3419		- scale /= 4;
	4827	+ // c'est quoi ca? scale /= 4;
3420	4828
3421	4829	//v.AO = scale;
3422	4830
..	..	@@ -3437,14 +4845,35 @@
3437	4845
3438	4846	void Align()
3439	4847	{
	4848	+ if (group.selection.size() == 0)
	4849	+ return;
	4850	+
	4851	+ cVector bbmin = new cVector();
	4852	+ cVector bbmax = new cVector();
	4853	+
	4854	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4855	+
	4856	+ double dx = bbmax.x - bbmin.x;
	4857	+ double dy = bbmax.y - bbmin.y;
	4858	+ double dz = bbmax.z - bbmin.z;
	4859	+
	4860	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4861	+
3440	4862	for (int i=0; i<group.selection.size(); i++)
3441	4863	{
3442	4864	Object3D obj = group.selection.get(i);
3443	4865
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
	4872	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4873	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4874	}
3447	4875
	4876	+ Globals.lighttouched = true;
3448	4877	refreshContents();
3449	4878	}
3450	4879
..	..	@@ -3455,7 +4884,7 @@
3455	4884	// ref.SaveSupports();
3456	4885	// Object3D par = ref.parent;
3457	4886	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4887	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4888	// ref.parent = par;
3460	4889	// ref.RestoreSupports();
3461	4890
..	..	@@ -3463,11 +4892,11 @@
3463	4892
3464	4893	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4894
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4895	+ boolean random = CameraPane.SWITCH;
	4896	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4897	lowres.linkVerticesThis(null);
3469	4898	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4899	+ CameraPane.SWITCH = random;
3471	4900
3472	4901	System.err.flush();
3473	4902
..	..	@@ -3485,7 +4914,7 @@
3485	4914	// lowres.SaveSupports();
3486	4915	// par = lowres.parent;
3487	4916	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4917	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4918	Object3D newlow = CloneObject(lowres, false);
3490	4919	newlow.name = sn.switchobject.get(i).name;
3491	4920	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4936,7 @@
3507	4936	return;
3508	4937
3509	4938	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4939	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4940
3512	4941	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4942
..	..	@@ -3676,7 +5105,7 @@
3676	5105	group.selection.RelinkToSupport(); // july 2014
3677	5106	System.out.println("DONE.");
3678	5107	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5108	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	5109	}
3681	5110
3682	5111	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5130,20 @@
3701	5130
3702	5131	void ClipMesh()
3703	5132	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5133	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5134	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5135	+ Object3D content = Grafreed.clipboard.get(0);
3707	5136
3708	5137	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5138	content = ((cGroup)content).get(0);
3710	5139
3711	5140	// for (int i=0; i<group.selection.size(); i++)
3712	5141	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5142	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5143	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5144	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5145	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5146	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5147	System.out.println("DONE.");
3719	5148	refreshContents();
3720	5149	}
..	..	@@ -3729,6 +5158,12 @@
3729	5158	void ClearMaterials()
3730	5159	{
3731	5160	group.selection.ClearMaterials();
	5161	+ refreshContents();
	5162	+ }
	5163	+
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
3732	5167	refreshContents();
3733	5168	}
3734	5169
..	..	@@ -3759,6 +5194,18 @@
3759	5194	void MarkLeaves(boolean hide)
3760	5195	{
3761	5196	group.selection.MarkLeaves(hide);
	5197	+ refreshContents();
	5198	+ }
	5199	+
	5200	+ void RewindLeaves(boolean hide)
	5201	+ {
	5202	+ group.selection.RewindLeaves(hide);
	5203	+ refreshContents();
	5204	+ }
	5205	+
	5206	+ void RandomLeaves(boolean hide)
	5207	+ {
	5208	+ group.selection.RandomLeaves(hide);
3762	5209	refreshContents();
3763	5210	}
3764	5211
..	..	@@ -3833,28 +5280,25 @@
3833	5280	// }
3834	5281	// }
3835	5282
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5283	void EditSelection(boolean newWindow)
3841	5284	{
	5285	+ if (group.selection == null)
	5286	+ {
	5287	+ EditElement(group, newWindow); // ? new
	5288	+ return;
	5289	+ }
	5290	+
3842	5291	// aConstraints.gridy = 0;
3843	5292	for (int i=0; i<group.selection.size(); i++)
3844	5293	{
3845	5294	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5295	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5296	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5297
3849	5298	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5299	+ if(elem != group \|\| !newWindow)
3851	5300	{
3852		- // if (!(elem instanceof Composite))
3853		- // newWindow = false;
3854		- listUI.add(elem);
3855		- elem.openEditWindow(this, newWindow); //, false);
3856		- System.out.println("edit : " + elem);
3857		- elem.editWindow.refreshContents(true); // ? new
	5301	+ EditElement(elem, newWindow); // ? new
3858	5302	}
3859	5303	}
3860	5304	}
..	..	@@ -3917,9 +5361,7 @@
3917	5361
3918	5362	freezemodel = false;
3919	5363	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5364	+
3923	5365	public void valueChanged(TreeSelectionEvent e)
3924	5366	//public boolean handleEvent(Event event)
3925	5367	{
..	..	@@ -3929,7 +5371,8 @@
3929	5371	//new Exception().printStackTrace();
3930	5372
3931	5373	freezemodel = true;
3932		-
	5374	+ ClearUnpinned();
	5375	+
3933	5376	/**/
3934	5377	//switch (event.id)
3935	5378	{
..	..	@@ -3937,7 +5380,6 @@
3937	5380	//case 702: // Event.LIST_DESELECT
3938	5381	group.deselectAll();
3939	5382	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5383	if (tps != null)
3942	5384	{
3943	5385	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5388,39 @@
3946	5388
3947	5389	//if (child.parent != null)
3948	5390	//child.parent.addSelectee(child);
	5391	+ objEditor.SetMaterial(child);
3949	5392	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5393	}
3954	5394	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5395	+// else
	5396	+// {
	5397	+// objEditor.SetMaterial(group); // .GetMaterial());
	5398	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5399	+// System.err.println("info : " + group.GetPath());
	5400	+// }
3961	5401
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5402	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5403	CameraPane.flash = true;
3966	5404
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5405	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5406	// a camera
3969	5407	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
	5409	+ {
	5410	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
	5412	+ }
	5413	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5414	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5415	}
3975	5416
	5417	+ if (tps != null && tps.length == 1)
	5418	+ {
	5419	+ EditSelection(false);
	5420	+ }
	5421	+
	5422	+ SetPinStates(tps != null && tps.length > 0);
	5423	+
3976	5424	refreshContents();
3977	5425	//return true;
3978	5426	}
..	..	@@ -3981,6 +5429,53 @@
3981	5429
3982	5430	freezemodel = false;
3983	5431	}
	5432	+
	5433	+ void SetPinStates(boolean enabled)
	5434	+ {
	5435	+ editButton.setEnabled(enabled);
	5436	+ uneditButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
	5438	+ flashSelectionButton.setEnabled(enabled);
	5439	+
	5440	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
	5456	+ }
	5457	+
	5458	+ void refreshContents(boolean cp)
	5459	+ {
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5462	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5463	+ {
	5464	+ objEditor.ClearInfo(); // .GetMaterial());
	5465	+
	5466	+ for (int i=0; i < group.selection.Size(); i++)
	5467	+ {
	5468	+ Object3D child = (Object3D) group.selection.get(i);
	5469	+
	5470	+ objEditor.AddInfo(child, this, true);
	5471	+// System.err.println("info : " + child.GetPath());
	5472	+ }
	5473	+
	5474	+ objEditor.SetText(); // jan 2014
	5475	+ }
	5476	+
	5477	+ super.refreshContents(cp);
	5478	+ }
3984	5479
3985	5480	void linkSomething(Object3D thing)
3986	5481	{
..	..	@@ -4052,16 +5547,19 @@
4052	5547	{
4053	5548	if (group.selection.isEmpty())
4054	5549	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5550	+
	5551	+ Grafreed.clipboardIsTempGroup = false;
4056	5552	Composite tGroup = null;
4057	5553	if (group.selection.size() > 0) // 1)
4058	5554	{
4059	5555	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5556	+ Grafreed.clipboardIsTempGroup = true;
4061	5557	}
4062	5558
4063	5559	if (cut)
4064	5560	{
	5561	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5562	+// Save();
4065	5563	//int indices[] = jList.getSelectedIndices();
4066	5564	//for (int i = indices.length - 1; i >= 0; i--)
4067	5565	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5595,16 @@
4097	5595	//System.out.println("cut " + child);
4098	5596	//System.out.println("parent = " + child.parent);
4099	5597	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5598	+ if (Grafreed.clipboardIsTempGroup)
4101	5599	tGroup.add/Child/(tmp);
4102	5600	else
4103		- GraphreeD.clipboard = tmp;
	5601	+ Grafreed.clipboard = tmp;
4104	5602	}
4105	5603	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5604	+ if (Grafreed.clipboardIsTempGroup)
4107	5605	tGroup.add/Child/(child);
4108	5606	else
4109		- GraphreeD.clipboard = child;
	5607	+ Grafreed.clipboard = child;
4110	5608	}
4111	5609
4112	5610	//ResetModel();
..	..	@@ -4138,21 +5636,23 @@
4138	5636	//System.out.println("cut " + elem);
4139	5637	//System.out.println("parent = " + elem.parent);
4140	5638	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5639	+ if (Grafreed.clipboardIsTempGroup)
4142	5640	tGroup.add/Child/(tmp);
4143	5641	else
4144		- GraphreeD.clipboard = tmp;
	5642	+ Grafreed.clipboard = tmp;
4145	5643	}
4146	5644	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5645	+ if (Grafreed.clipboardIsTempGroup)
4148	5646	tGroup.add/Child/(child);
4149	5647	else
4150		- GraphreeD.clipboard = child;
	5648	+ Grafreed.clipboard = child;
4151	5649	}
4152	5650
4153	5651	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5652	+
	5653	+ if (Grafreed.clipboardIsTempGroup)
	5654	+ Grafreed.clipboard = tGroup;
	5655	+
4156	5656	if (cut)
4157	5657	{
4158	5658	ResetModel();
..	..	@@ -4162,11 +5662,15 @@
4162	5662
4163	5663	void paste(boolean expand)
4164	5664	{
4165		- // if (GraphreeD.clipboard == null)
	5665	+ if (Globals.REPLACEONMAKE)
	5666	+ Save();
	5667	+ boolean keep = Globals.REPLACEONMAKE;
	5668	+ Globals.REPLACEONMAKE = false;
	5669	+ // if (GrafreeD.clipboard == null)
4166	5670	// return;
4167	5671	boolean first = true;
4168	5672
4169		- if (GraphreeD.clipboardIsTempGroup)
	5673	+ if (Grafreed.clipboardIsTempGroup)
4170	5674	{
4171	5675	Composite temp;
4172	5676
..	..	@@ -4177,7 +5681,7 @@
4177	5681	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5682	*/
4179	5683	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5684	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5685	{
4182	5686	Object3D child = (Object3D)e.nextElement();
4183	5687
..	..	@@ -4191,7 +5695,7 @@
4191	5695	else
4192	5696	elem = child.deepCopy(); // ?
4193	5697	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5698	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5699	// elem = elem.get(0);
4196	5700	makeSomething(elem, true); // ?? first);
4197	5701	//group.addChild(elem);
..	..	@@ -4211,23 +5715,24 @@
4211	5715	//Object3D cb = Applet3D.clipboard;
4212	5716	//temp.addChild(cb);
4213	5717	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	5718	+ assert(Grafreed.clipboard.parent == null);
	5719	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5720	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5721	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5722	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5723	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5724	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5725	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5726	}
4223	5727
	5728	+ Globals.REPLACEONMAKE = keep;
4224	5729	ResetModel();
4225	5730	refreshContents();
4226	5731	}
4227	5732
4228		- void pasteInto(boolean copyit)
	5733	+ void pasteInto(boolean copyit, boolean clone)
4229	5734	{
4230		-// if (GraphreeD.clipboard == null)
	5735	+// if (GrafreeD.clipboard == null)
4231	5736	// return;
4232	5737
4233	5738	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5759,22 @@
4254	5759	if (copyit)
4255	5760	{
4256	5761	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5762	+ if (clone)
	5763	+ {
	5764	+ CloneClipboard(false); // sept 2014
	5765	+ }
	5766	+ else
	5767	+ {
	5768	+ paste(false);
	5769	+ }
4258	5770	}
4259	5771	else
4260	5772	{
4261	5773	boolean first = true;
4262	5774
4263		- if (GraphreeD.clipboardIsTempGroup)
	5775	+ if (Grafreed.clipboardIsTempGroup)
4264	5776	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5777	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5778	Object3D copy;
4267	5779	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5780	{
..	..	@@ -4272,7 +5784,7 @@
4272	5784	}
4273	5785	} else
4274	5786	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5787	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5788	}
4277	5789	}
4278	5790	}
..	..	@@ -4349,6 +5861,10 @@
4349	5861
4350	5862	void group(Object3D csg, boolean grab)
4351	5863	{
	5864	+ if (Globals.REPLACEONMAKE)
	5865	+ Save();
	5866	+ boolean keep = Globals.REPLACEONMAKE;
	5867	+ Globals.REPLACEONMAKE = false;
4352	5868	if (//false) // why??
4353	5869	!group.selection.isEmpty())
4354	5870	{
..	..	@@ -4462,8 +5978,34 @@
4462	5978	//node.add(csg);
4463	5979	//makeSomething(node);
4464	5980	makeSomething(csg);
	5981	+ Globals.REPLACEONMAKE = keep;
4465	5982	}
4466	5983
	5984	+ void Ungroup(Object3D g)
	5985	+ {
	5986	+ if (Globals.REPLACEONMAKE)
	5987	+ Save();
	5988	+ boolean keep = Globals.REPLACEONMAKE;
	5989	+ Globals.REPLACEONMAKE = false;
	5990	+ if (g instanceof HiddenObject)
	5991	+ {
	5992	+ HiddenObject h = (HiddenObject) g;
	5993	+
	5994	+ for (int i=0; i<h.ActualSize(); i++)
	5995	+ {
	5996	+ objEditor.makeSomething(h.get(i), false);
	5997	+ }
	5998	+ }
	5999	+ else
	6000	+ {
	6001	+ for (int i=0; i<g.Size(); i++)
	6002	+ {
	6003	+ objEditor.makeSomething(g.get(i), false);
	6004	+ }
	6005	+ }
	6006	+ Globals.REPLACEONMAKE = keep;
	6007	+ }
	6008	+
4467	6009	void ungroup()
4468	6010	{
4469	6011	/*
..	..	@@ -4657,21 +6199,6 @@
4657	6199	}
4658	6200	*/
4659	6201
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	6202	/*
4676	6203	public void Callback(Object obj)
4677	6204	{
..	..	@@ -4695,26 +6222,9 @@
4695	6222	}
4696	6223	*/
4697	6224
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	6225	String GetFile(String dialogName)
4716	6226	{
4717		- if (GraphreeD.standAlone)
	6227	+ if (Grafreed.standAlone)
4718	6228	{
4719	6229	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6230	browser.show();
..	..	@@ -4778,10 +6288,48 @@
4778	6288	cButton flashSelectionButton;
4779	6289	cButton editButton;
4780	6290	cButton uneditButton;
	6291	+ JCheckBox allParamsButton;
4781	6292	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6293	cButton unselectButton;
4784	6294
	6295	+ cButton restoreCameraButton;
	6296	+
	6297	+ cButton oneStepButton;
	6298	+
	6299	+ cButton groupButton;
	6300	+ cButton ungroupButton;
	6301	+ cButton compositeButton;
	6302	+ cButton switchButton;
	6303	+ cButton loopButton;
	6304	+ cButton textureButton;
	6305	+
	6306	+ cButton skybox1Button;
	6307	+ cButton skybox2Button;
	6308	+ cButton skybox3Button;
	6309	+ cButton skybox4Button;
	6310	+ cButton skybox5Button;
	6311	+ cButton skybox6Button;
	6312	+ cButton skybox7Button;
	6313	+
	6314	+ cButton skybox11Button;
	6315	+ cButton skybox12Button;
	6316	+ cButton skybox13Button;
	6317	+ cButton skybox14Button;
	6318	+ cButton skybox15Button;
	6319	+ cButton skybox16Button;
	6320	+ cButton skybox17Button;
	6321	+
	6322	+ cButton gridButton;
	6323	+ cButton boxButton;
	6324	+ cButton sphereButton;
	6325	+ cButton coneButton;
	6326	+ cButton torusButton;
	6327	+ cButton superButton;
	6328	+ cButton kleinButton;
	6329	+ cButton particlesButton;
	6330	+ cButton overlayButton;
	6331	+ cButton lightButton;
	6332	+
4785	6333	cButton screenfitButton;
4786	6334	cButton screenfitpointButton;
4787	6335	cButton snapobjectButton;
..	..	@@ -4793,14 +6341,6 @@
4793	6341
4794	6342	cButton setsupportButton;
4795	6343
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	6344	//
4805	6345	//Composite
4806	6346	Object3D // to do !!
..	..	@@ -4810,10 +6350,12 @@
4810	6350	//JTree jTree;
4811	6351	private MenuItem lookAtItem;
4812	6352	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
4814		- private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
4816		- private MenuItem cloneItem;
	6353	+ private MenuItem switchViewItem;
	6354	+ private JMenuItem cutItem;
	6355	+ private MenuItem undoItem;
	6356	+ private MenuItem redoItem;
	6357	+ private JMenuItem duplicateItem;
	6358	+ private JMenuItem cloneItem;
4817	6359	private MenuItem cloneSupportItem;
4818	6360	private MenuItem overwriteGeoItem;
4819	6361	private MenuItem overwriteMatItem;
..	..	@@ -4823,8 +6365,9 @@
4823	6365	private MenuItem resetsupportItem;
4824	6366	private MenuItem resetreferencesItem;
4825	6367	private MenuItem linkverticesItem;
	6368	+ private MenuItem relinkverticesItem;
4826	6369	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6370	+ private MenuItem resetAllItem;
4828	6371	private MenuItem stepAllItem;
4829	6372	private MenuItem revertMeshItem;
4830	6373	private MenuItem poseMeshItem;
..	..	@@ -4833,16 +6376,19 @@
4833	6376	private MenuItem cloneGeometriesItem;
4834	6377	private MenuItem shareGeometriesItem;
4835	6378	private MenuItem mergeGeometriesItem;
4836		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
4837	6380	private MenuItem pasteItem;
4838		- private MenuItem pasteLinkItem;
4839		- private MenuItem pasteCloneItem;
4840		- private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
4842	6386	private MenuItem clearAllItem;
4843	6387	private MenuItem genUVItem;
	6388	+ private MenuItem genNormalsMESHItem;
4844	6389	private MenuItem genNormalsCADItem;
4845	6390	private MenuItem genNormalsORGANItem;
	6391	+ private MenuItem genNormalsMINEItem;
4846	6392	private MenuItem stripifyItem;
4847	6393	private MenuItem unstripifyItem;
4848	6394	private MenuItem trimItem;
..	..	@@ -4862,6 +6408,7 @@
4862	6408	private MenuItem clipMeshItem;
4863	6409	private MenuItem smoothMeshItem;
4864	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
4865	6412
4866	6413	private MenuItem liveleavesItem;
4867	6414	private MenuItem unliveleavesItem;
..	..	@@ -4871,6 +6418,10 @@
4871	6418	private MenuItem showleavesItem;
4872	6419	private MenuItem markleavesItem;
4873	6420	private MenuItem unmarkleavesItem;
	6421	+ private MenuItem rewindleavesItem;
	6422	+ private MenuItem unrewindleavesItem;
	6423	+ private MenuItem randomleavesItem;
	6424	+ private MenuItem unrandomleavesItem;
4874	6425
4875	6426	private MenuItem flipVItem;
4876	6427	private MenuItem unflipVItem;
..	..	@@ -4881,15 +6432,21 @@
4881	6432	private MenuItem maxTexturesItem;
4882	6433	private MenuItem panoTexturesItem;
4883	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
4884	6438	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6439	+ private MenuItem resetCentroidXZItem;
4886	6440	private MenuItem resetTransformItem;
4887		- private MenuItem grabItem;
	6441	+ private MenuItem transformGeometryItem;
	6442	+ private MenuItem transformChildrenItem;
	6443	+ private MenuItem hideItem;
	6444	+ private JMenuItem grabItem;
4888	6445	private MenuItem backItem;
4889	6446	private MenuItem frontItem;
4890	6447	private MenuItem cameraItem;
4891	6448	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6449	+ private MenuItem switchItem;
4893	6450	private MenuItem physicsItem;
4894	6451	private MenuItem frameselectorItem;
4895	6452	private MenuItem scriptNodeItem;
..	..	@@ -4897,13 +6454,14 @@
4897	6454	private MenuItem switchTransfoItem;
4898	6455	private MenuItem morphItem;
4899	6456	private MenuItem linkerItem;
4900		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
4901	6458	private MenuItem editItem;
4902	6459	private MenuItem openWindowItem;
4903	6460	private MenuItem editLeafItem;
4904	6461
4905	6462	private MenuItem resetParentItem;
4906	6463	private MenuItem repairParentItem;
	6464	+ private MenuItem repairShadowItem;
4907	6465	private MenuItem sortbysizeItem;
4908	6466	private MenuItem sortbynameItem;
4909	6467
..	..	@@ -4912,6 +6470,8 @@
4912	6470	private MenuItem attachBumpItem;
4913	6471	private MenuItem detachBumpItem;
4914	6472	private MenuItem pigmentBumpItem;
	6473	+ private MenuItem embedTexturesItem;
	6474	+ private MenuItem deEmbedTexturesItem;
4915	6475
4916	6476	private MenuItem particleItem;
4917	6477	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6484,11 @@
4924	6484	private MenuItem coneItem;
4925	6485	private MenuItem torusItem;
4926	6486	private MenuItem superItem;
	6487	+ private MenuItem kleinItem;
4927	6488	private MenuItem blobItem;
4928	6489	private MenuItem latheItem;
4929	6490	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6491	+ private MenuItem overlayItem;
4931	6492	private MenuItem meshItem;
4932	6493	// private MenuItem meshGroupItem;
4933	6494	private MenuItem springItem;
..	..	@@ -4936,6 +6497,7 @@
4936	6497	private MenuItem csgItem;
4937	6498	private MenuItem templateItem;
4938	6499	private MenuItem textureItem;
	6500	+ private MenuItem billboardItem;
4939	6501	private MenuItem shadowXItem;
4940	6502	private MenuItem shadowYItem;
4941	6503	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6510,6 @@
4948	6510	private MenuItem doubleItem;
4949	6511	private MenuItem tripleItem;
4950	6512
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6513	private MenuItem computeAOItem;
4957	6514	private MenuItem recompileItem;
4958	6515	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6519,8 @@
4962	6519	private MenuItem analyzeItem;
4963	6520	private MenuItem dumpItem;
4964	6521	//boolean freezemodel = false;
	6522	+
	6523	+ Menu cameraMenu;
	6524	+ MenuItem editCameraItem;
	6525	+ MenuItem restoreCameraItem;
4965	6526	}