~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
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,
..	..	@@ -22,6 +23,302 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ //AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("penguins", "dust", row0);
	62	+ AddSkyboxButton("penguins", "tropic", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
	64	+
	65	+ AddSkyboxButton("default", "uffizi", row1);
	66	+ AddSkyboxButton("bridge", "Bridge", row1);
	67	+ AddSkyboxButton("bridge", "Bridge2", row1);
	68	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	69	+
	70	+ AddSkyboxButton("urban", "Parliament", row2);
	71	+ AddSkyboxButton("urban", "Roundabout", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	73	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	74	+
	75	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	76	+ AddSkyboxButton("urban", "UnionSquare", row3);
	77	+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
	78	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	79	+
	80	+ AddSkyboxButton("park", "Buddha", row4);
	81	+ AddSkyboxButton("park", "CNTower2", row4);
	82	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	83	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	84	+
	85	+ AddSkyboxButton("park", "Park", row5);
	86	+ AddSkyboxButton("park", "Pond", row5);
	87	+ AddSkyboxButton("park", "Skansen", row5);
	88	+ AddSkyboxButton("park", "Skansen2", row5);
	89	+
	90	+ AddSkyboxButton("park", "Skansen3", row6);
	91	+ AddSkyboxButton("park", "Skansen4", row6);
	92	+ AddSkyboxButton("park", "Skansen5", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
	94	+
	95	+ tab0.add(row0);
	96	+ tab0.add(row1);
	97	+ tab0.add(row2);
	98	+ tab0.add(row3);
	99	+ tab0.add(row4);
	100	+ tab0.add(row5);
	101	+ tab0.add(row6);
	102	+
	103	+ for (int i=5; --i>=0;)
	104	+ {
	105	+ //oe.toolboxPanel.Return();
	106	+ //tab0.add(new cGridBag());
	107	+ }
	108	+ }
	109	+
	110	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	111	+ {
	112	+ cGridBag tab0 = new cGridBag().setVertical(true);
	113	+
	114	+ tab0.setName("Nature");
	115	+ skyboxpanel.add(tab0);
	116	+
	117	+ cGridBag row0 = new cGridBag();
	118	+ cGridBag row1 = new cGridBag();
	119	+ cGridBag row2 = new cGridBag();
	120	+ cGridBag row3 = new cGridBag();
	121	+ cGridBag row4 = new cGridBag();
	122	+ cGridBag row5 = new cGridBag();
	123	+ cGridBag row6 = new cGridBag();
	124	+
	125	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	126	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	127	+ AddSkyboxButton("beach", "PalmTrees", row0);
	128	+ AddSkyboxButton("beach", "Tenerife", row0);
	129	+
	130	+ AddSkyboxButton("beach", "Tenerife2", row1);
	131	+ AddSkyboxButton("beach", "Tenerife3", row1);
	132	+ AddSkyboxButton("field", "FishPond", row1);
	133	+ AddSkyboxButton("field", "Footballfield", row1);
	134	+
	135	+ AddSkyboxButton("field", "Meadow", row2);
	136	+ AddSkyboxButton("field", "Sorsele", row2);
	137	+ AddSkyboxButton("field", "Sorsele2", row2);
	138	+ AddSkyboxButton("field", "Sorsele3", row2);
	139	+
	140	+ AddSkyboxButton("forest", "Brudslojan", row3);
	141	+ AddSkyboxButton("forest", "Langholmen2", row3);
	142	+ AddSkyboxButton("forest", "Plants", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	146	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+ AddSkyboxButton("park", "Tantolunden4", row4);
	149	+
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
	152	+ AddSkyboxButton("rocky", "Langholmen", row5);
	153	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	154	+
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	156	+ AddSkyboxButton("default", "CloudyHills", row6);
	157	+ AddSkyboxButton("daz", "Autumn", row6);
	158	+ AddSkyboxButton("daz", "MountainTrail", row6);
	159	+ /*
	160	+Autumn
	161	+Greenlands
	162	+MountainTrail
	163	+Oasis
	164	+TheRock
	165	+TopOfTheWorld
	166	+Winter
	167	+ */
	168	+
	169	+ tab0.add(row0);
	170	+ tab0.add(row1);
	171	+ tab0.add(row2);
	172	+ tab0.add(row3);
	173	+ tab0.add(row4);
	174	+ tab0.add(row5);
	175	+ tab0.add(row6);
	176	+
	177	+ for (int i=5; --i>=0;)
	178	+ {
	179	+ //oe.toolboxPanel.Return();
	180	+ //tab0.add(new cGridBag());
	181	+ }
	182	+ }
	183	+
	184	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	185	+ {
	186	+ cGridBag tab0 = new cGridBag().setVertical(true);
	187	+
	188	+ tab0.setName("Night");
	189	+ skyboxpanel.add(tab0);
	190	+
	191	+ cGridBag row0 = new cGridBag();
	192	+ cGridBag row1 = new cGridBag();
	193	+ cGridBag row2 = new cGridBag();
	194	+ cGridBag row3 = new cGridBag();
	195	+ cGridBag row4 = new cGridBag();
	196	+ cGridBag row5 = new cGridBag();
	197	+ cGridBag row6 = new cGridBag();
	198	+
	199	+ AddSkyboxButton("night", "NightPath", row0);
	200	+ AddSkyboxButton("night", "PondNight", row0);
	201	+ AddSkyboxButton("night", "Powerlines", row0);
	202	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	203	+
	204	+ AddSkyboxButton("urban", "CNTower", row1);
	205	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	206	+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
	207	+ AddSkyboxButton("penguins", "sleepyhollow", row1);
	208	+
	209	+ AddSkyboxButton("penguins", "kenon_star", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
	212	+ AddSkyboxButton("indoors", "Vasa", row2);
	213	+
	214	+ AddSkyboxButton("winter", "Backyard", row3);
	215	+ AddSkyboxButton("winter", "Creek", row3);
	216	+ AddSkyboxButton("winter", "FootballField3", row3);
	217	+ AddSkyboxButton("winter", "Forest", row3);
	218	+
	219	+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
	220	+ AddSkyboxButton("winter", "House", row4);
	221	+ AddSkyboxButton("winter", "IceLake", row4);
	222	+ AddSkyboxButton("winter", "IceRiver", row4);
	223	+
	224	+ AddSkyboxButton("winter", "Park3", row5);
	225	+ AddSkyboxButton("winter", "PondWinter", row5);
	226	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	227	+ AddSkyboxButton("winter", "Vindelalven", row5);
	228	+
	229	+ AddSkyboxButton("daz", "TheRock", row6);
	230	+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
	231	+ AddSkyboxButton("daz", "Winter", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
	314	+ public void ChangeSkybox(String name)
	315	+ {
	316	+ //cameraView.envyoff = false;
	317	+ group.skyboxname = name;
	318	+ group.skyboxext = "jpg";
	319	+ cameraView.repaint();
	320	+ }
	321	+
25	322	//ObjEditor objEditor;
26	323	public void closeUI2()
27	324	{
..	..	@@ -59,6 +356,12 @@
59	356	this.copy = this.group = group;
60	357	//selectees = this.group.selectees;
61	358
	359	+ if (copy.versions == null)
	360	+ {
	361	+ copy.versions = new byte[100][];
	362	+ copy.versionindex = -1;
	363	+ }
	364	+
62	365	if(ui)
63	366	SetupUI(objEditor);
64	367	}
..	..	@@ -73,16 +376,28 @@
73	376	this.copy = this.group = copy;
74	377	//selectees = this.group.selectees;
75	378
76		- SetupMenu2(objEditor);
	379	+ SetupMenu2(this); //objEditor);
77	380	SetupUI2(objEditor);
78	381	objEditor.SetupUI(true);
79	382	SetupViews(objEditor);
80	383
81	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	385	+
	386	+ if (copy.versions == null)
	387	+ {
	388	+ copy.versions = new byte[100][];
	389	+ copy.versionindex = -1;
	390	+
	391	+ Save(true);
	392	+ }
82	393	}
83	394
84	395	void CloneSelection(boolean supports)
85	396	{
	397	+ if (Globals.REPLACEONMAKE)
	398	+ Save();
	399	+ boolean keep = Globals.REPLACEONMAKE;
	400	+ Globals.REPLACEONMAKE = false;
86	401	// Object3D keep = GrafreeD.clipboard;
87	402	//Object3D obj;
88	403	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +408,19 @@
93	408
94	409	makeSomething(clone, i==group.selection.size()-1);
95	410	}
	411	+ Globals.REPLACEONMAKE = keep;
96	412	}
97	413
98	414	void CloneClipboard(boolean supports)
99	415	{
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));
	416	+ assert(Grafreed.clipboard.parent == null);
	417	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	418	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	419	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	420	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	421	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	422	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	423	+ Grafreed.clipboard.get(0).parent = keepparent;
108	424	}
109	425
110	426	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +434,7 @@
118	434	// obj.support = null;
119	435	if (!supports)
120	436	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	437	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	438	obj.parent = parent;
123	439	// obj.support = support;
124	440	// clone.support = support; // aout 2013
..	..	@@ -147,30 +463,29 @@
147	463
148	464	//JTextField nameField;
149	465
150		- void SetupMenu2(ObjEditor oe)
	466	+ void SetupMenu2(GroupEditor oe)
151	467	{
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);
	468	+ oe.jTree = new cTree();
	469	+
163	470	Menu menu;
164	471	oe.menuBar.add(menu = new Menu("Edit"));
165	472	//editItem = menu.add(new MenuItem("Edit"));
166	473	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	474	+
	475	+// undoItem = menu.add(new MenuItem("Undo"));
	476	+// undoItem.addActionListener(this);
	477	+// redoItem = menu.add(new MenuItem("Redo"));
	478	+// redoItem.addActionListener(this);
	479	+// menu.add("-");
	480	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	481	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	482	cloneItem = menu.add(new MenuItem("Clone"));
171	483	cloneItem.addActionListener(this);
	484	+ if (Globals.ADVANCED)
	485	+ {
172	486	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	487	cloneSupportItem.addActionListener(this);
	488	+ }
174	489	menu.add("-");
175	490	cutItem = menu.add(new MenuItem("Cut"));
176	491	cutItem.addActionListener(this);
..	..	@@ -178,27 +493,123 @@
178	493	copyItem.addActionListener(this);
179	494	pasteItem = menu.add(new MenuItem("Paste"));
180	495	pasteItem.addActionListener(this);
	496	+
	497	+ menu.add("-");
	498	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	499	+ pasteIntoItem.addActionListener(this);
181	500	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	501	pasteLinkItem.addActionListener(this);
183	502	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	503	pasteCloneItem.addActionListener(this);
185	504	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	505	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	506	+ menu.add("-");
	507	+ deleteItem = menu.add(new MenuItem("Delete"));
	508	+ deleteItem.addActionListener(this);
	509	+
	510	+ if (Globals.ADVANCED)
	511	+ {
	512	+ // Deletes the cameras...
189	513	clearAllItem = menu.add(new MenuItem("Clear All"));
190	514	clearAllItem.addActionListener(this);
	515	+ }
	516	+
	517	+ menuBar.add(cameraMenu = new Menu("View"));
	518	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	519	+ //zBufferItem.addActionListener(this);
	520	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	521	+ //normalLensItem.addActionListener(this);
	522	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	523	+ restoreCameraItem.addActionListener(this);
	524	+
	525	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	526	+// toggleFullScreenItem.addItemListener(this);
	527	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	528	+// cameraMenu.add("-");
	529	+//
	530	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	531	+// toggleTextureItem.addItemListener(this);
	532	+// toggleTextureItem.setState(CameraPane.textureon);
	533	+//
	534	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	535	+// toggleSwitchItem.addItemListener(this);
	536	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	537	+
	538	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	539	+ toggleHandleItem.addItemListener(this);
	540	+ toggleHandleItem.setState(CameraPane.HANDLES);
	541	+
	542	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	543	+ togglePaintItem.addItemListener(this);
	544	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	545	+
	546	+ if (Globals.ADVANCED)
	547	+ {
	548	+ cameraMenu.add("-");
	549	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	550	+ toggleLiveItem.addItemListener(this);
	551	+ toggleLiveItem.setState(Globals.isLIVE());
191	552
	553	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	554	+ stepItem.addActionListener(this);
	555	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	556	+ // toggleDLItem.addItemListener(this);
	557	+ // toggleDLItem.setState(false);
	558	+
	559	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	560	+ toggleRenderItem.addItemListener(this);
	561	+ toggleRenderItem.setState(!CameraPane.frozen);
	562	+
	563	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	564	+ toggleDebugItem.addItemListener(this);
	565	+ toggleDebugItem.setState(Globals.DEBUG);
	566	+
	567	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	568	+ toggleFrustumItem.addItemListener(this);
	569	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	570	+
	571	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	572	+ toggleFootContactItem.addItemListener(this);
	573	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	574	+
	575	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	576	+ toggleTimelineItem.addItemListener(this);
	577	+ }
	578	+
	579	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	580	+// toggleRootItem.addItemListener(this);
	581	+// toggleRootItem.setState(false);
	582	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	583	+// animationItem.addItemListener(this);
	584	+// animationItem.setState(CameraPane.ANIMATION);
	585	+ cameraMenu.add("-");
	586	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	587	+ editCameraItem.addActionListener(this);
	588	+
	589	+ if (Globals.ADVANCED)
	590	+ {
	591	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	592	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	593	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	594	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	595	+ oe.cameraMenu.add("-");
	596	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	597	+ openWindowItem.addActionListener(this);
	598	+ editLeafItem.addActionListener(this);
	599	+ lookAtItem.addActionListener(this);
	600	+ //lookFromItem.addActinoListener(this);
	601	+ //switchViewItem.addActionListener(this);
	602	+ }
	603	+
192	604	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);
	605	+ if (Globals.ADVANCED)
	606	+ {
197	607	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	608	revertMeshItem.addActionListener(this);
199	609	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	610	resetreferencesItem.addActionListener(this);
201	611	menu.add("-");
	612	+ }
202	613	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	614	overwriteGeoItem.addActionListener(this);
204	615	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +621,104 @@
210	621	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	622	overwriteUVItem.addActionListener(this);
212	623	menu.add("-");
	624	+ if (Globals.ADVANCED)
	625	+ {
213	626	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	627	generateMeshItem.addActionListener(this);
215	628	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	629	poseMeshItem.addActionListener(this);
217	630	menu.add("-");
	631	+ }
218	632	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	633	resetsupportItem.addActionListener(this);
220	634	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	635	linkverticesItem.addActionListener(this);
222	636	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	637	relinkverticesItem.addActionListener(this);
	638	+
	639	+ if (Globals.ADVANCED)
	640	+ {
224	641	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	642	setMasterItem.addActionListener(this);
	643	+ }
226	644
227	645	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	646	+// grabItem = menu.add(new MenuItem("Grab"));
	647	+// grabItem.addActionListener(this);
230	648	backItem = menu.add(new MenuItem("Back"));
231	649	backItem.addActionListener(this);
232	650	frontItem = menu.add(new MenuItem("Front"));
233	651	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	652	+// compositeItem = menu.add(new MenuItem("Composite"));
	653	+// compositeItem.addActionListener(this);
	654	+
	655	+ if (Globals.ADVANCED)
	656	+ {
	657	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	658	hideItem.addActionListener(this);
	659	+ }
238	660	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	661	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);
	662	+
	663	+// menu.add("-");
	664	+//
	665	+// switchItem = menu.add(new MenuItem("Switch node"));
	666	+// switchItem.addActionListener(this);
	667	+ if (Globals.ADVANCED)
	668	+ {
247	669	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	670	switchGeoItem.addActionListener(this);
249	671	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	672	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	673	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	674	morphItem.addActionListener(this);
	675	+
	676	+ menu.add("-");
	677	+ physicsItem = menu.add(new MenuItem("Physics"));
	678	+ physicsItem.addActionListener(this);
	679	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	680	+ frameselectorItem.addActionListener(this);
253	681	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	682	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	683	+ }
257	684
258	685	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	686	+// textureItem = menu.add(new MenuItem("Texture"));
	687	+// textureItem.addActionListener(this);
