~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,360 @@
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	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
	379	+ }
	380	+
25	381	//ObjEditor objEditor;
26	382	public void closeUI2()
27	383	{
..	..	@@ -59,6 +415,16 @@
59	415	this.copy = this.group = group;
60	416	//selectees = this.group.selectees;
61	417
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
	427	+
62	428	if(ui)
63	429	SetupUI(objEditor);
64	430	}
..	..	@@ -73,17 +439,29 @@
73	439	this.copy = this.group = copy;
74	440	//selectees = this.group.selectees;
75	441
76		- SetupMenu2(objEditor);
	442	+ SetupMenu2(this); //objEditor);
77	443	SetupUI2(objEditor);
78	444	objEditor.SetupUI(true);
79	445	SetupViews(objEditor);
80	446
81	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	448	+
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
82	456	}
83	457
84	458	void CloneSelection(boolean supports)
85	459	{
86		- // Object3D keep = GraphreeD.clipboard;
	460	+ if (Globals.REPLACEONMAKE)
	461	+ Save();
	462	+ boolean keep = Globals.REPLACEONMAKE;
	463	+ Globals.REPLACEONMAKE = false;
	464	+ // Object3D keep = GrafreeD.clipboard;
87	465	//Object3D obj;
88	466	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	467	{
..	..	@@ -93,18 +471,19 @@
93	471
94	472	makeSomething(clone, i==group.selection.size()-1);
95	473	}
	474	+ Globals.REPLACEONMAKE = keep;
96	475	}
97	476
98	477	void CloneClipboard(boolean supports)
99	478	{
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));
	479	+ assert(Grafreed.clipboard.parent == null);
	480	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	481	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	482	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	483	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	484	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	485	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	486	+ Grafreed.clipboard.get(0).parent = keepparent;
108	487	}
109	488
110	489	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +497,7 @@
118	497	// obj.support = null;
119	498	if (!supports)
120	499	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	500	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	501	obj.parent = parent;
123	502	// obj.support = support;
124	503	// clone.support = support; // aout 2013
..	..	@@ -147,58 +526,153 @@
147	526
148	527	//JTextField nameField;
149	528
150		- void SetupMenu2(ObjEditor oe)
	529	+ void SetupMenu2(GroupEditor oe)
151	530	{
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);
	531	+ oe.jTree = new cTree();
	532	+
163	533	Menu menu;
164	534	oe.menuBar.add(menu = new Menu("Edit"));
165	535	//editItem = menu.add(new MenuItem("Edit"));
166	536	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	537	+
	538	+// undoItem = menu.add(new MenuItem("Undo"));
	539	+// undoItem.addActionListener(this);
	540	+// redoItem = menu.add(new MenuItem("Redo"));
	541	+// redoItem.addActionListener(this);
	542	+// menu.add("-");
	543	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	544	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
171	547	cloneItem.addActionListener(this);
	548	+ //if (Globals.ADVANCED)
	549	+ {
172	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	551	cloneSupportItem.addActionListener(this);
	552	+ }
	553	+ oe.jTree.popup.addSeparator();
174	554	menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
176	556	cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
178	558	copyItem.addActionListener(this);
179	559	pasteItem = menu.add(new MenuItem("Paste"));
180	560	pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
	565	+ pasteIntoItem.addActionListener(this);
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
182	567	pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
184	569	pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
186	571	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
	574	+
	575	+ if (Globals.ADVANCED)
	576	+ {
	577	+ // Deletes the cameras...
189	578	clearAllItem = menu.add(new MenuItem("Clear All"));
190	579	clearAllItem.addActionListener(this);
	580	+ }
	581	+
	582	+ menuBar.add(cameraMenu = new Menu("View"));
	583	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	584	+ //zBufferItem.addActionListener(this);
	585	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	586	+ //normalLensItem.addActionListener(this);
	587	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	588	+ restoreCameraItem.addActionListener(this);
	589	+
	590	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	591	+// toggleFullScreenItem.addItemListener(this);
	592	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	593	+// cameraMenu.add("-");
	594	+//
	595	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	596	+// toggleTextureItem.addItemListener(this);
	597	+// toggleTextureItem.setState(CameraPane.textureon);
	598	+//
	599	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	600	+// toggleSwitchItem.addItemListener(this);
	601	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	602	+
	603	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	604	+ toggleHandleItem.addItemListener(this);
	605	+ toggleHandleItem.setState(CameraPane.HANDLES);
	606	+
	607	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	608	+ togglePaintItem.addItemListener(this);
	609	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	610	+
	611	+ if (Globals.ADVANCED)
	612	+ {
	613	+ cameraMenu.add("-");
	614	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	615	+ toggleLiveItem.addItemListener(this);
	616	+ toggleLiveItem.setState(Globals.isLIVE());
191	617
	618	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	619	+ stepItem.addActionListener(this);
	620	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	621	+ // toggleDLItem.addItemListener(this);
	622	+ // toggleDLItem.setState(false);
	623	+
	624	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	625	+ toggleRenderItem.addItemListener(this);
	626	+ toggleRenderItem.setState(!CameraPane.frozen);
	627	+
	628	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	629	+ toggleDebugItem.addItemListener(this);
	630	+ toggleDebugItem.setState(Globals.DEBUG);
	631	+
	632	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	633	+ toggleFrustumItem.addItemListener(this);
	634	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	635	+
	636	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	637	+ toggleFootContactItem.addItemListener(this);
	638	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	639	+
	640	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	641	+ toggleTimelineItem.addItemListener(this);
	642	+ }
	643	+
	644	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	645	+// toggleRootItem.addItemListener(this);
	646	+// toggleRootItem.setState(false);
	647	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	648	+// animationItem.addItemListener(this);
	649	+// animationItem.setState(CameraPane.ANIMATION);
	650	+ cameraMenu.add("-");
	651	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	652	+ editCameraItem.addActionListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	657	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	658	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	659	+ oe.cameraMenu.add("-");
	660	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	661	+ openWindowItem.addActionListener(this);
	662	+ lookAtItem.addActionListener(this);
	663	+ //lookFromItem.addActinoListener(this);
	664	+ //switchViewItem.addActionListener(this);
	665	+ }
	666	+
192	667	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);
	668	+ if (Globals.ADVANCED)
	669	+ {
197	670	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	671	revertMeshItem.addActionListener(this);
199	672	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	673	resetreferencesItem.addActionListener(this);
201	674	menu.add("-");
	675	+ }
202	676	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	677	overwriteGeoItem.addActionListener(this);
204	678	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +684,118 @@
210	684	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	685	overwriteUVItem.addActionListener(this);
212	686	menu.add("-");
	687	+ if (Globals.ADVANCED)
	688	+ {
213	689	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	690	generateMeshItem.addActionListener(this);
215	691	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	692	poseMeshItem.addActionListener(this);
217	693	menu.add("-");
	694	+ }
218	695	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	696	resetsupportItem.addActionListener(this);
220	697	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	698	linkverticesItem.addActionListener(this);
	699	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	700	+ relinkverticesItem.addActionListener(this);
	701	+
	702	+ if (Globals.ADVANCED)
	703	+ {
222	704	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	705	setMasterItem.addActionListener(this);
	706	+ }
224	707
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);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
230	710	backItem = menu.add(new MenuItem("Back"));
231	711	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);
	712	+ frontItem = menu.add(new MenuItem("Front"));
	713	+ frontItem.addActionListener(this);
	714	+// compositeItem = menu.add(new MenuItem("Composite"));
	715	+// compositeItem.addActionListener(this);
	716	+
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
	720	+ if (Globals.ADVANCED)
	721	+ {
	722	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	723	+ hideItem.addActionListener(this);
	724	+ }
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
	726	+ ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
	732	+
	733	+// menu.add("-");
	734	+//
	735	+// switchItem = menu.add(new MenuItem("Switch node"));
	736	+// switchItem.addActionListener(this);
	737	+ if (Globals.ADVANCED)
	738	+ {
241	739	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	740	switchGeoItem.addActionListener(this);
243	741	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	742	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	743	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	744	morphItem.addActionListener(this);
	745	+
	746	+ menu.add("-");
	747	+ physicsItem = menu.add(new MenuItem("Physics"));
	748	+ physicsItem.addActionListener(this);
	749	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	750	+ frameselectorItem.addActionListener(this);
247	751	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	752	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	753	+ }
251	754
252	755	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	756	+// textureItem = menu.add(new MenuItem("Texture"));
	757	+// textureItem.addActionListener(this);
	758	+ billboardItem = menu.add(new MenuItem("Billboard"));
	759	+ billboardItem.addActionListener(this);
255	760	csgItem = menu.add(new MenuItem("CSG"));
256	761	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	762	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	763	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	764	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	765	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	766	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	767	shadowZItem.addActionListener(this);
	768	+
	769	+ if (Globals.ADVANCED)
	770	+ {
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
	773	+ menu.add("-");
263	774	linkerItem = menu.add(new MenuItem("Linker"));
264	775	linkerItem.addActionListener(this);
265	776	templateItem = menu.add(new MenuItem("Template"));
266	777	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	778	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	779	pointflowItem.addActionListener(this);
	780	+ }
271	781	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
274	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	790	resetTransformItem.addActionListener(this);
276	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	792	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
	794	+ resetCentroidXZItem.addActionListener(this);
	795	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	796	+ transformGeometryItem.addActionListener(this);
	797	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	798	+ transformChildrenItem.addActionListener(this);
280	799
281	800	oe.menuBar.add(menu = new Menu("Geometry"));
282	801	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +804,13 @@
285	804	genNormalsORGANItem.addActionListener(this);
286	805	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	806	genNormalsCADItem.addActionListener(this);
	807	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	808	+ genNormalsMESHItem.addActionListener(this);
	809	+ if (Globals.ADVANCED)
	810	+ {
	811	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	812	+ genNormalsMINEItem.addActionListener(this);
	813	+ }
288	814	stripifyItem = menu.add(new MenuItem("Stripify"));
289	815	stripifyItem.addActionListener(this);
290	816	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,31 +832,52 @@
306	832	reduce34MeshItem.addActionListener(this);
307	833	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	834	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	835	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	836	clipMeshItem.addActionListener(this);
	837	+
	838	+ if (Globals.ADVANCED)
	839	+ {
	840	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	841	+ smoothMeshItem.addActionListener(this);
	842	+ }
313	843
314	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
315	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	848	clearMaterialsItem.addActionListener(this);
	849	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	850	+ resetAllItem.addActionListener(this);
	851	+ stepAllItem = menu.add(new MenuItem("Step All"));
	852	+ stepAllItem.addActionListener(this);
317	853	menu.add("-");
318	854	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	855	liveleavesItem.addActionListener(this);
320	856	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	857	unliveleavesItem.addActionListener(this);
	858	+ if (Globals.ADVANCED)
	859	+ {
322	860	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	861	supportleavesItem.addActionListener(this);
324	862	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	863	unsupportleavesItem.addActionListener(this);
	864	+ }
326	865	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	866	hideleavesItem.addActionListener(this);
328	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
329	868	showleavesItem.addActionListener(this);
330		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
331	870	markleavesItem.addActionListener(this);
332		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
333	872	unmarkleavesItem.addActionListener(this);
	873	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	874	+ rewindleavesItem.addActionListener(this);
	875	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	876	+ unrewindleavesItem.addActionListener(this);
	877	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	878	+ randomleavesItem.addActionListener(this);
	879	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	880	+ unrandomleavesItem.addActionListener(this);
334	881	menu.add("-");
335	882	flipVItem = menu.add(new MenuItem("Flip V"));
336	883	flipVItem.addActionListener(this);
..	..	@@ -356,53 +903,135 @@
356	903	attachBumpItem.addActionListener(this);
357	904	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
358	905	pigmentBumpItem.addActionListener(this);
	906	+ //embedTexturesItem
359	907	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
360	908	detachPigmentItem.addActionListener(this);
361	909	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
362	910	detachBumpItem.addActionListener(this);
	911	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	912	+ embedTexturesItem.addActionListener(this);
	913	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	914	+ deEmbedTexturesItem.addActionListener(this);
363	915	menu.add("-");
364	916	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
365	917	sortbysizeItem.addActionListener(this);
366	918	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	919	sortbynameItem.addActionListener(this);
368	920	menu.add("-");
	921	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	922	+ shareGeometriesItem.addActionListener(this);
	923	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	924	+ mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
	928	+ if (Globals.ADVANCED)
	929	+ {
	930	+ // Pretty much the same as duplicate and clone.
369	931	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	932	extractGeometriesItem.addActionListener(this);
371	933	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	934	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);
	935	+ }
377	936
378	937	oe.menuBar.add(menu = new Menu("Insert"));
379	938	buildCreateMenu(menu);
380	939
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	940	oe.menuBar.add(menu = new Menu("Tools"));
393	941	buildToolsMenu(menu);
394	942	}
395	943
	944	+ JTabbedPane resourcecontainer;
	945	+ cGridBag currenttab;
	946	+ //boolean added; // patch for jar
	947	+
	948	+ int totalcount = 0;
	949	+
	950	+ int tabcount = 0;
	951	+ int colcount = 0;
	952	+ int rowcount = 0;
	953	+ int texturecount = 0;
	954	+
	955	+ int columns = 5;
	956	+ int rows = 7;
	957	+
	958	+ public void ResourceCallBack(String[] path)
	959	+ {
	960	+// for (int i = 0; i < path.length; i++)
	961	+// System.out.print(path[i] + "/");
	962	+// System.out.println();
	963	+
	964	+ if (//rowcount == 0 \|\|
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
	966	+ {
	967	+ currenttab = new cGridBag();
	968	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	969	+ currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ rowcount = 1;
	974	+ colcount = 0;
	975	+ texturecount = 0;
	976	+ }
	977	+
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	979	+ {
	980	+ //if (!added)
	981	+ {
	982	+ //added = true;
	983	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	985	+ }
	986	+
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
	989	+
	990	+ if (++colcount >= columns)
	991	+ {
	992	+ colcount = 0;
	993	+ currenttab.Return();
	994	+
	995	+ if (rowcount++ >= rows)
	996	+ {
	997	+ rowcount = 0;
	998	+ }
	999	+ }
	1000	+ }
	1001	+ else
	1002	+ {
	1003	+// if (!path[path.length-1].equals("icons"))
	1004	+// resourcecontainer.Return();
	1005	+ }
	1006	+ }
	1007	+
	1008	+ void CreateTexturePanel(cGridBag container)
	1009	+ {
	1010	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1011	+ container.add(resourcecontainer);
	1012	+
	1013	+ Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
	1016	+ }
	1017	+
396	1018	void SetupUI2(ObjEditor oe)
397	1019	{
	1020	+ // June 2019
	1021	+ if (oe == null)
	1022	+ {
	1023	+ //super.SetupUI2(this);
	1024	+ //return;
	1025	+ }
	1026	+
	1027	+ if (copy != group)
	1028	+ {
	1029	+ //super.SetupUI2(this);
	1030	+ }
	1031	+
398	1032	//new Exception().printStackTrace();
399	1033
400	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
407	1036
408	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -423,150 +1052,269 @@
423	1052	oe.radioPanel.add(dummyButton);
424	1053	oe.buttonGroup.add(dummyButton);
425	1054	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	1055	+ cGridBag versionManagerPanel = new cGridBag();
	1056	+
	1057	+ versionManagerPanel.preferredHeight = 4;
429	1058
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	1059	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	1060	+
	1061	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1062	+ //minButton.setToolTipText("Minimize window");
	1063	+ //minButton.addActionListener(this);
	1064	+
	1065	+ if (Globals.ADVANCED)
	1066	+ {
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
	1070	+ }
	1071	+
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1112	+ fullButton.setToolTipText("Full-screen window");
	1113	+ fullButton.addActionListener(this);
	1114	+
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1116	+ screenfitButton.setToolTipText("Screen fit");
	1117	+ screenfitButton.addActionListener(this);
	1118	+
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1120	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	1121	+ restoreCameraButton.addActionListener(this);
	1122	+
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ saveVersionButton.setToolTipText("Duplicate current version");
	1125	+ saveVersionButton.addActionListener(this);
	1126	+
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1128	+ deleteVersionButton.setToolTipText("Delete current version");
	1129	+ deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
	1131	+
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1133	+ previousVersionButton.setToolTipText("Previous version");
	1134	+ previousVersionButton.addActionListener(this);
	1135	+ previousVersionButton.setEnabled(false);
	1136	+
	1137	+ cGridBag updown = new cGridBag().setVertical(true);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1139	+ restoreButton.setToolTipText("Undo (restore current version)");
	1140	+ restoreButton.addActionListener(this);
	1141	+ restoreButton.setEnabled(false);
	1142	+
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1144	+ replaceButton.setToolTipText("Save (replace current version)");
	1145	+ replaceButton.addActionListener(this);
	1146	+ replaceButton.setEnabled(false);
	1147	+
	1148	+ versionManagerPanel.add(updown);
	1149	+
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1151	+ nextVersionButton.setToolTipText("Next version");
	1152	+ nextVersionButton.addActionListener(this);
	1153	+ nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
	1158	+
	1159	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1160	+ liveCB.setToolTipText("Enable animation");
431	1161	liveCB.addItemListener(this);
432	1162
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);
	1163	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	1164	+ fastCB.setToolTipText("Fast mode");
451	1165	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);
	1166	+
	1167	+ //oe.toolboxPanel.Return();
	1168	+
	1169	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	1170	+// trackCB.setToolTipText("Enable tracking");
	1171	+// trackCB.addItemListener(this);
