~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,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,7 +80,13 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
77	90	SetupUI2(objEditor);
78	91	objEditor.SetupUI(true);
79	92	SetupViews(objEditor);
..	..	@@ -83,6 +96,10 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
86	103	// Object3D keep = GrafreeD.clipboard;
87	104	//Object3D obj;
88	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +110,19 @@
93	110
94	111	makeSomething(clone, i==group.selection.size()-1);
95	112	}
	113	+ Globals.REPLACEONMAKE = keep;
96	114	}
97	115
98	116	void CloneClipboard(boolean supports)
99	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	123	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
108	126	}
109	127
110	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +136,7 @@
118	136	// obj.support = null;
119	137	if (!supports)
120	138	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	140	obj.parent = parent;
123	141	// obj.support = support;
124	142	// clone.support = support; // aout 2013
..	..	@@ -147,30 +165,29 @@
147	165
148	166	//JTextField nameField;
149	167
150		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
151	169	{
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);
	170	+ oe.jTree = new cTree();
	171	+
163	172	Menu menu;
164	173	oe.menuBar.add(menu = new Menu("Edit"));
165	174	//editItem = menu.add(new MenuItem("Edit"));
166	175	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	183	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	184	cloneItem = menu.add(new MenuItem("Clone"));
171	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
172	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	189	cloneSupportItem.addActionListener(this);
	190	+ }
174	191	menu.add("-");
175	192	cutItem = menu.add(new MenuItem("Cut"));
176	193	cutItem.addActionListener(this);
..	..	@@ -178,27 +195,123 @@
178	195	copyItem.addActionListener(this);
179	196	pasteItem = menu.add(new MenuItem("Paste"));
180	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
181	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	203	pasteLinkItem.addActionListener(this);
183	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	205	pasteCloneItem.addActionListener(this);
185	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	207	// pasteExpandItem.addActionListener(this);
	208	+ menu.add("-");
187	209	clearItem = menu.add(new MenuItem("Clear"));
188	210	clearItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
189	215	clearAllItem = menu.add(new MenuItem("Clear All"));
190	216	clearAllItem.addActionListener(this);
	217	+ }
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
191	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
192	306	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);
	307	+ if (Globals.ADVANCED)
	308	+ {
197	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	310	revertMeshItem.addActionListener(this);
199	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	312	resetreferencesItem.addActionListener(this);
201	313	menu.add("-");
	314	+ }
202	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	316	overwriteGeoItem.addActionListener(this);
204	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +323,104 @@
210	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	324	overwriteUVItem.addActionListener(this);
212	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
213	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	329	generateMeshItem.addActionListener(this);
215	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	331	poseMeshItem.addActionListener(this);
217	332	menu.add("-");
	333	+ }
218	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	335	resetsupportItem.addActionListener(this);
220	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	337	linkverticesItem.addActionListener(this);
222	338	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	339	relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
224	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	344	setMasterItem.addActionListener(this);
	345	+ }
226	346
227	347	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
230	350	backItem = menu.add(new MenuItem("Back"));
231	351	backItem.addActionListener(this);
232	352	frontItem = menu.add(new MenuItem("Front"));
233	353	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	360	hideItem.addActionListener(this);
	361	+ }
238	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	363	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);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
247	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	372	switchGeoItem.addActionListener(this);
249	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	374	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
253	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	384	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	385	+ }
257	386
258	387	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
261	390	billboardItem = menu.add(new MenuItem("Billboard"));
262	391	billboardItem.addActionListener(this);
263	392	csgItem = menu.add(new MenuItem("CSG"));
264	393	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	395	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	397	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
271	406	linkerItem = menu.add(new MenuItem("Linker"));
272	407	linkerItem.addActionListener(this);
273	408	templateItem = menu.add(new MenuItem("Template"));
274	409	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	411	pointflowItem.addActionListener(this);
	412	+ }
279	413	menu.add("-");
280	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	415	resetTransformItem.addActionListener(this);
282	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	417	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
286	424
287	425	oe.menuBar.add(menu = new Menu("Geometry"));
288	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +431,11 @@
293	431	genNormalsCADItem.addActionListener(this);
294	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	433	genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
296	436	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	437	genNormalsMINEItem.addActionListener(this);
	438	+ }
298	439	stripifyItem = menu.add(new MenuItem("Stripify"));
299	440	stripifyItem.addActionListener(this);
300	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +457,34 @@
316	457	reduce34MeshItem.addActionListener(this);
317	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	459	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
323	468
324	469	oe.menuBar.add(menu = new Menu("Attributes"));
325	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
327	476	menu.add("-");
328	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	478	liveleavesItem.addActionListener(this);
330	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
332	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	484	supportleavesItem.addActionListener(this);
334	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	486	unsupportleavesItem.addActionListener(this);
	487	+ }
336	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	489	hideleavesItem.addActionListener(this);
338	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +493,14 @@
341	493	markleavesItem.addActionListener(this);
342	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
344	504	menu.add("-");
345	505	flipVItem = menu.add(new MenuItem("Flip V"));
346	506	flipVItem.addActionListener(this);
..	..	@@ -376,35 +536,41 @@
376	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	537	sortbynameItem.addActionListener(this);
378	538	menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
379	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	547	extractGeometriesItem.addActionListener(this);
381	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	549	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);
	550	+ }
387	551
388	552	oe.menuBar.add(menu = new Menu("Insert"));
389	553	buildCreateMenu(menu);
390	554
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	555	oe.menuBar.add(menu = new Menu("Tools"));
403	556	buildToolsMenu(menu);
404	557	}
405	558
	559	+
406	560	void SetupUI2(ObjEditor oe)
407	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
408	574	//new Exception().printStackTrace();
409	575
410	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,153 +599,230 @@
433	599	oe.radioPanel.add(dummyButton);
434	600	oe.buttonGroup.add(dummyButton);
435	601	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
439	605
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	606	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	607	+
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
441	660	liveCB.addItemListener(this);
442	661
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);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
461	668	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);
	669	+
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
468	675
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	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	677	// 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	678
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);
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	687
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	689	+ twoButton.setToolTipText("Show center view only");
532	690	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	694	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	695	+ fourButton.setToolTipText("Show left panel only");
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ sixButton.setToolTipText("2-column layout left");
536	698	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ threeButton.setToolTipText("2-column layout right");
538	701	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ sevenButton.setToolTipText("3-column layout");
540	704	sevenButton.addActionListener(this);
541	705	//
542	706
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
544	709	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ closeButton.setToolTipText("Close tab");
547	713	closeButton.addActionListener(this);
548	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	715	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	716
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
560	802	uneditButton.addActionListener(this);
561	803
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
574	806	allParamsButton.addActionListener(this);
575	807
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
581	814	unselectButton.addActionListener(this);
582	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
583	826	// oe.aConstraints.gridx += 1;
584	827	// oe.aConstraints.weighty = 0;
585	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +834,25 @@
591	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	835	// gcButton.addActionListener(this);
593	836
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
605	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	842	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
628	856	//jList.addListSelectionListener(this);
629	857	oe.jTree.addTreeSelectionListener(this);
630	858	//jTree.setRootVisible(false);
..	..	@@ -646,10 +874,144 @@
646	874	radio.layout = sevenButton;
647	875	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	876	}
	877	+
	878	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	879	+ {
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
	912	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	913	+ // localCB.addItemListener(this);
	914	+
	915	+ panel.Return();
	916	+
	917	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	918	+ crowdCB.setToolTipText("Used for crowds");
	919	+ crowdCB.addItemListener(this);
	920	+
	921	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	922	+ smoothCB.setToolTipText("Snapping delay");
	923	+ smoothCB.addItemListener(this);
	924	+
	925	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	926	+ slowCB.setToolTipText("Smooth interpolation");
	927	+ slowCB.addItemListener(this);
	928	+
	929	+// constraints.gridy += 1;
	930	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	931	+// speakerMocapCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+
	935	+ if (false)
	936	+ {
	937	+ // handled in scripts
	938	+ //constraints.gridy += 1;
	939	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	940	+ speakerCameraCB.addItemListener(this);
	941	+
	942	+ //constraints.gridy += 1;
	943	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	944	+ speakerFocusCB.addItemListener(this);
	945	+
	946	+ //constraints.gridy += 1;
	947	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	948	+ smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
	950	+ }
	951	+
	952	+//constraints.gridx += 1;
	953	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	954	+// debugCB.addItemListener(this);
	955	+
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
	960	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
	962	+ oeilCB.addItemListener(this);
	963	+
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	985	+ lookAtCB.setToolTipText("Look-at target");
	986	+ lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
	1001	+
	1002	+ }
649	1003
650	1004	void EditObject(Object3D obj)
651	1005	{
652	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
653	1015	radioButton.SetObject(obj);
654	1016	radioButton.layout = sevenButton;
655	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -658,8 +1020,11 @@
658	1020	buttonGroup.add(radioButton);
659	1021	radioButton.doClick();
660	1022	}
	1023	+