261	688	billboardItem = menu.add(new MenuItem("Billboard"));
262	689	billboardItem.addActionListener(this);
263	690	csgItem = menu.add(new MenuItem("CSG"));
264	691	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	692	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	693	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	694	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	695	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	696	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	697	shadowZItem.addActionListener(this);
	698	+ attributeItem = menu.add(new MenuItem("Attribute"));
	699	+ attributeItem.addActionListener(this);
	700	+
	701	+ if (Globals.ADVANCED)
	702	+ {
	703	+ menu.add("-");
271	704	linkerItem = menu.add(new MenuItem("Linker"));
272	705	linkerItem.addActionListener(this);
273	706	templateItem = menu.add(new MenuItem("Template"));
274	707	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	708	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	709	pointflowItem.addActionListener(this);
	710	+ }
279	711	menu.add("-");
280	712	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	713	resetTransformItem.addActionListener(this);
282	714	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	715	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	716	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	717	+ resetCentroidXZItem.addActionListener(this);
	718	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	719	+ transformGeometryItem.addActionListener(this);
	720	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	721	+ transformChildrenItem.addActionListener(this);
286	722
287	723	oe.menuBar.add(menu = new Menu("Geometry"));
288	724	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +729,11 @@
293	729	genNormalsCADItem.addActionListener(this);
294	730	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	731	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	732	+ if (Globals.ADVANCED)
	733	+ {
	734	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	735	genNormalsMINEItem.addActionListener(this);
	736	+ }
298	737	stripifyItem = menu.add(new MenuItem("Stripify"));
299	738	stripifyItem.addActionListener(this);
300	739	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +755,34 @@
316	755	reduce34MeshItem.addActionListener(this);
317	756	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	757	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	758	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	759	clipMeshItem.addActionListener(this);
	760	+
	761	+ if (Globals.ADVANCED)
	762	+ {
	763	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	764	+ smoothMeshItem.addActionListener(this);
	765	+ }
323	766
324	767	oe.menuBar.add(menu = new Menu("Attributes"));
325	768	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	769	clearMaterialsItem.addActionListener(this);
	770	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	771	+ resetAllItem.addActionListener(this);
	772	+ stepAllItem = menu.add(new MenuItem("Step All"));
	773	+ stepAllItem.addActionListener(this);
327	774	menu.add("-");
328	775	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	776	liveleavesItem.addActionListener(this);
330	777	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	778	unliveleavesItem.addActionListener(this);
	779	+ if (Globals.ADVANCED)
	780	+ {
332	781	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	782	supportleavesItem.addActionListener(this);
334	783	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	784	unsupportleavesItem.addActionListener(this);
	785	+ }
336	786	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	787	hideleavesItem.addActionListener(this);
338	788	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +791,14 @@
341	791	markleavesItem.addActionListener(this);
342	792	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	793	unmarkleavesItem.addActionListener(this);
	794	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	795	+ rewindleavesItem.addActionListener(this);
	796	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	797	+ unrewindleavesItem.addActionListener(this);
	798	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	799	+ randomleavesItem.addActionListener(this);
	800	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	801	+ unrandomleavesItem.addActionListener(this);
344	802	menu.add("-");
345	803	flipVItem = menu.add(new MenuItem("Flip V"));
346	804	flipVItem.addActionListener(this);
..	..	@@ -366,45 +824,56 @@
366	824	attachBumpItem.addActionListener(this);
367	825	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	826	pigmentBumpItem.addActionListener(this);
	827	+ //embedTexturesItem
369	828	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	829	detachPigmentItem.addActionListener(this);
371	830	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	831	detachBumpItem.addActionListener(this);
	832	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	833	+ embedTexturesItem.addActionListener(this);
	834	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	835	+ deEmbedTexturesItem.addActionListener(this);
373	836	menu.add("-");
374	837	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	838	sortbysizeItem.addActionListener(this);
376	839	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	840	sortbynameItem.addActionListener(this);
378	841	menu.add("-");
	842	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	843	+ shareGeometriesItem.addActionListener(this);
	844	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	845	+ mergeGeometriesItem.addActionListener(this);
	846	+ if (Globals.ADVANCED)
	847	+ {
	848	+ // Pretty much the same as duplicate and clone.
379	849	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	850	extractGeometriesItem.addActionListener(this);
381	851	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	852	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);
	853	+ }
387	854
388	855	oe.menuBar.add(menu = new Menu("Insert"));
389	856	buildCreateMenu(menu);
390	857
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	858	oe.menuBar.add(menu = new Menu("Tools"));
403	859	buildToolsMenu(menu);
404	860	}
405	861
	862	+
406	863	void SetupUI2(ObjEditor oe)
407	864	{
	865	+ // June 2019
	866	+ if (oe == null)
	867	+ {
	868	+ //super.SetupUI2(this);
	869	+ //return;
	870	+ }
	871	+
	872	+ if (copy != group)
	873	+ {
	874	+ //super.SetupUI2(this);
	875	+ }
	876	+
408	877	//new Exception().printStackTrace();
409	878
410	879	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,153 +902,239 @@
433	902	oe.radioPanel.add(dummyButton);
434	903	oe.buttonGroup.add(dummyButton);
435	904	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	905	+ cGridBag copyOptionsPanel = new cGridBag();
	906	+
	907	+ copyOptionsPanel.preferredHeight = 2;
439	908
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	909	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	910	+
	911	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	912	+ //minButton.setToolTipText("Minimize window");
	913	+ //minButton.addActionListener(this);
	914	+
	915	+ if (Globals.ADVANCED)
	916	+ {
	917	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	918	+ maxButton.setToolTipText("Maximize window");
	919	+ maxButton.addActionListener(this);
	920	+ }
	921	+
	922	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	923	+ fullButton.setToolTipText("Full-screen window");
	924	+ fullButton.addActionListener(this);
	925	+
	926	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	927	+ screenfitButton.setToolTipText("Screen fit");
	928	+ screenfitButton.addActionListener(this);
	929	+
	930	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	932	+ restoreCameraButton.addActionListener(this);
	933	+
	934	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveButton.setToolTipText("New version");
	936	+ saveButton.addActionListener(this);
	937	+
	938	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ undoButton.setToolTipText("Previous version");
	940	+ undoButton.addActionListener(this);
	941	+ undoButton.setEnabled(false);
	942	+
	943	+ cGridBag updown = new cGridBag().setVertical(true);
	944	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	945	+ restoreButton.setToolTipText("Restore current");
	946	+ restoreButton.addActionListener(this);
	947	+ restoreButton.setEnabled(false);
	948	+
	949	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	950	+ replaceButton.setToolTipText("Replace current");
	951	+ replaceButton.addActionListener(this);
	952	+ replaceButton.setEnabled(false);
	953	+
	954	+ copyOptionsPanel.add(updown);
	955	+
	956	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	957	+ redoButton.setToolTipText("Next version");
	958	+ redoButton.addActionListener(this);
	959	+ redoButton.setEnabled(false);
	960	+
	961	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	962	+ liveCB.setToolTipText("Enable animation");
441	963	liveCB.addItemListener(this);
442	964
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", CameraPane.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);
	965	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	966	+ oneStepButton.setToolTipText("Animate one step forward");
	967	+ oneStepButton.addActionListener(this);
	968	+
	969	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	970	+ fastCB.setToolTipText("Fast mode");
461	971	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);
	972	+
	973	+ //oe.toolboxPanel.Return();
	974	+
	975	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	976	+// trackCB.setToolTipText("Enable tracking");
	977	+// trackCB.addItemListener(this);
468	978
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	979	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	980	// 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	981
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);
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	985	+ snapobjectButton.addActionListener(this);
	986	+ snapobjectButton.setToolTipText("Snap Object");
	987	+
	988	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	989	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);
	990	+ fourButton.setToolTipText("Show control panel only");
	991	+ }
	992	+
	993	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	994	+
	995	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	996	+ twoButton.setToolTipText("Show 3D view only");
	997	+ twoButton.addActionListener(this);
	998	+ this.fullscreenLayout = twoButton;
	999	+
	1000	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1001	+ threeButton.setToolTipText("Show controls and 3D view");
538	1002	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
540		- sevenButton.addActionListener(this);
	1003	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1004	+ sixButton.setToolTipText("Show 3D view and controls");
	1005	+ sixButton.addActionListener(this);
	1006	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+// sevenButton.setToolTipText("3-column layout");
	1008	+// sevenButton.addActionListener(this);
541	1009	//
542	1010
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	1011	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1012	+ rootButton.setToolTipText("Open selection in new tab");
544	1013	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	1014	+
	1015	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1016	+ closeButton.setToolTipText("Close tab");
547	1017	closeButton.addActionListener(this);
548	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	1019	//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	1020
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	1021	+ cGridBag row1 = new cGridBag();
	1022	+
	1023	+ // INSERT
	1024	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1025	+ gridButton.setToolTipText("Create grid");
	1026	+ gridButton.addActionListener(this);
	1027	+
	1028	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1029	+ boxButton.setToolTipText("Create box");
	1030	+ boxButton.addActionListener(this);
	1031	+
	1032	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1033	+ sphereButton.setToolTipText("Create sphere");
	1034	+ sphereButton.addActionListener(this);
	1035	+
	1036	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1037	+ coneButton.setToolTipText("Create cone");
	1038	+ coneButton.addActionListener(this);
	1039	+
	1040	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1041	+ torusButton.setToolTipText("Create torus");
	1042	+ torusButton.addActionListener(this);
	1043	+
	1044	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1045	+ superButton.setToolTipText("Create superellipsoid");
	1046	+ superButton.addActionListener(this);
	1047	+
	1048	+ if (Globals.ADVANCED)
	1049	+ {
	1050	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1051	+ kleinButton.setToolTipText("Create Klein bottle");
	1052	+ kleinButton.addActionListener(this);
	1053	+ }
	1054	+
	1055	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ particlesButton.setToolTipText("Create particle system");
	1057	+ particlesButton.addActionListener(this);
	1058	+
	1059	+ oe.toolboxPanel.add(row1);
	1060	+
	1061	+ cGridBag row2 = new cGridBag();
	1062	+
	1063	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1064	+ groupButton.setToolTipText("Create group");
	1065	+ groupButton.addActionListener(this);
	1066	+
	1067	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ compositeButton.setToolTipText("Create composite");
	1069	+ compositeButton.addActionListener(this);
	1070	+
	1071	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ switchButton.setToolTipText("Create item switcher");
	1073	+ switchButton.addActionListener(this);
	1074	+
	1075	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+ loopButton.setToolTipText("Create loop");
	1077	+ loopButton.addActionListener(this);
	1078	+
	1079	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1080	+ textureButton.setToolTipText("Create texture");
	1081	+ textureButton.addActionListener(this);
	1082	+
	1083	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ overlayButton.setToolTipText("Create overlay");
	1085	+ overlayButton.addActionListener(this);
	1086	+
	1087	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1088	+ lightButton.setToolTipText("Create light");
	1089	+ lightButton.addActionListener(this);
	1090	+
	1091	+ oe.toolboxPanel.add(row2);
	1092	+
	1093	+ // ENVYMAPS
	1094	+ cGridBag skyboxpane = new cGridBag();
	1095	+ skyboxpane.preferredHeight = 100;
	1096	+
	1097	+ oe.toolboxPanel.add(skyboxpane);
	1098	+
	1099	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1100	+ skyboxpane.add(skyboxpanel);
	1101	+
	1102	+ AddSkyboxTab0(skyboxpanel);
	1103	+ AddSkyboxTab1(skyboxpanel);
	1104	+ AddSkyboxTab2(skyboxpanel);
	1105	+ AddSkyboxTab3(skyboxpanel);
	1106	+
	1107	+ // EDIT panel
	1108	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ editButton.setToolTipText("Pin selection controls");
	1110	+ editButton.addActionListener(this);
	1111	+
	1112	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ uneditButton.setToolTipText("Remove selection controls");
560	1114	uneditButton.addActionListener(this);
561	1115
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);
	1116	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1117	+ allParamsButton.setToolTipText("Show all controle");
574	1118	allParamsButton.addActionListener(this);
575	1119
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);
	1120	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ clearPanelButton.setToolTipText("Clear edit panel");
	1122	+ clearPanelButton.addActionListener(this);
	1123	+
	1124	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ unselectButton.setToolTipText("Unselect");
581	1126	unselectButton.addActionListener(this);
582	1127
	1128	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ flashSelectionButton.setToolTipText("Highlight selection");
	1130	+ flashSelectionButton.addActionListener(this);
	1131	+
	1132	+ editCommandsPanel.preferredHeight = 1;
	1133	+
	1134	+ SetPinStates(false);
	1135	+// oe.treePanel.add(commandsPanel);
	1136	+// oe.treePanel.Return();
	1137	+
583	1138	// oe.aConstraints.gridx += 1;
584	1139	// oe.aConstraints.weighty = 0;
585	1140	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,47 +1146,32 @@
591	1146	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	1147	// gcButton.addActionListener(this);
593	1148
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;
	1149	+ cGridBag jSPPanel = new cGridBag();
	1150	+
	1151	+ JScrollPane jSP;
605	1152	//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);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	1154	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	1155
	1156	+ oe.treePanel.add(jSPPanel);
	1157	+ oe.treePanel.Return();
	1158	+
	1159	+ oe.treePanel.add(copyOptionsPanel);
	1160	+ oe.treePanel.Return();
	1161	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1162	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1163	+ sliderPane.preferredHeight = 1;
	1164	+
	1165	+// mainPanel.setDividerLocation(0.1); //1.0);
	1166	+ mainPanel.setResizeWeight(0.4);
	1167	+