458	1172
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	1173	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	1174	// 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	1175
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);
	1176	+ if (Globals.ADVANCED)
	1177	+ {
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1179	+ snapobjectButton.addActionListener(this);
	1180	+ snapobjectButton.setToolTipText("Snap Object");
	1181	+
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
521	1183	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		- //
	1184	+ fourButton.setToolTipText("Show control panel only");
	1185	+ }
529	1186
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1187	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	1188	+
	1189	+
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ rootButton.setToolTipText("Open selection in new tab");
531	1192	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1193	+
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ closeButton.setToolTipText("Close tab");
534	1196	closeButton.addActionListener(this);
535	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	1198	//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	1199
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1200	+ cGridBag row1 = new cGridBag();
	1201	+
	1202	+ // INSERT
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
	1205	+ gridButton.addActionListener(this);
	1206	+
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1208	+ boxButton.setToolTipText("Create box");
	1209	+ boxButton.addActionListener(this);
	1210	+
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1212	+ superButton.setToolTipText("Create superellipsoid");
	1213	+ superButton.addActionListener(this);
	1214	+
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
	1228	+ {
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1230	+ kleinButton.setToolTipText("Create Klein bottle");
	1231	+ kleinButton.addActionListener(this);
	1232	+ }
	1233	+
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1235	+ particlesButton.setToolTipText("Create particle system");
	1236	+ particlesButton.addActionListener(this);
	1237	+
	1238	+ oe.toolboxPanel.add(row1);
	1239	+
	1240	+ cGridBag row2 = new cGridBag();
	1241	+
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1243	+ groupButton.setToolTipText("Create group");
	1244	+ groupButton.addActionListener(this);
	1245	+
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1247	+ compositeButton.setToolTipText("Create composite");
	1248	+ compositeButton.addActionListener(this);
	1249	+
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1251	+ switchButton.setToolTipText("Create item switcher");
	1252	+ switchButton.addActionListener(this);
	1253	+
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1255	+ loopButton.setToolTipText("Create loop");
	1256	+ loopButton.addActionListener(this);
	1257	+
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1259	+ textureButton.setToolTipText("Create texture");
	1260	+ textureButton.addActionListener(this);
	1261	+
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1263	+ overlayButton.setToolTipText("Create overlay");
	1264	+ overlayButton.addActionListener(this);
	1265	+
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1267	+ lightButton.setToolTipText("Create light");
	1268	+ lightButton.addActionListener(this);
	1269	+
	1270	+ oe.toolboxPanel.add(row2);
	1271	+
	1272	+ cGridBag textures = new cGridBag();
	1273	+
	1274	+ CreateTexturePanel(textures);
	1275	+
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
	1281	+ oe.toolboxPanel.add(textures);
	1282	+
	1283	+ textures.preferredHeight = 100;
	1284	+
	1285	+ CreateSkyboxPanel(oe.skyboxPanel);
	1286	+
	1287	+ // EDIT panel
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1289	+ editButton.setToolTipText("Pin selection controls");
	1290	+ editButton.addActionListener(this);
	1291	+
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1293	+ uneditButton.setToolTipText("Unpin and remove selection controls");
547	1294	uneditButton.addActionListener(this);
548	1295
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);
	1296	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1297	+ allParamsButton.setToolTipText("Show all controls");
561	1298	allParamsButton.addActionListener(this);
562	1299
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);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1301	+ clearPanelButton.setToolTipText("Clear all controls");
	1302	+ clearPanelButton.addActionListener(this);
569	1303
	1304	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ //unselectButton.setToolTipText("Unselect");
	1306	+ //unselectButton.addActionListener(this);
	1307	+
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ flashSelectionButton.setToolTipText("Highlight selection");
	1310	+ flashSelectionButton.addActionListener(this);
	1311	+
	1312	+ editCommandsPanel.preferredHeight = 1;
	1313	+
	1314	+ SetPinStates(false);
	1315	+// oe.treePanel.add(commandsPanel);
	1316	+// oe.treePanel.Return();
	1317	+
570	1318	// oe.aConstraints.gridx += 1;
571	1319	// oe.aConstraints.weighty = 0;
572	1320	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,47 +1326,34 @@
578	1326	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	1327	// gcButton.addActionListener(this);
580	1328
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;
	1329	+ cGridBag jSPPanel = new cGridBag();
	1330	+
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
	1333	+ JScrollPane jSP;
592	1334	//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);
	1335	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	1336	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	1337
	1338	+ oe.treePanel.add(jSPPanel);
	1339	+ oe.treePanel.Return();
	1340	+
	1341	+ oe.treePanel.add(versionManagerPanel);
	1342	+ oe.treePanel.Return();
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
	1346	+
	1347	+// mainPanel.setDividerLocation(0.1); //1.0);
	1348	+ mainPanel.setResizeWeight(0.4);
	1349	+
615	1350	//jList.addListSelectionListener(this);
616	1351	oe.jTree.addTreeSelectionListener(this);
617	1352	//jTree.setRootVisible(false);
618	1353	//jTree.setEditable(true);
619	1354	oe.jTree.setDragEnabled(true);
620	1355	//jTree.setPreferredSize(new Dimension(10,10));
621		- jSP.setPreferredSize(new Dimension(100,200));
	1356	+ //jSP.setPreferredSize(new Dimension(100,200));
622	1357
623	1358	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
624	1359
..	..	@@ -630,47 +1365,204 @@
630	1365	dgr.addDragGestureListener(this);
631	1366	}catch(Exception e) {}
632	1367	*/
633		- radio.layout = sevenButton;
	1368	+ radio.layout = threeButton; // sixButton;
634	1369	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	1370	}
	1371	+
	1372	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1373	+ {
	1374	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1375	+ colorCB.setToolTipText("Copy color when dropped");
	1376	+ colorCB.addItemListener(this);
	1377	+
	1378	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1379	+ materialCB.setToolTipText("Copy material when dropped");
	1380	+ materialCB.addItemListener(this);
	1381	+
	1382	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1383	+ textureCB.setToolTipText("Copy texture when dropped");
	1384	+ textureCB.addItemListener(this);
	1385	+
	1386	+ panel.Return();
	1387	+
	1388	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1389	+ boxCB.setToolTipText("Display bounding boxes");
	1390	+ boxCB.addItemListener(this);
	1391	+
	1392	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1393	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1394	+ zoomBoxCB.addItemListener(this);
	1395	+
	1396	+ if (true) // Globals.ADVANCED)
	1397	+ {
	1398	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1399	+// supportCB.setToolTipText("Enable rigging");
	1400	+// supportCB.addItemListener(this);
	1401	+
	1402	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1403	+ freezeCB.setToolTipText("Fast moving camera");
	1404	+ freezeCB.addItemListener(this);
	1405	+
	1406	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1407	+ // localCB.addItemListener(this);
	1408	+
	1409	+ panel.Return();
	1410	+
	1411	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1412	+ crowdCB.setToolTipText("Used for crowds");
	1413	+ crowdCB.addItemListener(this);
	1414	+
	1415	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1416	+ smoothCB.setToolTipText("Snapping delay");
	1417	+ smoothCB.addItemListener(this);
	1418	+
	1419	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1420	+// slowCB.setToolTipText("Smooth interpolation");
	1421	+// slowCB.addItemListener(this);
	1422	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1423	+ minshaderCB.setToolTipText("Minimal fast shader");
	1424	+ minshaderCB.addItemListener(this);
	1425	+
	1426	+// constraints.gridy += 1;
	1427	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1428	+// speakerMocapCB.addItemListener(this);
	1429	+
	1430	+ panel.Return();
	1431	+
	1432	+ if (false)
	1433	+ {
	1434	+ // handled in scripts
	1435	+ //constraints.gridy += 1;
	1436	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1437	+ speakerCameraCB.addItemListener(this);
	1438	+
	1439	+ //constraints.gridy += 1;
	1440	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1441	+ speakerFocusCB.addItemListener(this);
	1442	+
	1443	+ //constraints.gridy += 1;
	1444	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1445	+ smoothfocusCB.addItemListener(this);
	1446	+ panel.Return();
	1447	+ }
	1448	+
	1449	+//constraints.gridx += 1;
	1450	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1451	+// debugCB.addItemListener(this);
	1452	+
	1453	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1454	+ trackCB.setToolTipText("Enable tracking target");
	1455	+ trackCB.addItemListener(this);
	1456	+
	1457	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1458	+ oeilCB.setToolTipText("Move camera when tracking");
	1459	+ oeilCB.addItemListener(this);
	1460	+
	1461	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1462	+ shadowCB.setToolTipText("When live compute shadows");
	1463	+ shadowCB.addItemListener(this);
	1464	+
	1465	+ panel.Return();
	1466	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1467	+ toggleTextureCB.setToolTipText("Load textures");
	1468	+ toggleTextureCB.addItemListener(this);
	1469	+
	1470	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1471	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1472	+ toggleSwitchCB.addItemListener(this);
	1473	+
	1474	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1475	+ autokeepCB.setToolTipText("On structure change");
	1476	+ autokeepCB.addItemListener(this);
	1477	+
	1478	+ panel.Return();
	1479	+ if (Globals.ADVANCED)
	1480	+ {
	1481	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1482	+ lookAtCB.setToolTipText("Look-at target");
	1483	+ lookAtCB.addItemListener(this);
	1484	+ }
	1485	+
	1486	+ }
	1487	+
	1488	+ cGridBag fill = new cGridBag();
	1489	+ fill.preferredHeight = 200;
	1490	+ cGridBag fill2 = new cGridBag();
	1491	+ fill2.preferredHeight = 200;
	1492	+ cGridBag fill3 = new cGridBag();
	1493	+ fill3.preferredHeight = 200;
	1494	+
	1495	+ panel.add(fill);
	1496	+ panel.add(fill2);
	1497	+ panel.add(fill3);
	1498	+
	1499	+ }
636	1500
637	1501	void EditObject(Object3D obj)
638	1502	{
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();
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
	1511	+ cRadio radioButton = new cRadio(obj.name);
	1512	+
	1513	+ // June 2019. Patch to avoid bug with transparency.
	1514	+ radioButton.hadMaterial = obj.material != null;
	1515	+ if (!radioButton.hadMaterial)
	1516	+ {
	1517	+ obj.material = new cMaterial();
	1518	+ }
	1519	+
	1520	+ radioButton.SetObject(obj);
	1521	+ radioButton.layout = threeButton; // sixButton;
	1522	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1523	+ radioButton.addActionListener(this);
	1524	+ radioPanel.add(radioButton);
	1525	+ buttonGroup.add(radioButton);
	1526	+ radioButton.doClick();
647	1527	}
	1528	+
648	1529	void SetupViews(ObjEditor oe)
649	1530	{
	1531	+ theFrame = this;
	1532	+
650	1533	oe.SetupViews();
651	1534
	1535	+ if (Globals.DEBUG)
652	1536	System.out.println("SetupViews");
653	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
654	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
655	1539	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1540	}
657	1541
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;
	1542	+ cToggleButton liveCB;
	1543	+ cCheckBox supportCB;
	1544	+ cCheckBox localCB;
	1545	+ cCheckBox crowdCB;
	1546	+ cCheckBox smoothCB;
	1547	+ cCheckBox minshaderCB;
	1548	+
	1549	+ cToggleButton fastCB;
	1550	+ cCheckBox slowCB;
	1551	+ cCheckBox boxCB;
	1552	+ cCheckBox zoomBoxCB;
	1553	+ cCheckBox freezeCB;
	1554	+ //cToggleButton trackCB;
	1555	+ cCheckBox trackCB;
	1556	+ cCheckBox smoothfocusCB;
668	1557	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1558	+ cCheckBox speakerCameraCB;
	1559	+ cCheckBox speakerFocusCB;
	1560	+ cCheckBox debugCB;
	1561	+
	1562	+ cCheckBox oeilCB;
	1563	+ cCheckBox shadowCB;
	1564	+ cCheckBox autokeepCB;
	1565	+ cCheckBox lookAtCB;
674	1566
675	1567	// static int COLOR = 1;
676	1568	// static int MATERIAL = 2;
..	..	@@ -678,9 +1570,9 @@
678	1570
679	1571	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1572
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1573	+ cCheckBox colorCB;
	1574	+ cCheckBox materialCB;
	1575	+ cCheckBox textureCB;