661	1024	void SetupViews(ObjEditor oe)
662	1025	{
	1026	+ theFrame = this;
	1027	+
663	1028	oe.SetupViews();
664	1029
665	1030	System.out.println("SetupViews");
..	..	@@ -668,22 +1033,28 @@
668	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	1034	}
670	1035
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
681	1049	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
687	1058
688	1059	// static int COLOR = 1;
689	1060	// static int MATERIAL = 2;
..	..	@@ -691,9 +1062,9 @@
691	1062
692	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1064
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
697	1068
698	1069	public void itemStateChanged(ItemEvent e)
699	1070	{
..	..	@@ -721,6 +1092,7 @@
721	1092	} else if(e.getSource() == liveCB)
722	1093	{
723	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
724	1096	}
725	1097	else if(e.getSource() == supportCB)
726	1098	{
..	..	@@ -756,6 +1128,10 @@
756	1128	cameraView.repaint();
757	1129	// refreshContents();
758	1130	}
	1131	+ else if(e.getSource() == zoomBoxCB)
	1132	+ {
	1133	+ cameraView.ToggleZoomBoxMode();
	1134	+ }
759	1135	else if(e.getSource() == smoothfocusCB)
760	1136	{
761	1137	cameraView.ToggleSmoothFocus();
..	..	@@ -781,6 +1157,18 @@
781	1157	{
782	1158	cameraView.ToggleOeil();
783	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
784	1172	else if(e.getSource() == lookAtCB)
785	1173	{
786	1174	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1185,8 @@
797	1185
798	1186	/**/
799	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1191	// We can't move the root node or an empty selection
803	1192	return;
..	..	@@ -860,8 +1249,6 @@
860	1249	}
861	1250	}
862	1251
863		- String string = (String) object;
864		-
865	1252	System.out.println("Transfer = " + object + "; drop : " + target);
866	1253	// if( object instanceof java.io.File[])
867	1254	// {
..	..	@@ -869,7 +1256,11 @@
869	1256	// objEditor.DropFile((java.io.File[]) object, true);
870	1257	// return;
871	1258	// }
872		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1264	{
874	1265	// file(s)
875	1266	String[] names = string.split("\n");
..	..	@@ -896,7 +1287,7 @@
896	1287
897	1288	flashIt = false;
898	1289	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1292
902	1293	if (group.selection.size() == 1)
..	..	@@ -912,23 +1303,33 @@
912	1303
913	1304	assert target == objEditor.jTree;
914	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
915	1307	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1309	} catch (Exception e) {
918	1310	System.out.println("destinationPath : " + destinationPath);
919	1311	return;
920	1312	}
921	1313
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
923	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
924	1325	loadClipboard(true);
925	1326	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
932	1333	}
933	1334	public void dropActionChanged(DropTargetDragEvent dtde)
934	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1033,85 +1434,107 @@
1033	1434	{
1034	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1436	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1048	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1456	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1052	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1464	ragdollItem.addActionListener(this);
1054	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1056	1468	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1470	meshItem.addActionListener(this);
1059	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1061	1475	springItem = menu.add(new MenuItem("Spring"));
1062	1476	springItem.addActionListener(this);
1063	1477	flagItem = menu.add(new MenuItem("Flag"));
1064	1478	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1479	blobItem = menu.add(new MenuItem("Blob"));
1070	1480	blobItem.addActionListener(this);
1071	1481	latheItem = menu.add(new MenuItem("Lathe"));
1072	1482	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1075	1490	menu.add("-");
1076	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1492	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1080	1495	doubleItem = menu.add(new MenuItem("Fork"));
1081	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1082	1499	tripleItem = menu.add(new MenuItem("Trident"));
1083	1500	tripleItem.addActionListener(this);
	1501	+ }
1084	1502	}
1085	1503
1086	1504	void buildToolsMenu(Menu menu)
1087	1505	{
1088	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1507	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1091	1512
1092	1513	menu.add("-");
1093	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1515	parseverticesItem.addActionListener(this);
1095	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1517	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1519	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1521	reduceMorphItem.addActionListener(this);
1103	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1523	reduce34MorphItem.addActionListener(this);
1105		-
1106		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1107		- computeAOItem.addActionListener(this);
1108	1524	menu.add("-");
1109		-
1110	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1112	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1536	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1538	dumpItem.addActionListener(this);
1116	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1540	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1552,7 @@
1129	1552	menu.add("-");
1130	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1554	editScriptItem.addActionListener(this);
	1555	+ }
1132	1556	}
1133	1557
1134	1558	void ScreenFit()
..	..	@@ -1251,9 +1675,24 @@
1251	1675	shadow.material = new cMaterial(obj.material);
1252	1676	shadow.material.diffuse = 0.0001f;
1253	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1254	1679
1255	1680	makeSomething(shadow);
1256	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1257	1696
1258	1697	/**
1259	1698	* applyExample
..	..	@@ -1457,9 +1896,9 @@
1457	1896
1458	1897	void Overwrite(int mask)
1459	1898	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1900	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1463	1902
1464	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1904	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1921,7 @@
1482	1921	//
1483	1922	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1923	{
	1924	+ Object source = event.getSource();
1485	1925	/*
1486	1926	if (event.getSource() == nameField)
1487	1927	{
..	..	@@ -1493,11 +1933,11 @@
1493	1933	}
1494	1934	else
1495	1935	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1936	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1937	{
1498	1938	ScreenFit();
1499	1939	} else
1500		- if (event.getSource() == switchItem)
	1940	+ if (source == switchViewItem)
1501	1941	{
1502	1942	cVector v1 = new cVector();
1503	1943	cVector v2 = new cVector();
..	..	@@ -1506,11 +1946,11 @@
1506	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1947	objEditor.cameraView.repaint();
1508	1948	} else
1509		- if (event.getSource() == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1510	1950	{
1511	1951	makeSomething(new Box());
1512	1952	} else
1513		- if (event.getSource() == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1514	1954	{
1515	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1971,9 @@
1531	1971	applyExample(particleGeom, "SMOKE");
1532	1972	makeSomething(particleGeom);
1533	1973	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1974	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1975	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1976	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1977
1538	1978	ragdoll.toParent = LA.newMatrix();
1539	1979	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1991,7 @@
1551	1991	} else
1552	1992	/*
1553	1993	*/
1554		- if (event.getSource() == heightFieldItem)
	1994	+ if (source == heightFieldItem)
