~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,150 +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		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526		-
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
529		- twoButton.addActionListener(this);
530		- 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);
531	989	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
533		- sixButton.addActionListener(this);
534		- 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");
535	1002	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
537		- 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);
538	1009	//
539	1010
540		- 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");
541	1013	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- 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");
544	1017	closeButton.addActionListener(this);
545	1018	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	1019	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	1020
556		- 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");
557	1114	uneditButton.addActionListener(this);
558	1115
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- 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");
571	1118	allParamsButton.addActionListener(this);
572	1119
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- 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");
578	1126	unselectButton.addActionListener(this);
579	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	+
580	1138	// oe.aConstraints.gridx += 1;
581	1139	// oe.aConstraints.weighty = 0;
582	1140	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,47 +1146,32 @@
588	1146	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	1147	// gcButton.addActionListener(this);
590	1148
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	1149	+ cGridBag jSPPanel = new cGridBag();
	1150	+
	1151	+ JScrollPane jSP;
602	1152	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1153	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	1154	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	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	+
625	1168	//jList.addListSelectionListener(this);
626	1169	oe.jTree.addTreeSelectionListener(this);
627	1170	//jTree.setRootVisible(false);
628	1171	//jTree.setEditable(true);
629	1172	oe.jTree.setDragEnabled(true);
630	1173	//jTree.setPreferredSize(new Dimension(10,10));
631		- jSP.setPreferredSize(new Dimension(100,200));
	1174	+ //jSP.setPreferredSize(new Dimension(100,200));
632	1175
633	1176	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
634	1177
..	..	@@ -640,23 +1183,160 @@
640	1183	dgr.addDragGestureListener(this);
641	1184	}catch(Exception e) {}
642	1185	*/
643		- radio.layout = sevenButton;
	1186	+ radio.layout = sixButton; // sevenButton;
644	1187	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	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	+ }
646	1315
647	1316	void EditObject(Object3D obj)
648	1317	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	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	+
	1327	+ radioButton.SetObject(obj);
	1328	+ radioButton.layout = sixButton; // sevenButton;
	1329	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1330	+ radioButton.addActionListener(this);
	1331	+ radioPanel.add(radioButton);
	1332	+ buttonGroup.add(radioButton);
	1333	+ radioButton.doClick();
657	1334	}
	1335	+
658	1336	void SetupViews(ObjEditor oe)
659	1337	{
	1338	+ theFrame = this;
	1339	+
660	1340	oe.SetupViews();
661	1341
662	1342	System.out.println("SetupViews");
..	..	@@ -665,22 +1345,28 @@
665	1345	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1346	}
667	1347
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- 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;
678	1361	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1362	+ cCheckBox speakerCameraCB;
	1363	+ cCheckBox speakerFocusCB;
	1364	+ cCheckBox debugCB;
	1365	+
	1366	+ cCheckBox oeilCB;
	1367	+ cCheckBox shadowCB;
	1368	+ cCheckBox autokeepCB;
	1369	+ cCheckBox lookAtCB;
684	1370
685	1371	// static int COLOR = 1;
686	1372	// static int MATERIAL = 2;
..	..	@@ -688,9 +1374,9 @@
688	1374
689	1375	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1376
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1377	+ cCheckBox colorCB;
	1378	+ cCheckBox materialCB;
	1379	+ cCheckBox textureCB;
694	1380
695	1381	public void itemStateChanged(ItemEvent e)
696	1382	{
..	..	@@ -715,10 +1401,10 @@
715	1401	dropAttributes \|= Object3D.TEXTURE;
716	1402	else
717	1403	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1404	+ } else if(e.getSource() == liveCB)
720	1405	{
721	1406	cameraView.ToggleLive();
	1407	+ refreshContents(false);
722	1408	}
723	1409	else if(e.getSource() == supportCB)
724	1410	{
..	..	@@ -754,6 +1440,10 @@
754	1440	cameraView.repaint();
755	1441	// refreshContents();
756	1442	}
	1443	+ else if(e.getSource() == zoomBoxCB)
	1444	+ {
	1445	+ cameraView.ToggleZoomBoxMode();
	1446	+ }
757	1447	else if(e.getSource() == smoothfocusCB)
758	1448	{
759	1449	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1469,18 @@
779	1469	{
780	1470	cameraView.ToggleOeil();
781	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	+ }
782	1484	else if(e.getSource() == lookAtCB)
783	1485	{
784	1486	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1497,8 @@
795	1497
796	1498	/**/
797	1499	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1500	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1501	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1502	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1503	// We can't move the root node or an empty selection
801	1504	return;
..	..	@@ -858,8 +1561,6 @@
858	1561	}
859	1562	}
860	1563
861		- String string = (String) object;
862		-
863	1564	System.out.println("Transfer = " + object + "; drop : " + target);
864	1565	// if( object instanceof java.io.File[])
865	1566	// {
..	..	@@ -867,7 +1568,11 @@
867	1568	// objEditor.DropFile((java.io.File[]) object, true);
868	1569	// return;
869	1570	// }
870		- 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) == ':')
871	1576	{
872	1577	// file(s)
873	1578	String[] names = string.split("\n");
..	..	@@ -894,7 +1599,7 @@
894	1599
895	1600	flashIt = false;
896	1601	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1602	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1603	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1604
900	1605	if (group.selection.size() == 1)
..	..	@@ -910,23 +1615,33 @@
910	1615
911	1616	assert target == objEditor.jTree;
912	1617	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1618	+ Object3D destinationLeaf;
913	1619	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1620	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1621	} catch (Exception e) {
916	1622	System.out.println("destinationPath : " + destinationPath);
917	1623	return;
918	1624	}
919	1625
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1626	+ for (int i=group.selection.size(); --i>=0;)
921	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	+// {
922	1637	loadClipboard(true);
923	1638	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1639	+ pasteInto(false, false);
	1640	+// } else {
	1641	+// loadClipboard(false);
	1642	+// objEditor.jTree.setSelectionPath(destinationPath);
	1643	+// pasteInto(false, false); // true); // ???
	1644	+// }
930	1645	}
931	1646	public void dropActionChanged(DropTargetDragEvent dtde)
932	1647	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1746,107 @@
1031	1746	{
1032	1747	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1748	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- 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	+ {
1046	1767	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1768	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1769	+ }
	1770	+
	1771	+// particleItem = menu.add(new MenuItem("Particle system"));
	1772	+// particleItem.addActionListener(this);
	1773	+ if (Globals.ADVANCED)
	1774	+ {
1050	1775	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1776	ragdollItem.addActionListener(this);
1052	1777	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1778	ragdoll2Item.addActionListener(this);
	1779	+ }
1054	1780	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1781	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1782	meshItem.addActionListener(this);
1057	1783	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1784	// meshGroupItem.addActionListener(this);
	1785	+ if (Globals.ADVANCED)
	1786	+ {
1059	1787	springItem = menu.add(new MenuItem("Spring"));
1060	1788	springItem.addActionListener(this);
1061	1789	flagItem = menu.add(new MenuItem("Flag"));
1062	1790	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1791	blobItem = menu.add(new MenuItem("Blob"));
1068	1792	blobItem.addActionListener(this);
1069	1793	latheItem = menu.add(new MenuItem("Lathe"));
1070	1794	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- 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);
1073	1802	menu.add("-");
1074	1803	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1804	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1805	+// loopItem = menu.add(new MenuItem("Loop"));
	1806	+// loopItem.addActionListener(this);
1078	1807	doubleItem = menu.add(new MenuItem("Fork"));
1079	1808	doubleItem.addActionListener(this);
	1809	+ if (Globals.ADVANCED)
	1810	+ {
1080	1811	tripleItem = menu.add(new MenuItem("Trident"));
1081	1812	tripleItem.addActionListener(this);
	1813	+ }
1082	1814	}
1083	1815
1084	1816	void buildToolsMenu(Menu menu)
1085	1817	{
1086	1818	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1819	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1820	+ animationItem.setState(Globals.ANIMATION);
	1821	+
	1822	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1823	+ archiveItem.addActionListener(this);
1089	1824
1090	1825	menu.add("-");
1091	1826	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1827	parseverticesItem.addActionListener(this);
1093	1828	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1829	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1830	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1831	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1832	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1833	reduceMorphItem.addActionListener(this);
1101	1834	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1835	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1836	menu.add("-");
1107		-
1108	1837	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	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("-");
1110	1847	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1848	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1849	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1850	dumpItem.addActionListener(this);
1114	1851	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1852	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1855,8 @@
1118	1855	resetParentItem.addActionListener(this);
1119	1856	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1857	repairParentItem.addActionListener(this);
	1858	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1859	+ repairShadowItem.addActionListener(this);
1121	1860	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1861	invariantsItem.addActionListener(this);
1123	1862	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1864,7 @@
1125	1864	menu.add("-");
1126	1865	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1866	editScriptItem.addActionListener(this);
	1867	+ }