684	1576
685	1577	public void itemStateChanged(ItemEvent e)
686	1578	{
..	..	@@ -705,10 +1597,10 @@
705	1597	dropAttributes \|= Object3D.TEXTURE;
706	1598	else
707	1599	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1600	+ } else if(e.getSource() == liveCB)
710	1601	{
711	1602	cameraView.ToggleLive();
	1603	+ refreshContents(false);
712	1604	}
713	1605	else if(e.getSource() == supportCB)
714	1606	{
..	..	@@ -724,6 +1616,12 @@
724	1616	{
725	1617	cameraView.ToggleInertia();
726	1618	cameraView.repaint();
	1619	+ }
	1620	+ else if(e.getSource() == minshaderCB)
	1621	+ {
	1622	+ Globals.MINSHADER ^= true;
	1623	+ cameraView.programInitialized = false;
	1624	+ cameraView.repaint();
727	1625	}
728	1626	else if(e.getSource() == localCB)
729	1627	{
..	..	@@ -743,6 +1641,10 @@
743	1641	Recompile();
744	1642	cameraView.repaint();
745	1643	// refreshContents();
	1644	+ }
	1645	+ else if(e.getSource() == zoomBoxCB)
	1646	+ {
	1647	+ cameraView.ToggleZoomBoxMode();
746	1648	}
747	1649	else if(e.getSource() == smoothfocusCB)
748	1650	{
..	..	@@ -769,6 +1671,18 @@
769	1671	{
770	1672	cameraView.ToggleOeil();
771	1673	}
	1674	+ else if(e.getSource() == shadowCB)
	1675	+ {
	1676	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1677	+ }
	1678	+ else if(e.getSource() == freezeCB)
	1679	+ {
	1680	+ Globals.FREEZEONMOVE ^= true;
	1681	+ }
	1682	+ else if(e.getSource() == autokeepCB)
	1683	+ {
	1684	+ Globals.REPLACEONMAKE ^= true;
	1685	+ }
772	1686	else if(e.getSource() == lookAtCB)
773	1687	{
774	1688	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1699,8 @@
785	1699
786	1700	/**/
787	1701	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1702	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1703	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1704	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1705	// We can't move the root node or an empty selection
791	1706	return;
..	..	@@ -848,8 +1763,6 @@
848	1763	}
849	1764	}
850	1765
851		- String string = (String) object;
852		-
853	1766	System.out.println("Transfer = " + object + "; drop : " + target);
854	1767	// if( object instanceof java.io.File[])
855	1768	// {
..	..	@@ -857,7 +1770,11 @@
857	1770	// objEditor.DropFile((java.io.File[]) object, true);
858	1771	// return;
859	1772	// }
860		- if (string.charAt(0) == '/')
	1773	+
	1774	+ String string = object.toString();
	1775	+
	1776	+ // File path for Mac and Windows
	1777	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1778	{
862	1779	// file(s)
863	1780	String[] names = string.split("\n");
..	..	@@ -884,7 +1801,7 @@
884	1801
885	1802	flashIt = false;
886	1803	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1804	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1805	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1806
890	1807	if (group.selection.size() == 1)
..	..	@@ -900,23 +1817,33 @@
900	1817
901	1818	assert target == objEditor.jTree;
902	1819	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1820	+ Object3D destinationLeaf;
903	1821	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1822	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1823	} catch (Exception e) {
906	1824	System.out.println("destinationPath : " + destinationPath);
907	1825	return;
908	1826	}
909	1827
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1828	+ for (int i=group.selection.size(); --i>=0;)
911	1829	{
	1830	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1831	+
	1832	+ // Cannot move into itself
	1833	+ if (child == destinationLeaf)
	1834	+ return;
	1835	+ }
	1836	+
	1837	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1838	+// {
912	1839	loadClipboard(true);
913	1840	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1841	+ pasteInto(false, false);
	1842	+// } else {
	1843	+// loadClipboard(false);
	1844	+// objEditor.jTree.setSelectionPath(destinationPath);
	1845	+// pasteInto(false, false); // true); // ???
	1846	+// }
920	1847	}
921	1848	public void dropActionChanged(DropTargetDragEvent dtde)
922	1849	// Called if the user has modified the current drop gesture
..	..	@@ -972,7 +1899,12 @@
972	1899	TreePath path;
973	1900
974	1901	public TransferableTreePath(TreePath tp) {
975		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
976	1908	}
977	1909
978	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1021,83 +1953,107 @@
1021	1953	{
1022	1954	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1955	//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);
	1956	+// gridItem = menu.add(new MenuItem("Grid"));
	1957	+// gridItem.addActionListener(this);
	1958	+// rectoidItem = menu.add(new MenuItem("Box"));
	1959	+// rectoidItem.addActionListener(this);
	1960	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1961	+// ellipsoidItem.addActionListener(this);
	1962	+// coneItem = menu.add(new MenuItem("Cone"));
	1963	+// coneItem.addActionListener(this);
	1964	+// torusItem = menu.add(new MenuItem("Torus"));
	1965	+// torusItem.addActionListener(this);
	1966	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1967	+// superItem.addActionListener(this);
	1968	+
	1969	+ cameraItem = menu.add(new MenuItem("Camera"));
	1970	+ cameraItem.addActionListener(this);
	1971	+
	1972	+ if (!Globals.ADVANCED)
	1973	+ {
	1974	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1975	+ kleinItem.addActionListener(this);
	1976	+ }
	1977	+
	1978	+// particleItem = menu.add(new MenuItem("Particle system"));
	1979	+// particleItem.addActionListener(this);
	1980	+ if (Globals.ADVANCED)
	1981	+ {
1038	1982	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1983	ragdollItem.addActionListener(this);
1040	1984	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1985	ragdoll2Item.addActionListener(this);
	1986	+ }
1042	1987	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1988	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1989	meshItem.addActionListener(this);
1045	1990	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1991	// meshGroupItem.addActionListener(this);
	1992	+ if (Globals.ADVANCED)
	1993	+ {
1047	1994	springItem = menu.add(new MenuItem("Spring"));
1048	1995	springItem.addActionListener(this);
1049	1996	flagItem = menu.add(new MenuItem("Flag"));
1050	1997	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	1998	blobItem = menu.add(new MenuItem("Blob"));
1056	1999	blobItem.addActionListener(this);
1057	2000	latheItem = menu.add(new MenuItem("Lathe"));
1058	2001	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	2002	+ }
	2003	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	2004	+ bezierItem.addActionListener(this);
	2005	+// overlayItem = menu.add(new MenuItem("Overlay"));
	2006	+// overlayItem.addActionListener(this);
	2007	+// lightItem = menu.add(new MenuItem("Light"));
	2008	+// lightItem.addActionListener(this);
1061	2009	menu.add("-");
1062	2010	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	2011	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	2012	+// loopItem = menu.add(new MenuItem("Loop"));
	2013	+// loopItem.addActionListener(this);
1066	2014	doubleItem = menu.add(new MenuItem("Fork"));
1067	2015	doubleItem.addActionListener(this);
	2016	+ if (Globals.ADVANCED)
	2017	+ {
1068	2018	tripleItem = menu.add(new MenuItem("Trident"));
1069	2019	tripleItem.addActionListener(this);
	2020	+ }
1070	2021	}
1071	2022
1072	2023	void buildToolsMenu(Menu menu)
1073	2024	{
1074	2025	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	2026	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	2027	+ animationItem.setState(Globals.ANIMATION);
	2028	+
	2029	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	2030	+ archiveItem.addActionListener(this);
1077	2031
1078	2032	menu.add("-");
1079	2033	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	2034	parseverticesItem.addActionListener(this);
1081	2035	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	2036	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	2037	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	2038	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	2039	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	2040	reduceMorphItem.addActionListener(this);
1089	2041	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	2042	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	2043	menu.add("-");
1095		-
1096	2044	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	2045	memoryItem.addActionListener(this);
	2046	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	2047	+ computeAOItem.addActionListener(this);
	2048	+
	2049	+ if (Globals.ADVANCED)
	2050	+ {
	2051	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	2052	+ mirrorItem.addActionListener(this);
	2053	+ menu.add("-");
1098	2054	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	2055	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	2056	+ menu.add(dumpItem = new MenuItem("Print"));
1101	2057	dumpItem.addActionListener(this);
1102	2058	// menu.add(pathItem = new MenuItem("From-to path"));
1103	2059	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +2062,8 @@
1106	2062	resetParentItem.addActionListener(this);
1107	2063	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	2064	repairParentItem.addActionListener(this);
	2065	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	2066	+ repairShadowItem.addActionListener(this);
1109	2067	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	2068	invariantsItem.addActionListener(this);
1111	2069	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +2071,7 @@
1113	2071	menu.add("-");
1114	2072	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	2073	editScriptItem.addActionListener(this);
	2074	+ }
1116	2075	}
1117	2076
1118	2077	void ScreenFit()
..	..	@@ -1177,24 +2136,24 @@
1177	2136	switch(axis)
1178	2137	{
1179	2138	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;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
1184	2143	norm = cVector.X;
1185	2144	break;
1186	2145	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;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
1191	2150	norm = cVector.Y;
1192	2151	break;
1193	2152	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;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
1198	2157	norm = cVector.Z;
1199	2158	break;
1200	2159	}
..	..	@@ -1235,9 +2194,38 @@
1235	2194	shadow.material = new cMaterial(obj.material);
1236	2195	shadow.material.diffuse = 0.0001f;
1237	2196	shadow.material.specular = 0.0001f;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
1238	2202
1239	2203	makeSomething(shadow);
1240	2204	}
	2205	+
	2206	+ private void ClearUnpinned()
	2207	+ {
	2208	+ //for (Object3D obj : listUI)
	2209	+ for (int i=listUI.size(); --i>=0;)
	2210	+ {
	2211	+ Object3D obj = listUI.elementAt(i);
	2212	+ if (!obj.pinned)
	2213	+ {
	2214	+ obj.CloseUI();
	2215	+ listUI.remove(i);
	2216	+ }
	2217	+ }
	2218	+ }
	2219	+
	2220	+ private void EditElement(Object3D elem, boolean newWindow)
	2221	+ {
	2222	+ // if (!(elem instanceof Composite))
	2223	+ // newWindow = false;
	2224	+ listUI.add(elem);
	2225	+ elem.openEditWindow(this, newWindow); //, false);
	2226	+ System.out.println("edit : " + elem);
	2227	+ elem.editWindow.refreshContents(true); // ? new
	2228	+ }
1241	2229
1242	2230	/**
1243	2231	* applyExample
..	..	@@ -1441,9 +2429,9 @@
1441	2429
1442	2430	void Overwrite(int mask)
1443	2431	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2432	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	2433	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	2434	+ Object3D content = Grafreed.clipboard.get(0);
1447	2435
1448	2436	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	2437	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +2454,7 @@
1466	2454	//
1467	2455	public void actionPerformed(ActionEvent event) // , Object arg)
1468	2456	{
	2457	+ Object source = event.getSource();
1469	2458	/*
1470	2459	if (event.getSource() == nameField)
1471	2460	{
..	..	@@ -1477,11 +2466,11 @@
1477	2466	}
1478	2467	else
1479	2468	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2469	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	2470	{
1482	2471	ScreenFit();
1483	2472	} else
1484		- if (event.getSource() == switchItem)
	2473	+ if (source == switchViewItem)
1485	2474	{
1486	2475	cVector v1 = new cVector();
1487	2476	cVector v2 = new cVector();
..	..	@@ -1490,11 +2479,11 @@
1490	2479	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	2480	objEditor.cameraView.repaint();
1492	2481	} else
1493		- if (event.getSource() == rectoidItem)
	2482	+ if (source == rectoidItem \|\| source == boxButton)
1494	2483	{
1495	2484	makeSomething(new Box());
1496	2485	} else
1497		- if (event.getSource() == particleItem)
	2486	+ if (source == particleItem \|\| source == particlesButton)
1498	2487	{
1499	2488	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	2489	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +2504,9 @@
1515	2504	applyExample(particleGeom, "SMOKE");
1516	2505	makeSomething(particleGeom);
1517	2506	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2507	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	2508	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2509	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	2510
1522	2511	ragdoll.toParent = LA.newMatrix();
1523	2512	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +2524,7 @@
1535	2524	} else
1536	2525	/*
1537	2526	*/
1538		- if (event.getSource() == heightFieldItem)
	2527	+ if (source == heightFieldItem)
1539	2528	{
1540	2529	Object3D obj = new Object3D();
1541	2530
..	..	@@ -1573,27 +2562,31 @@
1573	2562
1574	2563	makeSomething(obj);
1575	2564	} else
1576		- if (event.getSource() == gridItem)
	2565	+ if (source == gridItem \|\| source == gridButton)
1577	2566	{
1578	2567	makeSomething(new Grid());
1579	2568	} else
1580		- if (event.getSource() == ellipsoidItem)
	2569	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2570	{
1582	2571	makeSomething(new Sphere());
1583	2572	} else
1584		- if (event.getSource() == coneItem)
	2573	+ if (source == coneItem \|\| source == coneButton)
1585	2574	{
1586	2575	makeSomething(new Cone());
1587	2576	} else
1588		- if (event.getSource() == torusItem)
	2577	+ if (source == torusItem \|\| source == torusButton)
1589	2578	{
1590	2579	makeSomething(new Torus());
1591	2580	} else
1592		- if (event.getSource() == superItem)
	2581	+ if (source == superItem \|\| source == superButton)
1593	2582	{
1594	2583	makeSomething(new Superellipsoid());
1595	2584	} else
1596		- if (event.getSource() == blobItem)
	2585	+ if (source == kleinItem \|\| source == kleinButton)
	2586	+ {
	2587	+ makeSomething(new Klein());
	2588	+ } else
	2589	+ if (source == blobItem)
1597	2590	{
1598	2591	Blob blob = new Blob();
1599	2592	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2594,15 @@
1601	2594	//blob.retile();
1602	2595	makeSomething(blob);
1603	2596	} else
1604		- if (event.getSource() == latheItem)
	2597	+ if (source == latheItem)
1605	2598	{
1606	2599	makeSomething(new Lathe());
1607	2600	} else
1608		- if (event.getSource() == bezierItem)
	2601	+ if (source == bezierItem)
1609	2602	{
1610	2603	makeSomething(new BezierSurface());
1611	2604	} else
1612		- if (event.getSource() == checkerItem)
	2605	+ if (source == overlayItem \|\| source == overlayButton)
1613	2606	{
1614	2607	/*
1615	2608	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2617,7 @@
1624	2617	*/
1625	2618	makeSomething(new Checker());
1626	2619	} else
1627		- if (event.getSource() == meshItem)
	2620	+ if (source == meshItem)
1628	2621	{
1629	2622	Object3D itemtomake = new Object3D();
1630	2623	Object3D child;
..	..	@@ -1645,35 +2638,52 @@
1645	2638	makeSomething(child);
1646	2639	}
1647	2640	} else
1648		- if (event.getSource() == springItem)
	2641	+ if (source == springItem)
1649	2642	{
1650	2643	cSpring s = new cSpring();
1651	2644	s.setup();
1652	2645	makeSomething(s);
1653	2646	} else
1654		- if (event.getSource() == flagItem)
	2647	+ if (source == flagItem)
1655	2648	{
1656	2649	cSpring s = new cFlag();
1657	2650	s.setup();
1658	2651	makeSomething(s);
1659	2652	} else
1660		- if (event.getSource() == lightItem)
	2653	+ if (source == lightItem \|\| source == lightButton)
1661	2654	{
1662	2655	makeSomething(new Light());
1663	2656	} else
1664		- if (event.getSource() == csgItem)
	2657	+// if (source == skybox1Button \|\|
	2658	+// source == skybox2Button \|\|
	2659	+// source == skybox3Button \|\|
	2660	+// source == skybox4Button \|\|
	2661	+// source == skybox5Button \|\|
	2662	+// source == skybox6Button \|\|
	2663	+// source == skybox7Button \|\|
	2664	+// source == skybox11Button \|\|
	2665	+// source == skybox12Button \|\|
	2666	+// source == skybox13Button \|\|
	2667	+// source == skybox14Button \|\|
	2668	+// source == skybox15Button \|\|
	2669	+// source == skybox16Button \|\|
	2670	+// source == skybox17Button)
	2671	+// {
	2672	+// ChangeSkybox(source);
	2673	+// } else
	2674	+ if (source == csgItem)
1665	2675	{
1666	2676	group(new CSG());
1667	2677	} else
1668		- if (event.getSource() == templateItem)
	2678	+ if (source == templateItem)
1669	2679	{
1670	2680	group(new cTemplate());
1671	2681	} else
1672		- if (event.getSource() == attributeItem)
	2682	+ if (source == attributeItem)
1673	2683	{
1674	2684	makeSomething(new Attribute());
1675	2685	} else
1676		- if (event.getSource() == pointflowItem)
	2686	+ if (source == pointflowItem)
1677	2687	{
1678	2688	makeSomething(new PointFlow());
1679	2689	} else
..	..	@@ -1685,7 +2695,7 @@
1685	2695	} else
1686	2696	*/
1687	2697
1688		- if (event.getSource() == superLoopItem)
	2698	+ if (source == superLoopItem)