628	1168	//jList.addListSelectionListener(this);
629	1169	oe.jTree.addTreeSelectionListener(this);
630	1170	//jTree.setRootVisible(false);
631	1171	//jTree.setEditable(true);
632	1172	oe.jTree.setDragEnabled(true);
633	1173	//jTree.setPreferredSize(new Dimension(10,10));
634		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
635	1175
636	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
637	1177
..	..	@@ -643,23 +1183,160 @@
643	1183	dgr.addDragGestureListener(this);
644	1184	}catch(Exception e) {}
645	1185	*/
646		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
647	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	1188	}
	1189	+
	1190	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1191	+ {
	1192	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1193	+ colorCB.setToolTipText("Copy color when dropped");
	1194	+ colorCB.addItemListener(this);
	1195	+
	1196	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1197	+ materialCB.setToolTipText("Copy material when dropped");
	1198	+ materialCB.addItemListener(this);
	1199	+
	1200	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1201	+ textureCB.setToolTipText("Copy texture when dropped");
	1202	+ textureCB.addItemListener(this);
	1203	+
	1204	+ panel.Return();
	1205	+
	1206	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1207	+ boxCB.setToolTipText("Display bounding boxes");
	1208	+ boxCB.addItemListener(this);
	1209	+
	1210	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1211	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1212	+ zoomBoxCB.addItemListener(this);
	1213	+
	1214	+ if (true) // Globals.ADVANCED)
	1215	+ {
	1216	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1217	+// supportCB.setToolTipText("Enable rigging");
	1218	+// supportCB.addItemListener(this);
	1219	+
	1220	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1221	+ freezeCB.setToolTipText("Fast moving camera");
	1222	+ freezeCB.addItemListener(this);
	1223	+
	1224	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	1225	+ // localCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+
	1229	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	1230	+ crowdCB.setToolTipText("Used for crowds");
	1231	+ crowdCB.addItemListener(this);
	1232	+
	1233	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	1234	+ smoothCB.setToolTipText("Snapping delay");
	1235	+ smoothCB.addItemListener(this);
	1236	+
	1237	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1238	+ slowCB.setToolTipText("Smooth interpolation");
	1239	+ slowCB.addItemListener(this);
	1240	+
	1241	+// constraints.gridy += 1;
	1242	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	1243	+// speakerMocapCB.addItemListener(this);
	1244	+
	1245	+ panel.Return();
	1246	+
	1247	+ if (false)
	1248	+ {
	1249	+ // handled in scripts
	1250	+ //constraints.gridy += 1;
	1251	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	1252	+ speakerCameraCB.addItemListener(this);
	1253	+
	1254	+ //constraints.gridy += 1;
	1255	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	1256	+ speakerFocusCB.addItemListener(this);
	1257	+
	1258	+ //constraints.gridy += 1;
	1259	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1260	+ smoothfocusCB.addItemListener(this);
	1261	+ panel.Return();
	1262	+ }
	1263	+
	1264	+//constraints.gridx += 1;
	1265	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	1266	+// debugCB.addItemListener(this);
	1267	+
	1268	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1269	+ trackCB.setToolTipText("Enable tracking target");
	1270	+ trackCB.addItemListener(this);
	1271	+
	1272	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1273	+ oeilCB.setToolTipText("Move camera when tracking");
	1274	+ oeilCB.addItemListener(this);
	1275	+
	1276	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1277	+ shadowCB.setToolTipText("When live compute shadows");
	1278	+ shadowCB.addItemListener(this);
	1279	+
	1280	+ panel.Return();
	1281	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1282	+ toggleTextureCB.setToolTipText("Load textures");
	1283	+ toggleTextureCB.addItemListener(this);
	1284	+
	1285	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1286	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1287	+ toggleSwitchCB.addItemListener(this);
	1288	+
	1289	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1290	+ autokeepCB.setToolTipText("On structure change");
	1291	+ autokeepCB.addItemListener(this);
	1292	+
	1293	+ panel.Return();
	1294	+ if (Globals.ADVANCED)
	1295	+ {
	1296	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	1297	+ lookAtCB.setToolTipText("Look-at target");
	1298	+ lookAtCB.addItemListener(this);
	1299	+ }
	1300	+
	1301	+ }
	1302	+
	1303	+ cGridBag fill = new cGridBag();
	1304	+ fill.preferredHeight = 200;
	1305	+ cGridBag fill2 = new cGridBag();
	1306	+ fill2.preferredHeight = 200;
	1307	+ cGridBag fill3 = new cGridBag();
	1308	+ fill3.preferredHeight = 200;
	1309	+
	1310	+ panel.add(fill);
	1311	+ panel.add(fill2);
	1312	+ panel.add(fill3);
	1313	+
	1314	+ }
649	1315
650	1316	void EditObject(Object3D obj)
651	1317	{
652	1318	cRadio radioButton = new cRadio(obj.name);
	1319	+
	1320	+ // June 2019. Patch to avoid bug with transparency.
	1321	+ radioButton.hadMaterial = obj.material != null;
	1322	+ if (!radioButton.hadMaterial)
	1323	+ {
	1324	+ obj.material = new cMaterial();
	1325	+ }
	1326	+
653	1327	radioButton.SetObject(obj);
654		- radioButton.layout = sevenButton;
	1328	+ radioButton.layout = sixButton; // sevenButton;
655	1329	radioButton.SetCamera(cameraView.renderCamera, false);
656	1330	radioButton.addActionListener(this);
657	1331	radioPanel.add(radioButton);
658	1332	buttonGroup.add(radioButton);
659	1333	radioButton.doClick();
660	1334	}
	1335	+
661	1336	void SetupViews(ObjEditor oe)
662	1337	{
	1338	+ theFrame = this;
	1339	+
663	1340	oe.SetupViews();
664	1341
665	1342	System.out.println("SetupViews");
..	..	@@ -668,22 +1345,28 @@
668	1345	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1346	}
670	1347
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;
	1348	+ cToggleButton liveCB;
	1349	+ cCheckBox supportCB;
	1350	+ cCheckBox localCB;
	1351	+ cCheckBox crowdCB;
	1352	+ cCheckBox smoothCB;
	1353	+ cToggleButton fastCB;
	1354	+ cCheckBox slowCB;
	1355	+ cCheckBox boxCB;
	1356	+ cCheckBox zoomBoxCB;
	1357	+ cCheckBox freezeCB;
	1358	+ //cToggleButton trackCB;
	1359	+ cCheckBox trackCB;
	1360	+ cCheckBox smoothfocusCB;
681	1361	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1362	+ cCheckBox speakerCameraCB;
	1363	+ cCheckBox speakerFocusCB;
	1364	+ cCheckBox debugCB;
	1365	+
	1366	+ cCheckBox oeilCB;
	1367	+ cCheckBox shadowCB;
	1368	+ cCheckBox autokeepCB;
	1369	+ cCheckBox lookAtCB;
687	1370
688	1371	// static int COLOR = 1;
689	1372	// static int MATERIAL = 2;
..	..	@@ -691,9 +1374,9 @@
691	1374
692	1375	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1376
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1377	+ cCheckBox colorCB;
	1378	+ cCheckBox materialCB;
	1379	+ cCheckBox textureCB;
697	1380
698	1381	public void itemStateChanged(ItemEvent e)
699	1382	{
..	..	@@ -721,6 +1404,7 @@
721	1404	} else if(e.getSource() == liveCB)
722	1405	{
723	1406	cameraView.ToggleLive();
	1407	+ refreshContents(false);
724	1408	}
725	1409	else if(e.getSource() == supportCB)
726	1410	{
..	..	@@ -756,6 +1440,10 @@
756	1440	cameraView.repaint();
757	1441	// refreshContents();
758	1442	}
	1443	+ else if(e.getSource() == zoomBoxCB)
	1444	+ {
	1445	+ cameraView.ToggleZoomBoxMode();
	1446	+ }
759	1447	else if(e.getSource() == smoothfocusCB)
760	1448	{
761	1449	cameraView.ToggleSmoothFocus();
..	..	@@ -781,6 +1469,18 @@
781	1469	{
782	1470	cameraView.ToggleOeil();
783	1471	}
	1472	+ else if(e.getSource() == shadowCB)
	1473	+ {
	1474	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1475	+ }
	1476	+ else if(e.getSource() == freezeCB)
	1477	+ {
	1478	+ Globals.FREEZEONMOVE ^= true;
	1479	+ }
	1480	+ else if(e.getSource() == autokeepCB)
	1481	+ {
	1482	+ Globals.REPLACEONMAKE ^= true;
	1483	+ }
784	1484	else if(e.getSource() == lookAtCB)
785	1485	{
786	1486	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1497,8 @@
797	1497
798	1498	/**/
799	1499	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1500	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1501	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1502	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1503	// We can't move the root node or an empty selection
803	1504	return;
..	..	@@ -860,8 +1561,6 @@
860	1561	}
861	1562	}
862	1563
863		- String string = (String) object;
864		-
865	1564	System.out.println("Transfer = " + object + "; drop : " + target);
866	1565	// if( object instanceof java.io.File[])
867	1566	// {
..	..	@@ -869,7 +1568,11 @@
869	1568	// objEditor.DropFile((java.io.File[]) object, true);
870	1569	// return;
871	1570	// }
872		- if (string.charAt(0) == '/')
	1571	+
	1572	+ String string = object.toString();
	1573	+
	1574	+ // File path for Mac and Windows
	1575	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1576	{
874	1577	// file(s)
875	1578	String[] names = string.split("\n");
..	..	@@ -896,7 +1599,7 @@
896	1599
897	1600	flashIt = false;
898	1601	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1602	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1603	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1604
902	1605	if (group.selection.size() == 1)
..	..	@@ -912,23 +1615,33 @@
912	1615
913	1616	assert target == objEditor.jTree;
914	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
915	1619	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1621	} catch (Exception e) {
918	1622	System.out.println("destinationPath : " + destinationPath);
919	1623	return;
920	1624	}
921	1625
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1626	+ for (int i=group.selection.size(); --i>=0;)
923	1627	{
	1628	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1629	+
	1630	+ // Cannot move into itself
	1631	+ if (child == destinationLeaf)
	1632	+ return;
	1633	+ }
	1634	+
	1635	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1636	+// {
924	1637	loadClipboard(true);
925	1638	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1639	+ pasteInto(false, false);
	1640	+// } else {
	1641	+// loadClipboard(false);
	1642	+// objEditor.jTree.setSelectionPath(destinationPath);
	1643	+// pasteInto(false, false); // true); // ???
	1644	+// }
932	1645	}
933	1646	public void dropActionChanged(DropTargetDragEvent dtde)
934	1647	// Called if the user has modified the current drop gesture
..	..	@@ -1033,85 +1746,107 @@
1033	1746	{
1034	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1748	//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);
	1749	+// gridItem = menu.add(new MenuItem("Grid"));
	1750	+// gridItem.addActionListener(this);
	1751	+// rectoidItem = menu.add(new MenuItem("Box"));
	1752	+// rectoidItem.addActionListener(this);
	1753	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1754	+// ellipsoidItem.addActionListener(this);
	1755	+// coneItem = menu.add(new MenuItem("Cone"));
	1756	+// coneItem.addActionListener(this);
	1757	+// torusItem = menu.add(new MenuItem("Torus"));
	1758	+// torusItem.addActionListener(this);
	1759	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1760	+// superItem.addActionListener(this);
	1761	+
	1762	+ cameraItem = menu.add(new MenuItem("Camera"));
	1763	+ cameraItem.addActionListener(this);
	1764	+
	1765	+ if (!Globals.ADVANCED)
	1766	+ {
1048	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1768	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
	1773	+ if (Globals.ADVANCED)
	1774	+ {
1052	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1776	ragdollItem.addActionListener(this);
1054	1777	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1778	ragdoll2Item.addActionListener(this);
	1779	+ }
1056	1780	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1781	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1782	meshItem.addActionListener(this);
1059	1783	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1784	// meshGroupItem.addActionListener(this);
	1785	+ if (Globals.ADVANCED)
	1786	+ {
1061	1787	springItem = menu.add(new MenuItem("Spring"));
1062	1788	springItem.addActionListener(this);
1063	1789	flagItem = menu.add(new MenuItem("Flag"));
1064	1790	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	1791	blobItem = menu.add(new MenuItem("Blob"));
1070	1792	blobItem.addActionListener(this);
1071	1793	latheItem = menu.add(new MenuItem("Lathe"));
1072	1794	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1795	+ }
	1796	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1797	+ bezierItem.addActionListener(this);
	1798	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1799	+// overlayItem.addActionListener(this);
	1800	+// lightItem = menu.add(new MenuItem("Light"));
	1801	+// lightItem.addActionListener(this);
1075	1802	menu.add("-");
1076	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1804	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1080	1807	doubleItem = menu.add(new MenuItem("Fork"));
1081	1808	doubleItem.addActionListener(this);
	1809	+ if (Globals.ADVANCED)
	1810	+ {
1082	1811	tripleItem = menu.add(new MenuItem("Trident"));
1083	1812	tripleItem.addActionListener(this);
	1813	+ }
1084	1814	}
1085	1815
1086	1816	void buildToolsMenu(Menu menu)
1087	1817	{
1088	1818	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1819	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1820	+ animationItem.setState(Globals.ANIMATION);
	1821	+
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
1091	1824
1092	1825	menu.add("-");
1093	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1827	parseverticesItem.addActionListener(this);
1095	1828	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1829	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1830	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1831	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1832	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1833	reduceMorphItem.addActionListener(this);
1103	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1835	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	1836	menu.add("-");
1109		-
1110	1837	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1838	memoryItem.addActionListener(this);
	1839	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1840	+ computeAOItem.addActionListener(this);
	1841	+
	1842	+ if (Globals.ADVANCED)
	1843	+ {
	1844	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1845	+ mirrorItem.addActionListener(this);
	1846	+ menu.add("-");
1112	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1848	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1849	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1850	dumpItem.addActionListener(this);
1116	1851	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1852	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1864,7 @@
1129	1864	menu.add("-");
1130	1865	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1866	editScriptItem.addActionListener(this);
	1867	+ }
1132	1868	}
1133	1869
1134	1870	void ScreenFit()
..	..	@@ -1251,9 +1987,34 @@
1251	1987	shadow.material = new cMaterial(obj.material);
1252	1988	shadow.material.diffuse = 0.0001f;
1253	1989	shadow.material.specular = 0.0001f;
	1990	+ //shadow.projectedVertices[1].x = 300;
1254	1991
1255	1992	makeSomething(shadow);
1256	1993	}
	1994	+
	1995	+ private void ClearUnpinned()
	1996	+ {
	1997	+ //for (Object3D obj : listUI)
	1998	+ for (int i=listUI.size(); --i>=0;)
	1999	+ {
	2000	+ Object3D obj = listUI.elementAt(i);
	2001	+ if (!obj.pinned)
	2002	+ {
	2003	+ obj.CloseUI();
	2004	+ listUI.remove(i);
	2005	+ }
	2006	+ }
	2007	+ }
	2008	+
	2009	+ private void EditElement(Object3D elem, boolean newWindow)
	2010	+ {
	2011	+ // if (!(elem instanceof Composite))
	2012	+ // newWindow = false;
	2013	+ listUI.add(elem);
	2014	+ elem.openEditWindow(this, newWindow); //, false);
	2015	+ System.out.println("edit : " + elem);
	2016	+ elem.editWindow.refreshContents(true); // ? new
	2017	+ }
1257	2018
1258	2019	/**
1259	2020	* applyExample
..	..	@@ -1457,9 +2218,9 @@
1457	2218
1458	2219	void Overwrite(int mask)
1459	2220	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2221	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	2222	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	2223	+ Object3D content = Grafreed.clipboard.get(0);
1463	2224
1464	2225	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	2226	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +2243,7 @@
1482	2243	//
1483	2244	public void actionPerformed(ActionEvent event) // , Object arg)
1484	2245	{
	2246	+ Object source = event.getSource();
1485	2247	/*
1486	2248	if (event.getSource() == nameField)
1487	2249	{
..	..	@@ -1493,11 +2255,11 @@
1493	2255	}
1494	2256	else
1495	2257	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2258	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	2259	{
1498	2260	ScreenFit();
1499	2261	} else
1500		- if (event.getSource() == switchItem)
	2262	+ if (source == switchViewItem)
1501	2263	{
1502	2264	cVector v1 = new cVector();
1503	2265	cVector v2 = new cVector();
..	..	@@ -1506,11 +2268,11 @@
1506	2268	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	2269	objEditor.cameraView.repaint();
1508	2270	} else
1509		- if (event.getSource() == rectoidItem)
	2271	+ if (source == rectoidItem \|\| source == boxButton)
1510	2272	{
1511	2273	makeSomething(new Box());
1512	2274	} else
1513		- if (event.getSource() == particleItem)
	2275	+ if (source == particleItem \|\| source == particlesButton)
1514	2276	{
1515	2277	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	2278	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +2293,9 @@
1531	2293	applyExample(particleGeom, "SMOKE");
1532	2294	makeSomething(particleGeom);
1533	2295	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2296	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	2297	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2298	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	2299
1538	2300	ragdoll.toParent = LA.newMatrix();
1539	2301	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +2313,7 @@
1551	2313	} else
1552	2314	/*
1553	2315	*/
1554		- if (event.getSource() == heightFieldItem)
	2316	+ if (source == heightFieldItem)