1128	1868	}
1129	1869
1130	1870	void ScreenFit()
..	..	@@ -1247,9 +1987,34 @@
1247	1987	shadow.material = new cMaterial(obj.material);
1248	1988	shadow.material.diffuse = 0.0001f;
1249	1989	shadow.material.specular = 0.0001f;
	1990	+ //shadow.projectedVertices[1].x = 300;
1250	1991
1251	1992	makeSomething(shadow);
1252	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	+ }
1253	2018
1254	2019	/**
1255	2020	* applyExample
..	..	@@ -1453,9 +2218,9 @@
1453	2218
1454	2219	void Overwrite(int mask)
1455	2220	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2221	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	2222	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	2223	+ Object3D content = Grafreed.clipboard.get(0);
1459	2224
1460	2225	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	2226	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +2243,7 @@
1478	2243	//
1479	2244	public void actionPerformed(ActionEvent event) // , Object arg)
1480	2245	{
	2246	+ Object source = event.getSource();
1481	2247	/*
1482	2248	if (event.getSource() == nameField)
1483	2249	{
..	..	@@ -1489,11 +2255,11 @@
1489	2255	}
1490	2256	else
1491	2257	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	2258	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	2259	{
1494	2260	ScreenFit();
1495	2261	} else
1496		- if (event.getSource() == switchItem)
	2262	+ if (source == switchViewItem)
1497	2263	{
1498	2264	cVector v1 = new cVector();
1499	2265	cVector v2 = new cVector();
..	..	@@ -1502,11 +2268,11 @@
1502	2268	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	2269	objEditor.cameraView.repaint();
1504	2270	} else
1505		- if (event.getSource() == rectoidItem)
	2271	+ if (source == rectoidItem \|\| source == boxButton)
1506	2272	{
1507	2273	makeSomething(new Box());
1508	2274	} else
1509		- if (event.getSource() == particleItem)
	2275	+ if (source == particleItem \|\| source == particlesButton)
1510	2276	{
1511	2277	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	2278	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +2293,9 @@
1527	2293	applyExample(particleGeom, "SMOKE");
1528	2294	makeSomething(particleGeom);
1529	2295	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	2296	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	2297	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	2298	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	2299
1534	2300	ragdoll.toParent = LA.newMatrix();
1535	2301	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +2313,7 @@
1547	2313	} else
1548	2314	/*
1549	2315	*/
1550		- if (event.getSource() == heightFieldItem)
	2316	+ if (source == heightFieldItem)
1551	2317	{
1552	2318	Object3D obj = new Object3D();
1553	2319
..	..	@@ -1585,31 +2351,31 @@
1585	2351
1586	2352	makeSomething(obj);
1587	2353	} else
1588		- if (event.getSource() == gridItem)
	2354	+ if (source == gridItem \|\| source == gridButton)
1589	2355	{
1590	2356	makeSomething(new Grid());
1591	2357	} else
1592		- if (event.getSource() == ellipsoidItem)
	2358	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2359	{
1594	2360	makeSomething(new Sphere());
1595	2361	} else
1596		- if (event.getSource() == coneItem)
	2362	+ if (source == coneItem \|\| source == coneButton)
1597	2363	{
1598	2364	makeSomething(new Cone());
1599	2365	} else
1600		- if (event.getSource() == torusItem)
	2366	+ if (source == torusItem \|\| source == torusButton)
1601	2367	{
1602	2368	makeSomething(new Torus());
1603	2369	} else
1604		- if (event.getSource() == superItem)
	2370	+ if (source == superItem \|\| source == superButton)
1605	2371	{
1606	2372	makeSomething(new Superellipsoid());
1607	2373	} else
1608		- if (event.getSource() == kleinItem)
	2374	+ if (source == kleinItem \|\| source == kleinButton)
1609	2375	{
1610	2376	makeSomething(new Klein());
1611	2377	} else
1612		- if (event.getSource() == blobItem)
	2378	+ if (source == blobItem)
1613	2379	{
1614	2380	Blob blob = new Blob();
1615	2381	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2383,15 @@
1617	2383	//blob.retile();
1618	2384	makeSomething(blob);
1619	2385	} else
1620		- if (event.getSource() == latheItem)
	2386	+ if (source == latheItem)
1621	2387	{
1622	2388	makeSomething(new Lathe());
1623	2389	} else
1624		- if (event.getSource() == bezierItem)
	2390	+ if (source == bezierItem)
1625	2391	{
1626	2392	makeSomething(new BezierSurface());
1627	2393	} else
1628		- if (event.getSource() == checkerItem)
	2394	+ if (source == overlayItem \|\| source == overlayButton)
1629	2395	{
1630	2396	/*
1631	2397	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2406,7 @@
1640	2406	*/
1641	2407	makeSomething(new Checker());
1642	2408	} else
1643		- if (event.getSource() == meshItem)
	2409	+ if (source == meshItem)
1644	2410	{
1645	2411	Object3D itemtomake = new Object3D();
1646	2412	Object3D child;
..	..	@@ -1661,35 +2427,52 @@
1661	2427	makeSomething(child);
1662	2428	}
1663	2429	} else
1664		- if (event.getSource() == springItem)
	2430	+ if (source == springItem)
1665	2431	{
1666	2432	cSpring s = new cSpring();
1667	2433	s.setup();
1668	2434	makeSomething(s);
1669	2435	} else
1670		- if (event.getSource() == flagItem)
	2436	+ if (source == flagItem)
1671	2437	{
1672	2438	cSpring s = new cFlag();
1673	2439	s.setup();
1674	2440	makeSomething(s);
1675	2441	} else
1676		- if (event.getSource() == lightItem)
	2442	+ if (source == lightItem \|\| source == lightButton)
1677	2443	{
1678	2444	makeSomething(new Light());
1679	2445	} else
1680		- 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)
1681	2464	{
1682	2465	group(new CSG());
1683	2466	} else
1684		- if (event.getSource() == templateItem)
	2467	+ if (source == templateItem)
1685	2468	{
1686	2469	group(new cTemplate());
1687	2470	} else
1688		- if (event.getSource() == attributeItem)
	2471	+ if (source == attributeItem)
1689	2472	{
1690	2473	makeSomething(new Attribute());
1691	2474	} else
1692		- if (event.getSource() == pointflowItem)
	2475	+ if (source == pointflowItem)
1693	2476	{
1694	2477	makeSomething(new PointFlow());
1695	2478	} else
..	..	@@ -1701,7 +2484,7 @@
1701	2484	} else
1702	2485	*/
1703	2486
1704		- if (event.getSource() == superLoopItem)
	2487	+ if (source == superLoopItem)
1705	2488	{
1706	2489	Composite g = new cGroup();
1707	2490	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2506,30 @@
1723	2506
1724	2507	group(g);
1725	2508	} else
1726		- if (event.getSource() == loopItem)
	2509	+ if (source == loopItem \|\| source == loopButton)
1727	2510	{
1728	2511	Composite csg = new GroupLeaf();
1729	2512	csg.count = 5;
1730	2513	group(csg);
1731		- Composite child = new cGroup();
	2514	+ Composite child = new cGroup("Branch");
1732	2515	csg.addChild(child);
1733	2516	child.addChild(csg);
1734	2517	} else
1735		- if (event.getSource() == doubleItem)
	2518	+ if (source == doubleItem)
1736	2519	{
1737		- Composite csg = new GroupLeaf();
	2520	+ Composite csg = new GroupLeaf("Fork");
1738	2521	csg.count = 5;
1739	2522	group(csg);
1740		- Composite child = new cGroup();
	2523	+ Composite child = new cGroup("Branch A");
1741	2524	csg.addChild(child);
1742	2525	child.addChild(csg);
1743		- child = new cGroup();
	2526	+ child = new cGroup("Branch B");
1744	2527	csg.addChild(child);
1745	2528	child.addChild(csg);
1746	2529	} else
1747		- if (event.getSource() == tripleItem)
	2530	+ if (source == tripleItem)