1689	2699	{
1690	2700	Composite g = new cGroup();
1691	2701	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2717,38 @@
1707	2717
1708	2718	group(g);
1709	2719	} else
1710		- if (event.getSource() == loopItem)
	2720	+ if (source == loopItem \|\| source == loopButton)
1711	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
1712	2724	Composite csg = new GroupLeaf();
1713	2725	csg.count = 5;
1714		- group(csg);
1715		- Composite child = new cGroup();
	2726	+ Composite child = new cGroup("Branch");
1716	2727	csg.addChild(child);
1717	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
1718	2731	} else
1719		- if (event.getSource() == doubleItem)
	2732	+ if (source == doubleItem)
1720	2733	{
1721		- Composite csg = new GroupLeaf();
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
	2736	+ Composite csg = new GroupLeaf("Fork");
1722	2737	csg.count = 5;
	2738	+ Composite child = new cGroup("Branch A");
	2739	+ csg.addChild(child);
	2740	+ child.addChild(csg);
	2741	+ child = new cGroup("Branch B");
	2742	+ csg.addChild(child);
	2743	+ child.addChild(csg);
1723	2744	group(csg);
1724		- Composite child = new cGroup();
1725		- csg.addChild(child);
1726		- child.addChild(csg);
1727		- child = new cGroup();
1728		- csg.addChild(child);
1729		- child.addChild(csg);
	2745	+ }
1730	2746	} else
1731		- if (event.getSource() == tripleItem)
	2747	+ if (source == tripleItem)
1732	2748	{
1733		- Composite csg = new GroupLeaf();
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
	2751	+ Composite csg = new GroupLeaf("Trident");
1734	2752	csg.count = 4;
1735	2753	group(csg);
1736	2754	Composite child = new cGroup();
..	..	@@ -1742,74 +2760,119 @@
1742	2760	child = new cGroup();
1743	2761	csg.addChild(child);
1744	2762	child.addChild(csg);
	2763	+ }
1745	2764	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2765	+ if (source == computeAOItem)
1748	2766	{
1749		- ImportGFD();
	2767	+ Globals.drawMode = CameraPane.OCCLUSION;
	2768	+ cameraView.repaint();
1750	2769	} 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)
	2770	+ if (source == recompileItem)
1769	2771	{
1770	2772	Recompile();
1771	2773	refreshContents();
1772	2774	} else
1773		- if (event.getSource() == editScriptItem)
	2775	+ if (source == editScriptItem)
1774	2776	{
1775	2777	OpenDialog();
1776	2778	refreshContents();
1777	2779	} else
1778		- if (event.getSource() == invariantsItem)
	2780	+ if (source == invariantsItem)
1779	2781	{
1780	2782	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2783	+ Grafreed.grafreed.universe.invariants();
1782	2784	} else
1783		- if (event.getSource() == memoryItem)
	2785	+ if (source == memoryItem)
1784	2786	{
1785	2787	//System.out.println("Invariants:");
1786	2788	PrintMemory();
1787	2789	} else
1788		- if (event.getSource() == pathItem)
	2790	+ if (source == pathItem)
1789	2791	{
1790	2792	PrintPath();
1791	2793	} else
1792		- if (event.getSource() == analyzeItem)
	2794	+ if (source == analyzeItem)
1793	2795	{
1794	2796	AnalyzeObject();
1795	2797	} else
1796		- if (event.getSource() == dumpItem)
	2798	+ if (source == dumpItem)
1797	2799	{
1798	2800	DumpObject();
1799	2801	} else
1800		- if (event.getSource() == screenfitButton)
	2802	+ if (source == minButton)
1801	2803	{
1802		- //Reload(lastConverter, lastFilename, true);
	2804	+ Minimize();
	2805	+ } else
	2806	+ if (source == maxButton)
	2807	+ {
	2808	+ Maximize();
	2809	+ } else
	2810	+ if (source == fullButton)
	2811	+ {
	2812	+ ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
	2825	+ } else
	2826	+ if (source == previousVersionButton)
	2827	+ {
	2828	+ // Go to previous version
	2829	+ //if (!Undo())
	2830	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2831	+ PreviousVersion();
	2832	+ } else
	2833	+ if (source == restoreButton)
	2834	+ {
	2835	+ // Restore current version
	2836	+ Restore();
	2837	+ //restoreButton.setEnabled(false);
	2838	+ } else
	2839	+ if (source == replaceButton)
	2840	+ {
	2841	+ // Overwrite current version
	2842	+ Replace();
	2843	+ //replaceButton.setEnabled(false);
	2844	+ } else
	2845	+ if (source == nextVersionButton)
	2846	+ {
	2847	+ // Go to next version
	2848	+ NextVersion();
	2849	+ } else
	2850	+ if (source == saveVersionButton)
	2851	+ {
	2852	+ // Save a new version
	2853	+ if (!Save(true))
	2854	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2855	+ } else
	2856	+ if (source == deleteVersionButton)
	2857	+ {
	2858	+ // Delete a new version
	2859	+ DeleteVersion();
	2860	+ } else
	2861	+ if (source == oneStepButton)
	2862	+ {
	2863	+ Globals.ONESTEP = true;
	2864	+ cameraView.repaint();
	2865	+ } else
	2866	+ if (source == screenfitButton)
	2867	+ {
1803	2868	ScreenFit();
1804	2869	} else
1805		- if (event.getSource() == screenfitpointButton)
	2870	+ if (source == screenfitpointButton)
1806	2871	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2872	ScreenFitPoint();
1809	2873	} else
1810		- if (event.getSource() == snapobjectButton)
	2874	+ if (source == snapobjectButton)
1811	2875	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2876	SnapObject();
1814	2877	} else
1815	2878	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2881,13 @@
1818	2881	// Recompile();
1819	2882	// refreshContents();
1820	2883	// } else
1821		- if (event.getSource() == gcButton)
	2884	+ if (source == gcButton)
1822	2885	{
1823	2886	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2887	System.gc();
1825	2888	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2889	} else
1827		- if (event.getSource() == editLeafItem)
	2890	+ if (source == editLeafItem)
1828	2891	{
1829	2892	Object3D obj;
1830	2893	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2901,78 @@
1838	2901	}
1839	2902	refreshContents(true);
1840	2903	} else
1841		- if (event.getSource() == openWindowItem)
	2904	+ if (source == openWindowItem)
1842	2905	{
1843	2906	EditSelection(true);
1844	2907	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2908	+ if (source == cutItem \|\| source == clearButton)
1846	2909	{
1847	2910	loadClipboard(true);
1848	2911	} else
1849		- if (event.getSource() == duplicateItem)
	2912	+ if (source == undoItem)
1850	2913	{
1851		- Object3D keep = GraphreeD.clipboard;
	2914	+ PreviousVersion();
	2915	+ } else
	2916	+ if (source == redoItem)
	2917	+ {
	2918	+ NextVersion();
	2919	+ } else
	2920	+ if (source == duplicateItem)
	2921	+ {
	2922	+ Object3D keep = Grafreed.clipboard;
1852	2923	loadClipboard(false);
1853	2924	paste(false);
1854		- GraphreeD.clipboard = keep;
	2925	+ Grafreed.clipboard = keep;
1855	2926	} else
1856		- if (event.getSource() == cloneItem)
	2927	+ if (source == cloneItem)
1857	2928	{
1858	2929	CloneSelection(false);
1859	2930	} else
1860		- if (event.getSource() == cloneSupportItem)
	2931	+ if (source == cloneSupportItem)
1861	2932	{
1862	2933	CloneSelection(true);
1863	2934	} else
1864		- if (event.getSource() == copyItem)
	2935	+ if (source == copyItem)
1865	2936	{
1866	2937	loadClipboard(false);
1867	2938	} else
1868		- if (event.getSource() == pasteItem)
	2939	+ if (source == pasteItem)
1869	2940	{
1870	2941	paste(false);
1871	2942	} else
1872		- if (event.getSource() == pasteLinkItem)
	2943	+ if (source == pasteIntoItem)
1873	2944	{
1874		- pasteInto(false);
	2945	+ pasteInto(true, false);
1875	2946	} else
1876		- if (event.getSource() == pasteCloneItem)
	2947	+ if (source == pasteLinkItem)
1877	2948	{
1878		- pasteInto(true);
	2949	+ pasteInto(false, false);
1879	2950	} else
1880		- if (event.getSource() == pasteExpandItem)
	2951	+ if (source == pasteCloneItem)
	2952	+ {
	2953	+ pasteInto(true, true);
	2954	+ } else
	2955	+ if (source == pasteExpandItem)
1881	2956	{
1882	2957	paste(true);
1883	2958	} else
1884		- if (event.getSource() == synchronizeItem)
	2959	+ if (source == synchronizeItem)
1885	2960	{
1886	2961	Overwrite(Object3D.TRANSFORM);
1887	2962	} else
1888		- if (event.getSource() == overwriteNameItem)
	2963	+ if (source == overwriteNameItem)
1889	2964	{
1890	2965	Overwrite(Object3D.NAME);
1891	2966	} else
1892		- if (event.getSource() == overwriteUVItem)
	2967	+ if (source == overwriteUVItem)
1893	2968	{
1894	2969	Overwrite(Object3D.UV);
1895	2970	} else
1896		- if (event.getSource() == overwriteMatItem)
	2971	+ if (source == overwriteMatItem)
1897	2972	{
	2973	+ /* july 2015
1898	2974	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2975	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2976	else
1901	2977	{
1902	2978	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2984,16 @@
1908	2984	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2985	}
1910	2986	}
	2987	+ */
	2988	+
	2989	+ Overwrite(dropAttributes);
1911	2990	}
1912		- if (event.getSource() == overwriteGeoItem)
	2991	+ if (source == overwriteGeoItem)
1913	2992	{
1914	2993	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2994	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2995	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2996	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2997	//
1919	2998	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2999	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +3005,7 @@
1926	3005	// refreshContents();
1927	3006	// }
1928	3007	} else
1929		- if (event.getSource() == generateMeshItem)
	3008	+ if (source == generateMeshItem)
1930	3009	{
1931	3010	//if (group.selection.size() == 1)
1932	3011	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +3016,7 @@
1937	3016	ResetModel();
1938	3017	refreshContents();
1939	3018	} else
1940		- if (event.getSource() == extractGeometriesItem)
	3019	+ if (source == extractGeometriesItem)
1941	3020	{
1942	3021	boolean one = false;
1943	3022
..	..	@@ -1964,7 +3043,7 @@
1964	3043	ResetModel();
1965	3044	refreshContents();
1966	3045	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	3046	+ if (source == cloneGeometriesItem)
1968	3047	{
1969	3048	boolean one = false;
1970	3049
..	..	@@ -1990,32 +3069,37 @@
1990	3069	ResetModel();
1991	3070	refreshContents();
1992	3071	} else
1993		- if (event.getSource() == shareGeometriesItem)
	3072	+ if (source == shareGeometriesItem)
1994	3073	{
1995	3074	boolean one = false;
1996	3075
1997	3076	if (group.selection.size() == 1)
1998	3077	one = true;
1999	3078
	3079	+ Object3D merge = null;
	3080	+
2000	3081	Object3D content = new cGroup();
2001	3082
2002	3083	for (int i=0; i<group.selection.size(); i++)
2003	3084	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	3085	+ merge = new Merge(group.selection.get(i));
2005	3086
2006	3087	if (one)
2007		- makeSomething(sel, false);
	3088	+ makeSomething(merge, false);
2008	3089	else
2009		- content.addChild(sel);
	3090	+ content.addChild(merge);
2010	3091	}
2011	3092
2012	3093	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	3094	+ makeSomething(content, true);
	3095	+ else
	3096	+ {
	3097	+ ResetModel();
	3098	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	3099	+ refreshContents();
	3100	+ }
2017	3101	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	3102	+ if (source == mergeGeometriesItem)
2019	3103	{
2020	3104	boolean one = false;
2021	3105
..	..	@@ -2045,11 +3129,11 @@
2045	3129	ResetModel();
2046	3130	refreshContents();
2047	3131	} else
2048		- if (event.getSource() == linkverticesItem)
	3132	+ if (source == linkverticesItem)
2049	3133	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3134	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	3135	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	3136	+// Object3D content = GrafreeD.clipboard.get(0);
2053	3137	//
2054	3138	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	3139	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +3142,48 @@
2058	3142	// group.selection.get(0).setMasterThis(content); // should be identity
2059	3143	// refreshContents();
2060	3144	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3145	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	3146	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	3147	+ Object3D content = Grafreed.clipboard.get(0);
2064	3148
2065	3149	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	3150	content = ((cGroup)content).get(0);
2067	3151
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	3152	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	3153	for (int i=0; i<group.selection.size(); i++)
2070	3154	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	3155	+ boolean random = CameraPane.SWITCH;
	3156	+ CameraPane.SWITCH = false; // parse all random nodes
2073	3157	group.selection.get(i).linkVerticesThis(content);
2074	3158	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	3159	+ CameraPane.SWITCH = random;
2076	3160	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3161	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	3162	refreshContents();
2079	3163	}
2080	3164	} else
2081		- if (event.getSource() == resetsupportItem)
	3165	+ if (source == resetsupportItem)
2082	3166	{
2083	3167	for (int i=0; i<group.selection.size(); i++)
2084	3168	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	3169	+ boolean random = CameraPane.SWITCH;
	3170	+ CameraPane.SWITCH = false; // parse all random nodes
2087	3171	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	3172	+ CameraPane.SWITCH = random;
2089	3173	}
2090	3174
2091	3175	refreshContents();
2092	3176	} else
2093		- if (event.getSource() == resetreferencesItem)
	3177	+ if (source == relinkverticesItem)
	3178	+ {
	3179	+ boolean random = CameraPane.SWITCH;
	3180	+ CameraPane.SWITCH = false; // parse all random nodes
	3181	+ group.selection.RelinkToSupport();
	3182	+ CameraPane.SWITCH = random;
	3183	+
	3184	+ refreshContents();
	3185	+ } else
	3186	+ if (source == resetreferencesItem)
2094	3187	{
2095	3188	for (int i=0; i<group.selection.size(); i++)
2096	3189	{
..	..	@@ -2099,11 +3192,11 @@
2099	3192
2100	3193	refreshContents();
2101	3194	} else
2102		- if (event.getSource() == setMasterItem)
	3195	+ if (source == setMasterItem)
2103	3196	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	3197	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	3198	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	3199	+ Object3D content = Grafreed.clipboard.get(0);
2107	3200
2108	3201	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	3202	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +3205,13 @@
2112	3205	refreshContents();
2113	3206	}
2114	3207	} else
2115		- if (event.getSource() == poseMeshItem)
	3208	+ if (source == poseMeshItem)
2116	3209	{
2117	3210	if (group.selection.size() == 1)
2118	3211	{
2119		- if (GraphreeD.clipboard.size() == 1)
	3212	+ if (Grafreed.clipboard.size() == 1)
2120	3213	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	3214	+ Object3D content = Grafreed.clipboard.get(0);
2122	3215
2123	3216	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	3217	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +3224,19 @@
2131	3224	}
2132	3225
2133	3226	} else
2134		- if (event.getSource() == revertMeshItem)
	3227	+ if (source == revertMeshItem)
2135	3228	{
2136	3229	RevertMeshes();
2137	3230	} else
2138		- if (event.getSource() == resetMeshItem)
	3231	+ if (source == resetAllItem)
2139	3232	{
2140	3233	ResetAll();
2141	3234	} else
2142		- if (event.getSource() == stepAllItem)
	3235	+ if (source == stepAllItem)