1555	2317	{
1556	2318	Object3D obj = new Object3D();
1557	2319
..	..	@@ -1589,31 +2351,31 @@
1589	2351
1590	2352	makeSomething(obj);
1591	2353	} else
1592		- if (event.getSource() == gridItem)
	2354	+ if (source == gridItem \|\| source == gridButton)
1593	2355	{
1594	2356	makeSomething(new Grid());
1595	2357	} else
1596		- if (event.getSource() == ellipsoidItem)
	2358	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2359	{
1598	2360	makeSomething(new Sphere());
1599	2361	} else
1600		- if (event.getSource() == coneItem)
	2362	+ if (source == coneItem \|\| source == coneButton)
1601	2363	{
1602	2364	makeSomething(new Cone());
1603	2365	} else
1604		- if (event.getSource() == torusItem)
	2366	+ if (source == torusItem \|\| source == torusButton)
1605	2367	{
1606	2368	makeSomething(new Torus());
1607	2369	} else
1608		- if (event.getSource() == superItem)
	2370	+ if (source == superItem \|\| source == superButton)
1609	2371	{
1610	2372	makeSomething(new Superellipsoid());
1611	2373	} else
1612		- if (event.getSource() == kleinItem)
	2374	+ if (source == kleinItem \|\| source == kleinButton)
1613	2375	{
1614	2376	makeSomething(new Klein());
1615	2377	} else
1616		- if (event.getSource() == blobItem)
	2378	+ if (source == blobItem)
1617	2379	{
1618	2380	Blob blob = new Blob();
1619	2381	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2383,15 @@
1621	2383	//blob.retile();
1622	2384	makeSomething(blob);
1623	2385	} else
1624		- if (event.getSource() == latheItem)
	2386	+ if (source == latheItem)
1625	2387	{
1626	2388	makeSomething(new Lathe());
1627	2389	} else
1628		- if (event.getSource() == bezierItem)
	2390	+ if (source == bezierItem)
1629	2391	{
1630	2392	makeSomething(new BezierSurface());
1631	2393	} else
1632		- if (event.getSource() == checkerItem)
	2394	+ if (source == overlayItem \|\| source == overlayButton)
1633	2395	{
1634	2396	/*
1635	2397	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2406,7 @@
1644	2406	*/
1645	2407	makeSomething(new Checker());
1646	2408	} else
1647		- if (event.getSource() == meshItem)
	2409	+ if (source == meshItem)
1648	2410	{
1649	2411	Object3D itemtomake = new Object3D();
1650	2412	Object3D child;
..	..	@@ -1665,35 +2427,52 @@
1665	2427	makeSomething(child);
1666	2428	}
1667	2429	} else
1668		- if (event.getSource() == springItem)
	2430	+ if (source == springItem)
1669	2431	{
1670	2432	cSpring s = new cSpring();
1671	2433	s.setup();
1672	2434	makeSomething(s);
1673	2435	} else
1674		- if (event.getSource() == flagItem)
	2436	+ if (source == flagItem)
1675	2437	{
1676	2438	cSpring s = new cFlag();
1677	2439	s.setup();
1678	2440	makeSomething(s);
1679	2441	} else
1680		- if (event.getSource() == lightItem)
	2442	+ if (source == lightItem \|\| source == lightButton)
1681	2443	{
1682	2444	makeSomething(new Light());
1683	2445	} else
1684		- if (event.getSource() == csgItem)
	2446	+// if (source == skybox1Button \|\|
	2447	+// source == skybox2Button \|\|
	2448	+// source == skybox3Button \|\|
	2449	+// source == skybox4Button \|\|
	2450	+// source == skybox5Button \|\|
	2451	+// source == skybox6Button \|\|
	2452	+// source == skybox7Button \|\|
	2453	+// source == skybox11Button \|\|
	2454	+// source == skybox12Button \|\|
	2455	+// source == skybox13Button \|\|
	2456	+// source == skybox14Button \|\|
	2457	+// source == skybox15Button \|\|
	2458	+// source == skybox16Button \|\|
	2459	+// source == skybox17Button)
	2460	+// {
	2461	+// ChangeSkybox(source);
	2462	+// } else
	2463	+ if (source == csgItem)
1685	2464	{
1686	2465	group(new CSG());
1687	2466	} else
1688		- if (event.getSource() == templateItem)
	2467	+ if (source == templateItem)
1689	2468	{
1690	2469	group(new cTemplate());
1691	2470	} else
1692		- if (event.getSource() == attributeItem)
	2471	+ if (source == attributeItem)
1693	2472	{
1694	2473	makeSomething(new Attribute());
1695	2474	} else
1696		- if (event.getSource() == pointflowItem)
	2475	+ if (source == pointflowItem)
1697	2476	{
1698	2477	makeSomething(new PointFlow());
1699	2478	} else
..	..	@@ -1705,7 +2484,7 @@
1705	2484	} else
1706	2485	*/
1707	2486
1708		- if (event.getSource() == superLoopItem)
	2487	+ if (source == superLoopItem)
1709	2488	{
1710	2489	Composite g = new cGroup();
1711	2490	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2506,30 @@
1727	2506
1728	2507	group(g);
1729	2508	} else
1730		- if (event.getSource() == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
1731	2510	{
1732	2511	Composite csg = new GroupLeaf();
1733	2512	csg.count = 5;
1734	2513	group(csg);
1735		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
1736	2515	csg.addChild(child);
1737	2516	child.addChild(csg);
1738	2517	} else
1739		- if (event.getSource() == doubleItem)
	2518	+ if (source == doubleItem)
1740	2519	{
1741		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
1742	2521	csg.count = 5;
1743	2522	group(csg);
1744		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
1745	2524	csg.addChild(child);
1746	2525	child.addChild(csg);
1747		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
1748	2527	csg.addChild(child);
1749	2528	child.addChild(csg);
1750	2529	} else
1751		- if (event.getSource() == tripleItem)
	2530	+ if (source == tripleItem)
1752	2531	{
1753		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
1754	2533	csg.count = 4;
1755	2534	group(csg);
1756	2535	Composite child = new cGroup();
..	..	@@ -1763,73 +2542,98 @@
1763	2542	csg.addChild(child);
1764	2543	child.addChild(csg);
1765	2544	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
	2545	+ if (source == computeAOItem)
1768	2546	{
1769		- ImportGFD();
	2547	+ Globals.drawMode = CameraPane.OCCLUSION;
	2548	+ cameraView.repaint();
1770	2549	} 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)
1784		- {
1785		- CameraPane.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
1787		- } else
1788		- if (event.getSource() == recompileItem)
	2550	+ if (source == recompileItem)
1789	2551	{
1790	2552	Recompile();
1791	2553	refreshContents();
1792	2554	} else
1793		- if (event.getSource() == editScriptItem)
	2555	+ if (source == editScriptItem)
1794	2556	{
1795	2557	OpenDialog();
1796	2558	refreshContents();
1797	2559	} else
1798		- if (event.getSource() == invariantsItem)
	2560	+ if (source == invariantsItem)
1799	2561	{
1800	2562	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2563	+ Grafreed.grafreeD.universe.invariants();
1802	2564	} else
1803		- if (event.getSource() == memoryItem)
	2565	+ if (source == memoryItem)
1804	2566	{
1805	2567	//System.out.println("Invariants:");
1806	2568	PrintMemory();
1807	2569	} else
1808		- if (event.getSource() == pathItem)
	2570	+ if (source == pathItem)
1809	2571	{
1810	2572	PrintPath();
1811	2573	} else
1812		- if (event.getSource() == analyzeItem)
	2574	+ if (source == analyzeItem)
1813	2575	{
1814	2576	AnalyzeObject();
1815	2577	} else
1816		- if (event.getSource() == dumpItem)
	2578	+ if (source == dumpItem)
1817	2579	{
1818	2580	DumpObject();
1819	2581	} else
1820		- if (event.getSource() == screenfitButton)
	2582	+ if (source == minButton)
1821	2583	{
1822		- //Reload(lastConverter, lastFilename, true);
	2584	+ Minimize();
	2585	+ } else
	2586	+ if (source == maxButton)
	2587	+ {
	2588	+ Maximize();
	2589	+ } else
	2590	+ if (source == fullButton)
	2591	+ {
	2592	+ ToggleFullScreen();
	2593	+ } else
	2594	+ if (source == undoButton)
	2595	+ {
	2596	+ // Go to previous version
	2597	+ //if (!Undo())
	2598	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2599	+ Undo();
	2600	+ } else
	2601	+ if (source == restoreButton)
	2602	+ {
	2603	+ // Restore current version
	2604	+ Restore();
	2605	+ } else
	2606	+ if (source == replaceButton)
	2607	+ {
	2608	+ // Overwrite current version
	2609	+ Replace();
	2610	+ } else
	2611	+ if (source == redoButton)
	2612	+ {
	2613	+ // Go to next version
	2614	+ Redo();
	2615	+ } else
	2616	+ if (source == saveButton)
	2617	+ {
	2618	+ // Save a new version
	2619	+ if (!Save(true))
	2620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2621	+ } else
	2622	+ if (source == oneStepButton)
	2623	+ {
	2624	+ Globals.ONESTEP = true;
	2625	+ cameraView.repaint();
	2626	+ } else
	2627	+ if (source == screenfitButton)
	2628	+ {
1823	2629	ScreenFit();
1824	2630	} else
1825		- if (event.getSource() == screenfitpointButton)
	2631	+ if (source == screenfitpointButton)
1826	2632	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2633	ScreenFitPoint();
1829	2634	} else
1830		- if (event.getSource() == snapobjectButton)
	2635	+ if (source == snapobjectButton)
1831	2636	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2637	SnapObject();
1834	2638	} else
1835	2639	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2642,13 @@
1838	2642	// Recompile();
1839	2643	// refreshContents();
1840	2644	// } else
1841		- if (event.getSource() == gcButton)
	2645	+ if (source == gcButton)
1842	2646	{
1843	2647	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2648	System.gc();
1845	2649	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2650	} else
1847		- if (event.getSource() == editLeafItem)
	2651	+ if (source == editLeafItem)
1848	2652	{
1849	2653	Object3D obj;
1850	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2662,74 @@
1858	2662	}
1859	2663	refreshContents(true);
1860	2664	} else
1861		- if (event.getSource() == openWindowItem)
	2665	+ if (source == openWindowItem)