1748	2531	{
1749		- Composite csg = new GroupLeaf();
	2532	+ Composite csg = new GroupLeaf("Trident");
1750	2533	csg.count = 4;
1751	2534	group(csg);
1752	2535	Composite child = new cGroup();
..	..	@@ -1759,73 +2542,98 @@
1759	2542	csg.addChild(child);
1760	2543	child.addChild(csg);
1761	2544	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2545	+ if (source == computeAOItem)
1764	2546	{
1765		- ImportGFD();
	2547	+ Globals.drawMode = CameraPane.OCCLUSION;
	2548	+ cameraView.repaint();
1766	2549	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2550	+ if (source == recompileItem)
1785	2551	{
1786	2552	Recompile();
1787	2553	refreshContents();
1788	2554	} else
1789		- if (event.getSource() == editScriptItem)
	2555	+ if (source == editScriptItem)
1790	2556	{
1791	2557	OpenDialog();
1792	2558	refreshContents();
1793	2559	} else
1794		- if (event.getSource() == invariantsItem)
	2560	+ if (source == invariantsItem)
1795	2561	{
1796	2562	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2563	+ Grafreed.grafreeD.universe.invariants();
1798	2564	} else
1799		- if (event.getSource() == memoryItem)
	2565	+ if (source == memoryItem)
1800	2566	{
1801	2567	//System.out.println("Invariants:");
1802	2568	PrintMemory();
1803	2569	} else
1804		- if (event.getSource() == pathItem)
	2570	+ if (source == pathItem)
1805	2571	{
1806	2572	PrintPath();
1807	2573	} else
1808		- if (event.getSource() == analyzeItem)
	2574	+ if (source == analyzeItem)
1809	2575	{
1810	2576	AnalyzeObject();
1811	2577	} else
1812		- if (event.getSource() == dumpItem)
	2578	+ if (source == dumpItem)
1813	2579	{
1814	2580	DumpObject();
1815	2581	} else
1816		- if (event.getSource() == screenfitButton)
	2582	+ if (source == minButton)
1817	2583	{
1818		- //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	+ {
1819	2629	ScreenFit();
1820	2630	} else
1821		- if (event.getSource() == screenfitpointButton)
	2631	+ if (source == screenfitpointButton)
1822	2632	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2633	ScreenFitPoint();
1825	2634	} else
1826		- if (event.getSource() == snapobjectButton)
	2635	+ if (source == snapobjectButton)
1827	2636	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2637	SnapObject();
1830	2638	} else
1831	2639	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2642,13 @@
1834	2642	// Recompile();
1835	2643	// refreshContents();
1836	2644	// } else
1837		- if (event.getSource() == gcButton)
	2645	+ if (source == gcButton)
1838	2646	{
1839	2647	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2648	System.gc();
1841	2649	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2650	} else
1843		- if (event.getSource() == editLeafItem)
	2651	+ if (source == editLeafItem)
1844	2652	{
1845	2653	Object3D obj;
1846	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2662,74 @@
1854	2662	}
1855	2663	refreshContents(true);
1856	2664	} else
1857		- if (event.getSource() == openWindowItem)
	2665	+ if (source == openWindowItem)
