~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,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
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));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
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);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	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);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	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);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	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);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
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	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +580,214 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
441	621	liveCB.addItemListener(this);
442	622
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);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	628	+ fastCB.setToolTipText("Fast mode");
461	629	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);
468		-
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);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ screenfitButton.setToolTipText("Screen fit");
507	635	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
509	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	642	// 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	643
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
526	652
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ twoButton.setToolTipText("Show center view only");
529	655	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	659	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	660	+ fourButton.setToolTipText("Show left panel only");
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ sixButton.setToolTipText("2-column layout left");
533	663	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ threeButton.setToolTipText("2-column layout right");
535	666	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ sevenButton.setToolTipText("3-column layout");
537	669	sevenButton.addActionListener(this);
538	670	//
539	671
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ rootButton.setToolTipText("Edit selection in new tab");
541	674	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	675	+
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ closeButton.setToolTipText("Close tab");
544	678	closeButton.addActionListener(this);
545	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	680	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	681
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create item switcher");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
557	767	uneditButton.addActionListener(this);
558	768
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
571	771	allParamsButton.addActionListener(this);
572	772
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ clearPanelButton.setToolTipText("Clear edit panel");
	775	+ clearPanelButton.addActionListener(this);
	776	+
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	778	+ unselectButton.setToolTipText("Unselect");
578	779	unselectButton.addActionListener(this);
579	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
	790	+
580	791	// oe.aConstraints.gridx += 1;
581	792	// oe.aConstraints.weighty = 0;
582	793	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +799,22 @@
588	799	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	800	// gcButton.addActionListener(this);
590	801
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	802	+ cGridBag jSPPanel = new cGridBag();
	803	+
	804	+ JScrollPane jSP;
602	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	807	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	808
	809	+ oe.treePanel.add(jSPPanel);
	810	+ oe.treePanel.Return();
	811	+
	812	+ oe.treePanel.add(copyOptionsPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+// mainPanel.setDividerLocation(0.5); //1.0);
	816	+// mainPanel.setResizeWeight(0.5);
	817	+
625	818	//jList.addListSelectionListener(this);
626	819	oe.jTree.addTreeSelectionListener(this);
627	820	//jTree.setRootVisible(false);
..	..	@@ -643,20 +836,157 @@
643	836	radio.layout = sevenButton;
644	837	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	838	}
	839	+
	840	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	841	+ {
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
	856	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	857	+ boxCB.setToolTipText("Display bounding boxes");
	858	+ boxCB.addItemListener(this);
	859	+
	860	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
	862	+ zoomBoxCB.addItemListener(this);
	863	+
	864	+ if (true) // Globals.ADVANCED)
	865	+ {
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
	873	+
	874	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	875	+ // localCB.addItemListener(this);
	876	+
	877	+ panel.Return();
	878	+
	879	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	880	+ crowdCB.setToolTipText("Used for crowds");
	881	+ crowdCB.addItemListener(this);
	882	+
	883	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	884	+ smoothCB.setToolTipText("Snapping delay");
	885	+ smoothCB.addItemListener(this);
	886	+
	887	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	888	+ slowCB.setToolTipText("Smooth interpolation");
	889	+ slowCB.addItemListener(this);
	890	+
	891	+// constraints.gridy += 1;
	892	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	893	+// speakerMocapCB.addItemListener(this);
	894	+
	895	+ panel.Return();
	896	+
	897	+ if (false)
	898	+ {
	899	+ // handled in scripts
	900	+ //constraints.gridy += 1;
	901	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	902	+ speakerCameraCB.addItemListener(this);
	903	+
	904	+ //constraints.gridy += 1;
	905	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	906	+ speakerFocusCB.addItemListener(this);
	907	+
	908	+ //constraints.gridy += 1;
	909	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	910	+ smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
	912	+ }
	913	+
	914	+//constraints.gridx += 1;
	915	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	916	+// debugCB.addItemListener(this);
	917	+
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
	922	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
	924	+ oeilCB.addItemListener(this);
	925	+
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
	946	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	947	+ lookAtCB.setToolTipText("Look-at target");
	948	+ lookAtCB.addItemListener(this);
	949	+ }
	950	+
	951	+ }
	952	+
	953	+ cGridBag fill = new cGridBag();
	954	+ fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
	959	+
	960	+ panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
	963	+
	964	+ }
646	965
647	966	void EditObject(Object3D obj)
648	967	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	968	+ cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
	977	+ radioButton.SetObject(obj);
	978	+ radioButton.layout = sevenButton;
	979	+ radioButton.SetCamera(cameraView.renderCamera, false);
	980	+ radioButton.addActionListener(this);
	981	+ radioPanel.add(radioButton);
	982	+ buttonGroup.add(radioButton);
	983	+ radioButton.doClick();
657	984	}
	985	+
658	986	void SetupViews(ObjEditor oe)
659	987	{
	988	+ theFrame = this;
	989	+
660	990	oe.SetupViews();
661	991
662	992	System.out.println("SetupViews");
..	..	@@ -665,22 +995,28 @@
665	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	996	}
667	997
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
678	1011	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
684	1020
685	1021	// static int COLOR = 1;
686	1022	// static int MATERIAL = 2;
..	..	@@ -688,9 +1024,9 @@
688	1024
689	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1026
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
694	1030
695	1031	public void itemStateChanged(ItemEvent e)
696	1032	{
..	..	@@ -715,10 +1051,10 @@
715	1051	dropAttributes \|= Object3D.TEXTURE;
716	1052	else
717	1053	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1054	+ } else if(e.getSource() == liveCB)
720	1055	{
721	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
722	1058	}
723	1059	else if(e.getSource() == supportCB)
724	1060	{
..	..	@@ -754,6 +1090,10 @@
754	1090	cameraView.repaint();
755	1091	// refreshContents();
756	1092	}
	1093	+ else if(e.getSource() == zoomBoxCB)
	1094	+ {
	1095	+ cameraView.ToggleZoomBoxMode();
	1096	+ }