2143	3236	{
2144	3237	StepAll();
2145	3238	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3239	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2147	3240	{
2148	3241	//int indices[] = jList.getSelectedIndices();
2149	3242	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +3244,46 @@
2151	3244
2152	3245	ClearSelection(false);
2153	3246	} else
2154		- if (event.getSource() == clearAllItem)
	3247	+ if (source == clearAllItem)
2155	3248	{
2156	3249	ClearSelection(true);
2157	3250	} else
2158		- if (event.getSource() == grabItem)
	3251	+ if (source == grabItem \|\| source == groupButton)
2159	3252	{
2160		- group(new cGroup(), true);
	3253	+ group(new cGroup(), false); // true);
2161	3254	} else
2162		- if (event.getSource() == frontItem)
	3255	+ if (source == hideItem)
	3256	+ {
	3257	+ group(new HiddenObject());
	3258	+ } else
	3259	+ if (source == frontItem)
2163	3260	{
2164	3261	front();
2165	3262	} else
2166		- if (event.getSource() == backItem)
	3263	+ if (source == backItem)
2167	3264	{
2168	3265	back();
2169	3266	} else
2170		- if (event.getSource() == cameraItem)
	3267	+ if (source == cameraItem)
2171	3268	{
2172	3269	makeSomething(new Camera());
2173	3270	} else
2174		- if (event.getSource() == compositeItem)
	3271	+ if (source == compositeItem \|\| source == compositeButton)
2175	3272	{
2176	3273	group(new Composite());
2177	3274	} else
2178		- if (event.getSource() == randomItem)
	3275	+ if (source == switchItem \|\| source == switchButton)
2179	3276	{
2180	3277	RandomNode random = new RandomNode();
2181	3278	group(random);
2182	3279	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	3280	+ random.name = random.get(0).name + "Switch";
2184	3281	} else
2185		- if (event.getSource() == physicsItem)
	3282	+ if (source == physicsItem)
2186	3283	{
2187	3284	group(new PhysicsNode());
2188	3285	} else
2189		- if (event.getSource() == frameselectorItem)
	3286	+ if (source == frameselectorItem)
2190	3287	{
2191	3288	for (int i=0; i<group.selection.size(); i++)
2192	3289	{
..	..	@@ -2198,7 +3295,7 @@
2198	3295	ResetModel();
2199	3296	refreshContents();
2200	3297	} else
2201		- if (event.getSource() == switchGeoItem)
	3298	+ if (source == switchGeoItem)
2202	3299	{
2203	3300	for (int i=0; i<group.selection.size(); i++)
2204	3301	{
..	..	@@ -2210,7 +3307,7 @@
2210	3307	ResetModel();
2211	3308	refreshContents();
2212	3309	} else
2213		- if (event.getSource() == switchTransfoItem)
	3310	+ if (source == switchTransfoItem)
2214	3311	{
2215	3312	for (int i=0; i<group.selection.size(); i++)
2216	3313	{
..	..	@@ -2222,7 +3319,7 @@
2222	3319	ResetModel();
2223	3320	refreshContents();
2224	3321	} else
2225		- if (event.getSource() == morphItem)
	3322	+ if (source == morphItem)
2226	3323	{
2227	3324	for (int i=0; i<group.selection.size(); i++)
2228	3325	{
..	..	@@ -2234,7 +3331,7 @@
2234	3331	ResetModel();
2235	3332	refreshContents();
2236	3333	} else
2237		- if (event.getSource() == scriptNodeItem)
	3334	+ if (source == scriptNodeItem)
2238	3335	{
2239	3336	boolean atleastone = false;
2240	3337
..	..	@@ -2273,195 +3370,280 @@
2273	3370	}
2274	3371	}
2275	3372	} else
2276		- if (event.getSource() == linkerItem)
	3373	+ if (source == linkerItem)
2277	3374	{
2278	3375	group(new cLinker());
2279	3376	} else
2280		- if (event.getSource() == textureItem)
	3377	+ if (source == textureItem \|\| source == textureButton)
2281	3378	{
2282	3379	group(new TextureNode());
2283	3380	} else
2284		- if (event.getSource() == shadowXItem)
	3381	+ if (source == billboardItem)
	3382	+ {
	3383	+ group(new BillboardNode());
	3384	+ } else
	3385	+ if (source == shadowXItem)
2285	3386	{
2286	3387	CastShadow(0);
2287	3388	} else
2288		- if (event.getSource() == shadowYItem)
	3389	+ if (source == shadowYItem)
2289	3390	{
2290	3391	CastShadow(1);
2291	3392	} else
2292		- if (event.getSource() == shadowZItem)
	3393	+ if (source == shadowZItem)
2293	3394	{
2294	3395	CastShadow(2);
2295	3396	} else
2296		- if (event.getSource() == ungroupItem)
	3397	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	3398	{
2298		- ungroup();
	3399	+ boolean canUngroup = true;
	3400	+
	3401	+ for (int i=0; i<group.selection.size(); i++)
	3402	+ {
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
	3406	+ {
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
	3416	+ break;
	3417	+ }
	3418	+ }
	3419	+
	3420	+ if (canUngroup)
	3421	+ {
	3422	+ for (int i=0; i<group.selection.size(); i++)
	3423	+ {
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
	3427	+ }
	3428	+
	3429	+ ClearSelection(false);
	3430	+
	3431	+ refreshContents();
	3432	+ }
2299	3433	} else
2300		- if (event.getSource() == genUVItem)
	3434	+ if (source == genUVItem)
2301	3435	{
2302	3436	GenUV();
2303	3437	} else
2304		- if (event.getSource() == genNormalsCADItem)
	3438	+ if (source == genNormalsCADItem)
2305	3439	{
2306	3440	GenNormals(true);
2307	3441	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	3442	+ if (source == genNormalsMESHItem)
	3443	+ {
	3444	+ GenNormalsMESH();
	3445	+ } else
	3446	+ if (source == genNormalsORGANItem)
2309	3447	{
2310	3448	GenNormals(false);
2311	3449	} else
2312		- if (event.getSource() == stripifyItem)
	3450	+ if (source == genNormalsMINEItem)
	3451	+ {
	3452	+ GenNormalsMINE();
	3453	+ } else
	3454	+ if (source == stripifyItem)
2313	3455	{
2314	3456	Stripify();
2315	3457	} else
2316		- if (event.getSource() == unstripifyItem)
	3458	+ if (source == unstripifyItem)
2317	3459	{
2318	3460	Unstripify();
2319	3461	} else
2320		- if (event.getSource() == trimItem)
	3462	+ if (source == trimItem)
2321	3463	{
2322	3464	Trim();
2323	3465	} else
2324		- if (event.getSource() == untrimItem)
	3466	+ if (source == untrimItem)
2325	3467	{
2326	3468	Untrim();
2327	3469	} else
2328		- if (event.getSource() == clearColorsItem)
	3470	+ if (source == clearColorsItem)
2329	3471	{
2330	3472	ClearColors();
2331	3473	} else
2332		- if (event.getSource() == clearMaterialsItem)
	3474	+ if (source == clearMaterialsItem)
2333	3475	{
2334	3476	ClearMaterials();
2335	3477	} else
2336		- if (event.getSource() == liveleavesItem)
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
	3481	+ } else
	3482	+ if (source == liveleavesItem)
2337	3483	{
2338	3484	LiveLeaves(true);
2339	3485	} else
2340		- if (event.getSource() == unliveleavesItem)
	3486	+ if (source == unliveleavesItem)
2341	3487	{
2342	3488	LiveLeaves(false);
2343	3489	} else
2344		- if (event.getSource() == supportleavesItem)
	3490	+ if (source == supportleavesItem)
2345	3491	{
2346	3492	SupportLeaves(true);
2347	3493	} else
2348		- if (event.getSource() == unsupportleavesItem)
	3494	+ if (source == unsupportleavesItem)
2349	3495	{
2350	3496	SupportLeaves(false);
2351	3497	} else
2352		- if (event.getSource() == hideleavesItem)
	3498	+ if (source == hideleavesItem)
2353	3499	{
2354	3500	HideLeaves(true);
2355	3501	} else
2356		- if (event.getSource() == showleavesItem)
	3502	+ if (source == showleavesItem)
2357	3503	{
2358	3504	HideLeaves(false);
2359	3505	} else
2360		- if (event.getSource() == markleavesItem)
	3506	+ if (source == markleavesItem)
2361	3507	{
2362	3508	MarkLeaves(true);
2363	3509	} else
2364		- if (event.getSource() == unmarkleavesItem)
	3510	+ if (source == unmarkleavesItem)
2365	3511	{
2366	3512	MarkLeaves(false);
2367	3513	} else
2368		- if (event.getSource() == flipVItem)
	3514	+ if (source == rewindleavesItem)
	3515	+ {
	3516	+ RewindLeaves(true);
	3517	+ } else
	3518	+ if (source == unrewindleavesItem)
	3519	+ {
	3520	+ RewindLeaves(false);
	3521	+ } else
	3522	+ if (source == randomleavesItem)
	3523	+ {
	3524	+ RandomLeaves(true);
	3525	+ } else
	3526	+ if (source == unrandomleavesItem)
	3527	+ {
	3528	+ RandomLeaves(false);
	3529	+ } else
	3530	+ if (source == flipVItem)
2369	3531	{
2370	3532	FlipV(true);
2371	3533	} else
2372		- if (event.getSource() == unflipVItem)
	3534	+ if (source == unflipVItem)
2373	3535	{
2374	3536	FlipV(false);
2375	3537	} else
2376		- if (event.getSource() == lowTexturesItem)
	3538	+ if (source == lowTexturesItem)
2377	3539	{
2378	3540	SetTexRes(0);
2379	3541	} else
2380		- if (event.getSource() == normalTexturesItem)
	3542	+ if (source == normalTexturesItem)
2381	3543	{
2382	3544	SetTexRes(1);
2383	3545	} else
2384		- if (event.getSource() == highTexturesItem)
	3546	+ if (source == highTexturesItem)
2385	3547	{
2386	3548	SetTexRes(2);
2387	3549	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	3550	+ if (source == veryhighTexturesItem)
2389	3551	{
2390	3552	SetTexRes(3);
2391	3553	} else
2392		- if (event.getSource() == maxTexturesItem)
	3554	+ if (source == maxTexturesItem)
2393	3555	{
2394	3556	SetTexRes(4);
2395	3557	} else
2396		- if (event.getSource() == panoTexturesItem)
	3558	+ if (source == panoTexturesItem)
2397	3559	{
2398	3560	SetTexRes(5);
2399	3561	} else
2400		- if (event.getSource() == reverseNormalsItem)
	3562	+ if (source == reverseNormalsItem)
2401	3563	{
2402	3564	ReverseNormals();
2403	3565	} else
2404		- if (event.getSource() == parseverticesItem)
	3566	+ if (source == parseverticesItem)
2405	3567	{
2406	3568	ParseVertices();
2407	3569	} else
2408		- if (event.getSource() == textureFieldItem)
	3570	+ if (source == textureFieldItem)
2409	3571	{
2410	3572	TextureVertices();
2411	3573	} else
2412		- if (event.getSource() == alignItem)
	3574	+ if (source == alignItem)
2413	3575	{
2414	3576	Align();
2415	3577	} else
2416		- if (event.getSource() == mirrorItem)
	3578	+ if (source == mirrorItem)
2417	3579	{
2418	3580	MirrorPoses();
2419	3581	} else
2420		- if (event.getSource() == reduceMorphItem)
	3582	+ if (source == reduceMorphItem)
2421	3583	{
2422	3584	MeshReduction(false);
2423	3585	} else
2424		- if (event.getSource() == reduce34MorphItem)
	3586	+ if (source == reduce34MorphItem)
2425	3587	{
2426	3588	MeshReduction(true);
2427	3589	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	3590	+ if (source == reverseTrianglesItem)
2429	3591	{
2430	3592	ReverseTriangles();
2431	3593	} else
2432		- if (event.getSource() == reduceMeshItem)
	3594	+ if (source == reduceMeshItem)
2433	3595	{
2434	3596	ReduceMesh(false);
2435	3597	} else
2436		- if (event.getSource() == reduce34MeshItem)
	3598	+ if (source == reduce34MeshItem)
2437	3599	{
2438	3600	ReduceMesh(true);
2439	3601	} else
2440		- if (event.getSource() == increaseMeshItem)
	3602	+ if (source == increaseMeshItem)
2441	3603	{
2442	3604	IncreaseMesh();
2443	3605	} else
2444		- if (event.getSource() == clipMeshItem)
	3606	+ if (source == clipMeshItem)
2445	3607	{
2446	3608	ClipMesh();
2447	3609	} else
2448		- if (event.getSource() == smoothMeshItem)
	3610	+ if (source == smoothMeshItem)
2449	3611	{
2450	3612	SmoothMesh();
2451	3613	} else
2452		- if (event.getSource() == transformgeometryItem)
	3614	+ if (source == transformGeometryItem)
2453	3615	{
2454	3616	TransformGeometry();
2455	3617	} else
2456		- if (event.getSource() == resetTransformItem)
	3618	+ if (source == transformChildrenItem)
	3619	+ {
	3620	+ TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
	3633	+ } else
	3634	+ if (source == resetTransformItem)
2457	3635	{
2458	3636	ResetTransform();
2459	3637	} else
2460		- if (event.getSource() == resetCentroidItem)
	3638	+ if (source == resetCentroidItem)
2461	3639	{
2462		- ResetCentroid();
	3640	+ ResetCentroid(true);
2463	3641	} else
2464		- if (event.getSource() == resetParentItem)
	3642	+ if (source == resetCentroidXZItem)
	3643	+ {
	3644	+ ResetCentroid(false);
	3645	+ } else
	3646	+ if (source == resetParentItem)
2465	3647	{
2466	3648	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3649	{
..	..	@@ -2471,7 +3653,7 @@
2471	3653
2472	3654	refreshContents();
2473	3655	} else
2474		- if (event.getSource() == repairParentItem)
	3656	+ if (source == repairParentItem)
2475	3657	{
2476	3658	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3659	{
..	..	@@ -2485,7 +3667,21 @@
2485	3667
2486	3668	refreshContents();
2487	3669	} else
2488		- if (event.getSource() == sortbysizeItem)
	3670	+ if (source == repairShadowItem)
	3671	+ {
	3672	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3673	+ {
	3674	+ Object3D obj = (Object3D)e.nextElement();
	3675	+ obj.RepairShadow();
	3676	+// for (int i=0; i<obj.size(); i++)
	3677	+// {
	3678	+// obj.get(i).parent = obj;
	3679	+// }
	3680	+ }
	3681	+
	3682	+ refreshContents();
	3683	+ } else
	3684	+ if (source == sortbysizeItem)
2489	3685	{
2490	3686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3687	{
..	..	@@ -2497,7 +3693,7 @@
2497	3693	ResetModel();
2498	3694	refreshContents();
2499	3695	} else
2500		- if (event.getSource() == sortbynameItem)
	3696	+ if (source == sortbynameItem)
2501	3697	{
2502	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3699	{
..	..	@@ -2509,7 +3705,7 @@
2509	3705	ResetModel();
2510	3706	refreshContents();
2511	3707	} else
2512		- if (event.getSource() == attachPigmentItem)
	3708	+ if (source == attachPigmentItem)
2513	3709	{
2514	3710	String texture = GetFile("Attach pigment");
2515	3711	Object3D obj;
..	..	@@ -2521,7 +3717,7 @@
2521	3717
2522	3718	refreshContents();
2523	3719	} else
2524		- if (event.getSource() == detachPigmentItem)
	3720	+ if (source == detachPigmentItem)
2525	3721	{
2526	3722	Object3D obj;
2527	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3728,7 @@
2532	3728
2533	3729	refreshContents();
2534	3730	} else
2535		- if (event.getSource() == attachBumpItem)
	3731	+ if (source == attachBumpItem)
2536	3732	{
2537	3733	String texture = GetFile("Attach bump");
2538	3734	Object3D obj;
..	..	@@ -2544,18 +3740,18 @@
2544	3740
2545	3741	refreshContents();
2546	3742	} else
2547		- if (event.getSource() == detachBumpItem)
	3743	+ if (source == detachBumpItem)
2548	3744	{
2549	3745	Object3D obj;
2550	3746	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	3747	{
2552	3748	obj = (Object3D)e.nextElement();
2553		- obj.SetBumpTexture(null);
	3749	+ obj.ResetBumpTexture();
2554	3750	}
2555	3751
2556	3752	refreshContents();
2557	3753	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3754	+ if (source == pigmentBumpItem)
2559	3755	{
2560	3756	Object3D obj;
2561	3757	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,159 +3762,233 @@
2566	3762
2567	3763	refreshContents();
2568	3764	} else
2569		- if (event.getSource() == flashSelectionButton)
	3765	+ if (source == embedTexturesItem)
	3766	+ {
	3767	+ Object3D obj;
	3768	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3769	+ {
	3770	+ obj = (Object3D)e.nextElement();
	3771	+ obj.EmbedTextures(true);
	3772	+ }
	3773	+
	3774	+ refreshContents();
	3775	+ } else
	3776	+ if (source == deEmbedTexturesItem)
	3777	+ {
	3778	+ Object3D obj;
	3779	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3780	+ {
	3781	+ obj = (Object3D)e.nextElement();
	3782	+ obj.EmbedTextures(false);
	3783	+ }
	3784	+
	3785	+ CameraPane.texturepigment.clear();
	3786	+ CameraPane.texturebump.clear();
	3787	+
	3788	+ refreshContents();
	3789	+ } else
	3790	+ if (source == flashSelectionButton)
2570	3791	{
2571	3792	CameraPane.flash = true;
2572	3793	refreshContents();
2573	3794	} else
2574		- if (event.getSource() == oneButton)
	3795	+ if (source == oneButton)
2575	3796	{
2576	3797	} else
2577		- if (event.getSource() == twoButton)
	3798	+ if (source == twoButton)
2578	3799	{
2579	3800	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();
	3801	+
	3802	+ if (CameraPane.FULLSCREEN)
	3803	+ fullscreenLayout = radio.layout;
	3804	+
	3805	+ Show3DView();
	3806	+
	3807	+ cameraView.requestFocusInWindow();
	3808	+
	3809	+// refreshContents(true);
	3810	+//
	3811	+// try
	3812	+// {
	3813	+// java.awt.Robot bot = new java.awt.Robot();
	3814	+// int mask = InputEvent.BUTTON1_MASK;
	3815	+// bot.mouseMove(100, 100);
	3816	+// bot.mousePress(mask);
	3817	+// bot.mouseRelease(mask);
	3818	+// }
	3819	+// catch (Exception e)
	3820	+// {
	3821	+//
	3822	+// }
	3823	+
2607	3824	} else
2608		- if (event.getSource() == threeButton)
	3825	+ if (source == threeButton)
2609	3826	{
2610	3827	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();
	3828	+
	3829	+ if (CameraPane.FULLSCREEN)
	3830	+ fullscreenLayout = radio.layout;
	3831	+
	3832	+// bigThree.remove(scenePanel);
	3833	+// bigThree.remove(centralPanel);
	3834	+// bigThree.remove(XYZPanel);
	3835	+// aWindowConstraints.gridx = 0;
	3836	+// aWindowConstraints.gridy = 0;
	3837	+// aWindowConstraints.gridwidth = 1;
	3838	+// // aConstraints.gridheight = 3;
	3839	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3840	+// aWindowConstraints.weightx = 0;
	3841	+// aWindowConstraints.weighty = 1;
	3842	+// //bigThree.add(jtp, aWindowConstraints);
	3843	+// aWindowConstraints.weightx = 1;
	3844	+// aWindowConstraints.gridwidth = 3;
	3845	+// // aConstraints.gridheight = 3;
	3846	+// aWindowConstraints.gridx = 1;
	3847	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3848	+// bigThree.add(centralPanel, aWindowConstraints);
	3849	+// aWindowConstraints.weightx = 0;
	3850	+// aWindowConstraints.gridx = 4;
	3851	+// aWindowConstraints.gridwidth = 1;
	3852	+// // aConstraints.gridheight = 3;
	3853	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3854	+// bigThree.add(XYZPanel, aWindowConstraints);
	3855	+// bigThree.validate();
	3856	+// scenePanel.setVisible(false);
	3857	+// centralPanel.setVisible(true);
	3858	+// XYZPanel.setVisible(true);
	3859	+ bigThree.ClearUI();
	3860	+ bigThree.add(scenePanel);
	3861	+ bigThree.add(centralPanel);
	3862	+ bigThree.FlushUI();
	3863	+
	3864	+ cameraView.requestFocusInWindow();
2635	3865	} else
2636		- if (event.getSource() == fourButton)
	3866	+ if (source == fourButton)
2637	3867	{
2638	3868	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();
	3869	+
	3870	+ if (CameraPane.FULLSCREEN)
	3871	+ fullscreenLayout = radio.layout;
	3872	+
	3873	+// bigThree.remove(scenePanel);
	3874	+// bigThree.remove(centralPanel);
	3875	+// bigThree.remove(XYZPanel);
	3876	+// aWindowConstraints.gridx = 0;
	3877	+// aWindowConstraints.gridy = 0;
	3878	+// aWindowConstraints.gridwidth = 1;
	3879	+// // aWindowConstraints.gridheight = 3;
	3880	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3881	+// aWindowConstraints.weightx = 1;
	3882	+// aWindowConstraints.weighty = 1;
	3883	+// bigThree.add(scenePanel, aWindowConstraints);
	3884	+// aWindowConstraints.weightx = 1;
	3885	+// aWindowConstraints.gridwidth = 3;
	3886	+// // aConstraints.gridheight = 3;
	3887	+// aWindowConstraints.gridx = 1;
	3888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3889	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3890	+// aWindowConstraints.weightx = 0;
	3891	+// aWindowConstraints.gridx = 4;
	3892	+// aWindowConstraints.gridwidth = 1;
	3893	+// // aWindowConstraints.gridheight = 3;
	3894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3895	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3896	+// bigThree.validate();
	3897	+// scenePanel.setVisible(true);
	3898	+// centralPanel.setVisible(false);
	3899	+// XYZPanel.setVisible(false);
	3900	+ bigThree.ClearUI();
	3901	+ bigThree.add(scenePanel);
	3902	+ bigThree.FlushUI();
	3903	+
	3904	+ cameraView.requestFocusInWindow();
2663	3905	} else
2664		- if (event.getSource() == sixButton)
	3906	+ if (source == sixButton)
2665	3907	{
2666	3908	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();
	3909	+
	3910	+ if (CameraPane.FULLSCREEN)
	3911	+ fullscreenLayout = radio.layout;
	3912	+
	3913	+// bigThree.remove(scenePanel);
	3914	+// bigThree.remove(centralPanel);
	3915	+// bigThree.remove(XYZPanel);
	3916	+// aWindowConstraints.gridx = 0;
	3917	+// aWindowConstraints.gridy = 0;
	3918	+// aWindowConstraints.gridwidth = 1;
	3919	+// // aConstraints.gridheight = 3;
	3920	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3921	+// aWindowConstraints.weightx = 0;
	3922	+// aWindowConstraints.weighty = 1;
	3923	+// bigThree.add(scenePanel, aWindowConstraints);
	3924	+// aWindowConstraints.weightx = 1;
	3925	+// aWindowConstraints.gridwidth = 3;
	3926	+// // aWindowConstraints.gridheight = 3;
	3927	+// aWindowConstraints.gridx = 1;
	3928	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3929	+// bigThree.add(centralPanel, aWindowConstraints);
	3930	+// aWindowConstraints.weightx = 0;
	3931	+// aWindowConstraints.gridx = 4;
	3932	+// aWindowConstraints.gridwidth = 1;
	3933	+// // aWindowConstraints.gridheight = 3;
	3934	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3935	+// //bigThree.add(XYZPanel, aConstraints);
	3936	+// bigThree.validate();
	3937	+// scenePanel.setVisible(true);
	3938	+// centralPanel.setVisible(true);
	3939	+// XYZPanel.setVisible(false);
	3940	+ bigThree.ClearUI();
	3941	+ bigThree.add(centralPanel);
	3942	+ bigThree.add(scenePanel);
	3943	+ bigThree.FlushUI();
	3944	+
	3945	+ cameraView.requestFocusInWindow();
2691	3946	} else
2692		- if (event.getSource() == sevenButton)
	3947	+ if (source == sevenButton)
2693	3948	{
2694	3949	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();
	3950	+
	3951	+ if (CameraPane.FULLSCREEN)
	3952	+ fullscreenLayout = radio.layout;
	3953	+
	3954	+// bigThree.remove(scenePanel);
	3955	+// bigThree.remove(centralPanel);
	3956	+// bigThree.remove(XYZPanel);
	3957	+// aWindowConstraints.gridx = 0;
	3958	+// aWindowConstraints.gridy = 0;
	3959	+// aWindowConstraints.gridwidth = 1;
	3960	+// // aWindowConstraints.gridheight = 3;
	3961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3962	+// aWindowConstraints.weightx = 0;
	3963	+// aWindowConstraints.weighty = 1;
	3964	+// bigThree.add(scenePanel, aWindowConstraints);
	3965	+// aWindowConstraints.weightx = 1;
	3966	+// aWindowConstraints.gridwidth = 3;
	3967	+// // aWindowConstraints.gridheight = 3;
	3968	+// aWindowConstraints.gridx = 1;
	3969	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3970	+// bigThree.add(centralPanel, aWindowConstraints);
	3971	+// aWindowConstraints.weightx = 0;
	3972	+// aWindowConstraints.gridx = 4;
	3973	+// aWindowConstraints.gridwidth = 1;
	3974	+// // aConstraints.gridheight = 3;
	3975	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3976	+// bigThree.add(XYZPanel, aWindowConstraints);
	3977	+// bigThree.validate();
	3978	+// scenePanel.setVisible(true);
	3979	+// centralPanel.setVisible(true);
	3980	+// XYZPanel.setVisible(true);
	3981	+ bigThree.ClearUI();
	3982	+ bigThree.add(scenePanel);
	3983	+ bigThree.add(centralPanel);
	3984	+ bigThree.add(XYZPanel);
	3985	+ bigThree.FlushUI();
	3986	+
	3987	+ cameraView.requestFocusInWindow();
2719	3988	} else
2720		- if (event.getSource() == rootButton)
	3989	+ if (source == rootButton)
2721	3990	{
	3991	+ Replace();
2722	3992	Object3D obj;
2723	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2724	3994	{
..	..	@@ -2727,66 +3997,88 @@
2727	3997	EditObject(obj);
2728	3998	}
2729	3999
	4000	+ cameraView.requestFocusInWindow();
2730	4001	refreshContents(true);
2731	4002	} else
2732		- if (event.getSource() == closeButton)
	4003	+ if (source == closeButton)
2733	4004	{
2734	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
2735	4009	cRadio ab;
2736	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	4011	{
2738	4012	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	4013	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	4014	{
	4015	+ // Patch to avoid bug with transparency.
	4016	+ if (!ab.hadMaterial)
	4017	+ {
	4018	+ ab.object.material = null;
	4019	+ }
	4020	+
2741	4021	buttonGroup.remove(ab);
2742	4022	radioPanel.remove(ab);
2743	4023
2744		- ab.GetObject().editWindow = null;
	4024	+ //ab.GetObject().editWindow = null;
	4025	+ ab.GetObject().manipWindow = null;
2745	4026	// ab.GetObject().objectUI = null; // ?????????
2746	4027
2747	4028	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	4029	break;
2749	4030	}
2750	4031	}
	4032	+
	4033	+ cameraView.requestFocusInWindow();
2751	4034	refreshContents(true);
2752	4035	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	4036	+ if (source == editItem \|\| source == editButton)
2754	4037	{
	4038	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4039	+ {
	4040	+ Object3D child = (Object3D)e.nextElement();
	4041	+ child.pinned = true;
	4042	+ }
	4043	+
2755	4044	EditSelection(false);
2756	4045	} else
2757		- if (event.getSource() == uneditButton)
	4046	+ if (source == uneditButton)
2758	4047	{
2759	4048	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	4049	{
2761	4050	Object3D child = (Object3D)e.nextElement();
2762	4051	if(child.editWindow != null)
2763		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4052	+ child.pinned = false;
2764	4053	child.CloseUI();
2765	4054	listUI.remove(child);
	4055	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2766	4056
2767		- child.editWindow = null; // ???????????
	4057	+ //child.editWindow = null; // ???????????
2768	4058	}
2769		- objEditor.ctrlPanel.revalidate();
	4059	+ objEditor.ctrlPanel.FlushUI();
2770	4060	//objEditor.jTree.clearSelection();
2771	4061	//objEditor.ResetSliders();
2772	4062	refreshContents(true);
2773	4063	} else
2774		- if (event.getSource() == clearPanelButton)
	4064	+ if (source == clearPanelButton)
2775	4065	{
2776	4066	assert(copy == group);
2777	4067	//copy.ClearUI();
2778	4068	for (Object3D obj : listUI)
2779	4069	{
	4070	+ obj.pinned = false;
2780	4071	obj.CloseUI();
2781	4072	}
2782	4073	listUI.clear();
	4074	+ SetPinStates(group.selection.size() > 0);
2783	4075	refreshContents(true);
2784	4076	} else
2785		- if (event.getSource() == allParamsButton)
	4077	+ if (source == allParamsButton)
2786	4078	{
2787	4079	assert(copy == group);
2788	4080
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4081	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	4082
2791	4083	for (Object3D obj : listUI)
2792	4084	{
..	..	@@ -2803,19 +4095,22 @@
2803	4095
2804	4096	refreshContents(true);
2805	4097	} else
2806		- if (event.getSource() == unselectButton)
	4098	+ if (source == unselectButton)
2807	4099	{
2808	4100	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	4101	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	4102	objEditor.ResetSliders();
2811	4103	refreshContents(true);
2812	4104	} else
2813		- if(event.getSource() instanceof cRadio)
	4105	+ if(source instanceof cRadio)
2814	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
2815	4110	group.parent = keepparent;
2816	4111	group.attributes = 0;
2817	4112	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	4113	+ /cRadio/ radio = (cRadio)source;
2819	4114	Object3D obj = radio.GetObject();
2820	4115	System.out.println("Edit " + obj);
2821	4116	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +4130,8 @@
2835	4130	}
2836	4131
2837	4132	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	4133	+
	4134	+ //Globals.theRenderer.object = group;
2839	4135	if(!useclient)
2840	4136	{
2841	4137	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +4140,80 @@
2844	4140	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	4141	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	4142	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	4143	+ //cameraView.lighttouched = true;
	4144	+ Globals.lighttouched = true;
2848	4145	topView.object = group;
2849	4146	frontView.object = group;
2850	4147	sideView.object = group;
2851	4148	}
2852		- group.editWindow = this;
	4149	+
	4150	+// fix "+" issue
	4151	+ //group.editWindow = this;
	4152	+ group.manipWindow = this;
	4153	+
2853	4154	/*
2854	4155	currentLayout = radio.layout;
2855	4156	if (currentLayout == null)
2856	4157	currentLayout = sevenButton;
2857	4158	*/
2858	4159	radio.layout.doClick();
	4160	+
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
	4186	+ ClearUnpinned();
	4187	+
	4188	+ //Grafreed.Assert(group != null);
	4189	+ //Grafreed.Assert(group.selection != null);
	4190	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	4191	+ if (group.selection == null \|\| group.selection.size() == 1)
	4192	+ EditSelection(false);
2859	4193	keepparent = group.parent;
2860	4194	// PARENT = NULL or not???
2861	4195	//group.parent = null; // ROOT
2862	4196	//group.attributes = -1;
2863	4197	ResetModel();
	4198	+
	4199	+ cameraView.requestFocusInWindow();
2864	4200	refreshContents(true);
2865		- }
	4201	+ } else if (event.getSource() == editCameraItem)
	4202	+ {
	4203	+ cameraView.ProtectCamera();
	4204	+ cameraView.requestFocusInWindow();
	4205	+ cameraView.repaint();
	4206	+ return;
	4207	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	4208	+ {
	4209	+ cameraView.RevertCamera();
	4210	+ cameraView.requestFocusInWindow();
	4211	+ cameraView.repaint();
	4212	+ return;
	4213	+ // } else if (event.getSource() == textureButton)
	4214	+ // {
	4215	+ // return; // true;
	4216	+ }
2866	4217	else
2867	4218	{
2868	4219	//return super.action(event, arg);
..	..	@@ -2871,7 +4222,6 @@
2871	4222	}
2872	4223
2873	4224	boolean useclient = false;
2874		- cRadio radio;
2875	4225
2876	4226	void ToggleRoot()
2877	4227	{
..	..	@@ -2880,7 +4230,7 @@
2880	4230	if (useclient)
2881	4231	{
2882	4232	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	4233	+ Globals.lighttouched = true;
2884	4234	//topView.object = client;
2885	4235	//frontView.object = client;
2886	4236	//sideView.object = client;
..	..	@@ -2888,7 +4238,7 @@
2888	4238	else
2889	4239	{
2890	4240	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	4241	+ Globals.lighttouched = true;
2892	4242	//topView.object = group;
2893	4243	//frontView.object = group;
2894	4244	//sideView.object = group;
..	..	@@ -2923,6 +4273,40 @@
2923	4273	refreshContents();
2924	4274	}
2925	4275
	4276	+ void TransformChildren()
	4277	+ {
	4278	+ Object3D obj;
	4279	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4280	+ {
	4281	+ obj = (Object3D)e.nextElement();
	4282	+ obj.KeepTextureMatrices();
	4283	+ obj.TransformChildren();
	4284	+ obj.RestoreTextureMatrices();
	4285	+
	4286	+// if (obj.parent == null)
	4287	+// {
	4288	+// System.out.println("NULL PARENT!");
	4289	+// new Exception().printStackTrace();
	4290	+// }
	4291	+// else
	4292	+// TouchTransform(obj);
	4293	+// //obj.parent.Touch();
	4294	+ }
	4295	+
	4296	+ refreshContents();
	4297	+ }
	4298	+
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
2926	4310
2927	4311	void ResetTransform()
2928	4312	{
..	..	@@ -2939,42 +4323,8 @@
2939	4323	if (obj.toParent == null)
2940	4324	continue;
2941	4325
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		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
2978	4328	if (obj.parent == null)
2979	4329	{
2980	4330	System.out.println("NULL PARENT!");
..	..	@@ -3035,7 +4385,7 @@
3035	4385	refreshContents();
3036	4386	}
3037	4387
3038		- void ResetCentroid()
	4388	+ void ResetCentroid(boolean full)
3039	4389	{
3040	4390	Object3D obj;
3041	4391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +4400,16 @@
3050	4400	LA.matIdentity(Object3D.mat);
3051	4401	obj.getBounds(minima, maxima, false);
3052	4402	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4403	+ if (full)
	4404	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	4405	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	4406	obj.TransformMesh(Object3D.mat);
	4407	+
3056	4408	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4409	+ if (full)
	4410	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	4411	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4412	+
3059	4413	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	4414	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	4415	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +4438,8 @@
3084	4438
3085	4439	int size = obj.MemorySize();
3086	4440
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	4441	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4442	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	4443	}
3089	4444	}
3090	4445	catch (Exception e)
..	..	@@ -3121,9 +4476,9 @@
3121	4476	obj = (Object3D)e.nextElement();
3122	4477
3123	4478	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	4479	+ Grafreed.AnalyzeObject(obj);
3125	4480	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	4481	+ Grafreed.AnalyzeObject(obj.bRep);
3127	4482
3128	4483	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	4484	}
..	..	@@ -3165,6 +4520,20 @@
3165	4520	void GenNormals(boolean crease)
3166	4521	{
3167	4522	group.GenNormalsS(crease);
	4523	+
	4524	+ refreshContents();
	4525	+ }
	4526	+
	4527	+ void GenNormalsMESH()
	4528	+ {
	4529	+ group.GenNormalsMeshS();
	4530	+
	4531	+ refreshContents();
	4532	+ }
	4533	+
	4534	+ void GenNormalsMINE()
	4535	+ {
	4536	+ group.selection.GenNormalsMINE();
3168	4537
3169	4538	refreshContents();
3170	4539	}
..	..	@@ -3250,7 +4619,7 @@
3250	4619	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	4620	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	4621	//
3253		-// g.add(GraphreeD.clipboard);
	4622	+// g.add(GrafreeD.clipboard);
3254	4623	//
3255	4624	// buffer.add(g);
3256	4625	// }
..	..	@@ -3269,8 +4638,8 @@
3269	4638	// nodes = new Object3D();
3270	4639	// vertices = new Vector<Vertex>();
3271	4640	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4641	+// boolean epsequal = GrafreeD.epsequal;
	4642	+// GrafreeD.epsequal = true;
3274	4643	//
3275	4644	// for (int i=0; i<group.selection.size(); i++)
3276	4645	// {
..	..	@@ -3311,7 +4680,7 @@
3311	4680	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4681	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4682	//
3314		-// g.add(GraphreeD.clipboard);
	4683	+// g.add(GrafreeD.clipboard);
3315	4684	//
3316	4685	// buffer.add(g);
3317	4686	// }
..	..	@@ -3319,7 +4688,7 @@
3319	4688	// makeSomething(buffer, i==group.selection.size()-1);
3320	4689	// }
3321	4690	//
3322		-// GraphreeD.epsequal = epsequal;
	4691	+// GrafreeD.epsequal = epsequal;
3323	4692	//
3324	4693	// //buffer = null;
3325	4694	// temprep = null;
..	..	@@ -3330,8 +4699,8 @@
3330	4699
3331	4700	void ParseVertices()
3332	4701	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4702	+ boolean epsequal = Grafreed.epsequal;
	4703	+ Grafreed.epsequal = true;
3335	4704
3336	4705	for (int i=0; i<group.selection.size(); i++)
3337	4706	{
..	..	@@ -3356,7 +4725,7 @@
3356	4725	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4726	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4727
3359		- g.add(GraphreeD.clipboard);
	4728	+ g.add(Grafreed.clipboard);
3360	4729
3361	4730	buffer.add(g);
3362	4731	}
..	..	@@ -3371,7 +4740,7 @@
3371	4740	makeSomething(buffer, i==group.selection.size()-1);
3372	4741	}
3373	4742
3374		- GraphreeD.epsequal = epsequal;
	4743	+ Grafreed.epsequal = epsequal;
3375	4744
3376	4745	refreshContents();
3377	4746	}
..	..	@@ -3389,7 +4758,16 @@
3389	4758	String pigment = Object3D.GetPigment(tex);
3390	4759	//String bump = Object3D.GetBump(tex);
3391	4760
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4761	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4762	+
	4763	+ try
	4764	+ {
	4765	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4766	+ }
	4767	+ catch (Exception e)
	4768	+ {
	4769	+ System.err.println("FAIL: " + node);
	4770	+ }
3393	4771
3394	4772	double s = v.s;
3395	4773
..	..	@@ -3416,7 +4794,7 @@
3416	4794	scale /= 3;
3417	4795
3418	4796	scale /= 0xFF;
3419		- scale /= 4;
	4797	+ // c'est quoi ca? scale /= 4;
3420	4798
3421	4799	//v.AO = scale;
3422	4800
..	..	@@ -3437,12 +4815,32 @@
3437	4815
3438	4816	void Align()
3439	4817	{
	4818	+ if (group.selection.size() == 0)
	4819	+ return;
	4820	+
	4821	+ cVector bbmin = new cVector();
	4822	+ cVector bbmax = new cVector();
	4823	+
	4824	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4825	+
	4826	+ double dx = bbmax.x - bbmin.x;
	4827	+ double dy = bbmax.y - bbmin.y;
	4828	+ double dz = bbmax.z - bbmin.z;
	4829	+
	4830	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4831	+
3440	4832	for (int i=0; i<group.selection.size(); i++)
3441	4833	{
3442	4834	Object3D obj = group.selection.get(i);
3443	4835
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
	4842	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4843	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4844	}
3447	4845
3448	4846	refreshContents();
..	..	@@ -3455,7 +4853,7 @@
3455	4853	// ref.SaveSupports();
3456	4854	// Object3D par = ref.parent;
3457	4855	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4856	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4857	// ref.parent = par;
3460	4858	// ref.RestoreSupports();
3461	4859
..	..	@@ -3463,11 +4861,11 @@
3463	4861
3464	4862	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4863
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4864	+ boolean random = CameraPane.SWITCH;
	4865	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4866	lowres.linkVerticesThis(null);
3469	4867	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4868	+ CameraPane.SWITCH = random;
3471	4869
3472	4870	System.err.flush();
3473	4871
..	..	@@ -3485,7 +4883,7 @@
3485	4883	// lowres.SaveSupports();
3486	4884	// par = lowres.parent;
3487	4885	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4886	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4887	Object3D newlow = CloneObject(lowres, false);
3490	4888	newlow.name = sn.switchobject.get(i).name;
3491	4889	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4905,7 @@
3507	4905	return;
3508	4906
3509	4907	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4908	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4909
3512	4910	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4911
..	..	@@ -3676,7 +5074,7 @@
3676	5074	group.selection.RelinkToSupport(); // july 2014
3677	5075	System.out.println("DONE.");
3678	5076	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	5077	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	5078	}
3681	5079
3682	5080	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +5099,20 @@
3701	5099
3702	5100	void ClipMesh()
3703	5101	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	5102	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	5103	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	5104	+ Object3D content = Grafreed.clipboard.get(0);
3707	5105
3708	5106	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	5107	content = ((cGroup)content).get(0);
3710	5108
3711	5109	// for (int i=0; i<group.selection.size(); i++)
3712	5110	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	5111	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	5112	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	5113	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	5114	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	5115	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	5116	System.out.println("DONE.");
3719	5117	refreshContents();
3720	5118	}
..	..	@@ -3729,6 +5127,12 @@
3729	5127	void ClearMaterials()
3730	5128	{
3731	5129	group.selection.ClearMaterials();
	5130	+ refreshContents();
	5131	+ }
	5132	+
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
3732	5136	refreshContents();
3733	5137	}
3734	5138
..	..	@@ -3759,6 +5163,18 @@
3759	5163	void MarkLeaves(boolean hide)
3760	5164	{
3761	5165	group.selection.MarkLeaves(hide);
	5166	+ refreshContents();
	5167	+ }
	5168	+
	5169	+ void RewindLeaves(boolean hide)
	5170	+ {
	5171	+ group.selection.RewindLeaves(hide);
	5172	+ refreshContents();
	5173	+ }
	5174	+
	5175	+ void RandomLeaves(boolean hide)
	5176	+ {
	5177	+ group.selection.RandomLeaves(hide);
3762	5178	refreshContents();
3763	5179	}
3764	5180
..	..	@@ -3833,28 +5249,25 @@
3833	5249	// }
3834	5250	// }
3835	5251
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	5252	void EditSelection(boolean newWindow)
3841	5253	{
	5254	+ if (group.selection == null)
	5255	+ {
	5256	+ EditElement(group, newWindow); // ? new
	5257	+ return;
	5258	+ }
	5259	+
3842	5260	// aConstraints.gridy = 0;
3843	5261	for (int i=0; i<group.selection.size(); i++)
3844	5262	{
3845	5263	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	5264	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5265	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	5266
3849	5267	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	5268	+ if(elem != group \|\| !newWindow)
3851	5269	{
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
	5270	+ EditElement(elem, newWindow); // ? new
3858	5271	}
3859	5272	}
3860	5273	}
..	..	@@ -3917,9 +5330,7 @@
3917	5330
3918	5331	freezemodel = false;
3919	5332	}
3920		-
3921		- boolean flashIt = true;
3922		-
	5333	+
3923	5334	public void valueChanged(TreeSelectionEvent e)
3924	5335	//public boolean handleEvent(Event event)
3925	5336	{
..	..	@@ -3929,7 +5340,8 @@
3929	5340	//new Exception().printStackTrace();
3930	5341
3931	5342	freezemodel = true;
3932		-
	5343	+ ClearUnpinned();
	5344	+
3933	5345	/**/
3934	5346	//switch (event.id)
3935	5347	{
..	..	@@ -3937,7 +5349,6 @@
3937	5349	//case 702: // Event.LIST_DESELECT
3938	5350	group.deselectAll();
3939	5351	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	5352	if (tps != null)
3942	5353	{
3943	5354	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +5357,39 @@
3946	5357
3947	5358	//if (child.parent != null)
3948	5359	//child.parent.addSelectee(child);
	5360	+ objEditor.SetMaterial(child);
3949	5361	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	5362	}
3954	5363	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	5364	+// else
	5365	+// {
	5366	+// objEditor.SetMaterial(group); // .GetMaterial());
	5367	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5368	+// System.err.println("info : " + group.GetPath());
	5369	+// }
3961	5370
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5371	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	5372	CameraPane.flash = true;
3966	5373
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5374	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	5375	// a camera
3969	5376	{
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;
	5377	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5378	+ {
	5379	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5380	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5381	+ }
	5382	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5383	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	5384	}
3975	5385
	5386	+ if (tps != null && tps.length == 1)
	5387	+ {
	5388	+ EditSelection(false);
	5389	+ }
	5390	+
	5391	+ SetPinStates(tps != null && tps.length > 0);
	5392	+
3976	5393	refreshContents();
3977	5394	//return true;
3978	5395	}
..	..	@@ -3981,6 +5398,53 @@
3981	5398
3982	5399	freezemodel = false;
3983	5400	}
	5401	+
	5402	+ void SetPinStates(boolean enabled)
	5403	+ {
	5404	+ editButton.setEnabled(enabled);
	5405	+ uneditButton.setEnabled(enabled);
	5406	+ //unselectButton.setEnabled(enabled);
	5407	+ flashSelectionButton.setEnabled(enabled);
	5408	+
	5409	+ clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
	5425	+ }
	5426	+
	5427	+ void refreshContents(boolean cp)
	5428	+ {
	5429	+ if (Globals.ADVANCED)
	5430	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5431	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5432	+ {
	5433	+ objEditor.ClearInfo(); // .GetMaterial());
	5434	+
	5435	+ for (int i=0; i < group.selection.Size(); i++)
	5436	+ {
	5437	+ Object3D child = (Object3D) group.selection.get(i);
	5438	+
	5439	+ objEditor.AddInfo(child, this, true);
	5440	+// System.err.println("info : " + child.GetPath());
	5441	+ }
	5442	+
	5443	+ objEditor.SetText(); // jan 2014
	5444	+ }
	5445	+
	5446	+ super.refreshContents(cp);
	5447	+ }
3984	5448
3985	5449	void linkSomething(Object3D thing)
3986	5450	{
..	..	@@ -4052,16 +5516,19 @@
4052	5516	{
4053	5517	if (group.selection.isEmpty())
4054	5518	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	5519	+
	5520	+ Grafreed.clipboardIsTempGroup = false;
4056	5521	Composite tGroup = null;
4057	5522	if (group.selection.size() > 0) // 1)
4058	5523	{
4059	5524	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	5525	+ Grafreed.clipboardIsTempGroup = true;
4061	5526	}
4062	5527
4063	5528	if (cut)
4064	5529	{
	5530	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5531	+// Save();
4065	5532	//int indices[] = jList.getSelectedIndices();
4066	5533	//for (int i = indices.length - 1; i >= 0; i--)
4067	5534	//jList.remove(indices[i]);
..	..	@@ -4097,16 +5564,16 @@
4097	5564	//System.out.println("cut " + child);
4098	5565	//System.out.println("parent = " + child.parent);
4099	5566	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	5567	+ if (Grafreed.clipboardIsTempGroup)
4101	5568	tGroup.add/Child/(tmp);
4102	5569	else
4103		- GraphreeD.clipboard = tmp;
	5570	+ Grafreed.clipboard = tmp;
4104	5571	}
4105	5572	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	5573	+ if (Grafreed.clipboardIsTempGroup)
4107	5574	tGroup.add/Child/(child);
4108	5575	else
4109		- GraphreeD.clipboard = child;
	5576	+ Grafreed.clipboard = child;
4110	5577	}
4111	5578
4112	5579	//ResetModel();
..	..	@@ -4138,21 +5605,23 @@
4138	5605	//System.out.println("cut " + elem);
4139	5606	//System.out.println("parent = " + elem.parent);
4140	5607	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	5608	+ if (Grafreed.clipboardIsTempGroup)
4142	5609	tGroup.add/Child/(tmp);
4143	5610	else
4144		- GraphreeD.clipboard = tmp;
	5611	+ Grafreed.clipboard = tmp;
4145	5612	}
4146	5613	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	5614	+ if (Grafreed.clipboardIsTempGroup)
4148	5615	tGroup.add/Child/(child);
4149	5616	else
4150		- GraphreeD.clipboard = child;
	5617	+ Grafreed.clipboard = child;
4151	5618	}
4152	5619
4153	5620	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	5621	+
	5622	+ if (Grafreed.clipboardIsTempGroup)
	5623	+ Grafreed.clipboard = tGroup;
	5624	+
4156	5625	if (cut)
4157	5626	{
4158	5627	ResetModel();
..	..	@@ -4162,11 +5631,15 @@
4162	5631
4163	5632	void paste(boolean expand)
4164	5633	{
4165		- // if (GraphreeD.clipboard == null)
	5634	+ if (Globals.REPLACEONMAKE)
	5635	+ Save();
	5636	+ boolean keep = Globals.REPLACEONMAKE;
	5637	+ Globals.REPLACEONMAKE = false;
	5638	+ // if (GrafreeD.clipboard == null)
4166	5639	// return;
4167	5640	boolean first = true;
4168	5641
4169		- if (GraphreeD.clipboardIsTempGroup)
	5642	+ if (Grafreed.clipboardIsTempGroup)
4170	5643	{
4171	5644	Composite temp;
4172	5645
..	..	@@ -4177,7 +5650,7 @@
4177	5650	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	5651	*/
4179	5652	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5653	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	5654	{
4182	5655	Object3D child = (Object3D)e.nextElement();
4183	5656
..	..	@@ -4191,7 +5664,7 @@
4191	5664	else
4192	5665	elem = child.deepCopy(); // ?
4193	5666	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5667	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5668	// elem = elem.get(0);
4196	5669	makeSomething(elem, true); // ?? first);
4197	5670	//group.addChild(elem);
..	..	@@ -4211,23 +5684,24 @@
4211	5684	//Object3D cb = Applet3D.clipboard;
4212	5685	//temp.addChild(cb);
4213	5686	//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());
	5687	+ assert(Grafreed.clipboard.parent == null);
	5688	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5689	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5690	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5691	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5692	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5693	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5694	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5695	}
4223	5696
	5697	+ Globals.REPLACEONMAKE = keep;
4224	5698	ResetModel();
4225	5699	refreshContents();
4226	5700	}
4227	5701
4228		- void pasteInto(boolean copyit)
	5702	+ void pasteInto(boolean copyit, boolean clone)
4229	5703	{
4230		-// if (GraphreeD.clipboard == null)
	5704	+// if (GrafreeD.clipboard == null)
4231	5705	// return;
4232	5706
4233	5707	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5728,22 @@
4254	5728	if (copyit)
4255	5729	{
4256	5730	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5731	+ if (clone)
	5732	+ {
	5733	+ CloneClipboard(false); // sept 2014
	5734	+ }
	5735	+ else
	5736	+ {
	5737	+ paste(false);
	5738	+ }
4258	5739	}
4259	5740	else
4260	5741	{
4261	5742	boolean first = true;
4262	5743
4263		- if (GraphreeD.clipboardIsTempGroup)
	5744	+ if (Grafreed.clipboardIsTempGroup)
4264	5745	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5746	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5747	Object3D copy;
4267	5748	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5749	{
..	..	@@ -4272,7 +5753,7 @@
4272	5753	}
4273	5754	} else
4274	5755	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5756	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5757	}
4277	5758	}
4278	5759	}
..	..	@@ -4349,6 +5830,10 @@
4349	5830
4350	5831	void group(Object3D csg, boolean grab)
4351	5832	{
	5833	+ if (Globals.REPLACEONMAKE)
	5834	+ Save();
	5835	+ boolean keep = Globals.REPLACEONMAKE;
	5836	+ Globals.REPLACEONMAKE = false;
4352	5837	if (//false) // why??
4353	5838	!group.selection.isEmpty())
4354	5839	{
..	..	@@ -4462,8 +5947,34 @@
4462	5947	//node.add(csg);
4463	5948	//makeSomething(node);
4464	5949	makeSomething(csg);
	5950	+ Globals.REPLACEONMAKE = keep;
4465	5951	}
4466	5952
	5953	+ void Ungroup(Object3D g)
	5954	+ {
	5955	+ if (Globals.REPLACEONMAKE)
	5956	+ Save();
	5957	+ boolean keep = Globals.REPLACEONMAKE;
	5958	+ Globals.REPLACEONMAKE = false;
	5959	+ if (g instanceof HiddenObject)
	5960	+ {
	5961	+ HiddenObject h = (HiddenObject) g;
	5962	+
	5963	+ for (int i=0; i<h.ActualSize(); i++)
	5964	+ {
	5965	+ objEditor.makeSomething(h.get(i), false);
	5966	+ }
	5967	+ }
	5968	+ else
	5969	+ {
	5970	+ for (int i=0; i<g.Size(); i++)
	5971	+ {
	5972	+ objEditor.makeSomething(g.get(i), false);
	5973	+ }
	5974	+ }
	5975	+ Globals.REPLACEONMAKE = keep;
	5976	+ }
	5977	+
4467	5978	void ungroup()
4468	5979	{
4469	5980	/*
..	..	@@ -4657,21 +6168,6 @@
4657	6168	}
4658	6169	*/
4659	6170
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	6171	/*
4676	6172	public void Callback(Object obj)
4677	6173	{
..	..	@@ -4695,26 +6191,9 @@
4695	6191	}
4696	6192	*/
4697	6193
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	6194	String GetFile(String dialogName)
4716	6195	{
4717		- if (GraphreeD.standAlone)
	6196	+ if (Grafreed.standAlone)
4718	6197	{
4719	6198	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	6199	browser.show();
..	..	@@ -4778,10 +6257,48 @@
4778	6257	cButton flashSelectionButton;
4779	6258	cButton editButton;
4780	6259	cButton uneditButton;
	6260	+ JCheckBox allParamsButton;
4781	6261	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	6262	cButton unselectButton;
4784	6263
	6264	+ cButton restoreCameraButton;
	6265	+
	6266	+ cButton oneStepButton;
	6267	+
	6268	+ cButton groupButton;
	6269	+ cButton ungroupButton;
	6270	+ cButton compositeButton;
	6271	+ cButton switchButton;
	6272	+ cButton loopButton;
	6273	+ cButton textureButton;
	6274	+
	6275	+ cButton skybox1Button;
	6276	+ cButton skybox2Button;
	6277	+ cButton skybox3Button;
	6278	+ cButton skybox4Button;
	6279	+ cButton skybox5Button;
	6280	+ cButton skybox6Button;
	6281	+ cButton skybox7Button;
	6282	+
	6283	+ cButton skybox11Button;
	6284	+ cButton skybox12Button;
	6285	+ cButton skybox13Button;
	6286	+ cButton skybox14Button;
	6287	+ cButton skybox15Button;
	6288	+ cButton skybox16Button;
	6289	+ cButton skybox17Button;
	6290	+
	6291	+ cButton gridButton;
	6292	+ cButton boxButton;
	6293	+ cButton sphereButton;
	6294	+ cButton coneButton;
	6295	+ cButton torusButton;
	6296	+ cButton superButton;
	6297	+ cButton kleinButton;
	6298	+ cButton particlesButton;
	6299	+ cButton overlayButton;
	6300	+ cButton lightButton;
	6301	+
4785	6302	cButton screenfitButton;
4786	6303	cButton screenfitpointButton;
4787	6304	cButton snapobjectButton;
..	..	@@ -4793,14 +6310,6 @@
4793	6310
4794	6311	cButton setsupportButton;
4795	6312
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	6313	//
4805	6314	//Composite
4806	6315	Object3D // to do !!
..	..	@@ -4810,10 +6319,12 @@
4810	6319	//JTree jTree;
4811	6320	private MenuItem lookAtItem;
4812	6321	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
4814		- private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
4816		- private MenuItem cloneItem;
	6322	+ private MenuItem switchViewItem;
	6323	+ private JMenuItem cutItem;
	6324	+ private MenuItem undoItem;
	6325	+ private MenuItem redoItem;
	6326	+ private JMenuItem duplicateItem;
	6327	+ private JMenuItem cloneItem;
4817	6328	private MenuItem cloneSupportItem;
4818	6329	private MenuItem overwriteGeoItem;
4819	6330	private MenuItem overwriteMatItem;
..	..	@@ -4823,8 +6334,9 @@
4823	6334	private MenuItem resetsupportItem;
4824	6335	private MenuItem resetreferencesItem;
4825	6336	private MenuItem linkverticesItem;
	6337	+ private MenuItem relinkverticesItem;
4826	6338	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	6339	+ private MenuItem resetAllItem;
4828	6340	private MenuItem stepAllItem;
4829	6341	private MenuItem revertMeshItem;
4830	6342	private MenuItem poseMeshItem;
..	..	@@ -4833,16 +6345,19 @@
4833	6345	private MenuItem cloneGeometriesItem;
4834	6346	private MenuItem shareGeometriesItem;
4835	6347	private MenuItem mergeGeometriesItem;
4836		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
4837	6349	private MenuItem pasteItem;
4838		- private MenuItem pasteLinkItem;
4839		- private MenuItem pasteCloneItem;
4840		- private MenuItem pasteExpandItem;
4841		- private MenuItem clearItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
4842	6355	private MenuItem clearAllItem;
4843	6356	private MenuItem genUVItem;
	6357	+ private MenuItem genNormalsMESHItem;
4844	6358	private MenuItem genNormalsCADItem;
4845	6359	private MenuItem genNormalsORGANItem;
	6360	+ private MenuItem genNormalsMINEItem;
4846	6361	private MenuItem stripifyItem;
4847	6362	private MenuItem unstripifyItem;
4848	6363	private MenuItem trimItem;
..	..	@@ -4862,6 +6377,7 @@
4862	6377	private MenuItem clipMeshItem;
4863	6378	private MenuItem smoothMeshItem;
4864	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
4865	6381
4866	6382	private MenuItem liveleavesItem;
4867	6383	private MenuItem unliveleavesItem;
..	..	@@ -4871,6 +6387,10 @@
4871	6387	private MenuItem showleavesItem;
4872	6388	private MenuItem markleavesItem;
4873	6389	private MenuItem unmarkleavesItem;
	6390	+ private MenuItem rewindleavesItem;
	6391	+ private MenuItem unrewindleavesItem;
	6392	+ private MenuItem randomleavesItem;
	6393	+ private MenuItem unrandomleavesItem;
4874	6394
4875	6395	private MenuItem flipVItem;
4876	6396	private MenuItem unflipVItem;
..	..	@@ -4881,15 +6401,21 @@
4881	6401	private MenuItem maxTexturesItem;
4882	6402	private MenuItem panoTexturesItem;
4883	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
4884	6407	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	6408	+ private MenuItem resetCentroidXZItem;
4886	6409	private MenuItem resetTransformItem;
4887		- private MenuItem grabItem;
	6410	+ private MenuItem transformGeometryItem;
	6411	+ private MenuItem transformChildrenItem;
	6412	+ private MenuItem hideItem;
	6413	+ private JMenuItem grabItem;
4888	6414	private MenuItem backItem;
4889	6415	private MenuItem frontItem;
4890	6416	private MenuItem cameraItem;
4891	6417	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	6418	+ private MenuItem switchItem;
4893	6419	private MenuItem physicsItem;
4894	6420	private MenuItem frameselectorItem;
4895	6421	private MenuItem scriptNodeItem;
..	..	@@ -4897,13 +6423,14 @@
4897	6423	private MenuItem switchTransfoItem;
4898	6424	private MenuItem morphItem;
4899	6425	private MenuItem linkerItem;
4900		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
4901	6427	private MenuItem editItem;
4902	6428	private MenuItem openWindowItem;
4903	6429	private MenuItem editLeafItem;
4904	6430
4905	6431	private MenuItem resetParentItem;
4906	6432	private MenuItem repairParentItem;
	6433	+ private MenuItem repairShadowItem;
4907	6434	private MenuItem sortbysizeItem;
4908	6435	private MenuItem sortbynameItem;
4909	6436
..	..	@@ -4912,6 +6439,8 @@
4912	6439	private MenuItem attachBumpItem;
4913	6440	private MenuItem detachBumpItem;
4914	6441	private MenuItem pigmentBumpItem;
	6442	+ private MenuItem embedTexturesItem;
	6443	+ private MenuItem deEmbedTexturesItem;
4915	6444
4916	6445	private MenuItem particleItem;
4917	6446	private MenuItem ragdollItem;
..	..	@@ -4924,10 +6453,11 @@
4924	6453	private MenuItem coneItem;
4925	6454	private MenuItem torusItem;
4926	6455	private MenuItem superItem;
	6456	+ private MenuItem kleinItem;
4927	6457	private MenuItem blobItem;
4928	6458	private MenuItem latheItem;
4929	6459	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	6460	+ private MenuItem overlayItem;
4931	6461	private MenuItem meshItem;
4932	6462	// private MenuItem meshGroupItem;
4933	6463	private MenuItem springItem;
..	..	@@ -4936,6 +6466,7 @@
4936	6466	private MenuItem csgItem;
4937	6467	private MenuItem templateItem;
4938	6468	private MenuItem textureItem;
	6469	+ private MenuItem billboardItem;
4939	6470	private MenuItem shadowXItem;
4940	6471	private MenuItem shadowYItem;
4941	6472	private MenuItem shadowZItem;
..	..	@@ -4948,11 +6479,6 @@
4948	6479	private MenuItem doubleItem;
4949	6480	private MenuItem tripleItem;
4950	6481
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	6482	private MenuItem computeAOItem;
4957	6483	private MenuItem recompileItem;
4958	6484	private MenuItem editScriptItem;
..	..	@@ -4962,4 +6488,8 @@
4962	6488	private MenuItem analyzeItem;
4963	6489	private MenuItem dumpItem;
4964	6490	//boolean freezemodel = false;
	6491	+
	6492	+ Menu cameraMenu;
	6493	+ MenuItem editCameraItem;
	6494	+ MenuItem restoreCameraItem;
4965	6495	}