1858	2666	{
1859	2667	EditSelection(true);
1860	2668	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2669	+ if (source == cutItem \|\| source == clearButton)
1862	2670	{
1863	2671	loadClipboard(true);
1864	2672	} else
1865		- if (event.getSource() == duplicateItem)
	2673	+ if (source == undoItem)
1866	2674	{
1867		- 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;
1868	2684	loadClipboard(false);
1869	2685	paste(false);
1870		- GrafreeD.clipboard = keep;
	2686	+ Grafreed.clipboard = keep;
1871	2687	} else
1872		- if (event.getSource() == cloneItem)
	2688	+ if (source == cloneItem)
1873	2689	{
1874	2690	CloneSelection(false);
1875	2691	} else
1876		- if (event.getSource() == cloneSupportItem)
	2692	+ if (source == cloneSupportItem)
1877	2693	{
1878	2694	CloneSelection(true);
1879	2695	} else
1880		- if (event.getSource() == copyItem)
	2696	+ if (source == copyItem)
1881	2697	{
1882	2698	loadClipboard(false);
1883	2699	} else
1884		- if (event.getSource() == pasteItem)
	2700	+ if (source == pasteItem)
1885	2701	{
1886	2702	paste(false);
1887	2703	} else
1888		- if (event.getSource() == pasteLinkItem)
	2704	+ if (source == pasteIntoItem)
1889	2705	{
1890		- pasteInto(false);
	2706	+ pasteInto(true, false);
1891	2707	} else
1892		- if (event.getSource() == pasteCloneItem)
	2708	+ if (source == pasteLinkItem)
1893	2709	{
1894		- pasteInto(true);
	2710	+ pasteInto(false, false);
1895	2711	} else
1896		- if (event.getSource() == pasteExpandItem)
	2712	+ if (source == pasteCloneItem)
	2713	+ {
	2714	+ pasteInto(true, true);
	2715	+ } else
	2716	+ if (source == pasteExpandItem)
1897	2717	{
1898	2718	paste(true);
1899	2719	} else
1900		- if (event.getSource() == synchronizeItem)
	2720	+ if (source == synchronizeItem)
1901	2721	{
1902	2722	Overwrite(Object3D.TRANSFORM);
1903	2723	} else
1904		- if (event.getSource() == overwriteNameItem)
	2724	+ if (source == overwriteNameItem)
1905	2725	{
1906	2726	Overwrite(Object3D.NAME);
1907	2727	} else
1908		- if (event.getSource() == overwriteUVItem)
	2728	+ if (source == overwriteUVItem)
1909	2729	{
1910	2730	Overwrite(Object3D.UV);
1911	2731	} else
1912		- if (event.getSource() == overwriteMatItem)
	2732	+ if (source == overwriteMatItem)
1913	2733	{
1914	2734	/* july 2015
1915	2735	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2749,7 @@
1929	2749
1930	2750	Overwrite(dropAttributes);
1931	2751	}
1932		- if (event.getSource() == overwriteGeoItem)
	2752	+ if (source == overwriteGeoItem)
1933	2753	{
1934	2754	Overwrite(Object3D.GEOMETRY);
1935	2755	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2766,7 @@
1946	2766	// refreshContents();
1947	2767	// }
1948	2768	} else
1949		- if (event.getSource() == generateMeshItem)
	2769	+ if (source == generateMeshItem)
1950	2770	{
1951	2771	//if (group.selection.size() == 1)
1952	2772	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2777,7 @@
1957	2777	ResetModel();
1958	2778	refreshContents();
1959	2779	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2780	+ if (source == extractGeometriesItem)
1961	2781	{
1962	2782	boolean one = false;
1963	2783
..	..	@@ -1984,7 +2804,7 @@
1984	2804	ResetModel();
1985	2805	refreshContents();
1986	2806	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2807	+ if (source == cloneGeometriesItem)
1988	2808	{
1989	2809	boolean one = false;
1990	2810
..	..	@@ -2010,7 +2830,7 @@
2010	2830	ResetModel();
2011	2831	refreshContents();
2012	2832	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2833	+ if (source == shareGeometriesItem)
2014	2834	{
2015	2835	boolean one = false;
2016	2836
..	..	@@ -2040,7 +2860,7 @@
2040	2860	refreshContents();
2041	2861	}
2042	2862	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2863	+ if (source == mergeGeometriesItem)
2044	2864	{
2045	2865	boolean one = false;
2046	2866
..	..	@@ -2070,7 +2890,7 @@
2070	2890	ResetModel();
2071	2891	refreshContents();
2072	2892	} else
2073		- if (event.getSource() == linkverticesItem)
	2893	+ if (source == linkverticesItem)
2074	2894	{
2075	2895	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2896	// {
..	..	@@ -2083,48 +2903,48 @@
2083	2903	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2904	// refreshContents();
2085	2905	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2906	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2907	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2908	+ Object3D content = Grafreed.clipboard.get(0);
2089	2909
2090	2910	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2911	content = ((cGroup)content).get(0);
2092	2912
2093		- 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));
2094	2914	for (int i=0; i<group.selection.size(); i++)
2095	2915	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2916	+ boolean random = CameraPane.SWITCH;
	2917	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2918	group.selection.get(i).linkVerticesThis(content);
2099	2919	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2920	+ CameraPane.SWITCH = random;
2101	2921	}
2102		- 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));
2103	2923	refreshContents();
2104	2924	}
2105	2925	} else
2106		- if (event.getSource() == resetsupportItem)
	2926	+ if (source == resetsupportItem)
2107	2927	{
2108	2928	for (int i=0; i<group.selection.size(); i++)
2109	2929	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2930	+ boolean random = CameraPane.SWITCH;
	2931	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2932	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2933	+ CameraPane.SWITCH = random;
2114	2934	}
2115	2935
2116	2936	refreshContents();
2117	2937	} else
2118		- if (event.getSource() == relinkverticesItem)
	2938	+ if (source == relinkverticesItem)
2119	2939	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2940	+ boolean random = CameraPane.SWITCH;
	2941	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2942	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2943	+ CameraPane.SWITCH = random;
2124	2944
2125	2945	refreshContents();
2126	2946	} else
2127		- if (event.getSource() == resetreferencesItem)
	2947	+ if (source == resetreferencesItem)
2128	2948	{
2129	2949	for (int i=0; i<group.selection.size(); i++)
2130	2950	{
..	..	@@ -2133,11 +2953,11 @@
2133	2953
2134	2954	refreshContents();
2135	2955	} else
2136		- if (event.getSource() == setMasterItem)
	2956	+ if (source == setMasterItem)
2137	2957	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2958	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2959	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2960	+ Object3D content = Grafreed.clipboard.get(0);
2141	2961
2142	2962	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2963	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2966,13 @@
2146	2966	refreshContents();
2147	2967	}
2148	2968	} else
2149		- if (event.getSource() == poseMeshItem)
	2969	+ if (source == poseMeshItem)
2150	2970	{
2151	2971	if (group.selection.size() == 1)
2152	2972	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2973	+ if (Grafreed.clipboard.size() == 1)
2154	2974	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2975	+ Object3D content = Grafreed.clipboard.get(0);
2156	2976
2157	2977	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2978	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2985,19 @@
2165	2985	}
2166	2986
2167	2987	} else
2168		- if (event.getSource() == revertMeshItem)
	2988	+ if (source == revertMeshItem)
2169	2989	{
2170	2990	RevertMeshes();
2171	2991	} else
2172		- if (event.getSource() == resetMeshItem)
	2992	+ if (source == resetAllItem)
2173	2993	{
2174	2994	ResetAll();
2175	2995	} else
2176		- if (event.getSource() == stepAllItem)
	2996	+ if (source == stepAllItem)
2177	2997	{
2178	2998	StepAll();
2179	2999	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	3000	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2181	3001	{
2182	3002	//int indices[] = jList.getSelectedIndices();
2183	3003	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +3005,46 @@
2185	3005
2186	3006	ClearSelection(false);
2187	3007	} else
2188		- if (event.getSource() == clearAllItem)
	3008	+ if (source == clearAllItem)
2189	3009	{
2190	3010	ClearSelection(true);
2191	3011	} else
2192		- if (event.getSource() == grabItem)
	3012	+ if (source == grabItem \|\| source == groupButton)
2193	3013	{
2194		- group(new cGroup(), true);
	3014	+ group(new cGroup(), false); // true);
2195	3015	} else
2196		- if (event.getSource() == hideItem)
	3016	+ if (source == hideItem)
2197	3017	{
2198	3018	group(new HiddenObject());
2199	3019	} else
2200		- if (event.getSource() == frontItem)
	3020	+ if (source == frontItem)
2201	3021	{
2202	3022	front();
2203	3023	} else
2204		- if (event.getSource() == backItem)
	3024	+ if (source == backItem)
2205	3025	{
2206	3026	back();
2207	3027	} else
2208		- if (event.getSource() == cameraItem)
	3028	+ if (source == cameraItem)
2209	3029	{
2210	3030	makeSomething(new Camera());
2211	3031	} else
2212		- if (event.getSource() == compositeItem)
	3032	+ if (source == compositeItem \|\| source == compositeButton)
2213	3033	{
2214	3034	group(new Composite());
2215	3035	} else
2216		- if (event.getSource() == randomItem)
	3036	+ if (source == switchItem \|\| source == switchButton)
2217	3037	{
2218	3038	RandomNode random = new RandomNode();
2219	3039	group(random);
2220	3040	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	3041	+ random.name = random.get(0).name + "Switch";
2222	3042	} else
2223		- if (event.getSource() == physicsItem)
	3043	+ if (source == physicsItem)
2224	3044	{
2225	3045	group(new PhysicsNode());
2226	3046	} else
2227		- if (event.getSource() == frameselectorItem)
	3047	+ if (source == frameselectorItem)
2228	3048	{
2229	3049	for (int i=0; i<group.selection.size(); i++)
2230	3050	{
..	..	@@ -2236,7 +3056,7 @@
2236	3056	ResetModel();
2237	3057	refreshContents();
2238	3058	} else
2239		- if (event.getSource() == switchGeoItem)
	3059	+ if (source == switchGeoItem)
2240	3060	{
2241	3061	for (int i=0; i<group.selection.size(); i++)
2242	3062	{
..	..	@@ -2248,7 +3068,7 @@
2248	3068	ResetModel();
2249	3069	refreshContents();
2250	3070	} else
2251		- if (event.getSource() == switchTransfoItem)
	3071	+ if (source == switchTransfoItem)
2252	3072	{
2253	3073	for (int i=0; i<group.selection.size(); i++)
2254	3074	{
..	..	@@ -2260,7 +3080,7 @@
2260	3080	ResetModel();
2261	3081	refreshContents();
2262	3082	} else
2263		- if (event.getSource() == morphItem)
	3083	+ if (source == morphItem)
2264	3084	{
2265	3085	for (int i=0; i<group.selection.size(); i++)
2266	3086	{
..	..	@@ -2272,7 +3092,7 @@
2272	3092	ResetModel();
2273	3093	refreshContents();
2274	3094	} else
2275		- if (event.getSource() == scriptNodeItem)
	3095	+ if (source == scriptNodeItem)
2276	3096	{
2277	3097	boolean atleastone = false;
2278	3098
..	..	@@ -2311,215 +3131,252 @@
2311	3131	}
2312	3132	}
2313	3133	} else
2314		- if (event.getSource() == linkerItem)
	3134	+ if (source == linkerItem)
2315	3135	{
2316	3136	group(new cLinker());
2317	3137	} else
2318		- if (event.getSource() == textureItem)
	3138	+ if (source == textureItem \|\| source == textureButton)
2319	3139	{
2320	3140	group(new TextureNode());
2321	3141	} else
2322		- if (event.getSource() == billboardItem)
	3142	+ if (source == billboardItem)
2323	3143	{
2324	3144	group(new BillboardNode());
2325	3145	} else
2326		- if (event.getSource() == shadowXItem)
	3146	+ if (source == shadowXItem)
2327	3147	{
2328	3148	CastShadow(0);
2329	3149	} else
2330		- if (event.getSource() == shadowYItem)
	3150	+ if (source == shadowYItem)
2331	3151	{
2332	3152	CastShadow(1);
2333	3153	} else
2334		- if (event.getSource() == shadowZItem)
	3154	+ if (source == shadowZItem)
2335	3155	{
2336	3156	CastShadow(2);
2337	3157	} else
2338		- if (event.getSource() == ungroupItem)
	3158	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	3159	{
2340		- //ungroup();
	3160	+ boolean hasRoot = false;
	3161	+
2341	3162	for (int i=0; i<group.selection.size(); i++)
2342	3163	{
2343		- Ungroup(group.selection.get(i));
	3164	+ if (group.selection.get(i) == group)
	3165	+ {
	3166	+ hasRoot = true;
	3167	+ break;
	3168	+ }
2344	3169	}
2345	3170
2346		- ClearSelection(false);
2347		-
2348		- 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	+ }
2349	3182	} else
2350		- if (event.getSource() == genUVItem)
	3183	+ if (source == genUVItem)
2351	3184	{
2352	3185	GenUV();
2353	3186	} else
2354		- if (event.getSource() == genNormalsCADItem)
	3187	+ if (source == genNormalsCADItem)
2355	3188	{
2356	3189	GenNormals(true);
2357	3190	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	3191	+ if (source == genNormalsMESHItem)
2359	3192	{
2360		- GenNormals(true); // TODO
	3193	+ GenNormalsMESH();
2361	3194	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	3195	+ if (source == genNormalsORGANItem)
2363	3196	{
2364	3197	GenNormals(false);
2365	3198	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	3199	+ if (source == genNormalsMINEItem)
2367	3200	{
2368	3201	GenNormalsMINE();
2369	3202	} else
2370		- if (event.getSource() == stripifyItem)
	3203	+ if (source == stripifyItem)
2371	3204	{
2372	3205	Stripify();
2373	3206	} else
2374		- if (event.getSource() == unstripifyItem)
	3207	+ if (source == unstripifyItem)
2375	3208	{
2376	3209	Unstripify();
2377	3210	} else
2378		- if (event.getSource() == trimItem)
	3211	+ if (source == trimItem)
2379	3212	{
2380	3213	Trim();
2381	3214	} else
2382		- if (event.getSource() == untrimItem)
	3215	+ if (source == untrimItem)
2383	3216	{
2384	3217	Untrim();
2385	3218	} else
2386		- if (event.getSource() == clearColorsItem)
	3219	+ if (source == clearColorsItem)
2387	3220	{
2388	3221	ClearColors();
2389	3222	} else
2390		- if (event.getSource() == clearMaterialsItem)
	3223	+ if (source == clearMaterialsItem)
2391	3224	{
2392	3225	ClearMaterials();
2393	3226	} else
2394		- if (event.getSource() == liveleavesItem)
	3227	+ if (source == liveleavesItem)
2395	3228	{
2396	3229	LiveLeaves(true);
2397	3230	} else
2398		- if (event.getSource() == unliveleavesItem)
	3231	+ if (source == unliveleavesItem)
2399	3232	{
2400	3233	LiveLeaves(false);
2401	3234	} else
2402		- if (event.getSource() == supportleavesItem)
	3235	+ if (source == supportleavesItem)
2403	3236	{
2404	3237	SupportLeaves(true);
2405	3238	} else
2406		- if (event.getSource() == unsupportleavesItem)
	3239	+ if (source == unsupportleavesItem)
2407	3240	{
2408	3241	SupportLeaves(false);
2409	3242	} else
2410		- if (event.getSource() == hideleavesItem)
	3243	+ if (source == hideleavesItem)
2411	3244	{
2412	3245	HideLeaves(true);
2413	3246	} else
2414		- if (event.getSource() == showleavesItem)
	3247	+ if (source == showleavesItem)
2415	3248	{
2416	3249	HideLeaves(false);
2417	3250	} else
2418		- if (event.getSource() == markleavesItem)
	3251	+ if (source == markleavesItem)
2419	3252	{
2420	3253	MarkLeaves(true);
2421	3254	} else
2422		- if (event.getSource() == unmarkleavesItem)
	3255	+ if (source == unmarkleavesItem)
2423	3256	{
2424	3257	MarkLeaves(false);
2425	3258	} else
2426		- 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)
2427	3276	{
2428	3277	FlipV(true);
2429	3278	} else
2430		- if (event.getSource() == unflipVItem)
	3279	+ if (source == unflipVItem)
2431	3280	{
2432	3281	FlipV(false);
2433	3282	} else
2434		- if (event.getSource() == lowTexturesItem)
	3283	+ if (source == lowTexturesItem)
2435	3284	{
2436	3285	SetTexRes(0);
2437	3286	} else
2438		- if (event.getSource() == normalTexturesItem)
	3287	+ if (source == normalTexturesItem)
2439	3288	{
2440	3289	SetTexRes(1);
2441	3290	} else
2442		- if (event.getSource() == highTexturesItem)
	3291	+ if (source == highTexturesItem)
2443	3292	{
2444	3293	SetTexRes(2);
2445	3294	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	3295	+ if (source == veryhighTexturesItem)
2447	3296	{
2448	3297	SetTexRes(3);
2449	3298	} else
2450		- if (event.getSource() == maxTexturesItem)
	3299	+ if (source == maxTexturesItem)
2451	3300	{
2452	3301	SetTexRes(4);
2453	3302	} else
2454		- if (event.getSource() == panoTexturesItem)
	3303	+ if (source == panoTexturesItem)
2455	3304	{
2456	3305	SetTexRes(5);
2457	3306	} else
2458		- if (event.getSource() == reverseNormalsItem)
	3307	+ if (source == reverseNormalsItem)
2459	3308	{
2460	3309	ReverseNormals();
2461	3310	} else
2462		- if (event.getSource() == parseverticesItem)
	3311	+ if (source == parseverticesItem)
2463	3312	{
2464	3313	ParseVertices();
2465	3314	} else
2466		- if (event.getSource() == textureFieldItem)
	3315	+ if (source == textureFieldItem)
2467	3316	{
2468	3317	TextureVertices();
2469	3318	} else
2470		- if (event.getSource() == alignItem)
	3319	+ if (source == alignItem)
2471	3320	{
2472	3321	Align();
2473	3322	} else
2474		- if (event.getSource() == mirrorItem)
	3323	+ if (source == mirrorItem)
2475	3324	{
2476	3325	MirrorPoses();
2477	3326	} else
2478		- if (event.getSource() == reduceMorphItem)
	3327	+ if (source == reduceMorphItem)
2479	3328	{
2480	3329	MeshReduction(false);
2481	3330	} else
2482		- if (event.getSource() == reduce34MorphItem)
	3331	+ if (source == reduce34MorphItem)
2483	3332	{
2484	3333	MeshReduction(true);
2485	3334	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	3335	+ if (source == reverseTrianglesItem)
2487	3336	{
2488	3337	ReverseTriangles();
2489	3338	} else
2490		- if (event.getSource() == reduceMeshItem)
	3339	+ if (source == reduceMeshItem)
2491	3340	{
2492	3341	ReduceMesh(false);
2493	3342	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3343	+ if (source == reduce34MeshItem)
2495	3344	{
2496	3345	ReduceMesh(true);
2497	3346	} else
2498		- if (event.getSource() == increaseMeshItem)
	3347	+ if (source == increaseMeshItem)
2499	3348	{
2500	3349	IncreaseMesh();
2501	3350	} else
2502		- if (event.getSource() == clipMeshItem)
	3351	+ if (source == clipMeshItem)
2503	3352	{
2504	3353	ClipMesh();
2505	3354	} else
2506		- if (event.getSource() == smoothMeshItem)
	3355	+ if (source == smoothMeshItem)
2507	3356	{
2508	3357	SmoothMesh();
2509	3358	} else
2510		- if (event.getSource() == transformgeometryItem)
	3359	+ if (source == transformGeometryItem)
2511	3360	{
2512	3361	TransformGeometry();
2513	3362	} else
2514		- if (event.getSource() == resetTransformItem)
	3363	+ if (source == transformChildrenItem)
	3364	+ {
	3365	+ TransformChildren();
	3366	+ } else
	3367	+ if (source == resetTransformItem)
2515	3368	{
2516	3369	ResetTransform();
2517	3370	} else
2518		- if (event.getSource() == resetCentroidItem)
	3371	+ if (source == resetCentroidItem)
2519	3372	{
2520		- ResetCentroid();
	3373	+ ResetCentroid(true);
2521	3374	} else
2522		- if (event.getSource() == resetParentItem)
	3375	+ if (source == resetCentroidXZItem)
	3376	+ {
	3377	+ ResetCentroid(false);
	3378	+ } else
	3379	+ if (source == resetParentItem)
2523	3380	{
2524	3381	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3382	{
..	..	@@ -2529,7 +3386,7 @@
2529	3386
2530	3387	refreshContents();
2531	3388	} else
2532		- if (event.getSource() == repairParentItem)
	3389	+ if (source == repairParentItem)
2533	3390	{
2534	3391	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3392	{
..	..	@@ -2543,7 +3400,21 @@
2543	3400
2544	3401	refreshContents();
2545	3402	} else
2546		- if (event.getSource() == sortbysizeItem)
	3403	+ if (source == repairShadowItem)
	3404	+ {
	3405	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3406	+ {
	3407	+ Object3D obj = (Object3D)e.nextElement();
	3408	+ obj.RepairShadow();
	3409	+// for (int i=0; i<obj.size(); i++)
	3410	+// {
	3411	+// obj.get(i).parent = obj;
	3412	+// }
	3413	+ }
	3414	+
	3415	+ refreshContents();
	3416	+ } else
	3417	+ if (source == sortbysizeItem)
2547	3418	{
2548	3419	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3420	{
..	..	@@ -2555,7 +3426,7 @@
2555	3426	ResetModel();
2556	3427	refreshContents();
2557	3428	} else
2558		- if (event.getSource() == sortbynameItem)
	3429	+ if (source == sortbynameItem)
2559	3430	{
2560	3431	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3432	{
..	..	@@ -2567,7 +3438,7 @@
2567	3438	ResetModel();
2568	3439	refreshContents();
2569	3440	} else
2570		- if (event.getSource() == attachPigmentItem)
	3441	+ if (source == attachPigmentItem)
2571	3442	{
2572	3443	String texture = GetFile("Attach pigment");
2573	3444	Object3D obj;
..	..	@@ -2579,7 +3450,7 @@
2579	3450
2580	3451	refreshContents();
2581	3452	} else
2582		- if (event.getSource() == detachPigmentItem)
	3453	+ if (source == detachPigmentItem)
2583	3454	{
2584	3455	Object3D obj;
2585	3456	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3461,7 @@
2590	3461
2591	3462	refreshContents();
2592	3463	} else
2593		- if (event.getSource() == attachBumpItem)
	3464	+ if (source == attachBumpItem)
2594	3465	{
2595	3466	String texture = GetFile("Attach bump");
2596	3467	Object3D obj;
..	..	@@ -2602,18 +3473,18 @@
2602	3473
2603	3474	refreshContents();
2604	3475	} else
2605		- if (event.getSource() == detachBumpItem)
	3476	+ if (source == detachBumpItem)
2606	3477	{
2607	3478	Object3D obj;
2608	3479	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2609	3480	{
2610	3481	obj = (Object3D)e.nextElement();
2611		- obj.SetBumpTexture(null);
	3482	+ obj.ResetBumpTexture();
2612	3483	}
2613	3484
2614	3485	refreshContents();
2615	3486	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3487	+ if (source == pigmentBumpItem)
2617	3488	{
2618	3489	Object3D obj;
2619	3490	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3495,262 @@
2624	3495
2625	3496	refreshContents();
2626	3497	} else
2627		- 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)
2628	3524	{
2629	3525	CameraPane.flash = true;
2630	3526	refreshContents();
2631	3527	} else
2632		- if (event.getSource() == oneButton)
	3528	+ if (source == oneButton)
2633	3529	{
2634	3530	} else
2635		- if (event.getSource() == twoButton)
	3531	+ if (source == twoButton)
2636	3532	{
2637	3533	radio.layout = twoButton;
	3534	+
	3535	+ if (CameraPane.FULLSCREEN)
	3536	+ fullscreenLayout = radio.layout;
	3537	+
2638	3538	// bug
2639	3539	//gridPanel.setDividerLocation(1.0);
2640	3540	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- 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	+
2665	3588	} else
2666		- if (event.getSource() == threeButton)
	3589	+ if (source == threeButton)
2667	3590	{
2668	3591	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- 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();
2693	3629	} else
2694		- if (event.getSource() == fourButton)
	3630	+ if (source == fourButton)
2695	3631	{
2696	3632	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- 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();
2721	3669	} else
2722		- if (event.getSource() == sixButton)
	3670	+ if (source == sixButton)
2723	3671	{
2724	3672	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- 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();
2749	3710	} else
2750		- if (event.getSource() == sevenButton)
	3711	+ if (source == sevenButton)
2751	3712	{
2752	3713	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- 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();
2777	3752	} else
2778		- if (event.getSource() == rootButton)
	3753	+ if (source == rootButton)
2779	3754	{
2780	3755	Object3D obj;
2781	3756	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3760,84 @@
2785	3760	EditObject(obj);
2786	3761	}
2787	3762
	3763	+ cameraView.requestFocusInWindow();
2788	3764	refreshContents(true);
2789	3765	} else
2790		- if (event.getSource() == closeButton)
	3766	+ if (source == closeButton)
2791	3767	{
2792	3768	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3769	cRadio ab;
2794	3770	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3771	{
2796	3772	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3773	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3774	{
	3775	+ // Patch to avoid bug with transparency.
	3776	+ if (!ab.hadMaterial)
	3777	+ {
	3778	+ ab.object.material = null;
	3779	+ }
	3780	+
2799	3781	buttonGroup.remove(ab);
2800	3782	radioPanel.remove(ab);
2801	3783
2802		- ab.GetObject().editWindow = null;
	3784	+ //ab.GetObject().editWindow = null;
	3785	+ ab.GetObject().manipWindow = null;
2803	3786	// ab.GetObject().objectUI = null; // ?????????
2804	3787
2805	3788	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3789	break;
2807	3790	}
2808	3791	}
	3792	+
	3793	+ cameraView.requestFocusInWindow();
2809	3794	refreshContents(true);
2810	3795	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3796	+ if (source == editItem \|\| source == editButton)
2812	3797	{
	3798	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3799	+ {
	3800	+ Object3D child = (Object3D)e.nextElement();
	3801	+ child.pinned = true;
	3802	+ }
	3803	+
2813	3804	EditSelection(false);
2814	3805	} else
2815		- if (event.getSource() == uneditButton)
	3806	+ if (source == uneditButton)
2816	3807	{
2817	3808	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3809	{
2819	3810	Object3D child = (Object3D)e.nextElement();
2820	3811	if(child.editWindow != null)
2821	3812	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3813	+ child.pinned = false;
2822	3814	child.CloseUI();
2823	3815	listUI.remove(child);
2824	3816
2825		- child.editWindow = null; // ???????????
	3817	+ //child.editWindow = null; // ???????????
2826	3818	}
2827		- objEditor.ctrlPanel.revalidate();
	3819	+ objEditor.ctrlPanel.FlushUI();
2828	3820	//objEditor.jTree.clearSelection();
2829	3821	//objEditor.ResetSliders();
2830	3822	refreshContents(true);
2831	3823	} else
2832		- if (event.getSource() == clearPanelButton)
	3824	+ if (source == clearPanelButton)
2833	3825	{
2834	3826	assert(copy == group);
2835	3827	//copy.ClearUI();
2836	3828	for (Object3D obj : listUI)
2837	3829	{
	3830	+ obj.pinned = false;
2838	3831	obj.CloseUI();
2839	3832	}
2840	3833	listUI.clear();
2841	3834	refreshContents(true);
2842	3835	} else
2843		- if (event.getSource() == allParamsButton)
	3836	+ if (source == allParamsButton)
2844	3837	{
2845	3838	assert(copy == group);
2846	3839
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3840	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3841
2849	3842	for (Object3D obj : listUI)
2850	3843	{
..	..	@@ -2861,19 +3854,19 @@
2861	3854
2862	3855	refreshContents(true);
2863	3856	} else
2864		- if (event.getSource() == unselectButton)
	3857	+ if (source == unselectButton)
2865	3858	{
2866	3859	objEditor.jTree.clearSelection();
2867	3860	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3861	objEditor.ResetSliders();
2869	3862	refreshContents(true);
2870	3863	} else
2871		- if(event.getSource() instanceof cRadio)
	3864	+ if(source instanceof cRadio)
2872	3865	{
2873	3866	group.parent = keepparent;
2874	3867	group.attributes = 0;
2875	3868	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3869	+ /cRadio/ radio = (cRadio)source;
2877	3870	Object3D obj = radio.GetObject();
2878	3871	System.out.println("Edit " + obj);
2879	3872	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3886,10 @@
2893	3886	}
2894	3887
2895	3888	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3889	+
	3890	+ SetUndoStates();
	3891	+
	3892	+ //Globals.theRenderer.object = group;
2897	3893	if(!useclient)
2898	3894	{
2899	3895	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3898,52 @@
2902	3898	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3899	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3900	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3901	+ //cameraView.lighttouched = true;
	3902	+ Globals.lighttouched = true;
2906	3903	topView.object = group;
2907	3904	frontView.object = group;
2908	3905	sideView.object = group;
2909	3906	}
2910		- group.editWindow = this;
	3907	+
	3908	+// fix "+" issue
	3909	+ //group.editWindow = this;
	3910	+ group.manipWindow = this;
	3911	+
2911	3912	/*
2912	3913	currentLayout = radio.layout;
2913	3914	if (currentLayout == null)
2914	3915	currentLayout = sevenButton;
2915	3916	*/
2916	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);
2917	3925	keepparent = group.parent;
2918	3926	// PARENT = NULL or not???
2919	3927	//group.parent = null; // ROOT
2920	3928	//group.attributes = -1;
2921	3929	ResetModel();
	3930	+
	3931	+ cameraView.requestFocusInWindow();
2922	3932	refreshContents(true);
2923		- }
	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	+ }