1862	2666	{
1863	2667	EditSelection(true);
1864	2668	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2669	+ if (source == cutItem \|\| source == clearButton)
1866	2670	{
1867	2671	loadClipboard(true);
1868	2672	} else
1869		- if (event.getSource() == duplicateItem)
	2673	+ if (source == undoItem)
1870	2674	{
1871		- Object3D keep = GrafreeD.clipboard;
	2675	+ Undo();
	2676	+ } else
	2677	+ if (source == redoItem)
	2678	+ {
	2679	+ Redo();
	2680	+ } else
	2681	+ if (source == duplicateItem)
	2682	+ {
	2683	+ Object3D keep = Grafreed.clipboard;
1872	2684	loadClipboard(false);
1873	2685	paste(false);
1874		- GrafreeD.clipboard = keep;
	2686	+ Grafreed.clipboard = keep;
1875	2687	} else
1876		- if (event.getSource() == cloneItem)
	2688	+ if (source == cloneItem)
1877	2689	{
1878	2690	CloneSelection(false);
1879	2691	} else
1880		- if (event.getSource() == cloneSupportItem)
	2692	+ if (source == cloneSupportItem)
1881	2693	{
1882	2694	CloneSelection(true);
1883	2695	} else
1884		- if (event.getSource() == copyItem)
	2696	+ if (source == copyItem)
1885	2697	{
1886	2698	loadClipboard(false);
1887	2699	} else
1888		- if (event.getSource() == pasteItem)
	2700	+ if (source == pasteItem)
1889	2701	{
1890	2702	paste(false);
1891	2703	} else
1892		- if (event.getSource() == pasteLinkItem)
	2704	+ if (source == pasteIntoItem)
1893	2705	{
1894		- pasteInto(false);
	2706	+ pasteInto(true, false);
1895	2707	} else
1896		- if (event.getSource() == pasteCloneItem)
	2708	+ if (source == pasteLinkItem)
1897	2709	{
1898		- pasteInto(true);
	2710	+ pasteInto(false, false);
1899	2711	} else
1900		- if (event.getSource() == pasteExpandItem)
	2712	+ if (source == pasteCloneItem)
	2713	+ {
	2714	+ pasteInto(true, true);
	2715	+ } else
	2716	+ if (source == pasteExpandItem)
1901	2717	{
1902	2718	paste(true);
1903	2719	} else
1904		- if (event.getSource() == synchronizeItem)
	2720	+ if (source == synchronizeItem)
1905	2721	{
1906	2722	Overwrite(Object3D.TRANSFORM);
1907	2723	} else
1908		- if (event.getSource() == overwriteNameItem)
	2724	+ if (source == overwriteNameItem)
1909	2725	{
1910	2726	Overwrite(Object3D.NAME);
1911	2727	} else
1912		- if (event.getSource() == overwriteUVItem)
	2728	+ if (source == overwriteUVItem)
1913	2729	{
1914	2730	Overwrite(Object3D.UV);
1915	2731	} else
1916		- if (event.getSource() == overwriteMatItem)
	2732	+ if (source == overwriteMatItem)
1917	2733	{
1918	2734	/* july 2015
1919	2735	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2749,7 @@
1933	2749
1934	2750	Overwrite(dropAttributes);
1935	2751	}
1936		- if (event.getSource() == overwriteGeoItem)
	2752	+ if (source == overwriteGeoItem)
1937	2753	{
1938	2754	Overwrite(Object3D.GEOMETRY);
1939	2755	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2766,7 @@
1950	2766	// refreshContents();
1951	2767	// }
1952	2768	} else
1953		- if (event.getSource() == generateMeshItem)
	2769	+ if (source == generateMeshItem)
1954	2770	{
1955	2771	//if (group.selection.size() == 1)
1956	2772	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2777,7 @@
1961	2777	ResetModel();
1962	2778	refreshContents();
1963	2779	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2780	+ if (source == extractGeometriesItem)
1965	2781	{
1966	2782	boolean one = false;
1967	2783
..	..	@@ -1988,7 +2804,7 @@
1988	2804	ResetModel();
1989	2805	refreshContents();
1990	2806	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2807	+ if (source == cloneGeometriesItem)
1992	2808	{
1993	2809	boolean one = false;
1994	2810
..	..	@@ -2014,7 +2830,7 @@
2014	2830	ResetModel();
2015	2831	refreshContents();
2016	2832	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2833	+ if (source == shareGeometriesItem)
2018	2834	{
2019	2835	boolean one = false;
2020	2836
..	..	@@ -2044,7 +2860,7 @@
2044	2860	refreshContents();
2045	2861	}
2046	2862	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2863	+ if (source == mergeGeometriesItem)
2048	2864	{
2049	2865	boolean one = false;
2050	2866
..	..	@@ -2074,7 +2890,7 @@
2074	2890	ResetModel();
2075	2891	refreshContents();
2076	2892	} else
2077		- if (event.getSource() == linkverticesItem)
	2893	+ if (source == linkverticesItem)
2078	2894	{
2079	2895	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2896	// {
..	..	@@ -2087,48 +2903,48 @@
2087	2903	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2904	// refreshContents();
2089	2905	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2906	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2907	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2908	+ Object3D content = Grafreed.clipboard.get(0);
2093	2909
2094	2910	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2911	content = ((cGroup)content).get(0);
2096	2912
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2913	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2914	for (int i=0; i<group.selection.size(); i++)
2099	2915	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2916	+ boolean random = CameraPane.SWITCH;
	2917	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2918	group.selection.get(i).linkVerticesThis(content);
2103	2919	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2920	+ CameraPane.SWITCH = random;
2105	2921	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2922	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2923	refreshContents();
2108	2924	}
2109	2925	} else
2110		- if (event.getSource() == resetsupportItem)
	2926	+ if (source == resetsupportItem)
2111	2927	{
2112	2928	for (int i=0; i<group.selection.size(); i++)
2113	2929	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2930	+ boolean random = CameraPane.SWITCH;
	2931	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2932	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2933	+ CameraPane.SWITCH = random;
2118	2934	}
2119	2935
2120	2936	refreshContents();
2121	2937	} else
2122		- if (event.getSource() == relinkverticesItem)
	2938	+ if (source == relinkverticesItem)
2123	2939	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2940	+ boolean random = CameraPane.SWITCH;
	2941	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2942	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2943	+ CameraPane.SWITCH = random;
2128	2944
2129	2945	refreshContents();
2130	2946	} else
2131		- if (event.getSource() == resetreferencesItem)
	2947	+ if (source == resetreferencesItem)
2132	2948	{
2133	2949	for (int i=0; i<group.selection.size(); i++)
2134	2950	{
..	..	@@ -2137,11 +2953,11 @@
2137	2953
2138	2954	refreshContents();
2139	2955	} else
2140		- if (event.getSource() == setMasterItem)
	2956	+ if (source == setMasterItem)
2141	2957	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2958	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2959	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2960	+ Object3D content = Grafreed.clipboard.get(0);
2145	2961
2146	2962	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2963	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2966,13 @@
2150	2966	refreshContents();
2151	2967	}
2152	2968	} else
2153		- if (event.getSource() == poseMeshItem)
	2969	+ if (source == poseMeshItem)
2154	2970	{
2155	2971	if (group.selection.size() == 1)
2156	2972	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2973	+ if (Grafreed.clipboard.size() == 1)
2158	2974	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2975	+ Object3D content = Grafreed.clipboard.get(0);
2160	2976
2161	2977	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2978	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2985,19 @@
2169	2985	}
2170	2986
2171	2987	} else
2172		- if (event.getSource() == revertMeshItem)
	2988	+ if (source == revertMeshItem)
2173	2989	{
2174	2990	RevertMeshes();
2175	2991	} else
2176		- if (event.getSource() == resetMeshItem)
	2992	+ if (source == resetAllItem)
2177	2993	{
2178	2994	ResetAll();
2179	2995	} else
2180		- if (event.getSource() == stepAllItem)
	2996	+ if (source == stepAllItem)
2181	2997	{
2182	2998	StepAll();
2183	2999	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2185	3001	{
2186	3002	//int indices[] = jList.getSelectedIndices();
2187	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +3005,46 @@
2189	3005
2190	3006	ClearSelection(false);
2191	3007	} else
2192		- if (event.getSource() == clearAllItem)
	3008	+ if (source == clearAllItem)
2193	3009	{
2194	3010	ClearSelection(true);
2195	3011	} else
2196		- if (event.getSource() == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2197	3013	{
2198		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2199	3015	} else
2200		- if (event.getSource() == hideItem)
	3016	+ if (source == hideItem)
2201	3017	{
2202	3018	group(new HiddenObject());
2203	3019	} else
2204		- if (event.getSource() == frontItem)
	3020	+ if (source == frontItem)
2205	3021	{
2206	3022	front();
2207	3023	} else
2208		- if (event.getSource() == backItem)
	3024	+ if (source == backItem)
2209	3025	{
2210	3026	back();
2211	3027	} else
2212		- if (event.getSource() == cameraItem)
	3028	+ if (source == cameraItem)
2213	3029	{
2214	3030	makeSomething(new Camera());
2215	3031	} else
2216		- if (event.getSource() == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2217	3033	{
2218	3034	group(new Composite());
2219	3035	} else
2220		- if (event.getSource() == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2221	3037	{
2222	3038	RandomNode random = new RandomNode();
2223	3039	group(random);
2224	3040	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	3041	+ random.name = random.get(0).name + "Switch";
2226	3042	} else
2227		- if (event.getSource() == physicsItem)
	3043	+ if (source == physicsItem)
2228	3044	{
2229	3045	group(new PhysicsNode());
2230	3046	} else
2231		- if (event.getSource() == frameselectorItem)
	3047	+ if (source == frameselectorItem)
2232	3048	{
2233	3049	for (int i=0; i<group.selection.size(); i++)
2234	3050	{
..	..	@@ -2240,7 +3056,7 @@
2240	3056	ResetModel();
2241	3057	refreshContents();
2242	3058	} else
2243		- if (event.getSource() == switchGeoItem)
	3059	+ if (source == switchGeoItem)
2244	3060	{
2245	3061	for (int i=0; i<group.selection.size(); i++)
2246	3062	{
..	..	@@ -2252,7 +3068,7 @@
2252	3068	ResetModel();
2253	3069	refreshContents();
2254	3070	} else
2255		- if (event.getSource() == switchTransfoItem)
	3071	+ if (source == switchTransfoItem)
2256	3072	{
2257	3073	for (int i=0; i<group.selection.size(); i++)
2258	3074	{
..	..	@@ -2264,7 +3080,7 @@
2264	3080	ResetModel();
2265	3081	refreshContents();
2266	3082	} else
2267		- if (event.getSource() == morphItem)
	3083	+ if (source == morphItem)
2268	3084	{
2269	3085	for (int i=0; i<group.selection.size(); i++)
2270	3086	{
..	..	@@ -2276,7 +3092,7 @@
2276	3092	ResetModel();
2277	3093	refreshContents();
2278	3094	} else
2279		- if (event.getSource() == scriptNodeItem)
	3095	+ if (source == scriptNodeItem)
2280	3096	{
2281	3097	boolean atleastone = false;
2282	3098
..	..	@@ -2315,215 +3131,252 @@
2315	3131	}
2316	3132	}
2317	3133	} else
2318		- if (event.getSource() == linkerItem)
	3134	+ if (source == linkerItem)
2319	3135	{
2320	3136	group(new cLinker());
2321	3137	} else
2322		- if (event.getSource() == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2323	3139	{
2324	3140	group(new TextureNode());
2325	3141	} else
2326		- if (event.getSource() == billboardItem)
	3142	+ if (source == billboardItem)
2327	3143	{
2328	3144	group(new BillboardNode());
2329	3145	} else
2330		- if (event.getSource() == shadowXItem)
	3146	+ if (source == shadowXItem)
2331	3147	{
2332	3148	CastShadow(0);
2333	3149	} else
2334		- if (event.getSource() == shadowYItem)
	3150	+ if (source == shadowYItem)
2335	3151	{
2336	3152	CastShadow(1);
2337	3153	} else
2338		- if (event.getSource() == shadowZItem)
	3154	+ if (source == shadowZItem)
2339	3155	{
2340	3156	CastShadow(2);
2341	3157	} else
2342		- if (event.getSource() == ungroupItem)
	3158	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	3159	{
2344		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2345	3162	for (int i=0; i<group.selection.size(); i++)
2346	3163	{
2347		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2348	3169	}
2349	3170
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	3171	+ if (!hasRoot)
	3172	+ {
	3173	+ for (int i=0; i<group.selection.size(); i++)
	3174	+ {
	3175	+ Ungroup(group.selection.get(i));
	3176	+ }
	3177	+
	3178	+ ClearSelection(false);
	3179	+
	3180	+ refreshContents();
	3181	+ }
2353	3182	} else
2354		- if (event.getSource() == genUVItem)
	3183	+ if (source == genUVItem)
2355	3184	{
2356	3185	GenUV();
2357	3186	} else
2358		- if (event.getSource() == genNormalsCADItem)
	3187	+ if (source == genNormalsCADItem)
2359	3188	{
2360	3189	GenNormals(true);
2361	3190	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	3191	+ if (source == genNormalsMESHItem)
2363	3192	{
2364		- GenNormals(true); // TODO
	3193	+ GenNormalsMESH();
2365	3194	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	3195	+ if (source == genNormalsORGANItem)
2367	3196	{
2368	3197	GenNormals(false);
2369	3198	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	3199	+ if (source == genNormalsMINEItem)
2371	3200	{
2372	3201	GenNormalsMINE();
2373	3202	} else
2374		- if (event.getSource() == stripifyItem)
	3203	+ if (source == stripifyItem)
2375	3204	{
2376	3205	Stripify();
2377	3206	} else
2378		- if (event.getSource() == unstripifyItem)
	3207	+ if (source == unstripifyItem)
2379	3208	{
2380	3209	Unstripify();
2381	3210	} else
2382		- if (event.getSource() == trimItem)
	3211	+ if (source == trimItem)
2383	3212	{
2384	3213	Trim();
2385	3214	} else
2386		- if (event.getSource() == untrimItem)
	3215	+ if (source == untrimItem)
2387	3216	{
2388	3217	Untrim();
2389	3218	} else
2390		- if (event.getSource() == clearColorsItem)
	3219	+ if (source == clearColorsItem)
2391	3220	{
2392	3221	ClearColors();
2393	3222	} else
2394		- if (event.getSource() == clearMaterialsItem)
	3223	+ if (source == clearMaterialsItem)
2395	3224	{
2396	3225	ClearMaterials();
2397	3226	} else
2398		- if (event.getSource() == liveleavesItem)
	3227	+ if (source == liveleavesItem)
2399	3228	{
2400	3229	LiveLeaves(true);
2401	3230	} else
2402		- if (event.getSource() == unliveleavesItem)
	3231	+ if (source == unliveleavesItem)
2403	3232	{
2404	3233	LiveLeaves(false);
2405	3234	} else
2406		- if (event.getSource() == supportleavesItem)
	3235	+ if (source == supportleavesItem)
2407	3236	{
2408	3237	SupportLeaves(true);
2409	3238	} else
2410		- if (event.getSource() == unsupportleavesItem)
	3239	+ if (source == unsupportleavesItem)
2411	3240	{
2412	3241	SupportLeaves(false);
2413	3242	} else
2414		- if (event.getSource() == hideleavesItem)
	3243	+ if (source == hideleavesItem)
2415	3244	{
2416	3245	HideLeaves(true);
2417	3246	} else
2418		- if (event.getSource() == showleavesItem)
	3247	+ if (source == showleavesItem)
2419	3248	{
2420	3249	HideLeaves(false);
2421	3250	} else
2422		- if (event.getSource() == markleavesItem)
	3251	+ if (source == markleavesItem)
2423	3252	{
2424	3253	MarkLeaves(true);
2425	3254	} else
2426		- if (event.getSource() == unmarkleavesItem)
	3255	+ if (source == unmarkleavesItem)
2427	3256	{
2428	3257	MarkLeaves(false);
2429	3258	} else
2430		- if (event.getSource() == flipVItem)
	3259	+ if (source == rewindleavesItem)
	3260	+ {
	3261	+ RewindLeaves(true);
	3262	+ } else
	3263	+ if (source == unrewindleavesItem)
	3264	+ {
	3265	+ RewindLeaves(false);
	3266	+ } else
	3267	+ if (source == randomleavesItem)
	3268	+ {
	3269	+ RandomLeaves(true);
	3270	+ } else
	3271	+ if (source == unrandomleavesItem)
	3272	+ {
	3273	+ RandomLeaves(false);
	3274	+ } else
	3275	+ if (source == flipVItem)
2431	3276	{
2432	3277	FlipV(true);
2433	3278	} else
2434		- if (event.getSource() == unflipVItem)
	3279	+ if (source == unflipVItem)
2435	3280	{
2436	3281	FlipV(false);
2437	3282	} else
2438		- if (event.getSource() == lowTexturesItem)
	3283	+ if (source == lowTexturesItem)
2439	3284	{
2440	3285	SetTexRes(0);
2441	3286	} else
2442		- if (event.getSource() == normalTexturesItem)
	3287	+ if (source == normalTexturesItem)
2443	3288	{
2444	3289	SetTexRes(1);
2445	3290	} else
2446		- if (event.getSource() == highTexturesItem)
	3291	+ if (source == highTexturesItem)
2447	3292	{
2448	3293	SetTexRes(2);
2449	3294	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	3295	+ if (source == veryhighTexturesItem)
2451	3296	{
2452	3297	SetTexRes(3);
2453	3298	} else
2454		- if (event.getSource() == maxTexturesItem)
	3299	+ if (source == maxTexturesItem)
2455	3300	{
2456	3301	SetTexRes(4);
2457	3302	} else
2458		- if (event.getSource() == panoTexturesItem)
	3303	+ if (source == panoTexturesItem)
2459	3304	{
2460	3305	SetTexRes(5);
2461	3306	} else
2462		- if (event.getSource() == reverseNormalsItem)
	3307	+ if (source == reverseNormalsItem)
2463	3308	{
2464	3309	ReverseNormals();
2465	3310	} else
2466		- if (event.getSource() == parseverticesItem)
	3311	+ if (source == parseverticesItem)
2467	3312	{
2468	3313	ParseVertices();
2469	3314	} else
2470		- if (event.getSource() == textureFieldItem)
	3315	+ if (source == textureFieldItem)
2471	3316	{
2472	3317	TextureVertices();
2473	3318	} else
2474		- if (event.getSource() == alignItem)
	3319	+ if (source == alignItem)
2475	3320	{
2476	3321	Align();
2477	3322	} else
2478		- if (event.getSource() == mirrorItem)
	3323	+ if (source == mirrorItem)
2479	3324	{
2480	3325	MirrorPoses();
2481	3326	} else
2482		- if (event.getSource() == reduceMorphItem)
	3327	+ if (source == reduceMorphItem)
2483	3328	{
2484	3329	MeshReduction(false);
2485	3330	} else
2486		- if (event.getSource() == reduce34MorphItem)
	3331	+ if (source == reduce34MorphItem)
2487	3332	{
2488	3333	MeshReduction(true);
2489	3334	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	3335	+ if (source == reverseTrianglesItem)
2491	3336	{
2492	3337	ReverseTriangles();
2493	3338	} else
2494		- if (event.getSource() == reduceMeshItem)
	3339	+ if (source == reduceMeshItem)
2495	3340	{
2496	3341	ReduceMesh(false);
2497	3342	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3343	+ if (source == reduce34MeshItem)
2499	3344	{
2500	3345	ReduceMesh(true);
2501	3346	} else
2502		- if (event.getSource() == increaseMeshItem)
	3347	+ if (source == increaseMeshItem)
2503	3348	{
2504	3349	IncreaseMesh();
2505	3350	} else
2506		- if (event.getSource() == clipMeshItem)
	3351	+ if (source == clipMeshItem)
2507	3352	{
2508	3353	ClipMesh();
2509	3354	} else
2510		- if (event.getSource() == smoothMeshItem)
	3355	+ if (source == smoothMeshItem)
2511	3356	{
2512	3357	SmoothMesh();
2513	3358	} else
2514		- if (event.getSource() == transformgeometryItem)
	3359	+ if (source == transformGeometryItem)
2515	3360	{
2516	3361	TransformGeometry();
2517	3362	} else
2518		- if (event.getSource() == resetTransformItem)
	3363	+ if (source == transformChildrenItem)
	3364	+ {
	3365	+ TransformChildren();
	3366	+ } else
	3367	+ if (source == resetTransformItem)
2519	3368	{
2520	3369	ResetTransform();
2521	3370	} else
2522		- if (event.getSource() == resetCentroidItem)
	3371	+ if (source == resetCentroidItem)
2523	3372	{
2524		- ResetCentroid();
	3373	+ ResetCentroid(true);
2525	3374	} else
2526		- if (event.getSource() == resetParentItem)
	3375	+ if (source == resetCentroidXZItem)
	3376	+ {
	3377	+ ResetCentroid(false);
	3378	+ } else
	3379	+ if (source == resetParentItem)
2527	3380	{
2528	3381	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3382	{
..	..	@@ -2533,7 +3386,7 @@
2533	3386
2534	3387	refreshContents();
2535	3388	} else
2536		- if (event.getSource() == repairParentItem)
	3389	+ if (source == repairParentItem)
2537	3390	{
2538	3391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3392	{
..	..	@@ -2547,7 +3400,7 @@
2547	3400
2548	3401	refreshContents();
2549	3402	} else
2550		- if (event.getSource() == repairShadowItem)
	3403	+ if (source == repairShadowItem)
2551	3404	{
2552	3405	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3406	{
..	..	@@ -2561,7 +3414,7 @@
2561	3414
2562	3415	refreshContents();
2563	3416	} else
2564		- if (event.getSource() == sortbysizeItem)
	3417	+ if (source == sortbysizeItem)
2565	3418	{
2566	3419	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3420	{
..	..	@@ -2573,7 +3426,7 @@
2573	3426	ResetModel();
2574	3427	refreshContents();
2575	3428	} else
2576		- if (event.getSource() == sortbynameItem)
	3429	+ if (source == sortbynameItem)
2577	3430	{
2578	3431	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3432	{
..	..	@@ -2585,7 +3438,7 @@
2585	3438	ResetModel();
2586	3439	refreshContents();
2587	3440	} else
2588		- if (event.getSource() == attachPigmentItem)
	3441	+ if (source == attachPigmentItem)
2589	3442	{
2590	3443	String texture = GetFile("Attach pigment");
2591	3444	Object3D obj;
..	..	@@ -2597,7 +3450,7 @@
2597	3450
2598	3451	refreshContents();
2599	3452	} else
2600		- if (event.getSource() == detachPigmentItem)
	3453	+ if (source == detachPigmentItem)
2601	3454	{
2602	3455	Object3D obj;
2603	3456	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3461,7 @@
2608	3461
2609	3462	refreshContents();
2610	3463	} else
2611		- if (event.getSource() == attachBumpItem)
	3464	+ if (source == attachBumpItem)
2612	3465	{
2613	3466	String texture = GetFile("Attach bump");
2614	3467	Object3D obj;
..	..	@@ -2620,18 +3473,18 @@
2620	3473
2621	3474	refreshContents();
2622	3475	} else
2623		- if (event.getSource() == detachBumpItem)
	3476	+ if (source == detachBumpItem)
2624	3477	{
2625	3478	Object3D obj;
2626	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2627	3480	{
2628	3481	obj = (Object3D)e.nextElement();
2629		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2630	3483	}
2631	3484
2632	3485	refreshContents();
2633	3486	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3487	+ if (source == pigmentBumpItem)
2635	3488	{
2636	3489	Object3D obj;
2637	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +3495,262 @@
2642	3495
2643	3496	refreshContents();
2644	3497	} else
2645		- if (event.getSource() == flashSelectionButton)
	3498	+ if (source == embedTexturesItem)
	3499	+ {
	3500	+ Object3D obj;
	3501	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3502	+ {
	3503	+ obj = (Object3D)e.nextElement();
	3504	+ obj.EmbedTextures(true);
	3505	+ }
	3506	+
	3507	+ refreshContents();
	3508	+ } else
	3509	+ if (source == deEmbedTexturesItem)
	3510	+ {
	3511	+ Object3D obj;
	3512	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3513	+ {
	3514	+ obj = (Object3D)e.nextElement();
	3515	+ obj.EmbedTextures(false);
	3516	+ }
	3517	+
	3518	+ CameraPane.texturepigment.clear();
	3519	+ CameraPane.texturebump.clear();
	3520	+
	3521	+ refreshContents();
	3522	+ } else
	3523	+ if (source == flashSelectionButton)
2646	3524	{
2647	3525	CameraPane.flash = true;
2648	3526	refreshContents();
2649	3527	} else
2650		- if (event.getSource() == oneButton)
	3528	+ if (source == oneButton)
2651	3529	{
2652	3530	} else
2653		- if (event.getSource() == twoButton)
	3531	+ if (source == twoButton)
2654	3532	{
2655	3533	radio.layout = twoButton;
	3534	+
	3535	+ if (CameraPane.FULLSCREEN)
	3536	+ fullscreenLayout = radio.layout;
	3537	+
2656	3538	// bug
2657	3539	//gridPanel.setDividerLocation(1.0);
2658	3540	//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();
	3541	+// bigThree.remove(scenePanel);
	3542	+// bigThree.remove(centralPanel);
	3543	+// bigThree.remove(XYZPanel);
	3544	+// aWindowConstraints.gridx = 0;
	3545	+// aWindowConstraints.gridy = 0;
	3546	+// aWindowConstraints.gridwidth = 1;
	3547	+// // aConstraints.gridheight = 3;
	3548	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3549	+// aWindowConstraints.weightx = 0;
	3550	+// aWindowConstraints.weighty = 1;
	3551	+// //bigThree.add(jtp, aWindowConstraints);
	3552	+// aWindowConstraints.weightx = 1;
	3553	+// aWindowConstraints.gridwidth = 3;
	3554	+// // aConstraints.gridheight = 3;
	3555	+// aWindowConstraints.gridx = 1;
	3556	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3557	+// bigThree.add(centralPanel, aWindowConstraints);
	3558	+// aWindowConstraints.weightx = 0;
	3559	+// aWindowConstraints.gridx = 4;
	3560	+// aWindowConstraints.gridwidth = 1;
	3561	+// // aConstraints.gridheight = 3;
	3562	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3563	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3564	+// scenePanel.setVisible(false);
	3565	+// centralPanel.setVisible(true);
	3566	+// XYZPanel.setVisible(false);
	3567	+ bigThree.ClearUI();
	3568	+ bigThree.add(centralPanel);
	3569	+ bigThree.FlushUI();
	3570	+
	3571	+ cameraView.requestFocusInWindow();
	3572	+
	3573	+// refreshContents(true);
	3574	+//
	3575	+// try
	3576	+// {
	3577	+// java.awt.Robot bot = new java.awt.Robot();
	3578	+// int mask = InputEvent.BUTTON1_MASK;
	3579	+// bot.mouseMove(100, 100);
	3580	+// bot.mousePress(mask);
	3581	+// bot.mouseRelease(mask);
	3582	+// }
	3583	+// catch (Exception e)
	3584	+// {
	3585	+//
	3586	+// }
	3587	+
2683	3588	} else
2684		- if (event.getSource() == threeButton)
	3589	+ if (source == threeButton)
2685	3590	{
2686	3591	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();
	3592	+
	3593	+ if (CameraPane.FULLSCREEN)
	3594	+ fullscreenLayout = radio.layout;
	3595	+
	3596	+// bigThree.remove(scenePanel);
	3597	+// bigThree.remove(centralPanel);
	3598	+// bigThree.remove(XYZPanel);
	3599	+// aWindowConstraints.gridx = 0;
	3600	+// aWindowConstraints.gridy = 0;
	3601	+// aWindowConstraints.gridwidth = 1;
	3602	+// // aConstraints.gridheight = 3;
	3603	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3604	+// aWindowConstraints.weightx = 0;
	3605	+// aWindowConstraints.weighty = 1;
	3606	+// //bigThree.add(jtp, aWindowConstraints);
	3607	+// aWindowConstraints.weightx = 1;
	3608	+// aWindowConstraints.gridwidth = 3;
	3609	+// // aConstraints.gridheight = 3;
	3610	+// aWindowConstraints.gridx = 1;
	3611	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3612	+// bigThree.add(centralPanel, aWindowConstraints);
	3613	+// aWindowConstraints.weightx = 0;
	3614	+// aWindowConstraints.gridx = 4;
	3615	+// aWindowConstraints.gridwidth = 1;
	3616	+// // aConstraints.gridheight = 3;
	3617	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3618	+// bigThree.add(XYZPanel, aWindowConstraints);
	3619	+// bigThree.validate();
	3620	+// scenePanel.setVisible(false);
	3621	+// centralPanel.setVisible(true);
	3622	+// XYZPanel.setVisible(true);
	3623	+ bigThree.ClearUI();
	3624	+ bigThree.add(scenePanel);
	3625	+ bigThree.add(centralPanel);
	3626	+ bigThree.FlushUI();
	3627	+
	3628	+ cameraView.requestFocusInWindow();
2711	3629	} else
2712		- if (event.getSource() == fourButton)
	3630	+ if (source == fourButton)
2713	3631	{
2714	3632	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();
	3633	+
	3634	+ if (CameraPane.FULLSCREEN)
	3635	+ fullscreenLayout = radio.layout;
	3636	+
	3637	+// bigThree.remove(scenePanel);
	3638	+// bigThree.remove(centralPanel);
	3639	+// bigThree.remove(XYZPanel);
	3640	+// aWindowConstraints.gridx = 0;
	3641	+// aWindowConstraints.gridy = 0;
	3642	+// aWindowConstraints.gridwidth = 1;
	3643	+// // aWindowConstraints.gridheight = 3;
	3644	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3645	+// aWindowConstraints.weightx = 1;
	3646	+// aWindowConstraints.weighty = 1;
	3647	+// bigThree.add(scenePanel, aWindowConstraints);
	3648	+// aWindowConstraints.weightx = 1;
	3649	+// aWindowConstraints.gridwidth = 3;
	3650	+// // aConstraints.gridheight = 3;
	3651	+// aWindowConstraints.gridx = 1;
	3652	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3653	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3654	+// aWindowConstraints.weightx = 0;
	3655	+// aWindowConstraints.gridx = 4;
	3656	+// aWindowConstraints.gridwidth = 1;
	3657	+// // aWindowConstraints.gridheight = 3;
	3658	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3659	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3660	+// bigThree.validate();
	3661	+// scenePanel.setVisible(true);
	3662	+// centralPanel.setVisible(false);
	3663	+// XYZPanel.setVisible(false);
	3664	+ bigThree.ClearUI();
	3665	+ bigThree.add(scenePanel);
	3666	+ bigThree.FlushUI();
	3667	+
	3668	+ cameraView.requestFocusInWindow();
2739	3669	} else
2740		- if (event.getSource() == sixButton)
	3670	+ if (source == sixButton)
2741	3671	{
2742	3672	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();
	3673	+
	3674	+ if (CameraPane.FULLSCREEN)
	3675	+ fullscreenLayout = radio.layout;
	3676	+
	3677	+// bigThree.remove(scenePanel);
	3678	+// bigThree.remove(centralPanel);
	3679	+// bigThree.remove(XYZPanel);
	3680	+// aWindowConstraints.gridx = 0;
	3681	+// aWindowConstraints.gridy = 0;
	3682	+// aWindowConstraints.gridwidth = 1;
	3683	+// // aConstraints.gridheight = 3;
	3684	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3685	+// aWindowConstraints.weightx = 0;
	3686	+// aWindowConstraints.weighty = 1;
	3687	+// bigThree.add(scenePanel, aWindowConstraints);
	3688	+// aWindowConstraints.weightx = 1;
	3689	+// aWindowConstraints.gridwidth = 3;
	3690	+// // aWindowConstraints.gridheight = 3;
	3691	+// aWindowConstraints.gridx = 1;
	3692	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3693	+// bigThree.add(centralPanel, aWindowConstraints);
	3694	+// aWindowConstraints.weightx = 0;
	3695	+// aWindowConstraints.gridx = 4;
	3696	+// aWindowConstraints.gridwidth = 1;
	3697	+// // aWindowConstraints.gridheight = 3;
	3698	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3699	+// //bigThree.add(XYZPanel, aConstraints);
	3700	+// bigThree.validate();
	3701	+// scenePanel.setVisible(true);
	3702	+// centralPanel.setVisible(true);
	3703	+// XYZPanel.setVisible(false);
	3704	+ bigThree.ClearUI();
	3705	+ bigThree.add(centralPanel);
	3706	+ bigThree.add(scenePanel);
	3707	+ bigThree.FlushUI();
	3708	+
	3709	+ cameraView.requestFocusInWindow();
2767	3710	} else
2768		- if (event.getSource() == sevenButton)
	3711	+ if (source == sevenButton)
2769	3712	{
2770	3713	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();
	3714	+
	3715	+ if (CameraPane.FULLSCREEN)
	3716	+ fullscreenLayout = radio.layout;
	3717	+
	3718	+// bigThree.remove(scenePanel);
	3719	+// bigThree.remove(centralPanel);
	3720	+// bigThree.remove(XYZPanel);
	3721	+// aWindowConstraints.gridx = 0;
	3722	+// aWindowConstraints.gridy = 0;
	3723	+// aWindowConstraints.gridwidth = 1;
	3724	+// // aWindowConstraints.gridheight = 3;
	3725	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3726	+// aWindowConstraints.weightx = 0;
	3727	+// aWindowConstraints.weighty = 1;
	3728	+// bigThree.add(scenePanel, aWindowConstraints);
	3729	+// aWindowConstraints.weightx = 1;
	3730	+// aWindowConstraints.gridwidth = 3;
	3731	+// // aWindowConstraints.gridheight = 3;
	3732	+// aWindowConstraints.gridx = 1;
	3733	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3734	+// bigThree.add(centralPanel, aWindowConstraints);
	3735	+// aWindowConstraints.weightx = 0;
	3736	+// aWindowConstraints.gridx = 4;
	3737	+// aWindowConstraints.gridwidth = 1;
	3738	+// // aConstraints.gridheight = 3;
	3739	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3740	+// bigThree.add(XYZPanel, aWindowConstraints);
	3741	+// bigThree.validate();
	3742	+// scenePanel.setVisible(true);
	3743	+// centralPanel.setVisible(true);
	3744	+// XYZPanel.setVisible(true);
	3745	+ bigThree.ClearUI();
	3746	+ bigThree.add(scenePanel);
	3747	+ bigThree.add(centralPanel);
	3748	+ bigThree.add(XYZPanel);
	3749	+ bigThree.FlushUI();
	3750	+
	3751	+ cameraView.requestFocusInWindow();
2795	3752	} else
2796		- if (event.getSource() == rootButton)
	3753	+ if (source == rootButton)
2797	3754	{
2798	3755	Object3D obj;
2799	3756	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2803,66 +3760,84 @@
2803	3760	EditObject(obj);
2804	3761	}
2805	3762
	3763	+ cameraView.requestFocusInWindow();
2806	3764	refreshContents(true);
2807	3765	} else
2808		- if (event.getSource() == closeButton)
	3766	+ if (source == closeButton)
2809	3767	{
2810	3768	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3769	cRadio ab;
2812	3770	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3771	{
2814	3772	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3773	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3774	{
	3775	+ // Patch to avoid bug with transparency.
	3776	+ if (!ab.hadMaterial)
	3777	+ {
	3778	+ ab.object.material = null;
	3779	+ }
	3780	+
2817	3781	buttonGroup.remove(ab);
2818	3782	radioPanel.remove(ab);
2819	3783
2820		- ab.GetObject().editWindow = null;
	3784	+ //ab.GetObject().editWindow = null;
	3785	+ ab.GetObject().manipWindow = null;
2821	3786	// ab.GetObject().objectUI = null; // ?????????
2822	3787
2823	3788	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3789	break;
2825	3790	}
2826	3791	}
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2827	3794	refreshContents(true);
2828	3795	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3796	+ if (source == editItem \|\| source == editButton)
2830	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
2831	3804	EditSelection(false);
2832	3805	} else
2833		- if (event.getSource() == uneditButton)
	3806	+ if (source == uneditButton)
2834	3807	{
2835	3808	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3809	{
2837	3810	Object3D child = (Object3D)e.nextElement();
2838	3811	if(child.editWindow != null)
2839	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
2840	3814	child.CloseUI();
2841	3815	listUI.remove(child);
2842	3816
2843		- child.editWindow = null; // ???????????
	3817	+ //child.editWindow = null; // ???????????
2844	3818	}
2845		- objEditor.ctrlPanel.revalidate();
	3819	+ objEditor.ctrlPanel.FlushUI();
2846	3820	//objEditor.jTree.clearSelection();
2847	3821	//objEditor.ResetSliders();
2848	3822	refreshContents(true);
2849	3823	} else
2850		- if (event.getSource() == clearPanelButton)
	3824	+ if (source == clearPanelButton)
2851	3825	{
2852	3826	assert(copy == group);
2853	3827	//copy.ClearUI();
2854	3828	for (Object3D obj : listUI)
2855	3829	{
	3830	+ obj.pinned = false;
2856	3831	obj.CloseUI();
2857	3832	}
2858	3833	listUI.clear();
2859	3834	refreshContents(true);
2860	3835	} else
2861		- if (event.getSource() == allParamsButton)
	3836	+ if (source == allParamsButton)
2862	3837	{
2863	3838	assert(copy == group);
2864	3839
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	3841
2867	3842	for (Object3D obj : listUI)
2868	3843	{
..	..	@@ -2879,19 +3854,19 @@
2879	3854
2880	3855	refreshContents(true);
2881	3856	} else
2882		- if (event.getSource() == unselectButton)
	3857	+ if (source == unselectButton)
2883	3858	{
2884	3859	objEditor.jTree.clearSelection();
2885	3860	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3861	objEditor.ResetSliders();
2887	3862	refreshContents(true);
2888	3863	} else
2889		- if(event.getSource() instanceof cRadio)
	3864	+ if(source instanceof cRadio)
2890	3865	{
2891	3866	group.parent = keepparent;
2892	3867	group.attributes = 0;
2893	3868	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3869	+ /cRadio/ radio = (cRadio)source;
2895	3870	Object3D obj = radio.GetObject();
2896	3871	System.out.println("Edit " + obj);
2897	3872	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3886,10 @@
2911	3886	}
2912	3887
2913	3888	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
	3892	+ //Globals.theRenderer.object = group;
2915	3893	if(!useclient)
2916	3894	{
2917	3895	cameraView.renderCamera = radio.camera;
..	..	@@ -2920,25 +3898,52 @@
2920	3898	cameraView.cameras[cameraView.cameracount] = radio.camera;
2921	3899	cameraView.targetLookAt.set(radio.camera.lookAt);
2922	3900	cameraView.object = group;
2923		- cameraView.lighttouched = true;
	3901	+ //cameraView.lighttouched = true;
	3902	+ Globals.lighttouched = true;
2924	3903	topView.object = group;
2925	3904	frontView.object = group;
2926	3905	sideView.object = group;
2927	3906	}
2928		- group.editWindow = this;
	3907	+
	3908	+// fix "+" issue
	3909	+ //group.editWindow = this;
	3910	+ group.manipWindow = this;
	3911	+
2929	3912	/*
2930	3913	currentLayout = radio.layout;
2931	3914	if (currentLayout == null)
2932	3915	currentLayout = sevenButton;
2933	3916	*/
2934	3917	radio.layout.doClick();
	3918	+
	3919	+ ClearUnpinned();
	3920	+ //Grafreed.Assert(group != null);
	3921	+ //Grafreed.Assert(group.selection != null);
	3922	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3923	+ if (group.selection == null \|\| group.selection.size() == 1)
	3924	+ EditSelection(false);
2935	3925	keepparent = group.parent;
2936	3926	// PARENT = NULL or not???
2937	3927	//group.parent = null; // ROOT
2938	3928	//group.attributes = -1;
2939	3929	ResetModel();
	3930	+
	3931	+ cameraView.requestFocusInWindow();
2940	3932	refreshContents(true);
2941		- }
	3933	+ } else if (event.getSource() == editCameraItem)
	3934	+ {
	3935	+ cameraView.ProtectCamera();
	3936	+ cameraView.repaint();
	3937	+ return;
	3938	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3939	+ {
	3940	+ cameraView.RevertCamera();
	3941	+ cameraView.repaint();
	3942	+ return;
	3943	+ // } else if (event.getSource() == textureButton)
	3944	+ // {
	3945	+ // return; // true;
	3946	+ }
2942	3947	else
2943	3948	{
2944	3949	//return super.action(event, arg);
..	..	@@ -2947,7 +3952,6 @@
2947	3952	}
2948	3953
2949	3954	boolean useclient = false;
2950		- cRadio radio;
2951	3955
2952	3956	void ToggleRoot()
2953	3957	{
..	..	@@ -2956,7 +3960,7 @@
2956	3960	if (useclient)
2957	3961	{
2958	3962	cameraView.object = client;
2959		- cameraView.lighttouched = true;
	3963	+ Globals.lighttouched = true;
2960	3964	//topView.object = client;
2961	3965	//frontView.object = client;
2962	3966	//sideView.object = client;
..	..	@@ -2964,7 +3968,7 @@
2964	3968	else
2965	3969	{
2966	3970	cameraView.object = group;
2967		- cameraView.lighttouched = true;
	3971	+ Globals.lighttouched = true;
2968	3972	//topView.object = group;
2969	3973	//frontView.object = group;
2970	3974	//sideView.object = group;
..	..	@@ -2999,6 +4003,28 @@
2999	4003	refreshContents();
3000	4004	}
3001	4005
	4006	+ void TransformChildren()
	4007	+ {
	4008	+ Object3D obj;
	4009	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4010	+ {
	4011	+ obj = (Object3D)e.nextElement();
	4012	+ obj.KeepTextureMatrices();
	4013	+ obj.TransformChildren();
	4014	+ obj.RestoreTextureMatrices();
	4015	+
	4016	+// if (obj.parent == null)
	4017	+// {
	4018	+// System.out.println("NULL PARENT!");
	4019	+// new Exception().printStackTrace();
	4020	+// }
	4021	+// else
	4022	+// TouchTransform(obj);
	4023	+// //obj.parent.Touch();
	4024	+ }
	4025	+
	4026	+ refreshContents();
	4027	+ }
3002	4028
3003	4029	void ResetTransform()
3004	4030	{
..	..	@@ -3111,7 +4137,7 @@
3111	4137	refreshContents();
3112	4138	}
3113	4139
3114		- void ResetCentroid()
	4140	+ void ResetCentroid(boolean full)
3115	4141	{
3116	4142	Object3D obj;
3117	4143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3126,12 +4152,16 @@
3126	4152	LA.matIdentity(Object3D.mat);
3127	4153	obj.getBounds(minima, maxima, false);
3128	4154	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3129		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4155	+ if (full)
	4156	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3130	4157	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3131	4158	obj.TransformMesh(Object3D.mat);
	4159	+
3132	4160	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3133		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4161	+ if (full)
	4162	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3134	4163	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4164	+
3135	4165	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3136	4166	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3137	4167	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3160,7 +4190,8 @@
3160	4190
3161	4191	int size = obj.MemorySize();
3162	4192
3163		- System.err.println((size/1024) + " KB is the size of " + obj);
	4193	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4194	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3164	4195	}
3165	4196	}
3166	4197	catch (Exception e)
..	..	@@ -3197,9 +4228,9 @@
3197	4228	obj = (Object3D)e.nextElement();
3198	4229
3199	4230	System.out.println("Object is: " + obj);
3200		- GrafreeD.AnalyzeObject(obj);
	4231	+ Grafreed.AnalyzeObject(obj);
3201	4232	System.out.println("Boundary rep: " + obj.bRep);
3202		- GrafreeD.AnalyzeObject(obj.bRep);
	4233	+ Grafreed.AnalyzeObject(obj.bRep);
3203	4234
3204	4235	// System.err.println((size/1024) + " KB is the size of " + obj);
3205	4236	}
..	..	@@ -3241,6 +4272,13 @@
3241	4272	void GenNormals(boolean crease)
3242	4273	{
3243	4274	group.GenNormalsS(crease);
	4275	+
	4276	+ refreshContents();
	4277	+ }
	4278	+
	4279	+ void GenNormalsMESH()
	4280	+ {
	4281	+ group.GenNormalsMeshS();
3244	4282
3245	4283	refreshContents();
3246	4284	}
..	..	@@ -3413,8 +4451,8 @@
3413	4451
3414	4452	void ParseVertices()
3415	4453	{
3416		- boolean epsequal = GrafreeD.epsequal;
3417		- GrafreeD.epsequal = true;
	4454	+ boolean epsequal = Grafreed.epsequal;
	4455	+ Grafreed.epsequal = true;
3418	4456
3419	4457	for (int i=0; i<group.selection.size(); i++)
3420	4458	{
..	..	@@ -3439,7 +4477,7 @@
3439	4477	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3440	4478	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3441	4479
3442		- g.add(GrafreeD.clipboard);
	4480	+ g.add(Grafreed.clipboard);
3443	4481
3444	4482	buffer.add(g);
3445	4483	}
..	..	@@ -3454,7 +4492,7 @@
3454	4492	makeSomething(buffer, i==group.selection.size()-1);
3455	4493	}
3456	4494
3457		- GrafreeD.epsequal = epsequal;
	4495	+ Grafreed.epsequal = epsequal;
3458	4496
3459	4497	refreshContents();
3460	4498	}
..	..	@@ -3472,7 +4510,16 @@
3472	4510	String pigment = Object3D.GetPigment(tex);
3473	4511	//String bump = Object3D.GetBump(tex);
3474	4512
3475		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4513	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4514	+
	4515	+ try
	4516	+ {
	4517	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4518	+ }
	4519	+ catch (Exception e)
	4520	+ {
	4521	+ System.err.println("FAIL: " + node);
	4522	+ }