1555	1995	{
1556	1996	Object3D obj = new Object3D();
1557	1997
..	..	@@ -1589,31 +2029,31 @@
1589	2029
1590	2030	makeSomething(obj);
1591	2031	} else
1592		- if (event.getSource() == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1593	2033	{
1594	2034	makeSomething(new Grid());
1595	2035	} else
1596		- if (event.getSource() == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	2037	{
1598	2038	makeSomething(new Sphere());
1599	2039	} else
1600		- if (event.getSource() == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1601	2041	{
1602	2042	makeSomething(new Cone());
1603	2043	} else
1604		- if (event.getSource() == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1605	2045	{
1606	2046	makeSomething(new Torus());
1607	2047	} else
1608		- if (event.getSource() == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1609	2049	{
1610	2050	makeSomething(new Superellipsoid());
1611	2051	} else
1612		- if (event.getSource() == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1613	2053	{
1614	2054	makeSomething(new Klein());
1615	2055	} else
1616		- if (event.getSource() == blobItem)
	2056	+ if (source == blobItem)
1617	2057	{
1618	2058	Blob blob = new Blob();
1619	2059	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2061,15 @@
1621	2061	//blob.retile();
1622	2062	makeSomething(blob);
1623	2063	} else
1624		- if (event.getSource() == latheItem)
	2064	+ if (source == latheItem)
1625	2065	{
1626	2066	makeSomething(new Lathe());
1627	2067	} else
1628		- if (event.getSource() == bezierItem)
	2068	+ if (source == bezierItem)
1629	2069	{
1630	2070	makeSomething(new BezierSurface());
1631	2071	} else
1632		- if (event.getSource() == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1633	2073	{
1634	2074	/*
1635	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2084,7 @@
1644	2084	*/
1645	2085	makeSomething(new Checker());
1646	2086	} else
1647		- if (event.getSource() == meshItem)
	2087	+ if (source == meshItem)
1648	2088	{
1649	2089	Object3D itemtomake = new Object3D();
1650	2090	Object3D child;
..	..	@@ -1665,35 +2105,35 @@
1665	2105	makeSomething(child);
1666	2106	}
1667	2107	} else
1668		- if (event.getSource() == springItem)
	2108	+ if (source == springItem)
1669	2109	{
1670	2110	cSpring s = new cSpring();
1671	2111	s.setup();
1672	2112	makeSomething(s);
1673	2113	} else
1674		- if (event.getSource() == flagItem)
	2114	+ if (source == flagItem)
1675	2115	{
1676	2116	cSpring s = new cFlag();
1677	2117	s.setup();
1678	2118	makeSomething(s);
1679	2119	} else
1680		- if (event.getSource() == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1681	2121	{
1682	2122	makeSomething(new Light());
1683	2123	} else
1684		- if (event.getSource() == csgItem)
	2124	+ if (source == csgItem)
1685	2125	{
1686	2126	group(new CSG());
1687	2127	} else
1688		- if (event.getSource() == templateItem)
	2128	+ if (source == templateItem)
1689	2129	{
1690	2130	group(new cTemplate());
1691	2131	} else
1692		- if (event.getSource() == attributeItem)
	2132	+ if (source == attributeItem)
1693	2133	{
1694	2134	makeSomething(new Attribute());
1695	2135	} else
1696		- if (event.getSource() == pointflowItem)
	2136	+ if (source == pointflowItem)
1697	2137	{
1698	2138	makeSomething(new PointFlow());
1699	2139	} else
..	..	@@ -1705,7 +2145,7 @@
1705	2145	} else
1706	2146	*/
1707	2147
1708		- if (event.getSource() == superLoopItem)
	2148	+ if (source == superLoopItem)
1709	2149	{
1710	2150	Composite g = new cGroup();
1711	2151	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2167,30 @@
1727	2167
1728	2168	group(g);
1729	2169	} else
1730		- if (event.getSource() == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1731	2171	{
1732	2172	Composite csg = new GroupLeaf();
1733	2173	csg.count = 5;
1734	2174	group(csg);
1735		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1736	2176	csg.addChild(child);
1737	2177	child.addChild(csg);
1738	2178	} else
1739		- if (event.getSource() == doubleItem)
	2179	+ if (source == doubleItem)
1740	2180	{
1741		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1742	2182	csg.count = 5;
1743	2183	group(csg);
1744		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1745	2185	csg.addChild(child);
1746	2186	child.addChild(csg);
1747		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1748	2188	csg.addChild(child);
1749	2189	child.addChild(csg);
1750	2190	} else
1751		- if (event.getSource() == tripleItem)
	2191	+ if (source == tripleItem)
1752	2192	{
1753		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1754	2194	csg.count = 4;
1755	2195	group(csg);
1756	2196	Composite child = new cGroup();
..	..	@@ -1763,73 +2203,98 @@
1763	2203	csg.addChild(child);
1764	2204	child.addChild(csg);
1765	2205	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
	2206	+ if (source == computeAOItem)
1768	2207	{
1769		- ImportGFD();
	2208	+ Globals.drawMode = CameraPane.OCCLUSION;
	2209	+ Globals.theRenderer.repaint();
1770	2210	} else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
1784		- {
1785		- CameraPane.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
1787		- } else
1788		- if (event.getSource() == recompileItem)
	2211	+ if (source == recompileItem)
1789	2212	{
1790	2213	Recompile();
1791	2214	refreshContents();
1792	2215	} else
1793		- if (event.getSource() == editScriptItem)
	2216	+ if (source == editScriptItem)
1794	2217	{
1795	2218	OpenDialog();
1796	2219	refreshContents();
1797	2220	} else
1798		- if (event.getSource() == invariantsItem)
	2221	+ if (source == invariantsItem)
1799	2222	{
1800	2223	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1802	2225	} else
1803		- if (event.getSource() == memoryItem)
	2226	+ if (source == memoryItem)
1804	2227	{
1805	2228	//System.out.println("Invariants:");
1806	2229	PrintMemory();
1807	2230	} else
1808		- if (event.getSource() == pathItem)
	2231	+ if (source == pathItem)
1809	2232	{
1810	2233	PrintPath();
1811	2234	} else
1812		- if (event.getSource() == analyzeItem)
	2235	+ if (source == analyzeItem)
1813	2236	{
1814	2237	AnalyzeObject();
1815	2238	} else
1816		- if (event.getSource() == dumpItem)
	2239	+ if (source == dumpItem)
1817	2240	{
1818	2241	DumpObject();
1819	2242	} else
1820		- if (event.getSource() == screenfitButton)
	2243	+ if (source == minButton)
1821	2244	{
1822		- //Reload(lastConverter, lastFilename, true);
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
	2288	+ if (source == screenfitButton)
	2289	+ {
1823	2290	ScreenFit();
1824	2291	} else
1825		- if (event.getSource() == screenfitpointButton)
	2292	+ if (source == screenfitpointButton)
1826	2293	{
1827		- //Reload(lastConverter, lastFilename, true);
1828	2294	ScreenFitPoint();
1829	2295	} else
1830		- if (event.getSource() == snapobjectButton)
	2296	+ if (source == snapobjectButton)
1831	2297	{
1832		- //Reload(lastConverter, lastFilename, true);
1833	2298	SnapObject();
1834	2299	} else
1835	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1838,13 +2303,13 @@
1838	2303	// Recompile();
1839	2304	// refreshContents();
1840	2305	// } else
1841		- if (event.getSource() == gcButton)
	2306	+ if (source == gcButton)
1842	2307	{
1843	2308	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2309	System.gc();
1845	2310	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2311	} else
1847		- if (event.getSource() == editLeafItem)
	2312	+ if (source == editLeafItem)
1848	2313	{
1849	2314	Object3D obj;
1850	2315	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2323,74 @@
1858	2323	}
1859	2324	refreshContents(true);
1860	2325	} else
1861		- if (event.getSource() == openWindowItem)
	2326	+ if (source == openWindowItem)
1862	2327	{
1863	2328	EditSelection(true);
1864	2329	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2330	+ if (source == cutItem \|\| source == clearButton)
1866	2331	{
1867	2332	loadClipboard(true);
1868	2333	} else
1869		- if (event.getSource() == duplicateItem)
	2334	+ if (source == undoItem)
1870	2335	{
1871		- Object3D keep = GrafreeD.clipboard;
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
	2342	+ if (source == duplicateItem)
	2343	+ {
	2344	+ Object3D keep = Grafreed.clipboard;
1872	2345	loadClipboard(false);
1873	2346	paste(false);
1874		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1875	2348	} else
1876		- if (event.getSource() == cloneItem)
	2349	+ if (source == cloneItem)
1877	2350	{
1878	2351	CloneSelection(false);
1879	2352	} else
1880		- if (event.getSource() == cloneSupportItem)
	2353	+ if (source == cloneSupportItem)
1881	2354	{
1882	2355	CloneSelection(true);
1883	2356	} else
1884		- if (event.getSource() == copyItem)
	2357	+ if (source == copyItem)
1885	2358	{
1886	2359	loadClipboard(false);
1887	2360	} else
1888		- if (event.getSource() == pasteItem)
	2361	+ if (source == pasteItem)
1889	2362	{
1890	2363	paste(false);
1891	2364	} else
1892		- if (event.getSource() == pasteLinkItem)
	2365	+ if (source == pasteIntoItem)
1893	2366	{
1894		- pasteInto(false);
	2367	+ pasteInto(true, false);
1895	2368	} else
1896		- if (event.getSource() == pasteCloneItem)
	2369	+ if (source == pasteLinkItem)
1897	2370	{
1898		- pasteInto(true);
	2371	+ pasteInto(false, false);
1899	2372	} else
1900		- if (event.getSource() == pasteExpandItem)
	2373	+ if (source == pasteCloneItem)
	2374	+ {
	2375	+ pasteInto(true, true);
	2376	+ } else
	2377	+ if (source == pasteExpandItem)
1901	2378	{
1902	2379	paste(true);
1903	2380	} else
1904		- if (event.getSource() == synchronizeItem)
	2381	+ if (source == synchronizeItem)
1905	2382	{
1906	2383	Overwrite(Object3D.TRANSFORM);
1907	2384	} else
1908		- if (event.getSource() == overwriteNameItem)
	2385	+ if (source == overwriteNameItem)
1909	2386	{
1910	2387	Overwrite(Object3D.NAME);
1911	2388	} else
1912		- if (event.getSource() == overwriteUVItem)
	2389	+ if (source == overwriteUVItem)
1913	2390	{
1914	2391	Overwrite(Object3D.UV);
1915	2392	} else
1916		- if (event.getSource() == overwriteMatItem)
	2393	+ if (source == overwriteMatItem)
1917	2394	{
1918	2395	/* july 2015
1919	2396	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2410,7 @@
1933	2410
1934	2411	Overwrite(dropAttributes);
1935	2412	}
1936		- if (event.getSource() == overwriteGeoItem)
	2413	+ if (source == overwriteGeoItem)
1937	2414	{
1938	2415	Overwrite(Object3D.GEOMETRY);
1939	2416	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2427,7 @@
1950	2427	// refreshContents();
1951	2428	// }
1952	2429	} else
1953		- if (event.getSource() == generateMeshItem)
	2430	+ if (source == generateMeshItem)
1954	2431	{
1955	2432	//if (group.selection.size() == 1)
1956	2433	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2438,7 @@
1961	2438	ResetModel();
1962	2439	refreshContents();
1963	2440	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2441	+ if (source == extractGeometriesItem)
1965	2442	{
1966	2443	boolean one = false;
1967	2444
..	..	@@ -1988,7 +2465,7 @@
1988	2465	ResetModel();
1989	2466	refreshContents();
1990	2467	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2468	+ if (source == cloneGeometriesItem)
1992	2469	{
1993	2470	boolean one = false;
1994	2471
..	..	@@ -2014,7 +2491,7 @@
2014	2491	ResetModel();
2015	2492	refreshContents();
2016	2493	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2494	+ if (source == shareGeometriesItem)
2018	2495	{
2019	2496	boolean one = false;
2020	2497
..	..	@@ -2044,7 +2521,7 @@
2044	2521	refreshContents();
2045	2522	}
2046	2523	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2524	+ if (source == mergeGeometriesItem)
2048	2525	{
2049	2526	boolean one = false;
2050	2527
..	..	@@ -2074,7 +2551,7 @@
2074	2551	ResetModel();
2075	2552	refreshContents();
2076	2553	} else
2077		- if (event.getSource() == linkverticesItem)
	2554	+ if (source == linkverticesItem)
2078	2555	{
2079	2556	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2557	// {
..	..	@@ -2087,48 +2564,48 @@
2087	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2565	// refreshContents();
2089	2566	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2568	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2093	2570
2094	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2572	content = ((cGroup)content).get(0);
2096	2573
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2574	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2575	for (int i=0; i<group.selection.size(); i++)
2099	2576	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2579	group.selection.get(i).linkVerticesThis(content);
2103	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2105	2582	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2583	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2584	refreshContents();
2108	2585	}
2109	2586	} else
2110		- if (event.getSource() == resetsupportItem)
	2587	+ if (source == resetsupportItem)
2111	2588	{
2112	2589	for (int i=0; i<group.selection.size(); i++)
2113	2590	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2593	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2118	2595	}
2119	2596
2120	2597	refreshContents();
2121	2598	} else
2122		- if (event.getSource() == relinkverticesItem)
	2599	+ if (source == relinkverticesItem)
2123	2600	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2603	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2128	2605
2129	2606	refreshContents();
2130	2607	} else
2131		- if (event.getSource() == resetreferencesItem)
	2608	+ if (source == resetreferencesItem)
2132	2609	{
2133	2610	for (int i=0; i<group.selection.size(); i++)
2134	2611	{
..	..	@@ -2137,11 +2614,11 @@
2137	2614
2138	2615	refreshContents();
2139	2616	} else
2140		- if (event.getSource() == setMasterItem)
	2617	+ if (source == setMasterItem)
2141	2618	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2620	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2145	2622
2146	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2624	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2627,13 @@
2150	2627	refreshContents();
2151	2628	}
2152	2629	} else
2153		- if (event.getSource() == poseMeshItem)
	2630	+ if (source == poseMeshItem)
2154	2631	{
2155	2632	if (group.selection.size() == 1)
2156	2633	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2158	2635	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2160	2637
2161	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2639	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2646,19 @@
2169	2646	}
2170	2647
2171	2648	} else
2172		- if (event.getSource() == revertMeshItem)
	2649	+ if (source == revertMeshItem)
2173	2650	{
2174	2651	RevertMeshes();
2175	2652	} else
2176		- if (event.getSource() == resetMeshItem)
	2653	+ if (source == resetAllItem)
2177	2654	{
2178	2655	ResetAll();
2179	2656	} else
2180		- if (event.getSource() == stepAllItem)
	2657	+ if (source == stepAllItem)
2181	2658	{
2182	2659	StepAll();
2183	2660	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2661	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2662	{
2186	2663	//int indices[] = jList.getSelectedIndices();
2187	2664	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2666,46 @@
2189	2666
2190	2667	ClearSelection(false);
2191	2668	} else
2192		- if (event.getSource() == clearAllItem)
	2669	+ if (source == clearAllItem)
2193	2670	{
2194	2671	ClearSelection(true);
2195	2672	} else
2196		- if (event.getSource() == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2197	2674	{
2198		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2199	2676	} else
2200		- if (event.getSource() == hideItem)
	2677	+ if (source == hideItem)
2201	2678	{
2202	2679	group(new HiddenObject());
2203	2680	} else
2204		- if (event.getSource() == frontItem)
	2681	+ if (source == frontItem)
2205	2682	{
2206	2683	front();
2207	2684	} else
2208		- if (event.getSource() == backItem)
	2685	+ if (source == backItem)
2209	2686	{
2210	2687	back();
2211	2688	} else
2212		- if (event.getSource() == cameraItem)
	2689	+ if (source == cameraItem)
2213	2690	{
2214	2691	makeSomething(new Camera());
2215	2692	} else
2216		- if (event.getSource() == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2217	2694	{
2218	2695	group(new Composite());
2219	2696	} else
2220		- if (event.getSource() == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2221	2698	{
2222	2699	RandomNode random = new RandomNode();
2223	2700	group(random);
2224	2701	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2226	2703	} else
2227		- if (event.getSource() == physicsItem)
	2704	+ if (source == physicsItem)
2228	2705	{
2229	2706	group(new PhysicsNode());
2230	2707	} else
2231		- if (event.getSource() == frameselectorItem)
	2708	+ if (source == frameselectorItem)
2232	2709	{
2233	2710	for (int i=0; i<group.selection.size(); i++)
2234	2711	{
..	..	@@ -2240,7 +2717,7 @@
2240	2717	ResetModel();
2241	2718	refreshContents();
2242	2719	} else
2243		- if (event.getSource() == switchGeoItem)
	2720	+ if (source == switchGeoItem)
2244	2721	{
2245	2722	for (int i=0; i<group.selection.size(); i++)
2246	2723	{
..	..	@@ -2252,7 +2729,7 @@
2252	2729	ResetModel();
2253	2730	refreshContents();
2254	2731	} else
2255		- if (event.getSource() == switchTransfoItem)
	2732	+ if (source == switchTransfoItem)
2256	2733	{
2257	2734	for (int i=0; i<group.selection.size(); i++)
2258	2735	{
..	..	@@ -2264,7 +2741,7 @@
2264	2741	ResetModel();
2265	2742	refreshContents();
2266	2743	} else
2267		- if (event.getSource() == morphItem)
	2744	+ if (source == morphItem)
2268	2745	{
2269	2746	for (int i=0; i<group.selection.size(); i++)
2270	2747	{
..	..	@@ -2276,7 +2753,7 @@
2276	2753	ResetModel();
2277	2754	refreshContents();
2278	2755	} else
2279		- if (event.getSource() == scriptNodeItem)
	2756	+ if (source == scriptNodeItem)
2280	2757	{
2281	2758	boolean atleastone = false;
2282	2759
..	..	@@ -2315,215 +2792,252 @@
2315	2792	}
2316	2793	}
2317	2794	} else
2318		- if (event.getSource() == linkerItem)
	2795	+ if (source == linkerItem)
2319	2796	{
2320	2797	group(new cLinker());
2321	2798	} else
2322		- if (event.getSource() == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2323	2800	{
2324	2801	group(new TextureNode());
2325	2802	} else
2326		- if (event.getSource() == billboardItem)
	2803	+ if (source == billboardItem)
2327	2804	{
2328	2805	group(new BillboardNode());
2329	2806	} else
2330		- if (event.getSource() == shadowXItem)
	2807	+ if (source == shadowXItem)
2331	2808	{
2332	2809	CastShadow(0);
2333	2810	} else
2334		- if (event.getSource() == shadowYItem)
	2811	+ if (source == shadowYItem)
2335	2812	{
2336	2813	CastShadow(1);
2337	2814	} else
2338		- if (event.getSource() == shadowZItem)
	2815	+ if (source == shadowZItem)
2339	2816	{
2340	2817	CastShadow(2);
2341	2818	} else
2342		- if (event.getSource() == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	2820	{
2344		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2345	2823	for (int i=0; i<group.selection.size(); i++)
2346	2824	{
2347		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2348	2830	}
2349	2831
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2353	2843	} else
2354		- if (event.getSource() == genUVItem)
	2844	+ if (source == genUVItem)
2355	2845	{
2356	2846	GenUV();
2357	2847	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2848	+ if (source == genNormalsCADItem)
2359	2849	{
2360	2850	GenNormals(true);
2361	2851	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2852	+ if (source == genNormalsMESHItem)
2363	2853	{
2364		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2365	2855	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2856	+ if (source == genNormalsORGANItem)
2367	2857	{
2368	2858	GenNormals(false);
2369	2859	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2860	+ if (source == genNormalsMINEItem)
2371	2861	{
2372	2862	GenNormalsMINE();
2373	2863	} else
2374		- if (event.getSource() == stripifyItem)
	2864	+ if (source == stripifyItem)
2375	2865	{
2376	2866	Stripify();
2377	2867	} else
2378		- if (event.getSource() == unstripifyItem)
	2868	+ if (source == unstripifyItem)
2379	2869	{
2380	2870	Unstripify();
2381	2871	} else
2382		- if (event.getSource() == trimItem)
	2872	+ if (source == trimItem)
2383	2873	{
2384	2874	Trim();
2385	2875	} else
2386		- if (event.getSource() == untrimItem)
	2876	+ if (source == untrimItem)
2387	2877	{
2388	2878	Untrim();
2389	2879	} else
2390		- if (event.getSource() == clearColorsItem)
	2880	+ if (source == clearColorsItem)
2391	2881	{
2392	2882	ClearColors();
2393	2883	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2884	+ if (source == clearMaterialsItem)
2395	2885	{
2396	2886	ClearMaterials();
2397	2887	} else
2398		- if (event.getSource() == liveleavesItem)
	2888	+ if (source == liveleavesItem)
2399	2889	{
2400	2890	LiveLeaves(true);
2401	2891	} else
2402		- if (event.getSource() == unliveleavesItem)
	2892	+ if (source == unliveleavesItem)
2403	2893	{
2404	2894	LiveLeaves(false);
2405	2895	} else
2406		- if (event.getSource() == supportleavesItem)
	2896	+ if (source == supportleavesItem)
2407	2897	{
2408	2898	SupportLeaves(true);
2409	2899	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2900	+ if (source == unsupportleavesItem)
2411	2901	{
2412	2902	SupportLeaves(false);
2413	2903	} else
2414		- if (event.getSource() == hideleavesItem)
	2904	+ if (source == hideleavesItem)
2415	2905	{
2416	2906	HideLeaves(true);
2417	2907	} else
2418		- if (event.getSource() == showleavesItem)
	2908	+ if (source == showleavesItem)
2419	2909	{
2420	2910	HideLeaves(false);
2421	2911	} else
2422		- if (event.getSource() == markleavesItem)
	2912	+ if (source == markleavesItem)
2423	2913	{
2424	2914	MarkLeaves(true);
2425	2915	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2916	+ if (source == unmarkleavesItem)
2427	2917	{
2428	2918	MarkLeaves(false);
2429	2919	} else
2430		- if (event.getSource() == flipVItem)
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
	2935	+ } else
	2936	+ if (source == flipVItem)
2431	2937	{
2432	2938	FlipV(true);
2433	2939	} else
2434		- if (event.getSource() == unflipVItem)
	2940	+ if (source == unflipVItem)
2435	2941	{
2436	2942	FlipV(false);
2437	2943	} else
2438		- if (event.getSource() == lowTexturesItem)
	2944	+ if (source == lowTexturesItem)
2439	2945	{
2440	2946	SetTexRes(0);
2441	2947	} else
2442		- if (event.getSource() == normalTexturesItem)
	2948	+ if (source == normalTexturesItem)
2443	2949	{
2444	2950	SetTexRes(1);
2445	2951	} else
2446		- if (event.getSource() == highTexturesItem)
	2952	+ if (source == highTexturesItem)
2447	2953	{
2448	2954	SetTexRes(2);
2449	2955	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2956	+ if (source == veryhighTexturesItem)
2451	2957	{
2452	2958	SetTexRes(3);
2453	2959	} else
2454		- if (event.getSource() == maxTexturesItem)
	2960	+ if (source == maxTexturesItem)
2455	2961	{
2456	2962	SetTexRes(4);
2457	2963	} else
2458		- if (event.getSource() == panoTexturesItem)
	2964	+ if (source == panoTexturesItem)
2459	2965	{
2460	2966	SetTexRes(5);
2461	2967	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2968	+ if (source == reverseNormalsItem)
2463	2969	{
2464	2970	ReverseNormals();
2465	2971	} else
2466		- if (event.getSource() == parseverticesItem)
	2972	+ if (source == parseverticesItem)
2467	2973	{
2468	2974	ParseVertices();
2469	2975	} else
2470		- if (event.getSource() == textureFieldItem)
	2976	+ if (source == textureFieldItem)
2471	2977	{
2472	2978	TextureVertices();
2473	2979	} else
2474		- if (event.getSource() == alignItem)
	2980	+ if (source == alignItem)
2475	2981	{
2476	2982	Align();
2477	2983	} else
2478		- if (event.getSource() == mirrorItem)
	2984	+ if (source == mirrorItem)
2479	2985	{
2480	2986	MirrorPoses();
2481	2987	} else
2482		- if (event.getSource() == reduceMorphItem)
	2988	+ if (source == reduceMorphItem)
2483	2989	{
2484	2990	MeshReduction(false);
2485	2991	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2992	+ if (source == reduce34MorphItem)
2487	2993	{
2488	2994	MeshReduction(true);
2489	2995	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2996	+ if (source == reverseTrianglesItem)
2491	2997	{
2492	2998	ReverseTriangles();
2493	2999	} else
2494		- if (event.getSource() == reduceMeshItem)
	3000	+ if (source == reduceMeshItem)
2495	3001	{
2496	3002	ReduceMesh(false);
2497	3003	} else
2498		- if (event.getSource() == reduce34MeshItem)
	3004	+ if (source == reduce34MeshItem)
2499	3005	{
2500	3006	ReduceMesh(true);
2501	3007	} else
2502		- if (event.getSource() == increaseMeshItem)
	3008	+ if (source == increaseMeshItem)
2503	3009	{
2504	3010	IncreaseMesh();
2505	3011	} else
2506		- if (event.getSource() == clipMeshItem)
	3012	+ if (source == clipMeshItem)
2507	3013	{
2508	3014	ClipMesh();
2509	3015	} else
2510		- if (event.getSource() == smoothMeshItem)
	3016	+ if (source == smoothMeshItem)
2511	3017	{
2512	3018	SmoothMesh();
2513	3019	} else
2514		- if (event.getSource() == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2515	3021	{
2516	3022	TransformGeometry();
2517	3023	} else
2518		- if (event.getSource() == resetTransformItem)
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
	3027	+ } else
	3028	+ if (source == resetTransformItem)
2519	3029	{
2520	3030	ResetTransform();
2521	3031	} else
2522		- if (event.getSource() == resetCentroidItem)
	3032	+ if (source == resetCentroidItem)
2523	3033	{
2524		- ResetCentroid();
	3034	+ ResetCentroid(true);
2525	3035	} else
2526		- if (event.getSource() == resetParentItem)
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
	3039	+ } else
	3040	+ if (source == resetParentItem)
2527	3041	{
2528	3042	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	3043	{
..	..	@@ -2533,7 +3047,7 @@
2533	3047
2534	3048	refreshContents();
2535	3049	} else
2536		- if (event.getSource() == repairParentItem)
	3050	+ if (source == repairParentItem)
2537	3051	{
2538	3052	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3053	{
..	..	@@ -2547,7 +3061,7 @@
2547	3061
2548	3062	refreshContents();
2549	3063	} else
2550		- if (event.getSource() == repairShadowItem)
	3064	+ if (source == repairShadowItem)
2551	3065	{
2552	3066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3067	{
..	..	@@ -2561,7 +3075,7 @@
2561	3075
2562	3076	refreshContents();
2563	3077	} else
2564		- if (event.getSource() == sortbysizeItem)
	3078	+ if (source == sortbysizeItem)
2565	3079	{
2566	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3081	{
..	..	@@ -2573,7 +3087,7 @@
2573	3087	ResetModel();
2574	3088	refreshContents();
2575	3089	} else
2576		- if (event.getSource() == sortbynameItem)
	3090	+ if (source == sortbynameItem)
2577	3091	{
2578	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3093	{
..	..	@@ -2585,7 +3099,7 @@
2585	3099	ResetModel();
2586	3100	refreshContents();
2587	3101	} else
2588		- if (event.getSource() == attachPigmentItem)
	3102	+ if (source == attachPigmentItem)
2589	3103	{
2590	3104	String texture = GetFile("Attach pigment");
2591	3105	Object3D obj;
..	..	@@ -2597,7 +3111,7 @@
2597	3111
2598	3112	refreshContents();
2599	3113	} else
2600		- if (event.getSource() == detachPigmentItem)
	3114	+ if (source == detachPigmentItem)
2601	3115	{
2602	3116	Object3D obj;
2603	3117	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3122,7 @@
2608	3122
2609	3123	refreshContents();
2610	3124	} else
2611		- if (event.getSource() == attachBumpItem)
	3125	+ if (source == attachBumpItem)
2612	3126	{
2613	3127	String texture = GetFile("Attach bump");
2614	3128	Object3D obj;
..	..	@@ -2620,7 +3134,7 @@
2620	3134
2621	3135	refreshContents();
2622	3136	} else
2623		- if (event.getSource() == detachBumpItem)
	3137	+ if (source == detachBumpItem)
2624	3138	{
2625	3139	Object3D obj;
2626	3140	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +3145,7 @@
2631	3145
2632	3146	refreshContents();
2633	3147	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3148	+ if (source == pigmentBumpItem)
2635	3149	{
2636	3150	Object3D obj;
2637	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +3156,237 @@
2642	3156
2643	3157	refreshContents();
2644	3158	} else
2645		- if (event.getSource() == flashSelectionButton)
	3159	+ if (source == flashSelectionButton)
2646	3160	{
2647	3161	CameraPane.flash = true;
2648	3162	refreshContents();
2649	3163	} else
2650		- if (event.getSource() == oneButton)
	3164	+ if (source == oneButton)
2651	3165	{
2652	3166	} else
2653		- if (event.getSource() == twoButton)
	3167	+ if (source == twoButton)
2654	3168	{
2655	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2656	3174	// bug
2657	3175	//gridPanel.setDividerLocation(1.0);
2658	3176	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3177	+// bigThree.remove(scenePanel);
	3178	+// bigThree.remove(centralPanel);
	3179	+// bigThree.remove(XYZPanel);
	3180	+// aWindowConstraints.gridx = 0;
	3181	+// aWindowConstraints.gridy = 0;
	3182	+// aWindowConstraints.gridwidth = 1;
	3183	+// // aConstraints.gridheight = 3;
	3184	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.weighty = 1;
	3187	+// //bigThree.add(jtp, aWindowConstraints);
	3188	+// aWindowConstraints.weightx = 1;
	3189	+// aWindowConstraints.gridwidth = 3;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.gridx = 1;
	3192	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3193	+// bigThree.add(centralPanel, aWindowConstraints);
	3194	+// aWindowConstraints.weightx = 0;
	3195	+// aWindowConstraints.gridx = 4;
	3196	+// aWindowConstraints.gridwidth = 1;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3199	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3200	+// scenePanel.setVisible(false);
	3201	+// centralPanel.setVisible(true);
	3202	+// XYZPanel.setVisible(false);
	3203	+ bigThree.ClearUI();
	3204	+ bigThree.add(centralPanel);
	3205	+ bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2683	3224	} else
2684		- if (event.getSource() == threeButton)
	3225	+ if (source == threeButton)
2685	3226	{
2686	3227	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
	3231	+
	3232	+// bigThree.remove(scenePanel);
	3233	+// bigThree.remove(centralPanel);
	3234	+// bigThree.remove(XYZPanel);
	3235	+// aWindowConstraints.gridx = 0;
	3236	+// aWindowConstraints.gridy = 0;
	3237	+// aWindowConstraints.gridwidth = 1;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3240	+// aWindowConstraints.weightx = 0;
	3241	+// aWindowConstraints.weighty = 1;
	3242	+// //bigThree.add(jtp, aWindowConstraints);
	3243	+// aWindowConstraints.weightx = 1;
	3244	+// aWindowConstraints.gridwidth = 3;
	3245	+// // aConstraints.gridheight = 3;
	3246	+// aWindowConstraints.gridx = 1;
	3247	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3248	+// bigThree.add(centralPanel, aWindowConstraints);
	3249	+// aWindowConstraints.weightx = 0;
	3250	+// aWindowConstraints.gridx = 4;
	3251	+// aWindowConstraints.gridwidth = 1;
	3252	+// // aConstraints.gridheight = 3;
	3253	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3254	+// bigThree.add(XYZPanel, aWindowConstraints);
	3255	+// bigThree.validate();
	3256	+// scenePanel.setVisible(false);
	3257	+// centralPanel.setVisible(true);
	3258	+// XYZPanel.setVisible(true);
	3259	+ bigThree.ClearUI();
	3260	+ bigThree.add(centralPanel);
	3261	+ bigThree.add(XYZPanel);
	3262	+ bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2711	3265	} else
2712		- if (event.getSource() == fourButton)
	3266	+ if (source == fourButton)
2713	3267	{
2714	3268	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
	3272	+
	3273	+// bigThree.remove(scenePanel);
	3274	+// bigThree.remove(centralPanel);
	3275	+// bigThree.remove(XYZPanel);
	3276	+// aWindowConstraints.gridx = 0;
	3277	+// aWindowConstraints.gridy = 0;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// aWindowConstraints.weightx = 1;
	3282	+// aWindowConstraints.weighty = 1;
	3283	+// bigThree.add(scenePanel, aWindowConstraints);
	3284	+// aWindowConstraints.weightx = 1;
	3285	+// aWindowConstraints.gridwidth = 3;
	3286	+// // aConstraints.gridheight = 3;
	3287	+// aWindowConstraints.gridx = 1;
	3288	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3289	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3290	+// aWindowConstraints.weightx = 0;
	3291	+// aWindowConstraints.gridx = 4;
	3292	+// aWindowConstraints.gridwidth = 1;
	3293	+// // aWindowConstraints.gridheight = 3;
	3294	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3295	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3296	+// bigThree.validate();
	3297	+// scenePanel.setVisible(true);
	3298	+// centralPanel.setVisible(false);
	3299	+// XYZPanel.setVisible(false);
	3300	+ bigThree.ClearUI();
	3301	+ bigThree.add(scenePanel);
	3302	+ bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2739	3305	} else
2740		- if (event.getSource() == sixButton)
	3306	+ if (source == sixButton)
2741	3307	{
2742	3308	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
	3312	+
	3313	+// bigThree.remove(scenePanel);
	3314	+// bigThree.remove(centralPanel);
	3315	+// bigThree.remove(XYZPanel);
	3316	+// aWindowConstraints.gridx = 0;
	3317	+// aWindowConstraints.gridy = 0;
	3318	+// aWindowConstraints.gridwidth = 1;
	3319	+// // aConstraints.gridheight = 3;
	3320	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3321	+// aWindowConstraints.weightx = 0;
	3322	+// aWindowConstraints.weighty = 1;
	3323	+// bigThree.add(scenePanel, aWindowConstraints);
	3324	+// aWindowConstraints.weightx = 1;
	3325	+// aWindowConstraints.gridwidth = 3;
	3326	+// // aWindowConstraints.gridheight = 3;
	3327	+// aWindowConstraints.gridx = 1;
	3328	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3329	+// bigThree.add(centralPanel, aWindowConstraints);
	3330	+// aWindowConstraints.weightx = 0;
	3331	+// aWindowConstraints.gridx = 4;
	3332	+// aWindowConstraints.gridwidth = 1;
	3333	+// // aWindowConstraints.gridheight = 3;
	3334	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3335	+// //bigThree.add(XYZPanel, aConstraints);
	3336	+// bigThree.validate();
	3337	+// scenePanel.setVisible(true);
	3338	+// centralPanel.setVisible(true);
	3339	+// XYZPanel.setVisible(false);
	3340	+ bigThree.ClearUI();
	3341	+ bigThree.add(scenePanel);
	3342	+ bigThree.add(centralPanel);
	3343	+ bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2767	3346	} else
2768		- if (event.getSource() == sevenButton)
	3347	+ if (source == sevenButton)
2769	3348	{
2770	3349	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
	3353	+
	3354	+// bigThree.remove(scenePanel);
	3355	+// bigThree.remove(centralPanel);
	3356	+// bigThree.remove(XYZPanel);
	3357	+// aWindowConstraints.gridx = 0;
	3358	+// aWindowConstraints.gridy = 0;
	3359	+// aWindowConstraints.gridwidth = 1;
	3360	+// // aWindowConstraints.gridheight = 3;
	3361	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3362	+// aWindowConstraints.weightx = 0;
	3363	+// aWindowConstraints.weighty = 1;
	3364	+// bigThree.add(scenePanel, aWindowConstraints);
	3365	+// aWindowConstraints.weightx = 1;
	3366	+// aWindowConstraints.gridwidth = 3;
	3367	+// // aWindowConstraints.gridheight = 3;
	3368	+// aWindowConstraints.gridx = 1;
	3369	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3370	+// bigThree.add(centralPanel, aWindowConstraints);
	3371	+// aWindowConstraints.weightx = 0;
	3372	+// aWindowConstraints.gridx = 4;
	3373	+// aWindowConstraints.gridwidth = 1;
	3374	+// // aConstraints.gridheight = 3;
	3375	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3376	+// bigThree.add(XYZPanel, aWindowConstraints);
	3377	+// bigThree.validate();
	3378	+// scenePanel.setVisible(true);
	3379	+// centralPanel.setVisible(true);
	3380	+// XYZPanel.setVisible(true);
	3381	+ bigThree.ClearUI();
	3382	+ bigThree.add(scenePanel);
	3383	+ bigThree.add(centralPanel);
	3384	+ bigThree.add(XYZPanel);
	3385	+ bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2795	3388	} else
2796		- if (event.getSource() == rootButton)
	3389	+ if (source == rootButton)
2797	3390	{
2798	3391	Object3D obj;
2799	3392	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2803,66 +3396,84 @@
2803	3396	EditObject(obj);
2804	3397	}
2805	3398
	3399	+ cameraView.requestFocusInWindow();
2806	3400	refreshContents(true);
2807	3401	} else
2808		- if (event.getSource() == closeButton)
	3402	+ if (source == closeButton)
2809	3403	{
2810	3404	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3405	cRadio ab;
2812	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3407	{
2814	3408	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2817	3417	buttonGroup.remove(ab);
2818	3418	radioPanel.remove(ab);
2819	3419
2820		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2821	3422	// ab.GetObject().objectUI = null; // ?????????
2822	3423
2823	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3425	break;
2825	3426	}
2826	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2827	3430	refreshContents(true);
2828	3431	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3432	+ if (source == editItem \|\| source == editButton)
2830	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2831	3440	EditSelection(false);
2832	3441	} else
2833		- if (event.getSource() == uneditButton)
	3442	+ if (source == uneditButton)
2834	3443	{
2835	3444	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3445	{
2837	3446	Object3D child = (Object3D)e.nextElement();
2838	3447	if(child.editWindow != null)
2839	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2840	3450	child.CloseUI();
2841	3451	listUI.remove(child);
2842	3452
2843		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2844	3454	}
2845		- objEditor.ctrlPanel.revalidate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2846	3456	//objEditor.jTree.clearSelection();
2847	3457	//objEditor.ResetSliders();
2848	3458	refreshContents(true);
2849	3459	} else
2850		- if (event.getSource() == clearPanelButton)
	3460	+ if (source == clearPanelButton)
2851	3461	{
2852	3462	assert(copy == group);
2853	3463	//copy.ClearUI();
2854	3464	for (Object3D obj : listUI)
2855	3465	{
	3466	+ obj.pinned = false;
2856	3467	obj.CloseUI();
2857	3468	}
2858	3469	listUI.clear();
2859	3470	refreshContents(true);
2860	3471	} else
2861		- if (event.getSource() == allParamsButton)
	3472	+ if (source == allParamsButton)
2862	3473	{
2863	3474	assert(copy == group);
2864	3475
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	3477
2867	3478	for (Object3D obj : listUI)
2868	3479	{
..	..	@@ -2879,19 +3490,19 @@
2879	3490
2880	3491	refreshContents(true);
2881	3492	} else
2882		- if (event.getSource() == unselectButton)
	3493	+ if (source == unselectButton)
2883	3494	{
2884	3495	objEditor.jTree.clearSelection();
2885	3496	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3497	objEditor.ResetSliders();
2887	3498	refreshContents(true);
2888	3499	} else
2889		- if(event.getSource() instanceof cRadio)
	3500	+ if(source instanceof cRadio)
2890	3501	{
2891	3502	group.parent = keepparent;
2892	3503	group.attributes = 0;
2893	3504	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3505	+ /cRadio/ radio = (cRadio)source;
2895	3506	Object3D obj = radio.GetObject();
2896	3507	System.out.println("Edit " + obj);
2897	3508	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3522,10 @@
2911	3522	}
2912	3523
2913	3524	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
	3528	+ //Globals.theRenderer.object = group;
2915	3529	if(!useclient)
2916	3530	{
2917	3531	cameraView.renderCamera = radio.camera;
..	..	@@ -2920,25 +3534,52 @@
2920	3534	cameraView.cameras[cameraView.cameracount] = radio.camera;
2921	3535	cameraView.targetLookAt.set(radio.camera.lookAt);
2922	3536	cameraView.object = group;
2923		- cameraView.lighttouched = true;
	3537	+ //cameraView.lighttouched = true;
	3538	+ Globals.lighttouched = true;
2924	3539	topView.object = group;
2925	3540	frontView.object = group;
2926	3541	sideView.object = group;
2927	3542	}
2928		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2929	3548	/*
2930	3549	currentLayout = radio.layout;
2931	3550	if (currentLayout == null)
2932	3551	currentLayout = sevenButton;
2933	3552	*/
2934	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
2935	3561	keepparent = group.parent;
2936	3562	// PARENT = NULL or not???
2937	3563	//group.parent = null; // ROOT
2938	3564	//group.attributes = -1;
2939	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
2940	3568	refreshContents(true);
2941		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
2942	3583	else
2943	3584	{
2944	3585	//return super.action(event, arg);
..	..	@@ -2947,7 +3588,6 @@
2947	3588	}
2948	3589
2949	3590	boolean useclient = false;
2950		- cRadio radio;
2951	3591
2952	3592	void ToggleRoot()
2953	3593	{
..	..	@@ -2956,7 +3596,7 @@
2956	3596	if (useclient)
2957	3597	{
2958	3598	cameraView.object = client;
2959		- cameraView.lighttouched = true;
	3599	+ Globals.lighttouched = true;
2960	3600	//topView.object = client;
2961	3601	//frontView.object = client;
2962	3602	//sideView.object = client;
..	..	@@ -2964,7 +3604,7 @@
2964	3604	else
2965	3605	{
2966	3606	cameraView.object = group;
2967		- cameraView.lighttouched = true;
	3607	+ Globals.lighttouched = true;
2968	3608	//topView.object = group;
2969	3609	//frontView.object = group;
2970	3610	//sideView.object = group;
..	..	@@ -2999,6 +3639,28 @@
2999	3639	refreshContents();
3000	3640	}
3001	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
3002	3664
3003	3665	void ResetTransform()
3004	3666	{
..	..	@@ -3111,7 +3773,7 @@
3111	3773	refreshContents();
3112	3774	}
3113	3775
3114		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3115	3777	{
3116	3778	Object3D obj;
3117	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3126,12 +3788,16 @@
3126	3788	LA.matIdentity(Object3D.mat);
3127	3789	obj.getBounds(minima, maxima, false);
3128	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3129		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3130	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3131	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3132	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3133		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3134	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3135	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3136	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3137	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3160,7 +3826,8 @@
3160	3826
3161	3827	int size = obj.MemorySize();
3162	3828
3163		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3164	3831	}
3165	3832	}
3166	3833	catch (Exception e)
..	..	@@ -3197,9 +3864,9 @@
3197	3864	obj = (Object3D)e.nextElement();
3198	3865
3199	3866	System.out.println("Object is: " + obj);
3200		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3201	3868	System.out.println("Boundary rep: " + obj.bRep);
3202		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3203	3870
3204	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3205	3872	}
..	..	@@ -3241,6 +3908,13 @@
3241	3908	void GenNormals(boolean crease)
3242	3909	{
3243	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3244	3918
3245	3919	refreshContents();
3246	3920	}
..	..	@@ -3413,8 +4087,8 @@
3413	4087
3414	4088	void ParseVertices()
3415	4089	{
3416		- boolean epsequal = GrafreeD.epsequal;
3417		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3418	4092
3419	4093	for (int i=0; i<group.selection.size(); i++)
3420	4094	{
..	..	@@ -3439,7 +4113,7 @@
3439	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3440	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3441	4115
3442		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3443	4117
3444	4118	buffer.add(g);
3445	4119	}
..	..	@@ -3454,7 +4128,7 @@
3454	4128	makeSomething(buffer, i==group.selection.size()-1);
3455	4129	}
3456	4130
3457		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3458	4132
3459	4133	refreshContents();
3460	4134	}
..	..	@@ -3472,7 +4146,16 @@
3472	4146	String pigment = Object3D.GetPigment(tex);
3473	4147	//String bump = Object3D.GetBump(tex);
3474	4148
3475		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3476	4159
3477	4160	double s = v.s;
3478	4161
..	..	@@ -3560,11 +4243,11 @@
3560	4243
3561	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3562	4245
3563		- boolean random = CameraPane.RANDOM;
3564		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3565	4248	lowres.linkVerticesThis(null);
3566	4249	lowres.linkVerticesThis(sn);
3567		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3568	4251
3569	4252	System.err.flush();
3570	4253
..	..	@@ -3604,7 +4287,7 @@
3604	4287	return;
3605	4288
3606	4289	Object3D poses = group.selection.get(0);
3607		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3608	4291
3609	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3610	4293
..	..	@@ -3773,7 +4456,7 @@
3773	4456	group.selection.RelinkToSupport(); // july 2014
3774	4457	System.out.println("DONE.");
3775	4458	refreshContents();
3776		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4459	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3777	4460	}
3778	4461
3779	4462	void ReduceMesh(boolean reduction34)
..	..	@@ -3798,9 +4481,9 @@
3798	4481
3799	4482	void ClipMesh()
3800	4483	{
3801		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3802	4485	{
3803		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3804	4487
3805	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3806	4489	content = ((cGroup)content).get(0);
..	..	@@ -3809,7 +4492,7 @@
3809	4492	// {
3810	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3811	4494	// }
3812		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3813	4496	}
3814	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3815	4498	System.out.println("DONE.");
..	..	@@ -3856,6 +4539,18 @@
3856	4539	void MarkLeaves(boolean hide)
3857	4540	{
3858	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3859	4554	refreshContents();
3860	4555	}
3861	4556
..	..	@@ -3930,10 +4625,6 @@
3930	4625	// }
3931	4626	// }
3932	4627
3933		- static boolean allparams = true;
3934		-
3935		- static Vector<Object3D> listUI = new Vector<Object3D>();
3936		-
3937	4628	void EditSelection(boolean newWindow)
3938	4629	{
3939	4630	// aConstraints.gridy = 0;
..	..	@@ -3941,10 +4632,10 @@
3941	4632	{
3942	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3943	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3944		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3945	4636
3946	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
3947		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
3948	4639	{
3949	4640	// if (!(elem instanceof Composite))
3950	4641	// newWindow = false;
..	..	@@ -4026,7 +4717,8 @@
4026	4717	//new Exception().printStackTrace();
4027	4718
4028	4719	freezemodel = true;
4029		-
	4720	+ ClearUnpinned();
	4721	+
4030	4722	/**/
4031	4723	//switch (event.id)
4032	4724	{
..	..	@@ -4034,7 +4726,6 @@
4034	4726	//case 702: // Event.LIST_DESELECT
4035	4727	group.deselectAll();
4036	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4037		- objEditor.ClearInfo(); // .GetMaterial());
4038	4729	if (tps != null)
4039	4730	{
4040	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4043,33 +4734,39 @@
4043	4734
4044	4735	//if (child.parent != null)
4045	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4046	4738	group.addSelectee(child);
4047		- objEditor.SetMaterial(child); // .GetMaterial());
4048		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4049		- System.err.println("info : " + child.GetPath());
4050	4739	}
4051	4740	}
4052		- else
4053		- {
4054		- objEditor.SetMaterial(group); // .GetMaterial());
4055		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4056		- System.err.println("info : " + group.GetPath());
4057		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
4058	4747
4059		- objEditor.SetText(); // jan 2014
4060		-
4061		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4062	4749	CameraPane.flash = true;
4063	4750
4064		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4065	4752	// a camera
4066	4753	{
4067		- CameraPane.camerachangeframe = 0; // don't refuse it
4068		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4069		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4070		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
	4759	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4760	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4071	4761	}
4072	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4073	4770	refreshContents();
4074	4771	//return true;
4075	4772	}
..	..	@@ -4078,6 +4775,35 @@
4078	4775
4079	4776	freezemodel = false;
4080	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4081	4807
4082	4808	void linkSomething(Object3D thing)
4083	4809	{
..	..	@@ -4149,16 +4875,19 @@
4149	4875	{
4150	4876	if (group.selection.isEmpty())
4151	4877	return;
4152		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4153	4880	Composite tGroup = null;
4154	4881	if (group.selection.size() > 0) // 1)
4155	4882	{
4156	4883	tGroup = new cGroup();
4157		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4158	4885	}
4159	4886
4160	4887	if (cut)
4161	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4162	4891	//int indices[] = jList.getSelectedIndices();
4163	4892	//for (int i = indices.length - 1; i >= 0; i--)
4164	4893	//jList.remove(indices[i]);
..	..	@@ -4194,16 +4923,16 @@
4194	4923	//System.out.println("cut " + child);
4195	4924	//System.out.println("parent = " + child.parent);
4196	4925	// tmp.addChild(child);
4197		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4198	4927	tGroup.add/Child/(tmp);
4199	4928	else
4200		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4201	4930	}
4202	4931	else
4203		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4204	4933	tGroup.add/Child/(child);
4205	4934	else
4206		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4207	4936	}
4208	4937
4209	4938	//ResetModel();
..	..	@@ -4235,21 +4964,23 @@
4235	4964	//System.out.println("cut " + elem);
4236	4965	//System.out.println("parent = " + elem.parent);
4237	4966	// tmp.addChild(elem);
4238		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4239	4968	tGroup.add/Child/(tmp);
4240	4969	else
4241		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4242	4971	}
4243	4972	else
4244		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4245	4974	tGroup.add/Child/(child);
4246	4975	else
4247		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4248	4977	}
4249	4978
4250	4979	}
4251		- if (GrafreeD.clipboardIsTempGroup)
4252		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4253	4984	if (cut)
4254	4985	{
4255	4986	ResetModel();
..	..	@@ -4259,11 +4990,15 @@
4259	4990
4260	4991	void paste(boolean expand)
4261	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4262	4997	// if (GrafreeD.clipboard == null)
4263	4998	// return;
4264	4999	boolean first = true;
4265	5000
4266		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4267	5002	{
4268	5003	Composite temp;
4269	5004
..	..	@@ -4274,7 +5009,7 @@
4274	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4275	5010	*/
4276	5011	Object3D elem;
4277		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4278	5013	{
4279	5014	Object3D child = (Object3D)e.nextElement();
4280	5015
..	..	@@ -4308,21 +5043,22 @@
4308	5043	//Object3D cb = Applet3D.clipboard;
4309	5044	//temp.addChild(cb);
4310	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4311		- assert(GrafreeD.clipboard.parent == null);
4312		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4313		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4314		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4315		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4316	5051	else
4317		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4318		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4319	5054	}
4320	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4321	5057	ResetModel();
4322	5058	refreshContents();
4323	5059	}
4324	5060
4325		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4326	5062	{
4327	5063	// if (GrafreeD.clipboard == null)
4328	5064	// return;
..	..	@@ -4351,15 +5087,22 @@
4351	5087	if (copyit)
4352	5088	{
4353	5089	// paste(false);
4354		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4355	5098	}
4356	5099	else
4357	5100	{
4358	5101	boolean first = true;
4359	5102
4360		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4361	5104	{
4362		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4363	5106	Object3D copy;
4364	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4365	5108	{
..	..	@@ -4369,7 +5112,7 @@
4369	5112	}
4370	5113	} else
4371	5114	{
4372		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4373	5116	}
4374	5117	}
4375	5118	}
..	..	@@ -4446,6 +5189,10 @@
4446	5189
4447	5190	void group(Object3D csg, boolean grab)
4448	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4449	5196	if (//false) // why??
4450	5197	!group.selection.isEmpty())
4451	5198	{
..	..	@@ -4559,10 +5306,15 @@
4559	5306	//node.add(csg);
4560	5307	//makeSomething(node);
4561	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4562	5310	}
4563	5311
4564	5312	void Ungroup(Object3D g)
4565	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4566	5318	if (g instanceof HiddenObject)
4567	5319	{
4568	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4579,6 +5331,7 @@
4579	5331	objEditor.makeSomething(g.get(i), false);
4580	5332	}
4581	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4582	5335	}
4583	5336
4584	5337	void ungroup()
..	..	@@ -4774,21 +5527,6 @@
4774	5527	}
4775	5528	*/
4776	5529
4777		- void ImportGFD()
4778		- {
4779		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4780		- browser.show();
4781		- String filename = browser.getFile();
4782		- if (filename != null && filename.length() > 0)
4783		- {
4784		- String fullname = browser.getDirectory() + filename;
4785		-
4786		- //Object3D readobj =
4787		- objEditor.ReadGFD(fullname, objEditor);
4788		- //makeSomething(readobj);
4789		- }
4790		- }
4791		-
4792	5530	/*
4793	5531	public void Callback(Object obj)
4794	5532	{
..	..	@@ -4812,26 +5550,9 @@
4812	5550	}
4813	5551	*/
4814	5552
4815		- void ImportVRMLX3D()
4816		- {
4817		- if (GrafreeD.standAlone)
4818		- {
4819		- /**/
4820		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4821		- browser.show();
4822		- String filename = browser.getFile();
4823		- if (filename != null && filename.length() > 0)
4824		- {
4825		- String fullname = browser.getDirectory() + filename;
4826		- LoadVRMLX3D(fullname);
4827		- }
4828		- /**/
4829		- }
4830		- }
4831		-
4832	5553	String GetFile(String dialogName)
4833	5554	{
4834		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4835	5556	{
4836	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4837	5558	browser.show();
..	..	@@ -4895,10 +5616,33 @@
4895	5616	cButton flashSelectionButton;
4896	5617	cButton editButton;
4897	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4898	5620	cButton clearpanelButton;
4899		- cButton allParamsButton;
4900	5621	cButton unselectButton;
4901	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4902	5646	cButton screenfitButton;
4903	5647	cButton screenfitpointButton;
4904	5648	cButton snapobjectButton;
..	..	@@ -4910,14 +5654,6 @@
4910	5654
4911	5655	cButton setsupportButton;
4912	5656
4913		- cButton twoButton;
4914		- cButton sixButton;
4915		- cButton threeButton;
4916		- cButton sevenButton;
4917		- cButton fourButton; // full panel
4918		- cButton oneButton; // full XYZ
4919		- //cButton currentLayout;
4920		-
4921	5657	//
4922	5658	//Composite
4923	5659	Object3D // to do !!
..	..	@@ -4927,9 +5663,11 @@
4927	5663	//JTree jTree;
4928	5664	private MenuItem lookAtItem;
4929	5665	private MenuItem lookFromItem;
4930		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4931	5667	private MenuItem cutItem;
4932		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4933	5671	private MenuItem cloneItem;
4934	5672	private MenuItem cloneSupportItem;
4935	5673	private MenuItem overwriteGeoItem;
..	..	@@ -4942,7 +5680,7 @@
4942	5680	private MenuItem linkverticesItem;
4943	5681	private MenuItem relinkverticesItem;
4944	5682	private MenuItem setMasterItem;
4945		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
4946	5684	private MenuItem stepAllItem;
4947	5685	private MenuItem revertMeshItem;
4948	5686	private MenuItem poseMeshItem;
..	..	@@ -4953,6 +5691,7 @@
4953	5691	private MenuItem mergeGeometriesItem;
4954	5692	private MenuItem copyItem;
4955	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
4956	5695	private MenuItem pasteLinkItem;
4957	5696	private MenuItem pasteCloneItem;
4958	5697	private MenuItem pasteExpandItem;
..	..	@@ -4991,6 +5730,10 @@
4991	5730	private MenuItem showleavesItem;
4992	5731	private MenuItem markleavesItem;
4993	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
4994	5737
4995	5738	private MenuItem flipVItem;
4996	5739	private MenuItem unflipVItem;
..	..	@@ -5002,15 +5745,17 @@
5002	5745	private MenuItem panoTexturesItem;
5003	5746
5004	5747	private MenuItem resetCentroidItem;
5005		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5006	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5007	5752	private MenuItem hideItem;
5008	5753	private MenuItem grabItem;
5009	5754	private MenuItem backItem;
5010	5755	private MenuItem frontItem;
5011	5756	private MenuItem cameraItem;
5012	5757	private MenuItem compositeItem;
5013		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5014	5759	private MenuItem physicsItem;
5015	5760	private MenuItem frameselectorItem;
5016	5761	private MenuItem scriptNodeItem;
..	..	@@ -5050,7 +5795,7 @@
5050	5795	private MenuItem blobItem;
5051	5796	private MenuItem latheItem;
5052	5797	private MenuItem bezierItem;
5053		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5054	5799	private MenuItem meshItem;
5055	5800	// private MenuItem meshGroupItem;
5056	5801	private MenuItem springItem;
..	..	@@ -5072,11 +5817,6 @@
5072	5817	private MenuItem doubleItem;
5073	5818	private MenuItem tripleItem;
5074	5819
5075		- private MenuItem importGFDItem;
5076		- private MenuItem importVRMLX3DItem;
5077		- private MenuItem import3DSItem;
5078		- private MenuItem importOBJItem;
5079		-
5080	5820	private MenuItem computeAOItem;
5081	5821	private MenuItem recompileItem;
5082	5822	private MenuItem editScriptItem;
..	..	@@ -5086,4 +5826,8 @@
5086	5826	private MenuItem analyzeItem;
5087	5827	private MenuItem dumpItem;
5088	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5089	5833	}