2924	3947	else
2925	3948	{
2926	3949	//return super.action(event, arg);
..	..	@@ -2929,7 +3952,6 @@
2929	3952	}
2930	3953
2931	3954	boolean useclient = false;
2932		- cRadio radio;
2933	3955
2934	3956	void ToggleRoot()
2935	3957	{
..	..	@@ -2938,7 +3960,7 @@
2938	3960	if (useclient)
2939	3961	{
2940	3962	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3963	+ Globals.lighttouched = true;
2942	3964	//topView.object = client;
2943	3965	//frontView.object = client;
2944	3966	//sideView.object = client;
..	..	@@ -2946,7 +3968,7 @@
2946	3968	else
2947	3969	{
2948	3970	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3971	+ Globals.lighttouched = true;
2950	3972	//topView.object = group;
2951	3973	//frontView.object = group;
2952	3974	//sideView.object = group;
..	..	@@ -2981,6 +4003,28 @@
2981	4003	refreshContents();
2982	4004	}
2983	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	+ }
2984	4028
2985	4029	void ResetTransform()
2986	4030	{
..	..	@@ -3093,7 +4137,7 @@
3093	4137	refreshContents();
3094	4138	}
3095	4139
3096		- void ResetCentroid()
	4140	+ void ResetCentroid(boolean full)
3097	4141	{
3098	4142	Object3D obj;
3099	4143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +4152,16 @@
3108	4152	LA.matIdentity(Object3D.mat);
3109	4153	obj.getBounds(minima, maxima, false);
3110	4154	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4155	+ if (full)
	4156	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	4157	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	4158	obj.TransformMesh(Object3D.mat);
	4159	+
3114	4160	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4161	+ if (full)
	4162	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	4163	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4164	+
3117	4165	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	4166	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	4167	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +4190,8 @@
3142	4190
3143	4191	int size = obj.MemorySize();
3144	4192
3145		- 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)");
3146	4195	}
3147	4196	}
3148	4197	catch (Exception e)
..	..	@@ -3179,9 +4228,9 @@
3179	4228	obj = (Object3D)e.nextElement();
3180	4229
3181	4230	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	4231	+ Grafreed.AnalyzeObject(obj);
3183	4232	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	4233	+ Grafreed.AnalyzeObject(obj.bRep);
3185	4234
3186	4235	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	4236	}
..	..	@@ -3223,6 +4272,13 @@
3223	4272	void GenNormals(boolean crease)
3224	4273	{
3225	4274	group.GenNormalsS(crease);
	4275	+
	4276	+ refreshContents();
	4277	+ }
	4278	+
	4279	+ void GenNormalsMESH()
	4280	+ {
	4281	+ group.GenNormalsMeshS();
3226	4282
3227	4283	refreshContents();
3228	4284	}
..	..	@@ -3395,8 +4451,8 @@
3395	4451
3396	4452	void ParseVertices()
3397	4453	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4454	+ boolean epsequal = Grafreed.epsequal;
	4455	+ Grafreed.epsequal = true;