3476	4523
3477	4524	double s = v.s;
3478	4525
..	..	@@ -3560,11 +4607,11 @@
3560	4607
3561	4608	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3562	4609
3563		- boolean random = CameraPane.RANDOM;
3564		- CameraPane.RANDOM = false; // parse all random nodes
	4610	+ boolean random = CameraPane.SWITCH;
	4611	+ CameraPane.SWITCH = false; // parse all random nodes
3565	4612	lowres.linkVerticesThis(null);
3566	4613	lowres.linkVerticesThis(sn);
3567		- CameraPane.RANDOM = random;
	4614	+ CameraPane.SWITCH = random;
3568	4615
3569	4616	System.err.flush();
3570	4617
..	..	@@ -3604,7 +4651,7 @@
3604	4651	return;
3605	4652
3606	4653	Object3D poses = group.selection.get(0);
3607		- Object3D ref = GrafreeD.clipboard.get(0);
	4654	+ Object3D ref = Grafreed.clipboard.get(0);
3608	4655
3609	4656	Object3D newgroup = new Object3D("Po:" + poses.name);
3610	4657
..	..	@@ -3773,7 +4820,7 @@
3773	4820	group.selection.RelinkToSupport(); // july 2014
3774	4821	System.out.println("DONE.");
3775	4822	refreshContents();
3776		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4823	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777	4824	}
3778	4825
3779	4826	void ReduceMesh(boolean reduction34)
..	..	@@ -3798,9 +4845,9 @@
3798	4845
3799	4846	void ClipMesh()
3800	4847	{
3801		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4848	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3802	4849	{
3803		- Object3D content = GrafreeD.clipboard.get(0);
	4850	+ Object3D content = Grafreed.clipboard.get(0);
3804	4851
3805	4852	if (content instanceof cGroup && ((cGroup)content).transientlink )
3806	4853	content = ((cGroup)content).get(0);
..	..	@@ -3809,7 +4856,7 @@
3809	4856	// {
3810	4857	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3811	4858	// }
3812		- group.selection.ClipMesh(GrafreeD.clipboard);
	4859	+ group.selection.ClipMesh(Grafreed.clipboard);
3813	4860	}
3814	4861	// group.selection.ClipMesh(GrafreeD.clipboard);
3815	4862	System.out.println("DONE.");
..	..	@@ -3856,6 +4903,18 @@
3856	4903	void MarkLeaves(boolean hide)
3857	4904	{
3858	4905	group.selection.MarkLeaves(hide);
	4906	+ refreshContents();
	4907	+ }
	4908	+
	4909	+ void RewindLeaves(boolean hide)
	4910	+ {
	4911	+ group.selection.RewindLeaves(hide);
	4912	+ refreshContents();
	4913	+ }
	4914	+
	4915	+ void RandomLeaves(boolean hide)
	4916	+ {
	4917	+ group.selection.RandomLeaves(hide);
3859	4918	refreshContents();
3860	4919	}
3861	4920
..	..	@@ -3930,28 +4989,25 @@
3930	4989	// }
3931	4990	// }
3932	4991
3933		- static boolean allparams = true;
3934		-
3935		- static Vector<Object3D> listUI = new Vector<Object3D>();
3936		-
3937	4992	void EditSelection(boolean newWindow)
3938	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
3939	5000	// aConstraints.gridy = 0;
3940	5001	for (int i=0; i<group.selection.size(); i++)
3941	5002	{
3942	5003	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3943	5004	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3944		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5005	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3945	5006
3946	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
3947		- if(elem != group)
	5008	+ if(elem != group \|\| !newWindow)
3948	5009	{
3949		- // if (!(elem instanceof Composite))
3950		- // newWindow = false;
3951		- listUI.add(elem);
3952		- elem.openEditWindow(this, newWindow); //, false);
3953		- System.out.println("edit : " + elem);
3954		- elem.editWindow.refreshContents(true); // ? new
	5010	+ EditElement(elem, newWindow); // ? new
3955	5011	}
3956	5012	}
3957	5013	}
..	..	@@ -4026,7 +5082,8 @@
4026	5082	//new Exception().printStackTrace();
4027	5083
4028	5084	freezemodel = true;
4029		-
	5085	+ ClearUnpinned();
	5086	+