757	1097	else if(e.getSource() == smoothfocusCB)
758	1098	{
759	1099	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1119,18 @@
779	1119	{
780	1120	cameraView.ToggleOeil();
781	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
782	1134	else if(e.getSource() == lookAtCB)
783	1135	{
784	1136	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1147,8 @@
795	1147
796	1148	/**/
797	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1153	// We can't move the root node or an empty selection
801	1154	return;
..	..	@@ -867,7 +1220,9 @@
867	1220	// objEditor.DropFile((java.io.File[]) object, true);
868	1221	// return;
869	1222	// }
870		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1226	{
872	1227	// file(s)
873	1228	String[] names = string.split("\n");
..	..	@@ -894,7 +1249,7 @@
894	1249
895	1250	flashIt = false;
896	1251	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1254
900	1255	if (group.selection.size() == 1)
..	..	@@ -910,23 +1265,33 @@
910	1265
911	1266	assert target == objEditor.jTree;
912	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
913	1269	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1271	} catch (Exception e) {
916	1272	System.out.println("destinationPath : " + destinationPath);
917	1273	return;
918	1274	}
919	1275
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
921	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
922	1287	loadClipboard(true);
923	1288	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1289	+ pasteInto(false, false);
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
930	1295	}
931	1296	public void dropActionChanged(DropTargetDragEvent dtde)
932	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1396,104 @@
1031	1396	{
1032	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1398	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1046	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1418	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
	1423	+ if (Globals.ADVANCED)
	1424	+ {
1050	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1426	ragdollItem.addActionListener(this);
1052	1427	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1428	ragdoll2Item.addActionListener(this);
	1429	+ }
1054	1430	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1431	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1432	meshItem.addActionListener(this);
1057	1433	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1434	// meshGroupItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1059	1437	springItem = menu.add(new MenuItem("Spring"));
1060	1438	springItem.addActionListener(this);
1061	1439	flagItem = menu.add(new MenuItem("Flag"));
1062	1440	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1441	blobItem = menu.add(new MenuItem("Blob"));
1068	1442	blobItem.addActionListener(this);
1069	1443	latheItem = menu.add(new MenuItem("Lathe"));
1070	1444	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- lightItem.addActionListener(this);
	1445	+ }
	1446	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1447	+ bezierItem.addActionListener(this);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1073	1452	menu.add("-");
1074	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1454	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1078	1457	doubleItem = menu.add(new MenuItem("Fork"));
1079	1458	doubleItem.addActionListener(this);
	1459	+ if (Globals.ADVANCED)
	1460	+ {
1080	1461	tripleItem = menu.add(new MenuItem("Trident"));
1081	1462	tripleItem.addActionListener(this);
	1463	+ }
1082	1464	}
1083	1465
1084	1466	void buildToolsMenu(Menu menu)
1085	1467	{
1086	1468	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1469	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1470	+ animationItem.setState(Globals.ANIMATION);
1089	1471
1090	1472	menu.add("-");
1091	1473	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1474	parseverticesItem.addActionListener(this);
1093	1475	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1476	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1477	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1478	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1479	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1480	reduceMorphItem.addActionListener(this);
1101	1481	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1482	reduce34MorphItem.addActionListener(this);
1103		-
	1483	+ menu.add("-");
1104	1484	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1485	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1486
	1487	+ if (Globals.ADVANCED)
	1488	+ {
	1489	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1490	+ mirrorItem.addActionListener(this);
	1491	+ menu.add("-");
1108	1492	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1493	memoryItem.addActionListener(this);
1110	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1495	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1497	dumpItem.addActionListener(this);
1114	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1499	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1502,8 @@
1118	1502	resetParentItem.addActionListener(this);
1119	1503	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1504	repairParentItem.addActionListener(this);
	1505	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1506	+ repairShadowItem.addActionListener(this);
1121	1507	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1508	invariantsItem.addActionListener(this);
1123	1509	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1511,7 @@
1125	1511	menu.add("-");
1126	1512	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1513	editScriptItem.addActionListener(this);
	1514	+ }
1128	1515	}
1129	1516
1130	1517	void ScreenFit()
..	..	@@ -1247,9 +1634,24 @@
1247	1634	shadow.material = new cMaterial(obj.material);
1248	1635	shadow.material.diffuse = 0.0001f;
1249	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1250	1638
1251	1639	makeSomething(shadow);
1252	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1253	1655
1254	1656	/**
1255	1657	* applyExample
..	..	@@ -1453,9 +1855,9 @@
1453	1855
1454	1856	void Overwrite(int mask)
1455	1857	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1859	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1459	1861
1460	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1863	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1880,7 @@
1478	1880	//
1479	1881	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1882	{
	1883	+ Object source = event.getSource();
1481	1884	/*
1482	1885	if (event.getSource() == nameField)
1483	1886	{
..	..	@@ -1489,11 +1892,11 @@
1489	1892	}
1490	1893	else
1491	1894	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1895	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1896	{
1494	1897	ScreenFit();
1495	1898	} else
1496		- if (event.getSource() == switchItem)
	1899	+ if (source == switchViewItem)
1497	1900	{
1498	1901	cVector v1 = new cVector();
1499	1902	cVector v2 = new cVector();
..	..	@@ -1502,11 +1905,11 @@
1502	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1906	objEditor.cameraView.repaint();
1504	1907	} else
1505		- if (event.getSource() == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1506	1909	{
1507	1910	makeSomething(new Box());
1508	1911	} else
1509		- if (event.getSource() == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1510	1913	{
1511	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1930,9 @@
1527	1930	applyExample(particleGeom, "SMOKE");
1528	1931	makeSomething(particleGeom);
1529	1932	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1933	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1934	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1935	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1936
1534	1937	ragdoll.toParent = LA.newMatrix();
1535	1938	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1950,7 @@
1547	1950	} else
1548	1951	/*
1549	1952	*/
1550		- if (event.getSource() == heightFieldItem)
	1953	+ if (source == heightFieldItem)
1551	1954	{
1552	1955	Object3D obj = new Object3D();
1553	1956
..	..	@@ -1585,31 +1988,31 @@
1585	1988
1586	1989	makeSomething(obj);
1587	1990	} else
1588		- if (event.getSource() == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1589	1992	{
1590	1993	makeSomething(new Grid());
1591	1994	} else
1592		- if (event.getSource() == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	1996	{
1594	1997	makeSomething(new Sphere());
1595	1998	} else
1596		- if (event.getSource() == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1597	2000	{
1598	2001	makeSomething(new Cone());
1599	2002	} else
1600		- if (event.getSource() == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1601	2004	{
1602	2005	makeSomething(new Torus());
1603	2006	} else
1604		- if (event.getSource() == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1605	2008	{
1606	2009	makeSomething(new Superellipsoid());
1607	2010	} else
1608		- if (event.getSource() == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1609	2012	{
1610	2013	makeSomething(new Klein());
1611	2014	} else
1612		- if (event.getSource() == blobItem)
	2015	+ if (source == blobItem)
1613	2016	{
1614	2017	Blob blob = new Blob();
1615	2018	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2020,15 @@
1617	2020	//blob.retile();
1618	2021	makeSomething(blob);
1619	2022	} else
1620		- if (event.getSource() == latheItem)
	2023	+ if (source == latheItem)
1621	2024	{
1622	2025	makeSomething(new Lathe());
1623	2026	} else
1624		- if (event.getSource() == bezierItem)
	2027	+ if (source == bezierItem)
1625	2028	{
1626	2029	makeSomething(new BezierSurface());
1627	2030	} else
1628		- if (event.getSource() == checkerItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1629	2032	{
1630	2033	/*
1631	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2043,7 @@
1640	2043	*/
1641	2044	makeSomething(new Checker());
1642	2045	} else
1643		- if (event.getSource() == meshItem)
	2046	+ if (source == meshItem)
1644	2047	{
1645	2048	Object3D itemtomake = new Object3D();
1646	2049	Object3D child;
..	..	@@ -1661,35 +2064,35 @@
1661	2064	makeSomething(child);
1662	2065	}
1663	2066	} else
1664		- if (event.getSource() == springItem)
	2067	+ if (source == springItem)
1665	2068	{
1666	2069	cSpring s = new cSpring();
1667	2070	s.setup();
1668	2071	makeSomething(s);
1669	2072	} else
1670		- if (event.getSource() == flagItem)
	2073	+ if (source == flagItem)
1671	2074	{
1672	2075	cSpring s = new cFlag();
1673	2076	s.setup();
1674	2077	makeSomething(s);
1675	2078	} else
1676		- if (event.getSource() == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1677	2080	{
1678	2081	makeSomething(new Light());
1679	2082	} else
1680		- if (event.getSource() == csgItem)
	2083	+ if (source == csgItem)
1681	2084	{
1682	2085	group(new CSG());
1683	2086	} else
1684		- if (event.getSource() == templateItem)
	2087	+ if (source == templateItem)
1685	2088	{
1686	2089	group(new cTemplate());
1687	2090	} else
1688		- if (event.getSource() == attributeItem)
	2091	+ if (source == attributeItem)
1689	2092	{
1690	2093	makeSomething(new Attribute());
1691	2094	} else
1692		- if (event.getSource() == pointflowItem)
	2095	+ if (source == pointflowItem)
1693	2096	{
1694	2097	makeSomething(new PointFlow());
1695	2098	} else
..	..	@@ -1701,7 +2104,7 @@
1701	2104	} else
1702	2105	*/
1703	2106
1704		- if (event.getSource() == superLoopItem)
	2107	+ if (source == superLoopItem)
1705	2108	{
1706	2109	Composite g = new cGroup();
1707	2110	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2126,30 @@
1723	2126
1724	2127	group(g);
1725	2128	} else
1726		- if (event.getSource() == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1727	2130	{
1728	2131	Composite csg = new GroupLeaf();
1729	2132	csg.count = 5;
1730	2133	group(csg);
1731		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1732	2135	csg.addChild(child);
1733	2136	child.addChild(csg);
1734	2137	} else
1735		- if (event.getSource() == doubleItem)
	2138	+ if (source == doubleItem)
1736	2139	{
1737		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1738	2141	csg.count = 5;
1739	2142	group(csg);
1740		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1741	2144	csg.addChild(child);
1742	2145	child.addChild(csg);
1743		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1744	2147	csg.addChild(child);
1745	2148	child.addChild(csg);
1746	2149	} else
1747		- if (event.getSource() == tripleItem)
	2150	+ if (source == tripleItem)
1748	2151	{
1749		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1750	2153	csg.count = 4;
1751	2154	group(csg);
1752	2155	Composite child = new cGroup();
..	..	@@ -1759,71 +2162,83 @@
1759	2162	csg.addChild(child);
1760	2163	child.addChild(csg);
1761	2164	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2165	+ if (source == computeAOItem)
1764	2166	{
1765		- ImportGFD();
	2167	+ Globals.drawMode = CameraPane.OCCLUSION;
	2168	+ Globals.theRenderer.repaint();
1766	2169	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2170	+ if (source == recompileItem)
1785	2171	{
1786	2172	Recompile();
1787	2173	refreshContents();
1788	2174	} else
1789		- if (event.getSource() == editScriptItem)
	2175	+ if (source == editScriptItem)
1790	2176	{
1791	2177	OpenDialog();
1792	2178	refreshContents();
1793	2179	} else
1794		- if (event.getSource() == invariantsItem)
	2180	+ if (source == invariantsItem)
1795	2181	{
1796	2182	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1798	2184	} else
1799		- if (event.getSource() == memoryItem)
	2185	+ if (source == memoryItem)
1800	2186	{
1801	2187	//System.out.println("Invariants:");
1802	2188	PrintMemory();
1803	2189	} else
1804		- if (event.getSource() == pathItem)
	2190	+ if (source == pathItem)
1805	2191	{
1806	2192	PrintPath();
1807	2193	} else
1808		- if (event.getSource() == analyzeItem)
	2194	+ if (source == analyzeItem)
1809	2195	{
1810	2196	AnalyzeObject();
1811	2197	} else
1812		- if (event.getSource() == dumpItem)
	2198	+ if (source == dumpItem)
1813	2199	{
1814	2200	DumpObject();
1815	2201	} else
1816		- if (event.getSource() == screenfitButton)
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
	2213	+ } else
	2214	+ if (source == undoButton)
	2215	+ {
	2216	+ Undo();
	2217	+ } else
	2218	+ if (source == redoButton)
	2219	+ {
	2220	+ Redo();
	2221	+ } else
	2222	+ if (source == saveButton)
	2223	+ {
	2224	+ Save();
	2225	+ } else
	2226	+ if (source == oneStepButton)
	2227	+ {
	2228	+ Globals.ONESTEP = true;
	2229	+ cameraView.repaint();
	2230	+ } else
	2231	+ if (source == screenfitButton)
1817	2232	{
1818	2233	//Reload(lastConverter, lastFilename, true);
1819	2234	ScreenFit();
1820	2235	} else
1821		- if (event.getSource() == screenfitpointButton)
	2236	+ if (source == screenfitpointButton)
1822	2237	{
1823	2238	//Reload(lastConverter, lastFilename, true);
1824	2239	ScreenFitPoint();
1825	2240	} else
1826		- if (event.getSource() == snapobjectButton)
	2241	+ if (source == snapobjectButton)
1827	2242	{
1828	2243	//Reload(lastConverter, lastFilename, true);
1829	2244	SnapObject();
..	..	@@ -1834,13 +2249,13 @@
1834	2249	// Recompile();
1835	2250	// refreshContents();
1836	2251	// } else
1837		- if (event.getSource() == gcButton)
	2252	+ if (source == gcButton)
1838	2253	{
1839	2254	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2255	System.gc();
1841	2256	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2257	} else
1843		- if (event.getSource() == editLeafItem)
	2258	+ if (source == editLeafItem)
1844	2259	{
1845	2260	Object3D obj;
1846	2261	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2269,74 @@
1854	2269	}
1855	2270	refreshContents(true);
1856	2271	} else
1857		- if (event.getSource() == openWindowItem)
	2272	+ if (source == openWindowItem)
1858	2273	{
1859	2274	EditSelection(true);
1860	2275	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2276	+ if (source == cutItem \|\| source == clearButton)
1862	2277	{
1863	2278	loadClipboard(true);
1864	2279	} else
1865		- if (event.getSource() == duplicateItem)
	2280	+ if (source == undoItem)
1866	2281	{
1867		- Object3D keep = GrafreeD.clipboard;
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == duplicateItem)
	2289	+ {
	2290	+ Object3D keep = Grafreed.clipboard;
1868	2291	loadClipboard(false);
1869	2292	paste(false);
1870		- GrafreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1871	2294	} else
1872		- if (event.getSource() == cloneItem)
	2295	+ if (source == cloneItem)
1873	2296	{
1874	2297	CloneSelection(false);
1875	2298	} else
1876		- if (event.getSource() == cloneSupportItem)
	2299	+ if (source == cloneSupportItem)
1877	2300	{
1878	2301	CloneSelection(true);
1879	2302	} else
1880		- if (event.getSource() == copyItem)
	2303	+ if (source == copyItem)
1881	2304	{
1882	2305	loadClipboard(false);
1883	2306	} else
1884		- if (event.getSource() == pasteItem)
	2307	+ if (source == pasteItem)
1885	2308	{
1886	2309	paste(false);
1887	2310	} else
1888		- if (event.getSource() == pasteLinkItem)
	2311	+ if (source == pasteIntoItem)
1889	2312	{
1890		- pasteInto(false);
	2313	+ pasteInto(true, false);
1891	2314	} else
1892		- if (event.getSource() == pasteCloneItem)
	2315	+ if (source == pasteLinkItem)
1893	2316	{
1894		- pasteInto(true);
	2317	+ pasteInto(false, false);
1895	2318	} else
1896		- if (event.getSource() == pasteExpandItem)
	2319	+ if (source == pasteCloneItem)
	2320	+ {
	2321	+ pasteInto(true, true);
	2322	+ } else
	2323	+ if (source == pasteExpandItem)
1897	2324	{
1898	2325	paste(true);
1899	2326	} else
1900		- if (event.getSource() == synchronizeItem)
	2327	+ if (source == synchronizeItem)
1901	2328	{
1902	2329	Overwrite(Object3D.TRANSFORM);
1903	2330	} else
1904		- if (event.getSource() == overwriteNameItem)
	2331	+ if (source == overwriteNameItem)
1905	2332	{
1906	2333	Overwrite(Object3D.NAME);
1907	2334	} else
1908		- if (event.getSource() == overwriteUVItem)
	2335	+ if (source == overwriteUVItem)
1909	2336	{
1910	2337	Overwrite(Object3D.UV);
1911	2338	} else
1912		- if (event.getSource() == overwriteMatItem)
	2339	+ if (source == overwriteMatItem)
1913	2340	{
1914	2341	/* july 2015
1915	2342	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2356,7 @@
1929	2356
1930	2357	Overwrite(dropAttributes);
1931	2358	}
1932		- if (event.getSource() == overwriteGeoItem)
	2359	+ if (source == overwriteGeoItem)
1933	2360	{
1934	2361	Overwrite(Object3D.GEOMETRY);
1935	2362	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2373,7 @@
1946	2373	// refreshContents();
1947	2374	// }
1948	2375	} else
1949		- if (event.getSource() == generateMeshItem)
	2376	+ if (source == generateMeshItem)
1950	2377	{
1951	2378	//if (group.selection.size() == 1)
1952	2379	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2384,7 @@
1957	2384	ResetModel();
1958	2385	refreshContents();
1959	2386	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2387	+ if (source == extractGeometriesItem)
1961	2388	{
1962	2389	boolean one = false;
1963	2390
..	..	@@ -1984,7 +2411,7 @@
1984	2411	ResetModel();
1985	2412	refreshContents();
1986	2413	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2414	+ if (source == cloneGeometriesItem)
1988	2415	{
1989	2416	boolean one = false;
1990	2417
..	..	@@ -2010,7 +2437,7 @@
2010	2437	ResetModel();
2011	2438	refreshContents();
2012	2439	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2440	+ if (source == shareGeometriesItem)
2014	2441	{
2015	2442	boolean one = false;
2016	2443
..	..	@@ -2040,7 +2467,7 @@
2040	2467	refreshContents();
2041	2468	}
2042	2469	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2470	+ if (source == mergeGeometriesItem)
2044	2471	{
2045	2472	boolean one = false;
2046	2473
..	..	@@ -2070,7 +2497,7 @@
2070	2497	ResetModel();
2071	2498	refreshContents();
2072	2499	} else
2073		- if (event.getSource() == linkverticesItem)
	2500	+ if (source == linkverticesItem)
2074	2501	{
2075	2502	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2503	// {
..	..	@@ -2083,48 +2510,48 @@
2083	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2511	// refreshContents();
2085	2512	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2514	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2089	2516
2090	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2518	content = ((cGroup)content).get(0);
2092	2519
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2520	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2521	for (int i=0; i<group.selection.size(); i++)
2095	2522	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2525	group.selection.get(i).linkVerticesThis(content);
2099	2526	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2527	+ CameraPane.SWITCH = random;
2101	2528	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2529	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2530	refreshContents();
2104	2531	}
2105	2532	} else
2106		- if (event.getSource() == resetsupportItem)
	2533	+ if (source == resetsupportItem)
2107	2534	{
2108	2535	for (int i=0; i<group.selection.size(); i++)
2109	2536	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2537	+ boolean random = CameraPane.SWITCH;
	2538	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2539	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2540	+ CameraPane.SWITCH = random;
2114	2541	}
2115	2542
2116	2543	refreshContents();
2117	2544	} else
2118		- if (event.getSource() == relinkverticesItem)
	2545	+ if (source == relinkverticesItem)
2119	2546	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2547	+ boolean random = CameraPane.SWITCH;
	2548	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2549	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2550	+ CameraPane.SWITCH = random;
2124	2551
2125	2552	refreshContents();
2126	2553	} else
2127		- if (event.getSource() == resetreferencesItem)
	2554	+ if (source == resetreferencesItem)
2128	2555	{
2129	2556	for (int i=0; i<group.selection.size(); i++)
2130	2557	{
..	..	@@ -2133,11 +2560,11 @@
2133	2560
2134	2561	refreshContents();
2135	2562	} else
2136		- if (event.getSource() == setMasterItem)
	2563	+ if (source == setMasterItem)
2137	2564	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2566	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2141	2568
2142	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2570	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2573,13 @@
2146	2573	refreshContents();
2147	2574	}
2148	2575	} else
2149		- if (event.getSource() == poseMeshItem)
	2576	+ if (source == poseMeshItem)
2150	2577	{
2151	2578	if (group.selection.size() == 1)
2152	2579	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2154	2581	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2156	2583
2157	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2585	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2592,19 @@
2165	2592	}
2166	2593
2167	2594	} else
2168		- if (event.getSource() == revertMeshItem)
	2595	+ if (source == revertMeshItem)
2169	2596	{
2170	2597	RevertMeshes();
2171	2598	} else
2172		- if (event.getSource() == resetMeshItem)
	2599	+ if (source == resetAllItem)
2173	2600	{
2174	2601	ResetAll();
2175	2602	} else
2176		- if (event.getSource() == stepAllItem)
	2603	+ if (source == stepAllItem)
2177	2604	{
2178	2605	StepAll();
2179	2606	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2607	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2608	{
2182	2609	//int indices[] = jList.getSelectedIndices();
2183	2610	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2612,46 @@
2185	2612
2186	2613	ClearSelection(false);
2187	2614	} else
2188		- if (event.getSource() == clearAllItem)
	2615	+ if (source == clearAllItem)
2189	2616	{
2190	2617	ClearSelection(true);
2191	2618	} else
2192		- if (event.getSource() == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2193	2620	{
2194		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2195	2622	} else
2196		- if (event.getSource() == hideItem)
	2623	+ if (source == hideItem)
2197	2624	{
2198	2625	group(new HiddenObject());
2199	2626	} else
2200		- if (event.getSource() == frontItem)
	2627	+ if (source == frontItem)
2201	2628	{
2202	2629	front();
2203	2630	} else
2204		- if (event.getSource() == backItem)
	2631	+ if (source == backItem)
2205	2632	{
2206	2633	back();
2207	2634	} else
2208		- if (event.getSource() == cameraItem)
	2635	+ if (source == cameraItem)
2209	2636	{
2210	2637	makeSomething(new Camera());
2211	2638	} else
2212		- if (event.getSource() == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2213	2640	{
2214	2641	group(new Composite());
2215	2642	} else
2216		- if (event.getSource() == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2217	2644	{
2218	2645	RandomNode random = new RandomNode();
2219	2646	group(random);
2220	2647	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2648	+ random.name = random.get(0).name + "Switch";
2222	2649	} else
2223		- if (event.getSource() == physicsItem)
	2650	+ if (source == physicsItem)
2224	2651	{
2225	2652	group(new PhysicsNode());
2226	2653	} else
2227		- if (event.getSource() == frameselectorItem)
	2654	+ if (source == frameselectorItem)
2228	2655	{
2229	2656	for (int i=0; i<group.selection.size(); i++)
2230	2657	{
..	..	@@ -2236,7 +2663,7 @@
2236	2663	ResetModel();
2237	2664	refreshContents();
2238	2665	} else
2239		- if (event.getSource() == switchGeoItem)
	2666	+ if (source == switchGeoItem)
2240	2667	{
2241	2668	for (int i=0; i<group.selection.size(); i++)
2242	2669	{
..	..	@@ -2248,7 +2675,7 @@
2248	2675	ResetModel();
2249	2676	refreshContents();
2250	2677	} else
2251		- if (event.getSource() == switchTransfoItem)
	2678	+ if (source == switchTransfoItem)
2252	2679	{
2253	2680	for (int i=0; i<group.selection.size(); i++)
2254	2681	{
..	..	@@ -2260,7 +2687,7 @@
2260	2687	ResetModel();
2261	2688	refreshContents();
2262	2689	} else
2263		- if (event.getSource() == morphItem)
	2690	+ if (source == morphItem)
2264	2691	{
2265	2692	for (int i=0; i<group.selection.size(); i++)
2266	2693	{
..	..	@@ -2272,7 +2699,7 @@
2272	2699	ResetModel();
2273	2700	refreshContents();
2274	2701	} else
2275		- if (event.getSource() == scriptNodeItem)
	2702	+ if (source == scriptNodeItem)
2276	2703	{
2277	2704	boolean atleastone = false;
2278	2705
..	..	@@ -2311,215 +2738,252 @@
2311	2738	}
2312	2739	}
2313	2740	} else
2314		- if (event.getSource() == linkerItem)
	2741	+ if (source == linkerItem)
2315	2742	{
2316	2743	group(new cLinker());
2317	2744	} else
2318		- if (event.getSource() == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2319	2746	{
2320	2747	group(new TextureNode());
2321	2748	} else
2322		- if (event.getSource() == billboardItem)
	2749	+ if (source == billboardItem)
2323	2750	{
2324	2751	group(new BillboardNode());
2325	2752	} else
2326		- if (event.getSource() == shadowXItem)
	2753	+ if (source == shadowXItem)
2327	2754	{
2328	2755	CastShadow(0);
2329	2756	} else
2330		- if (event.getSource() == shadowYItem)
	2757	+ if (source == shadowYItem)
2331	2758	{
2332	2759	CastShadow(1);
2333	2760	} else
2334		- if (event.getSource() == shadowZItem)
	2761	+ if (source == shadowZItem)
2335	2762	{
2336	2763	CastShadow(2);
2337	2764	} else
2338		- if (event.getSource() == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	2766	{
2340		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2341	2769	for (int i=0; i<group.selection.size(); i++)
2342	2770	{
2343		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2344	2776	}
2345	2777
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2349	2789	} else
2350		- if (event.getSource() == genUVItem)
	2790	+ if (source == genUVItem)
2351	2791	{
2352	2792	GenUV();
2353	2793	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2794	+ if (source == genNormalsCADItem)
2355	2795	{
2356	2796	GenNormals(true);
2357	2797	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2798	+ if (source == genNormalsMESHItem)
2359	2799	{
2360		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2361	2801	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2802	+ if (source == genNormalsORGANItem)
2363	2803	{
2364	2804	GenNormals(false);
2365	2805	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2806	+ if (source == genNormalsMINEItem)
2367	2807	{
2368	2808	GenNormalsMINE();
2369	2809	} else
2370		- if (event.getSource() == stripifyItem)
	2810	+ if (source == stripifyItem)
2371	2811	{
2372	2812	Stripify();
2373	2813	} else
2374		- if (event.getSource() == unstripifyItem)
	2814	+ if (source == unstripifyItem)
2375	2815	{
2376	2816	Unstripify();
2377	2817	} else
2378		- if (event.getSource() == trimItem)
	2818	+ if (source == trimItem)
2379	2819	{
2380	2820	Trim();
2381	2821	} else
2382		- if (event.getSource() == untrimItem)
	2822	+ if (source == untrimItem)
2383	2823	{
2384	2824	Untrim();
2385	2825	} else
2386		- if (event.getSource() == clearColorsItem)
	2826	+ if (source == clearColorsItem)
2387	2827	{
2388	2828	ClearColors();
2389	2829	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2830	+ if (source == clearMaterialsItem)
2391	2831	{
2392	2832	ClearMaterials();
2393	2833	} else
2394		- if (event.getSource() == liveleavesItem)
	2834	+ if (source == liveleavesItem)
2395	2835	{
2396	2836	LiveLeaves(true);
2397	2837	} else
2398		- if (event.getSource() == unliveleavesItem)
	2838	+ if (source == unliveleavesItem)
2399	2839	{
2400	2840	LiveLeaves(false);
2401	2841	} else
2402		- if (event.getSource() == supportleavesItem)
	2842	+ if (source == supportleavesItem)
2403	2843	{
2404	2844	SupportLeaves(true);
2405	2845	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2846	+ if (source == unsupportleavesItem)
2407	2847	{
2408	2848	SupportLeaves(false);
2409	2849	} else
2410		- if (event.getSource() == hideleavesItem)
	2850	+ if (source == hideleavesItem)
2411	2851	{
2412	2852	HideLeaves(true);
2413	2853	} else
2414		- if (event.getSource() == showleavesItem)
	2854	+ if (source == showleavesItem)
2415	2855	{
2416	2856	HideLeaves(false);
2417	2857	} else
2418		- if (event.getSource() == markleavesItem)
	2858	+ if (source == markleavesItem)
2419	2859	{
2420	2860	MarkLeaves(true);
2421	2861	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2862	+ if (source == unmarkleavesItem)
2423	2863	{
2424	2864	MarkLeaves(false);
2425	2865	} else
2426		- if (event.getSource() == flipVItem)
	2866	+ if (source == rewindleavesItem)
	2867	+ {
	2868	+ RewindLeaves(true);
	2869	+ } else
	2870	+ if (source == unrewindleavesItem)
	2871	+ {
	2872	+ RewindLeaves(false);
	2873	+ } else
	2874	+ if (source == randomleavesItem)
	2875	+ {
	2876	+ RandomLeaves(true);
	2877	+ } else
	2878	+ if (source == unrandomleavesItem)
	2879	+ {
	2880	+ RandomLeaves(false);
	2881	+ } else
	2882	+ if (source == flipVItem)
2427	2883	{
2428	2884	FlipV(true);
2429	2885	} else
2430		- if (event.getSource() == unflipVItem)
	2886	+ if (source == unflipVItem)
2431	2887	{
2432	2888	FlipV(false);
2433	2889	} else
2434		- if (event.getSource() == lowTexturesItem)
	2890	+ if (source == lowTexturesItem)
2435	2891	{
2436	2892	SetTexRes(0);
2437	2893	} else
2438		- if (event.getSource() == normalTexturesItem)
	2894	+ if (source == normalTexturesItem)
2439	2895	{
2440	2896	SetTexRes(1);
2441	2897	} else
2442		- if (event.getSource() == highTexturesItem)
	2898	+ if (source == highTexturesItem)
2443	2899	{
2444	2900	SetTexRes(2);
2445	2901	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2902	+ if (source == veryhighTexturesItem)
2447	2903	{
2448	2904	SetTexRes(3);
2449	2905	} else
2450		- if (event.getSource() == maxTexturesItem)
	2906	+ if (source == maxTexturesItem)
2451	2907	{
2452	2908	SetTexRes(4);
2453	2909	} else
2454		- if (event.getSource() == panoTexturesItem)
	2910	+ if (source == panoTexturesItem)
2455	2911	{
2456	2912	SetTexRes(5);
2457	2913	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2914	+ if (source == reverseNormalsItem)
2459	2915	{
2460	2916	ReverseNormals();
2461	2917	} else
2462		- if (event.getSource() == parseverticesItem)
	2918	+ if (source == parseverticesItem)
2463	2919	{
2464	2920	ParseVertices();
2465	2921	} else
2466		- if (event.getSource() == textureFieldItem)
	2922	+ if (source == textureFieldItem)
2467	2923	{
2468	2924	TextureVertices();
2469	2925	} else
2470		- if (event.getSource() == alignItem)
	2926	+ if (source == alignItem)
2471	2927	{
2472	2928	Align();
2473	2929	} else
2474		- if (event.getSource() == mirrorItem)
	2930	+ if (source == mirrorItem)
2475	2931	{
2476	2932	MirrorPoses();
2477	2933	} else
2478		- if (event.getSource() == reduceMorphItem)
	2934	+ if (source == reduceMorphItem)
2479	2935	{
2480	2936	MeshReduction(false);
2481	2937	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2938	+ if (source == reduce34MorphItem)
2483	2939	{
2484	2940	MeshReduction(true);
2485	2941	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2942	+ if (source == reverseTrianglesItem)
2487	2943	{
2488	2944	ReverseTriangles();
2489	2945	} else
2490		- if (event.getSource() == reduceMeshItem)
	2946	+ if (source == reduceMeshItem)
2491	2947	{
2492	2948	ReduceMesh(false);
2493	2949	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2950	+ if (source == reduce34MeshItem)
2495	2951	{
2496	2952	ReduceMesh(true);
2497	2953	} else
2498		- if (event.getSource() == increaseMeshItem)
	2954	+ if (source == increaseMeshItem)
2499	2955	{
2500	2956	IncreaseMesh();
2501	2957	} else
2502		- if (event.getSource() == clipMeshItem)
	2958	+ if (source == clipMeshItem)
2503	2959	{
2504	2960	ClipMesh();
2505	2961	} else
2506		- if (event.getSource() == smoothMeshItem)
	2962	+ if (source == smoothMeshItem)
2507	2963	{
2508	2964	SmoothMesh();
2509	2965	} else
2510		- if (event.getSource() == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2511	2967	{
2512	2968	TransformGeometry();
2513	2969	} else
2514		- if (event.getSource() == resetTransformItem)
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
	2973	+ } else
	2974	+ if (source == resetTransformItem)
2515	2975	{
2516	2976	ResetTransform();
2517	2977	} else
2518		- if (event.getSource() == resetCentroidItem)
	2978	+ if (source == resetCentroidItem)
2519	2979	{
2520		- ResetCentroid();
	2980	+ ResetCentroid(true);
2521	2981	} else
2522		- if (event.getSource() == resetParentItem)
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
	2985	+ } else
	2986	+ if (source == resetParentItem)
2523	2987	{
2524	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2989	{
..	..	@@ -2529,7 +2993,7 @@
2529	2993
2530	2994	refreshContents();
2531	2995	} else
2532		- if (event.getSource() == repairParentItem)
	2996	+ if (source == repairParentItem)
2533	2997	{
2534	2998	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2999	{
..	..	@@ -2543,7 +3007,21 @@
2543	3007
2544	3008	refreshContents();
2545	3009	} else
2546		- if (event.getSource() == sortbysizeItem)
	3010	+ if (source == repairShadowItem)
	3011	+ {
	3012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3013	+ {
	3014	+ Object3D obj = (Object3D)e.nextElement();
	3015	+ obj.RepairShadow();
	3016	+// for (int i=0; i<obj.size(); i++)
	3017	+// {
	3018	+// obj.get(i).parent = obj;
	3019	+// }
	3020	+ }
	3021	+
	3022	+ refreshContents();
	3023	+ } else
	3024	+ if (source == sortbysizeItem)
2547	3025	{
2548	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3027	{
..	..	@@ -2555,7 +3033,7 @@
2555	3033	ResetModel();
2556	3034	refreshContents();
2557	3035	} else
2558		- if (event.getSource() == sortbynameItem)
	3036	+ if (source == sortbynameItem)
2559	3037	{
2560	3038	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3039	{
..	..	@@ -2567,7 +3045,7 @@
2567	3045	ResetModel();
2568	3046	refreshContents();
2569	3047	} else
2570		- if (event.getSource() == attachPigmentItem)
	3048	+ if (source == attachPigmentItem)
2571	3049	{
2572	3050	String texture = GetFile("Attach pigment");
2573	3051	Object3D obj;
..	..	@@ -2579,7 +3057,7 @@
2579	3057
2580	3058	refreshContents();
2581	3059	} else
2582		- if (event.getSource() == detachPigmentItem)
	3060	+ if (source == detachPigmentItem)
2583	3061	{
2584	3062	Object3D obj;
2585	3063	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3068,7 @@
2590	3068
2591	3069	refreshContents();
2592	3070	} else
2593		- if (event.getSource() == attachBumpItem)
	3071	+ if (source == attachBumpItem)
2594	3072	{
2595	3073	String texture = GetFile("Attach bump");
2596	3074	Object3D obj;
..	..	@@ -2602,7 +3080,7 @@
2602	3080
2603	3081	refreshContents();
2604	3082	} else
2605		- if (event.getSource() == detachBumpItem)
	3083	+ if (source == detachBumpItem)
2606	3084	{
2607	3085	Object3D obj;
2608	3086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +3091,7 @@
2613	3091
2614	3092	refreshContents();
2615	3093	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3094	+ if (source == pigmentBumpItem)
2617	3095	{
2618	3096	Object3D obj;
2619	3097	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3102,237 @@
2624	3102
2625	3103	refreshContents();
2626	3104	} else
2627		- if (event.getSource() == flashSelectionButton)
	3105	+ if (source == flashSelectionButton)
2628	3106	{
2629	3107	CameraPane.flash = true;
2630	3108	refreshContents();
2631	3109	} else
2632		- if (event.getSource() == oneButton)
	3110	+ if (source == oneButton)
2633	3111	{
2634	3112	} else
2635		- if (event.getSource() == twoButton)
	3113	+ if (source == twoButton)
2636	3114	{
2637	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2638	3120	// bug
2639	3121	//gridPanel.setDividerLocation(1.0);
2640	3122	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3123	+// bigThree.remove(scenePanel);
	3124	+// bigThree.remove(centralPanel);
	3125	+// bigThree.remove(XYZPanel);
	3126	+// aWindowConstraints.gridx = 0;
	3127	+// aWindowConstraints.gridy = 0;
	3128	+// aWindowConstraints.gridwidth = 1;
	3129	+// // aConstraints.gridheight = 3;
	3130	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3131	+// aWindowConstraints.weightx = 0;
	3132	+// aWindowConstraints.weighty = 1;
	3133	+// //bigThree.add(jtp, aWindowConstraints);
	3134	+// aWindowConstraints.weightx = 1;
	3135	+// aWindowConstraints.gridwidth = 3;
	3136	+// // aConstraints.gridheight = 3;
	3137	+// aWindowConstraints.gridx = 1;
	3138	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3139	+// bigThree.add(centralPanel, aWindowConstraints);
	3140	+// aWindowConstraints.weightx = 0;
	3141	+// aWindowConstraints.gridx = 4;
	3142	+// aWindowConstraints.gridwidth = 1;
	3143	+// // aConstraints.gridheight = 3;
	3144	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3145	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3146	+// scenePanel.setVisible(false);
	3147	+// centralPanel.setVisible(true);
	3148	+// XYZPanel.setVisible(false);
	3149	+ bigThree.ClearUI();
	3150	+ bigThree.add(centralPanel);
	3151	+ bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2665	3170	} else
2666		- if (event.getSource() == threeButton)
	3171	+ if (source == threeButton)
2667	3172	{
2668	3173	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
	3177	+
	3178	+// bigThree.remove(scenePanel);
	3179	+// bigThree.remove(centralPanel);
	3180	+// bigThree.remove(XYZPanel);
	3181	+// aWindowConstraints.gridx = 0;
	3182	+// aWindowConstraints.gridy = 0;
	3183	+// aWindowConstraints.gridwidth = 1;
	3184	+// // aConstraints.gridheight = 3;
	3185	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3186	+// aWindowConstraints.weightx = 0;
	3187	+// aWindowConstraints.weighty = 1;
	3188	+// //bigThree.add(jtp, aWindowConstraints);
	3189	+// aWindowConstraints.weightx = 1;
	3190	+// aWindowConstraints.gridwidth = 3;
	3191	+// // aConstraints.gridheight = 3;
	3192	+// aWindowConstraints.gridx = 1;
	3193	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3194	+// bigThree.add(centralPanel, aWindowConstraints);
	3195	+// aWindowConstraints.weightx = 0;
	3196	+// aWindowConstraints.gridx = 4;
	3197	+// aWindowConstraints.gridwidth = 1;
	3198	+// // aConstraints.gridheight = 3;
	3199	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3200	+// bigThree.add(XYZPanel, aWindowConstraints);
	3201	+// bigThree.validate();
	3202	+// scenePanel.setVisible(false);
	3203	+// centralPanel.setVisible(true);
	3204	+// XYZPanel.setVisible(true);
	3205	+ bigThree.ClearUI();
	3206	+ bigThree.add(centralPanel);
	3207	+ bigThree.add(XYZPanel);
	3208	+ bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2693	3211	} else
2694		- if (event.getSource() == fourButton)
	3212	+ if (source == fourButton)
2695	3213	{
2696	3214	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
	3218	+
	3219	+// bigThree.remove(scenePanel);
	3220	+// bigThree.remove(centralPanel);
	3221	+// bigThree.remove(XYZPanel);
	3222	+// aWindowConstraints.gridx = 0;
	3223	+// aWindowConstraints.gridy = 0;
	3224	+// aWindowConstraints.gridwidth = 1;
	3225	+// // aWindowConstraints.gridheight = 3;
	3226	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3227	+// aWindowConstraints.weightx = 1;
	3228	+// aWindowConstraints.weighty = 1;
	3229	+// bigThree.add(scenePanel, aWindowConstraints);
	3230	+// aWindowConstraints.weightx = 1;
	3231	+// aWindowConstraints.gridwidth = 3;
	3232	+// // aConstraints.gridheight = 3;
	3233	+// aWindowConstraints.gridx = 1;
	3234	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3235	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3236	+// aWindowConstraints.weightx = 0;
	3237	+// aWindowConstraints.gridx = 4;
	3238	+// aWindowConstraints.gridwidth = 1;
	3239	+// // aWindowConstraints.gridheight = 3;
	3240	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3241	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3242	+// bigThree.validate();
	3243	+// scenePanel.setVisible(true);
	3244	+// centralPanel.setVisible(false);
	3245	+// XYZPanel.setVisible(false);
	3246	+ bigThree.ClearUI();
	3247	+ bigThree.add(scenePanel);
	3248	+ bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2721	3251	} else
2722		- if (event.getSource() == sixButton)
	3252	+ if (source == sixButton)
2723	3253	{
2724	3254	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
	3258	+
	3259	+// bigThree.remove(scenePanel);
	3260	+// bigThree.remove(centralPanel);
	3261	+// bigThree.remove(XYZPanel);
	3262	+// aWindowConstraints.gridx = 0;
	3263	+// aWindowConstraints.gridy = 0;
	3264	+// aWindowConstraints.gridwidth = 1;
	3265	+// // aConstraints.gridheight = 3;
	3266	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3267	+// aWindowConstraints.weightx = 0;
	3268	+// aWindowConstraints.weighty = 1;
	3269	+// bigThree.add(scenePanel, aWindowConstraints);
	3270	+// aWindowConstraints.weightx = 1;
	3271	+// aWindowConstraints.gridwidth = 3;
	3272	+// // aWindowConstraints.gridheight = 3;
	3273	+// aWindowConstraints.gridx = 1;
	3274	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3275	+// bigThree.add(centralPanel, aWindowConstraints);
	3276	+// aWindowConstraints.weightx = 0;
	3277	+// aWindowConstraints.gridx = 4;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3281	+// //bigThree.add(XYZPanel, aConstraints);
	3282	+// bigThree.validate();
	3283	+// scenePanel.setVisible(true);
	3284	+// centralPanel.setVisible(true);
	3285	+// XYZPanel.setVisible(false);
	3286	+ bigThree.ClearUI();
	3287	+ bigThree.add(scenePanel);
	3288	+ bigThree.add(centralPanel);
	3289	+ bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2749	3292	} else
2750		- if (event.getSource() == sevenButton)
	3293	+ if (source == sevenButton)
2751	3294	{
2752	3295	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
	3299	+
	3300	+// bigThree.remove(scenePanel);
	3301	+// bigThree.remove(centralPanel);
	3302	+// bigThree.remove(XYZPanel);
	3303	+// aWindowConstraints.gridx = 0;
	3304	+// aWindowConstraints.gridy = 0;
	3305	+// aWindowConstraints.gridwidth = 1;
	3306	+// // aWindowConstraints.gridheight = 3;
	3307	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3308	+// aWindowConstraints.weightx = 0;
	3309	+// aWindowConstraints.weighty = 1;
	3310	+// bigThree.add(scenePanel, aWindowConstraints);
	3311	+// aWindowConstraints.weightx = 1;
	3312	+// aWindowConstraints.gridwidth = 3;
	3313	+// // aWindowConstraints.gridheight = 3;
	3314	+// aWindowConstraints.gridx = 1;
	3315	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3316	+// bigThree.add(centralPanel, aWindowConstraints);
	3317	+// aWindowConstraints.weightx = 0;
	3318	+// aWindowConstraints.gridx = 4;
	3319	+// aWindowConstraints.gridwidth = 1;
	3320	+// // aConstraints.gridheight = 3;
	3321	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3322	+// bigThree.add(XYZPanel, aWindowConstraints);
	3323	+// bigThree.validate();
	3324	+// scenePanel.setVisible(true);
	3325	+// centralPanel.setVisible(true);
	3326	+// XYZPanel.setVisible(true);
	3327	+ bigThree.ClearUI();
	3328	+ bigThree.add(scenePanel);
	3329	+ bigThree.add(centralPanel);
	3330	+ bigThree.add(XYZPanel);
	3331	+ bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2777	3334	} else
2778		- if (event.getSource() == rootButton)
	3335	+ if (source == rootButton)
2779	3336	{
2780	3337	Object3D obj;
2781	3338	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3342,84 @@
2785	3342	EditObject(obj);
2786	3343	}
2787	3344
	3345	+ cameraView.requestFocusInWindow();
2788	3346	refreshContents(true);
2789	3347	} else
2790		- if (event.getSource() == closeButton)
	3348	+ if (source == closeButton)
2791	3349	{
2792	3350	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3351	cRadio ab;
2794	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3353	{
2796	3354	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2799	3363	buttonGroup.remove(ab);
2800	3364	radioPanel.remove(ab);
2801	3365
2802		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2803	3368	// ab.GetObject().objectUI = null; // ?????????
2804	3369
2805	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3371	break;
2807	3372	}
2808	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2809	3376	refreshContents(true);
2810	3377	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3378	+ if (source == editItem \|\| source == editButton)
2812	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2813	3386	EditSelection(false);
2814	3387	} else
2815		- if (event.getSource() == uneditButton)
	3388	+ if (source == uneditButton)
2816	3389	{
2817	3390	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3391	{
2819	3392	Object3D child = (Object3D)e.nextElement();
2820	3393	if(child.editWindow != null)
2821	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2822	3396	child.CloseUI();
2823	3397	listUI.remove(child);
2824	3398
2825		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2826	3400	}
2827		- objEditor.ctrlPanel.revalidate();
	3401	+ objEditor.ctrlPanel.FlushUI();
2828	3402	//objEditor.jTree.clearSelection();
2829	3403	//objEditor.ResetSliders();
2830	3404	refreshContents(true);
2831	3405	} else
2832		- if (event.getSource() == clearPanelButton)
	3406	+ if (source == clearPanelButton)
2833	3407	{
2834	3408	assert(copy == group);
2835	3409	//copy.ClearUI();
2836	3410	for (Object3D obj : listUI)
2837	3411	{
	3412	+ obj.pinned = false;
2838	3413	obj.CloseUI();
2839	3414	}
2840	3415	listUI.clear();
2841	3416	refreshContents(true);
2842	3417	} else
2843		- if (event.getSource() == allParamsButton)
	3418	+ if (source == allParamsButton)
2844	3419	{
2845	3420	assert(copy == group);
2846	3421
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3423
2849	3424	for (Object3D obj : listUI)
2850	3425	{
..	..	@@ -2861,19 +3436,19 @@
2861	3436
2862	3437	refreshContents(true);
2863	3438	} else
2864		- if (event.getSource() == unselectButton)
	3439	+ if (source == unselectButton)
2865	3440	{
2866	3441	objEditor.jTree.clearSelection();
2867	3442	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3443	objEditor.ResetSliders();
2869	3444	refreshContents(true);
2870	3445	} else
2871		- if(event.getSource() instanceof cRadio)
	3446	+ if(source instanceof cRadio)
2872	3447	{
2873	3448	group.parent = keepparent;
2874	3449	group.attributes = 0;
2875	3450	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3451	+ /cRadio/ radio = (cRadio)source;
2877	3452	Object3D obj = radio.GetObject();
2878	3453	System.out.println("Edit " + obj);
2879	3454	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3468,7 @@
2893	3468	}
2894	3469
2895	3470	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3471	+ //Globals.theRenderer.object = group;
2897	3472	if(!useclient)
2898	3473	{
2899	3474	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3477,50 @@
2902	3477	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3478	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3479	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3480	+ //cameraView.lighttouched = true;
	3481	+ Globals.lighttouched = true;
2906	3482	topView.object = group;
2907	3483	frontView.object = group;
2908	3484	sideView.object = group;
2909	3485	}
2910		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
2911	3491	/*
2912	3492	currentLayout = radio.layout;
2913	3493	if (currentLayout == null)
2914	3494	currentLayout = sevenButton;
2915	3495	*/
2916	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
2917	3502	keepparent = group.parent;
2918	3503	// PARENT = NULL or not???
2919	3504	//group.parent = null; // ROOT
2920	3505	//group.attributes = -1;
2921	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
2922	3509	refreshContents(true);
2923		- }
	3510	+ } else if (event.getSource() == editCameraItem)
	3511	+ {
	3512	+ cameraView.ProtectCamera();
	3513	+ cameraView.repaint();
	3514	+ return;
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3516	+ {
	3517	+ cameraView.RevertCamera();
	3518	+ cameraView.repaint();
	3519	+ return;
	3520	+ // } else if (event.getSource() == textureButton)
	3521	+ // {
	3522	+ // return; // true;
	3523	+ }
2924	3524	else
2925	3525	{
2926	3526	//return super.action(event, arg);
..	..	@@ -2929,7 +3529,6 @@
2929	3529	}
2930	3530
2931	3531	boolean useclient = false;
2932		- cRadio radio;
2933	3532
2934	3533	void ToggleRoot()
2935	3534	{
..	..	@@ -2938,7 +3537,7 @@
2938	3537	if (useclient)
2939	3538	{
2940	3539	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3540	+ Globals.lighttouched = true;
2942	3541	//topView.object = client;
2943	3542	//frontView.object = client;
2944	3543	//sideView.object = client;
..	..	@@ -2946,7 +3545,7 @@
2946	3545	else
2947	3546	{
2948	3547	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3548	+ Globals.lighttouched = true;
2950	3549	//topView.object = group;
2951	3550	//frontView.object = group;
2952	3551	//sideView.object = group;
..	..	@@ -2981,6 +3580,28 @@
2981	3580	refreshContents();
2982	3581	}
2983	3582
	3583	+ void TransformChildren()
	3584	+ {
	3585	+ Object3D obj;
	3586	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3587	+ {
	3588	+ obj = (Object3D)e.nextElement();
	3589	+ obj.KeepTextureMatrices();
	3590	+ obj.TransformChildren();
	3591	+ obj.RestoreTextureMatrices();
	3592	+
	3593	+// if (obj.parent == null)
	3594	+// {
	3595	+// System.out.println("NULL PARENT!");
	3596	+// new Exception().printStackTrace();
	3597	+// }
	3598	+// else
	3599	+// TouchTransform(obj);
	3600	+// //obj.parent.Touch();
	3601	+ }
	3602	+
	3603	+ refreshContents();
	3604	+ }
2984	3605
2985	3606	void ResetTransform()
2986	3607	{
..	..	@@ -3093,7 +3714,7 @@
3093	3714	refreshContents();
3094	3715	}
3095	3716
3096		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
3097	3718	{
3098	3719	Object3D obj;
3099	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3729,16 @@
3108	3729	LA.matIdentity(Object3D.mat);
3109	3730	obj.getBounds(minima, maxima, false);
3110	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3114	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3117	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3767,8 @@
3142	3767
3143	3768	int size = obj.MemorySize();
3144	3769
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	3770	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3771	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	3772	}
3147	3773	}
3148	3774	catch (Exception e)
..	..	@@ -3179,9 +3805,9 @@
3179	3805	obj = (Object3D)e.nextElement();
3180	3806
3181	3807	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3183	3809	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3811
3186	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3813	}
..	..	@@ -3223,6 +3849,13 @@
3223	3849	void GenNormals(boolean crease)
3224	3850	{
3225	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3226	3859
3227	3860	refreshContents();
3228	3861	}
..	..	@@ -3395,8 +4028,8 @@
3395	4028
3396	4029	void ParseVertices()
3397	4030	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3400	4033
3401	4034	for (int i=0; i<group.selection.size(); i++)
3402	4035	{
..	..	@@ -3421,7 +4054,7 @@
3421	4054	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4055	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4056
3424		- g.add(GrafreeD.clipboard);
	4057	+ g.add(Grafreed.clipboard);
3425	4058
3426	4059	buffer.add(g);
3427	4060	}
..	..	@@ -3436,7 +4069,7 @@
3436	4069	makeSomething(buffer, i==group.selection.size()-1);
3437	4070	}
3438	4071
3439		- GrafreeD.epsequal = epsequal;
	4072	+ Grafreed.epsequal = epsequal;
3440	4073
3441	4074	refreshContents();
3442	4075	}
..	..	@@ -3454,7 +4087,16 @@
3454	4087	String pigment = Object3D.GetPigment(tex);
3455	4088	//String bump = Object3D.GetBump(tex);
3456	4089
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4090	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4091	+
	4092	+ try
	4093	+ {
	4094	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4095	+ }
	4096	+ catch (Exception e)
	4097	+ {
	4098	+ System.err.println("FAIL: " + node);
	4099	+ }
3458	4100
3459	4101	double s = v.s;
3460	4102
..	..	@@ -3542,11 +4184,11 @@
3542	4184
3543	4185	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4186
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4187	+ boolean random = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4189	lowres.linkVerticesThis(null);
3548	4190	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4191	+ CameraPane.SWITCH = random;
3550	4192
3551	4193	System.err.flush();
3552	4194
..	..	@@ -3586,7 +4228,7 @@
3586	4228	return;
3587	4229
3588	4230	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4232
3591	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4234
..	..	@@ -3755,7 +4397,7 @@
3755	4397	group.selection.RelinkToSupport(); // july 2014
3756	4398	System.out.println("DONE.");
3757	4399	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4400	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4401	}
3760	4402
3761	4403	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4422,9 @@
3780	4422
3781	4423	void ClipMesh()
3782	4424	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4426	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3786	4428
3787	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4430	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4433,7 @@
3791	4433	// {
3792	4434	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4435	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4437	}
3796	4438	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4439	System.out.println("DONE.");
..	..	@@ -3838,6 +4480,18 @@
3838	4480	void MarkLeaves(boolean hide)
3839	4481	{
3840	4482	group.selection.MarkLeaves(hide);
	4483	+ refreshContents();
	4484	+ }
	4485	+
	4486	+ void RewindLeaves(boolean hide)
	4487	+ {
	4488	+ group.selection.RewindLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RandomLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RandomLeaves(hide);
3841	4495	refreshContents();
3842	4496	}
3843	4497
..	..	@@ -3912,10 +4566,6 @@
3912	4566	// }
3913	4567	// }
3914	4568
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4569	void EditSelection(boolean newWindow)
3920	4570	{
3921	4571	// aConstraints.gridy = 0;
..	..	@@ -3923,10 +4573,10 @@
3923	4573	{
3924	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4577
3928	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
3930	4580	{
3931	4581	// if (!(elem instanceof Composite))
3932	4582	// newWindow = false;
..	..	@@ -4008,7 +4658,8 @@
4008	4658	//new Exception().printStackTrace();
4009	4659
4010	4660	freezemodel = true;
4011		-
	4661	+ ClearUnpinned();
	4662	+
4012	4663	/**/
4013	4664	//switch (event.id)
4014	4665	{
..	..	@@ -4016,7 +4667,6 @@
4016	4667	//case 702: // Event.LIST_DESELECT
4017	4668	group.deselectAll();
4018	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4670	if (tps != null)
4021	4671	{
4022	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +4675,39 @@
4025	4675
4026	4676	//if (child.parent != null)
4027	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4028	4679	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4680	}
4033	4681	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4682	+// else
	4683	+// {
	4684	+// objEditor.SetMaterial(group); // .GetMaterial());
	4685	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4686	+// System.err.println("info : " + group.GetPath());
	4687	+// }
4040	4688
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4689	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	4690	CameraPane.flash = true;
4045	4691
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4693	// a camera
4048	4694	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4696	+ {
	4697	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4698	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4699	+ }
	4700	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4701	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4702	}
4054	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4055	4711	refreshContents();
4056	4712	//return true;
4057	4713	}
..	..	@@ -4060,6 +4716,35 @@
4060	4716
4061	4717	freezemodel = false;
4062	4718	}
	4719	+
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
	4728	+ void refreshContents(boolean cp)
	4729	+ {
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4732	+ {
	4733	+ objEditor.ClearInfo(); // .GetMaterial());
	4734	+
	4735	+ for (int i=0; i < group.selection.Size(); i++)
	4736	+ {
	4737	+ Object3D child = (Object3D) group.selection.get(i);
	4738	+
	4739	+ objEditor.AddInfo(child, this, true);
	4740	+ System.err.println("info : " + child.GetPath());
	4741	+ }
	4742	+
	4743	+ objEditor.SetText(); // jan 2014
	4744	+ }
	4745	+
	4746	+ super.refreshContents(cp);
	4747	+ }
4063	4748
4064	4749	void linkSomething(Object3D thing)
4065	4750	{
..	..	@@ -4131,16 +4816,19 @@
4131	4816	{
4132	4817	if (group.selection.isEmpty())
4133	4818	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
4135	4821	Composite tGroup = null;
4136	4822	if (group.selection.size() > 0) // 1)
4137	4823	{
4138	4824	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
4140	4826	}
4141	4827
4142	4828	if (cut)
4143	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4144	4832	//int indices[] = jList.getSelectedIndices();
4145	4833	//for (int i = indices.length - 1; i >= 0; i--)
4146	4834	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4864,16 @@
4176	4864	//System.out.println("cut " + child);
4177	4865	//System.out.println("parent = " + child.parent);
4178	4866	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
4180	4868	tGroup.add/Child/(tmp);
4181	4869	else
4182		- GrafreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
4183	4871	}
4184	4872	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4186	4874	tGroup.add/Child/(child);
4187	4875	else
4188		- GrafreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
4189	4877	}
4190	4878
4191	4879	//ResetModel();
..	..	@@ -4217,21 +4905,23 @@
4217	4905	//System.out.println("cut " + elem);
4218	4906	//System.out.println("parent = " + elem.parent);
4219	4907	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
4221	4909	tGroup.add/Child/(tmp);
4222	4910	else
4223		- GrafreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
4224	4912	}
4225	4913	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4227	4915	tGroup.add/Child/(child);
4228	4916	else
4229		- GrafreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
4230	4918	}
4231	4919
4232	4920	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
4235	4925	if (cut)
4236	4926	{
4237	4927	ResetModel();
..	..	@@ -4245,7 +4935,7 @@
4245	4935	// return;
4246	4936	boolean first = true;
4247	4937
4248		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4249	4939	{
4250	4940	Composite temp;
4251	4941
..	..	@@ -4256,7 +4946,7 @@
4256	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4947	*/
4258	4948	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4949	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	4950	{
4261	4951	Object3D child = (Object3D)e.nextElement();
4262	4952
..	..	@@ -4290,21 +4980,21 @@
4290	4980	//Object3D cb = Applet3D.clipboard;
4291	4981	//temp.addChild(cb);
4292	4982	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4983	+ assert(Grafreed.clipboard.parent == null);
	4984	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4985	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4986	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4987	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	4988	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	4991	}
4302	4992
4303	4993	ResetModel();
4304	4994	refreshContents();
4305	4995	}
4306	4996
4307		- void pasteInto(boolean copyit)
	4997	+ void pasteInto(boolean copyit, boolean clone)
4308	4998	{
4309	4999	// if (GrafreeD.clipboard == null)
4310	5000	// return;
..	..	@@ -4333,15 +5023,22 @@
4333	5023	if (copyit)
4334	5024	{
4335	5025	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5026	+ if (clone)
	5027	+ {
	5028	+ CloneClipboard(false); // sept 2014
	5029	+ }
	5030	+ else
	5031	+ {
	5032	+ paste(false);
	5033	+ }
4337	5034	}
4338	5035	else
4339	5036	{
4340	5037	boolean first = true;
4341	5038
4342		- if (GrafreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4343	5040	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5042	Object3D copy;
4346	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5044	{
..	..	@@ -4351,7 +5048,7 @@
4351	5048	}
4352	5049	} else
4353	5050	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5052	}
4356	5053	}
4357	5054	}
..	..	@@ -4756,21 +5453,6 @@
4756	5453	}
4757	5454	*/
4758	5455
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5456	/*
4775	5457	public void Callback(Object obj)
4776	5458	{
..	..	@@ -4794,26 +5476,9 @@
4794	5476	}
4795	5477	*/
4796	5478
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5479	String GetFile(String dialogName)
4815	5480	{
4816		- if (GrafreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4817	5482	{
4818	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5484	browser.show();
..	..	@@ -4877,10 +5542,33 @@
4877	5542	cButton flashSelectionButton;
4878	5543	cButton editButton;
4879	5544	cButton uneditButton;
	5545	+ JCheckBox allParamsButton;
4880	5546	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5547	cButton unselectButton;
4883	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
	5552	+ cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
	5571	+
4884	5572	cButton screenfitButton;
4885	5573	cButton screenfitpointButton;
4886	5574	cButton snapobjectButton;
..	..	@@ -4892,14 +5580,6 @@
4892	5580
4893	5581	cButton setsupportButton;
4894	5582
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5583	//
4904	5584	//Composite
4905	5585	Object3D // to do !!
..	..	@@ -4909,9 +5589,11 @@
4909	5589	//JTree jTree;
4910	5590	private MenuItem lookAtItem;
4911	5591	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
4913	5593	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
4915	5597	private MenuItem cloneItem;
4916	5598	private MenuItem cloneSupportItem;
4917	5599	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5606,7 @@
4924	5606	private MenuItem linkverticesItem;
4925	5607	private MenuItem relinkverticesItem;
4926	5608	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
4928	5610	private MenuItem stepAllItem;
4929	5611	private MenuItem revertMeshItem;
4930	5612	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5617,7 @@
4935	5617	private MenuItem mergeGeometriesItem;
4936	5618	private MenuItem copyItem;
4937	5619	private MenuItem pasteItem;
	5620	+ private MenuItem pasteIntoItem;
4938	5621	private MenuItem pasteLinkItem;
4939	5622	private MenuItem pasteCloneItem;
4940	5623	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5656,10 @@
4973	5656	private MenuItem showleavesItem;
4974	5657	private MenuItem markleavesItem;
4975	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
4976	5663
4977	5664	private MenuItem flipVItem;
4978	5665	private MenuItem unflipVItem;
..	..	@@ -4984,15 +5671,17 @@
4984	5671	private MenuItem panoTexturesItem;
4985	5672
4986	5673	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
4988	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
4989	5678	private MenuItem hideItem;
4990	5679	private MenuItem grabItem;
4991	5680	private MenuItem backItem;
4992	5681	private MenuItem frontItem;
4993	5682	private MenuItem cameraItem;
4994	5683	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
4996	5685	private MenuItem physicsItem;
4997	5686	private MenuItem frameselectorItem;
4998	5687	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +5696,7 @@
5007	5696
5008	5697	private MenuItem resetParentItem;
5009	5698	private MenuItem repairParentItem;
	5699	+ private MenuItem repairShadowItem;
5010	5700	private MenuItem sortbysizeItem;
5011	5701	private MenuItem sortbynameItem;
5012	5702
..	..	@@ -5031,7 +5721,7 @@
5031	5721	private MenuItem blobItem;
5032	5722	private MenuItem latheItem;
5033	5723	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5724	+ private MenuItem overlayItem;
5035	5725	private MenuItem meshItem;
5036	5726	// private MenuItem meshGroupItem;
5037	5727	private MenuItem springItem;
..	..	@@ -5053,11 +5743,6 @@
5053	5743	private MenuItem doubleItem;
5054	5744	private MenuItem tripleItem;
5055	5745
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5746	private MenuItem computeAOItem;
5062	5747	private MenuItem recompileItem;
5063	5748	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5752,8 @@
5067	5752	private MenuItem analyzeItem;
5068	5753	private MenuItem dumpItem;
5069	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5070	5759	}