3400	4456
3401	4457	for (int i=0; i<group.selection.size(); i++)
3402	4458	{
..	..	@@ -3421,7 +4477,7 @@
3421	4477	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4478	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4479
3424		- g.add(GrafreeD.clipboard);
	4480	+ g.add(Grafreed.clipboard);
3425	4481
3426	4482	buffer.add(g);
3427	4483	}
..	..	@@ -3436,7 +4492,7 @@
3436	4492	makeSomething(buffer, i==group.selection.size()-1);
3437	4493	}
3438	4494
3439		- GrafreeD.epsequal = epsequal;
	4495	+ Grafreed.epsequal = epsequal;
3440	4496
3441	4497	refreshContents();
3442	4498	}
..	..	@@ -3454,7 +4510,16 @@
3454	4510	String pigment = Object3D.GetPigment(tex);
3455	4511	//String bump = Object3D.GetBump(tex);
3456	4512
3457		- 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	+ }
3458	4523
3459	4524	double s = v.s;
3460	4525
..	..	@@ -3542,11 +4607,11 @@
3542	4607
3543	4608	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4609
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4610	+ boolean random = CameraPane.SWITCH;
	4611	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4612	lowres.linkVerticesThis(null);
3548	4613	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4614	+ CameraPane.SWITCH = random;
3550	4615
3551	4616	System.err.flush();
3552	4617
..	..	@@ -3586,7 +4651,7 @@
3586	4651	return;
3587	4652
3588	4653	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4654	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4655
3591	4656	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4657
..	..	@@ -3755,7 +4820,7 @@
3755	4820	group.selection.RelinkToSupport(); // july 2014
3756	4821	System.out.println("DONE.");
3757	4822	refreshContents();
3758		- 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));
3759	4824	}
3760	4825
3761	4826	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4845,9 @@
3780	4845
3781	4846	void ClipMesh()
3782	4847	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4848	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4849	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4850	+ Object3D content = Grafreed.clipboard.get(0);
3786	4851
3787	4852	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4853	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4856,7 @@
3791	4856	// {
3792	4857	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4858	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4859	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4860	}
3796	4861	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4862	System.out.println("DONE.");
..	..	@@ -3838,6 +4903,18 @@
3838	4903	void MarkLeaves(boolean hide)
3839	4904	{
3840	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);
3841	4918	refreshContents();
3842	4919	}
3843	4920
..	..	@@ -3912,28 +4989,25 @@
3912	4989	// }
3913	4990	// }
3914	4991
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4992	void EditSelection(boolean newWindow)
3920	4993	{
	4994	+ if (group.selection == null)
	4995	+ {
	4996	+ EditElement(group, newWindow); // ? new
	4997	+ return;
	4998	+ }
	4999	+
3921	5000	// aConstraints.gridy = 0;
3922	5001	for (int i=0; i<group.selection.size(); i++)
3923	5002	{
3924	5003	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	5004	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	5005	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	5006
3928	5007	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	5008	+ if(elem != group \|\| !newWindow)
3930	5009	{
3931		- // if (!(elem instanceof Composite))
3932		- // newWindow = false;
3933		- listUI.add(elem);
3934		- elem.openEditWindow(this, newWindow); //, false);
3935		- System.out.println("edit : " + elem);
3936		- elem.editWindow.refreshContents(true); // ? new
	5010	+ EditElement(elem, newWindow); // ? new
3937	5011	}
3938	5012	}
3939	5013	}
..	..	@@ -4008,7 +5082,8 @@
4008	5082	//new Exception().printStackTrace();
4009	5083
4010	5084	freezemodel = true;
4011		-
	5085	+ ClearUnpinned();
	5086	+