4030	5087	/**/
4031	5088	//switch (event.id)
4032	5089	{
..	..	@@ -4034,7 +5091,6 @@
4034	5091	//case 702: // Event.LIST_DESELECT
4035	5092	group.deselectAll();
4036	5093	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4037		- objEditor.ClearInfo(); // .GetMaterial());
4038	5094	if (tps != null)
4039	5095	{
4040	5096	for (int i=0; i < tps.length; i++)
..	..	@@ -4043,33 +5099,39 @@
4043	5099
4044	5100	//if (child.parent != null)
4045	5101	//child.parent.addSelectee(child);
	5102	+ objEditor.SetMaterial(child);
4046	5103	group.addSelectee(child);
4047		- objEditor.SetMaterial(child); // .GetMaterial());
4048		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4049		- System.err.println("info : " + child.GetPath());
4050	5104	}
4051	5105	}
4052		- else
4053		- {
4054		- objEditor.SetMaterial(group); // .GetMaterial());
4055		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4056		- System.err.println("info : " + group.GetPath());
4057		- }
	5106	+// else
	5107	+// {
	5108	+// objEditor.SetMaterial(group); // .GetMaterial());
	5109	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5110	+// System.err.println("info : " + group.GetPath());
	5111	+// }
4058	5112
4059		- objEditor.SetText(); // jan 2014
4060		-
4061		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5113	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4062	5114	CameraPane.flash = true;
4063	5115
4064		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5116	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4065	5117	// a camera
4066	5118	{
4067		- CameraPane.camerachangeframe = 0; // don't refuse it
4068		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	5119	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5120	+ {
	5121	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5122	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5123	+ }
	5124	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	5125	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4071	5126	}
