~nbriere/GrafreeD.git - Noware Git Repository

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