4012	5087	/**/
4013	5088	//switch (event.id)
4014	5089	{
..	..	@@ -4016,7 +5091,6 @@
4016	5091	//case 702: // Event.LIST_DESELECT
4017	5092	group.deselectAll();
4018	5093	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	5094	if (tps != null)
4021	5095	{
4022	5096	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +5099,39 @@
4025	5099
4026	5100	//if (child.parent != null)
4027	5101	//child.parent.addSelectee(child);
	5102	+ objEditor.SetMaterial(child);
4028	5103	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	5104	}
4033	5105	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	5106	+// else
	5107	+// {
	5108	+// objEditor.SetMaterial(group); // .GetMaterial());
	5109	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5110	+// System.err.println("info : " + group.GetPath());
	5111	+// }
4040	5112
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- 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))
4044	5114	CameraPane.flash = true;
4045	5115
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5116	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	5117	// a camera
4048	5118	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // 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;
4053	5126	}
4054	5127
	5128	+ if (tps != null && tps.length == 1)
	5129	+ {
	5130	+ EditSelection(false);
	5131	+ }
	5132	+
	5133	+ SetPinStates(tps != null && tps.length > 0);
	5134	+
4055	5135	refreshContents();
4056	5136	//return true;
4057	5137	}
..	..	@@ -4060,6 +5140,35 @@
4060	5140
4061	5141	freezemodel = false;
4062	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	+ }
4063	5172
4064	5173	void linkSomething(Object3D thing)
4065	5174	{
..	..	@@ -4131,16 +5240,19 @@
4131	5240	{
4132	5241	if (group.selection.isEmpty())
4133	5242	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	5243	+
	5244	+ Grafreed.clipboardIsTempGroup = false;
4135	5245	Composite tGroup = null;
4136	5246	if (group.selection.size() > 0) // 1)
4137	5247	{
4138	5248	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	5249	+ Grafreed.clipboardIsTempGroup = true;
4140	5250	}
4141	5251
4142	5252	if (cut)
4143	5253	{
	5254	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5255	+// Save();
4144	5256	//int indices[] = jList.getSelectedIndices();
4145	5257	//for (int i = indices.length - 1; i >= 0; i--)
4146	5258	//jList.remove(indices[i]);
..	..	@@ -4176,16 +5288,16 @@
4176	5288	//System.out.println("cut " + child);
4177	5289	//System.out.println("parent = " + child.parent);
4178	5290	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	5291	+ if (Grafreed.clipboardIsTempGroup)
4180	5292	tGroup.add/Child/(tmp);
4181	5293	else
4182		- GrafreeD.clipboard = tmp;
	5294	+ Grafreed.clipboard = tmp;
4183	5295	}
4184	5296	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	5297	+ if (Grafreed.clipboardIsTempGroup)
4186	5298	tGroup.add/Child/(child);
4187	5299	else
4188		- GrafreeD.clipboard = child;
	5300	+ Grafreed.clipboard = child;
4189	5301	}
4190	5302
4191	5303	//ResetModel();
..	..	@@ -4217,21 +5329,23 @@
4217	5329	//System.out.println("cut " + elem);
4218	5330	//System.out.println("parent = " + elem.parent);
4219	5331	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	5332	+ if (Grafreed.clipboardIsTempGroup)
4221	5333	tGroup.add/Child/(tmp);
4222	5334	else
4223		- GrafreeD.clipboard = tmp;
	5335	+ Grafreed.clipboard = tmp;
4224	5336	}
4225	5337	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	5338	+ if (Grafreed.clipboardIsTempGroup)
4227	5339	tGroup.add/Child/(child);
4228	5340	else
4229		- GrafreeD.clipboard = child;
	5341	+ Grafreed.clipboard = child;
4230	5342	}
4231	5343
4232	5344	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	5345	+
	5346	+ if (Grafreed.clipboardIsTempGroup)
	5347	+ Grafreed.clipboard = tGroup;
	5348	+
4235	5349	if (cut)
4236	5350	{
4237	5351	ResetModel();
..	..	@@ -4241,11 +5355,15 @@
4241	5355
4242	5356	void paste(boolean expand)
4243	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4244	5362	// if (GrafreeD.clipboard == null)
4245	5363	// return;
4246	5364	boolean first = true;
4247	5365
4248		- if (GrafreeD.clipboardIsTempGroup)
	5366	+ if (Grafreed.clipboardIsTempGroup)
4249	5367	{
4250	5368	Composite temp;
4251	5369
..	..	@@ -4256,7 +5374,7 @@
4256	5374	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5375	*/
4258	5376	Object3D elem;
4259		- 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))
4260	5378	{
4261	5379	Object3D child = (Object3D)e.nextElement();
4262	5380
..	..	@@ -4290,21 +5408,22 @@
4290	5408	//Object3D cb = Applet3D.clipboard;
4291	5409	//temp.addChild(cb);
4292	5410	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- 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());
4298	5416	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5417	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5418	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5419	}
4302	5420
	5421	+ Globals.REPLACEONMAKE = keep;