4072	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4073	5135	refreshContents();
4074	5136	//return true;
4075	5137	}
..	..	@@ -4078,6 +5140,35 @@
4078	5140
4079	5141	freezemodel = false;
4080	5142	}
	5143	+
	5144	+ void SetPinStates(boolean enabled)
	5145	+ {
	5146	+ editButton.setEnabled(enabled);
	5147	+ uneditButton.setEnabled(enabled);
	5148	+ unselectButton.setEnabled(enabled);
	5149	+ flashSelectionButton.setEnabled(enabled);
	5150	+ }
	5151	+
	5152	+ void refreshContents(boolean cp)
	5153	+ {
	5154	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5155	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5156	+ {
	5157	+ objEditor.ClearInfo(); // .GetMaterial());
	5158	+
	5159	+ for (int i=0; i < group.selection.Size(); i++)
	5160	+ {
	5161	+ Object3D child = (Object3D) group.selection.get(i);
	5162	+
	5163	+ objEditor.AddInfo(child, this, true);
	5164	+ System.err.println("info : " + child.GetPath());
	5165	+ }
	5166	+
	5167	+ objEditor.SetText(); // jan 2014
	5168	+ }
	5169	+
	5170	+ super.refreshContents(cp);
	5171	+ }
4081	5172
4082	5173	void linkSomething(Object3D thing)
4083	5174	{
..	..	@@ -4149,16 +5240,19 @@
4149	5240	{
4150	5241	if (group.selection.isEmpty())
4151	5242	return;
4152		- GrafreeD.clipboardIsTempGroup = false;
	5243	+
	5244	+ Grafreed.clipboardIsTempGroup = false;
4153	5245	Composite tGroup = null;
4154	5246	if (group.selection.size() > 0) // 1)
4155	5247	{
4156	5248	tGroup = new cGroup();
4157		- GrafreeD.clipboardIsTempGroup = true;
	5249	+ Grafreed.clipboardIsTempGroup = true;
4158	5250	}
4159	5251
4160	5252	if (cut)
4161	5253	{
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4162	5256	//int indices[] = jList.getSelectedIndices();
4163	5257	//for (int i = indices.length - 1; i >= 0; i--)
4164	5258	//jList.remove(indices[i]);
..	..	@@ -4194,16 +5288,16 @@
4194	5288	//System.out.println("cut " + child);
4195	5289	//System.out.println("parent = " + child.parent);
4196	5290	// tmp.addChild(child);
4197		- if (GrafreeD.clipboardIsTempGroup)
	5291	+ if (Grafreed.clipboardIsTempGroup)
4198	5292	tGroup.add/Child/(tmp);
4199	5293	else
4200		- GrafreeD.clipboard = tmp;
	5294	+ Grafreed.clipboard = tmp;
4201	5295	}
4202	5296	else
4203		- if (GrafreeD.clipboardIsTempGroup)
	5297	+ if (Grafreed.clipboardIsTempGroup)
4204	5298	tGroup.add/Child/(child);
4205	5299	else
4206		- GrafreeD.clipboard = child;
	5300	+ Grafreed.clipboard = child;
4207	5301	}
4208	5302
4209	5303	//ResetModel();
..	..	@@ -4235,21 +5329,23 @@
4235	5329	//System.out.println("cut " + elem);
4236	5330	//System.out.println("parent = " + elem.parent);
4237	5331	// tmp.addChild(elem);
4238		- if (GrafreeD.clipboardIsTempGroup)
	5332	+ if (Grafreed.clipboardIsTempGroup)
4239	5333	tGroup.add/Child/(tmp);
4240	5334	else
4241		- GrafreeD.clipboard = tmp;
	5335	+ Grafreed.clipboard = tmp;
4242	5336	}
4243	5337	else
4244		- if (GrafreeD.clipboardIsTempGroup)
	5338	+ if (Grafreed.clipboardIsTempGroup)
4245	5339	tGroup.add/Child/(child);
4246	5340	else
4247		- GrafreeD.clipboard = child;
	5341	+ Grafreed.clipboard = child;
4248	5342	}
4249	5343
4250	5344	}
4251		- if (GrafreeD.clipboardIsTempGroup)
4252		- GrafreeD.clipboard = tGroup;
	5345	+
	5346	+ if (Grafreed.clipboardIsTempGroup)
	5347	+ Grafreed.clipboard = tGroup;
	5348	+
4253	5349	if (cut)
4254	5350	{
4255	5351	ResetModel();
..	..	@@ -4259,11 +5355,15 @@
4259	5355
4260	5356	void paste(boolean expand)
4261	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4262	5362	// if (GrafreeD.clipboard == null)
4263	5363	// return;
4264	5364	boolean first = true;
4265	5365
4266		- if (GrafreeD.clipboardIsTempGroup)
	5366	+ if (Grafreed.clipboardIsTempGroup)
4267	5367	{
4268	5368	Composite temp;
4269	5369
..	..	@@ -4274,7 +5374,7 @@
4274	5374	temp = (Composite)Applet3D.clipboard.deepCopy();
4275	5375	*/
4276	5376	Object3D elem;
4277		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5377	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4278	5378	{
4279	5379	Object3D child = (Object3D)e.nextElement();
4280	5380
..	..	@@ -4308,21 +5408,22 @@
4308	5408	//Object3D cb = Applet3D.clipboard;
4309	5409	//temp.addChild(cb);
4310	5410	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4311		- assert(GrafreeD.clipboard.parent == null);
4312		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4313		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4314		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4315		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5411	+ assert(Grafreed.clipboard.parent == null);
	5412	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5413	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5414	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5415	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4316	5416	else
4317		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4318		- GrafreeD.clipboard.get(0).parent = keepparent;
	5417	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5418	+ Grafreed.clipboard.get(0).parent = keepparent;
4319	5419	}
4320	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4321	5422	ResetModel();
4322	5423	refreshContents();
4323	5424	}
4324	5425
4325		- void pasteInto(boolean copyit)
	5426	+ void pasteInto(boolean copyit, boolean clone)
4326	5427	{
4327	5428	// if (GrafreeD.clipboard == null)
4328	5429	// return;
..	..	@@ -4351,15 +5452,22 @@
4351	5452	if (copyit)
4352	5453	{
4353	5454	// paste(false);
4354		- CloneClipboard(false); // sept 2014
	5455	+ if (clone)
	5456	+ {
	5457	+ CloneClipboard(false); // sept 2014
	5458	+ }
	5459	+ else
	5460	+ {
	5461	+ paste(false);
	5462	+ }
4355	5463	}
4356	5464	else
4357	5465	{
4358	5466	boolean first = true;
4359	5467
4360		- if (GrafreeD.clipboardIsTempGroup)
	5468	+ if (Grafreed.clipboardIsTempGroup)
4361	5469	{
4362		- Composite temp = (Composite)GrafreeD.clipboard;
	5470	+ Composite temp = (Composite)Grafreed.clipboard;
4363	5471	Object3D copy;
4364	5472	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4365	5473	{
..	..	@@ -4369,7 +5477,7 @@
4369	5477	}
4370	5478	} else
4371	5479	{
4372		- linkSomething(GrafreeD.clipboard); //.get(0));
	5480	+ linkSomething(Grafreed.clipboard); //.get(0));
4373	5481	}
4374	5482	}
4375	5483	}
..	..	@@ -4446,6 +5554,10 @@
4446	5554
4447	5555	void group(Object3D csg, boolean grab)
4448	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4449	5561	if (//false) // why??
4450	5562	!group.selection.isEmpty())
4451	5563	{
..	..	@@ -4559,10 +5671,15 @@
4559	5671	//node.add(csg);
4560	5672	//makeSomething(node);
4561	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
4562	5675	}
4563	5676
4564	5677	void Ungroup(Object3D g)
4565	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
4566	5683	if (g instanceof HiddenObject)
4567	5684	{
4568	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -4579,6 +5696,7 @@
4579	5696	objEditor.makeSomething(g.get(i), false);
4580	5697	}
4581	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
4582	5700	}
4583	5701
4584	5702	void ungroup()
..	..	@@ -4774,21 +5892,6 @@
4774	5892	}
4775	5893	*/
4776	5894
4777		- void ImportGFD()
4778		- {
4779		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4780		- browser.show();
4781		- String filename = browser.getFile();
4782		- if (filename != null && filename.length() > 0)
4783		- {
4784		- String fullname = browser.getDirectory() + filename;
4785		-
4786		- //Object3D readobj =
4787		- objEditor.ReadGFD(fullname, objEditor);
4788		- //makeSomething(readobj);
4789		- }
4790		- }
4791		-
4792	5895	/*
4793	5896	public void Callback(Object obj)
4794	5897	{
..	..	@@ -4812,26 +5915,9 @@
4812	5915	}
4813	5916	*/
4814	5917
4815		- void ImportVRMLX3D()
4816		- {
4817		- if (GrafreeD.standAlone)
4818		- {
4819		- /**/
4820		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4821		- browser.show();
4822		- String filename = browser.getFile();
4823		- if (filename != null && filename.length() > 0)
4824		- {
4825		- String fullname = browser.getDirectory() + filename;
4826		- LoadVRMLX3D(fullname);
4827		- }
4828		- /**/
4829		- }
4830		- }
4831		-
4832	5918	String GetFile(String dialogName)
4833	5919	{
4834		- if (GrafreeD.standAlone)
	5920	+ if (Grafreed.standAlone)
4835	5921	{
4836	5922	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4837	5923	browser.show();
..	..	@@ -4895,10 +5981,49 @@
4895	5981	cButton flashSelectionButton;
4896	5982	cButton editButton;
4897	5983	cButton uneditButton;
	5984	+ JCheckBox allParamsButton;
4898	5985	cButton clearpanelButton;
4899		- cButton allParamsButton;
4900	5986	cButton unselectButton;
4901	5987
	5988	+ cButton restoreCameraButton;
	5989	+
	5990	+ cButton saveButton;
	5991	+ cButton oneStepButton;
	5992	+
	5993	+ cButton groupButton;
	5994	+ cButton ungroupButton;
	5995	+ cButton compositeButton;
	5996	+ cButton switchButton;
	5997	+ cButton loopButton;
	5998	+ cButton textureButton;
	5999	+
	6000	+ cButton skybox1Button;
	6001	+ cButton skybox2Button;
	6002	+ cButton skybox3Button;
	6003	+ cButton skybox4Button;
	6004	+ cButton skybox5Button;
	6005	+ cButton skybox6Button;
	6006	+ cButton skybox7Button;
	6007	+
	6008	+ cButton skybox11Button;
	6009	+ cButton skybox12Button;
	6010	+ cButton skybox13Button;
	6011	+ cButton skybox14Button;
	6012	+ cButton skybox15Button;
	6013	+ cButton skybox16Button;
	6014	+ cButton skybox17Button;
	6015	+
	6016	+ cButton gridButton;
	6017	+ cButton boxButton;
	6018	+ cButton sphereButton;
	6019	+ cButton coneButton;
	6020	+ cButton torusButton;
	6021	+ cButton superButton;
	6022	+ cButton kleinButton;
	6023	+ cButton particlesButton;
	6024	+ cButton overlayButton;
	6025	+ cButton lightButton;
	6026	+
4902	6027	cButton screenfitButton;
4903	6028	cButton screenfitpointButton;
4904	6029	cButton snapobjectButton;
..	..	@@ -4910,14 +6035,6 @@
4910	6035
4911	6036	cButton setsupportButton;
4912	6037
4913		- cButton twoButton;
4914		- cButton sixButton;
4915		- cButton threeButton;
4916		- cButton sevenButton;
4917		- cButton fourButton; // full panel
4918		- cButton oneButton; // full XYZ
4919		- //cButton currentLayout;
4920		-
4921	6038	//
4922	6039	//Composite
4923	6040	Object3D // to do !!
..	..	@@ -4927,9 +6044,11 @@
4927	6044	//JTree jTree;
4928	6045	private MenuItem lookAtItem;
4929	6046	private MenuItem lookFromItem;
4930		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
4931	6048	private MenuItem cutItem;
4932		- private MenuItem duplicateItem;
	6049	+ private MenuItem undoItem;
	6050	+ private MenuItem redoItem;
	6051	+ private JMenuItem duplicateItem;
4933	6052	private MenuItem cloneItem;
4934	6053	private MenuItem cloneSupportItem;
4935	6054	private MenuItem overwriteGeoItem;
..	..	@@ -4942,7 +6061,7 @@
4942	6061	private MenuItem linkverticesItem;
4943	6062	private MenuItem relinkverticesItem;
4944	6063	private MenuItem setMasterItem;
4945		- private MenuItem resetMeshItem;
	6064	+ private MenuItem resetAllItem;
4946	6065	private MenuItem stepAllItem;
4947	6066	private MenuItem revertMeshItem;
4948	6067	private MenuItem poseMeshItem;
..	..	@@ -4953,10 +6072,11 @@
4953	6072	private MenuItem mergeGeometriesItem;
4954	6073	private MenuItem copyItem;
4955	6074	private MenuItem pasteItem;
	6075	+ private MenuItem pasteIntoItem;
4956	6076	private MenuItem pasteLinkItem;
4957	6077	private MenuItem pasteCloneItem;
4958	6078	private MenuItem pasteExpandItem;
4959		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
4960	6080	private MenuItem clearAllItem;
4961	6081	private MenuItem genUVItem;
4962	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -4991,6 +6111,10 @@
4991	6111	private MenuItem showleavesItem;
4992	6112	private MenuItem markleavesItem;
4993	6113	private MenuItem unmarkleavesItem;
	6114	+ private MenuItem rewindleavesItem;
	6115	+ private MenuItem unrewindleavesItem;
	6116	+ private MenuItem randomleavesItem;
	6117	+ private MenuItem unrandomleavesItem;
4994	6118
4995	6119	private MenuItem flipVItem;
4996	6120	private MenuItem unflipVItem;
..	..	@@ -5002,15 +6126,17 @@
5002	6126	private MenuItem panoTexturesItem;
5003	6127
5004	6128	private MenuItem resetCentroidItem;
5005		- private MenuItem transformgeometryItem;
	6129	+ private MenuItem resetCentroidXZItem;
5006	6130	private MenuItem resetTransformItem;
	6131	+ private MenuItem transformGeometryItem;
	6132	+ private MenuItem transformChildrenItem;
5007	6133	private MenuItem hideItem;
5008	6134	private MenuItem grabItem;
5009	6135	private MenuItem backItem;
5010	6136	private MenuItem frontItem;
5011	6137	private MenuItem cameraItem;
5012	6138	private MenuItem compositeItem;
5013		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
5014	6140	private MenuItem physicsItem;
5015	6141	private MenuItem frameselectorItem;
5016	6142	private MenuItem scriptNodeItem;
..	..	@@ -5034,6 +6160,8 @@
5034	6160	private MenuItem attachBumpItem;
5035	6161	private MenuItem detachBumpItem;
5036	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5037	6165
5038	6166	private MenuItem particleItem;
5039	6167	private MenuItem ragdollItem;
..	..	@@ -5050,7 +6178,7 @@
5050	6178	private MenuItem blobItem;
5051	6179	private MenuItem latheItem;
5052	6180	private MenuItem bezierItem;
5053		- private MenuItem checkerItem;
	6181	+ private MenuItem overlayItem;
5054	6182	private MenuItem meshItem;
5055	6183	// private MenuItem meshGroupItem;
5056	6184	private MenuItem springItem;
..	..	@@ -5072,11 +6200,6 @@
5072	6200	private MenuItem doubleItem;
5073	6201	private MenuItem tripleItem;
5074	6202
5075		- private MenuItem importGFDItem;
5076		- private MenuItem importVRMLX3DItem;
5077		- private MenuItem import3DSItem;
5078		- private MenuItem importOBJItem;
5079		-
5080	6203	private MenuItem computeAOItem;
5081	6204	private MenuItem recompileItem;
5082	6205	private MenuItem editScriptItem;
..	..	@@ -5086,4 +6209,8 @@
5086	6209	private MenuItem analyzeItem;
5087	6210	private MenuItem dumpItem;
5088	6211	//boolean freezemodel = false;
	6212	+
	6213	+ Menu cameraMenu;
	6214	+ MenuItem editCameraItem;
	6215	+ MenuItem restoreCameraItem;
5089	6216	}