4303	5422	ResetModel();
4304	5423	refreshContents();
4305	5424	}
4306	5425
4307		- void pasteInto(boolean copyit)
	5426	+ void pasteInto(boolean copyit, boolean clone)
4308	5427	{
4309	5428	// if (GrafreeD.clipboard == null)
4310	5429	// return;
..	..	@@ -4333,15 +5452,22 @@
4333	5452	if (copyit)
4334	5453	{
4335	5454	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5455	+ if (clone)
	5456	+ {
	5457	+ CloneClipboard(false); // sept 2014
	5458	+ }
	5459	+ else
	5460	+ {
	5461	+ paste(false);
	5462	+ }
4337	5463	}
4338	5464	else
4339	5465	{
4340	5466	boolean first = true;
4341	5467
4342		- if (GrafreeD.clipboardIsTempGroup)
	5468	+ if (Grafreed.clipboardIsTempGroup)
4343	5469	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5470	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5471	Object3D copy;
4346	5472	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5473	{
..	..	@@ -4351,7 +5477,7 @@
4351	5477	}
4352	5478	} else
4353	5479	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5480	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5481	}
4356	5482	}
4357	5483	}
..	..	@@ -4428,6 +5554,10 @@
4428	5554
4429	5555	void group(Object3D csg, boolean grab)
4430	5556	{
	5557	+ if (Globals.REPLACEONMAKE)
	5558	+ Save();
	5559	+ boolean keep = Globals.REPLACEONMAKE;
	5560	+ Globals.REPLACEONMAKE = false;
4431	5561	if (//false) // why??
4432	5562	!group.selection.isEmpty())
4433	5563	{
..	..	@@ -4541,10 +5671,15 @@
4541	5671	//node.add(csg);
4542	5672	//makeSomething(node);
4543	5673	makeSomething(csg);
	5674	+ Globals.REPLACEONMAKE = keep;
4544	5675	}
4545	5676
4546	5677	void Ungroup(Object3D g)
4547	5678	{
	5679	+ if (Globals.REPLACEONMAKE)
	5680	+ Save();
	5681	+ boolean keep = Globals.REPLACEONMAKE;
	5682	+ Globals.REPLACEONMAKE = false;
4548	5683	if (g instanceof HiddenObject)
4549	5684	{
4550	5685	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5696,7 @@
4561	5696	objEditor.makeSomething(g.get(i), false);
4562	5697	}
4563	5698	}
	5699	+ Globals.REPLACEONMAKE = keep;
4564	5700	}
4565	5701
4566	5702	void ungroup()
..	..	@@ -4756,21 +5892,6 @@
4756	5892	}
4757	5893	*/
4758	5894
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5895	/*
4775	5896	public void Callback(Object obj)
4776	5897	{
..	..	@@ -4794,26 +5915,9 @@
4794	5915	}
4795	5916	*/
4796	5917
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5918	String GetFile(String dialogName)
4815	5919	{
4816		- if (GrafreeD.standAlone)
	5920	+ if (Grafreed.standAlone)
4817	5921	{
4818	5922	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5923	browser.show();
..	..	@@ -4877,10 +5981,49 @@
4877	5981	cButton flashSelectionButton;
4878	5982	cButton editButton;
4879	5983	cButton uneditButton;
	5984	+ JCheckBox allParamsButton;
4880	5985	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5986	cButton unselectButton;
4883	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	+
4884	6027	cButton screenfitButton;
4885	6028	cButton screenfitpointButton;
4886	6029	cButton snapobjectButton;
..	..	@@ -4892,14 +6035,6 @@
4892	6035
4893	6036	cButton setsupportButton;
4894	6037
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	6038	//
4904	6039	//Composite
4905	6040	Object3D // to do !!
..	..	@@ -4909,9 +6044,11 @@
4909	6044	//JTree jTree;
4910	6045	private MenuItem lookAtItem;
4911	6046	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	6047	+ private MenuItem switchViewItem;
4913	6048	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	6049	+ private MenuItem undoItem;
	6050	+ private MenuItem redoItem;
	6051	+ private JMenuItem duplicateItem;
4915	6052	private MenuItem cloneItem;
4916	6053	private MenuItem cloneSupportItem;
4917	6054	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +6061,7 @@
4924	6061	private MenuItem linkverticesItem;
4925	6062	private MenuItem relinkverticesItem;
4926	6063	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	6064	+ private MenuItem resetAllItem;
4928	6065	private MenuItem stepAllItem;
4929	6066	private MenuItem revertMeshItem;
4930	6067	private MenuItem poseMeshItem;
..	..	@@ -4935,10 +6072,11 @@
4935	6072	private MenuItem mergeGeometriesItem;
4936	6073	private MenuItem copyItem;
4937	6074	private MenuItem pasteItem;
	6075	+ private MenuItem pasteIntoItem;
4938	6076	private MenuItem pasteLinkItem;
4939	6077	private MenuItem pasteCloneItem;
4940	6078	private MenuItem pasteExpandItem;
4941		- private MenuItem clearItem;
	6079	+ private MenuItem deleteItem;
4942	6080	private MenuItem clearAllItem;
4943	6081	private MenuItem genUVItem;
4944	6082	private MenuItem genNormalsMESHItem;
..	..	@@ -4973,6 +6111,10 @@
4973	6111	private MenuItem showleavesItem;
4974	6112	private MenuItem markleavesItem;
4975	6113	private MenuItem unmarkleavesItem;
	6114	+ private MenuItem rewindleavesItem;
	6115	+ private MenuItem unrewindleavesItem;
	6116	+ private MenuItem randomleavesItem;
	6117	+ private MenuItem unrandomleavesItem;
4976	6118
4977	6119	private MenuItem flipVItem;
4978	6120	private MenuItem unflipVItem;
..	..	@@ -4984,15 +6126,17 @@
4984	6126	private MenuItem panoTexturesItem;
4985	6127
4986	6128	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	6129	+ private MenuItem resetCentroidXZItem;
4988	6130	private MenuItem resetTransformItem;
	6131	+ private MenuItem transformGeometryItem;
	6132	+ private MenuItem transformChildrenItem;
4989	6133	private MenuItem hideItem;
4990	6134	private MenuItem grabItem;
4991	6135	private MenuItem backItem;
4992	6136	private MenuItem frontItem;
4993	6137	private MenuItem cameraItem;
4994	6138	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	6139	+ private MenuItem switchItem;
4996	6140	private MenuItem physicsItem;
4997	6141	private MenuItem frameselectorItem;
4998	6142	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +6151,7 @@
5007	6151
5008	6152	private MenuItem resetParentItem;
5009	6153	private MenuItem repairParentItem;
	6154	+ private MenuItem repairShadowItem;
5010	6155	private MenuItem sortbysizeItem;
5011	6156	private MenuItem sortbynameItem;
5012	6157
..	..	@@ -5015,6 +6160,8 @@
5015	6160	private MenuItem attachBumpItem;
5016	6161	private MenuItem detachBumpItem;
5017	6162	private MenuItem pigmentBumpItem;
	6163	+ private MenuItem embedTexturesItem;
	6164	+ private MenuItem deEmbedTexturesItem;
5018	6165
5019	6166	private MenuItem particleItem;
5020	6167	private MenuItem ragdollItem;
..	..	@@ -5031,7 +6178,7 @@
5031	6178	private MenuItem blobItem;
5032	6179	private MenuItem latheItem;
5033	6180	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	6181	+ private MenuItem overlayItem;
5035	6182	private MenuItem meshItem;
5036	6183	// private MenuItem meshGroupItem;
5037	6184	private MenuItem springItem;
..	..	@@ -5053,11 +6200,6 @@
5053	6200	private MenuItem doubleItem;
5054	6201	private MenuItem tripleItem;
5055	6202
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	6203	private MenuItem computeAOItem;
5062	6204	private MenuItem recompileItem;
5063	6205	private MenuItem editScriptItem;
..	..	@@ -5067,4 +6209,8 @@
5067	6209	private MenuItem analyzeItem;
5068	6210	private MenuItem dumpItem;
5069	6211	//boolean freezemodel = false;
	6212	+
	6213	+ Menu cameraMenu;
	6214	+ MenuItem editCameraItem;
	6215	+ MenuItem restoreCameraItem;
5070	6216	}