~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,73 +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);
	321	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	322	+ relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
222	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	327	setMasterItem.addActionListener(this);
	328	+ }
224	329
225	330	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
228	333	backItem = menu.add(new MenuItem("Back"));
229	334	backItem.addActionListener(this);
230	335	frontItem = menu.add(new MenuItem("Front"));
231	336	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	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"));
	343	+ hideItem.addActionListener(this);
	344	+ }
	345	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	346	+ ungroupItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
241	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	355	switchGeoItem.addActionListener(this);
243	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	357	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	367	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	368	+ }
251	369
252	370	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
	373	+ billboardItem = menu.add(new MenuItem("Billboard"));
	374	+ billboardItem.addActionListener(this);
255	375	csgItem = menu.add(new MenuItem("CSG"));
256	376	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	378	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	380	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
263	386	linkerItem = menu.add(new MenuItem("Linker"));
264	387	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	388	attributeItem = menu.add(new MenuItem("Attribute"));
268	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
269	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	393	pointflowItem.addActionListener(this);
	394	+ }
271	395	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	397	resetTransformItem.addActionListener(this);
276	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	399	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	406
281	407	oe.menuBar.add(menu = new Menu("Geometry"));
282	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +411,13 @@
285	411	genNormalsORGANItem.addActionListener(this);
286	412	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	413	genNormalsCADItem.addActionListener(this);
	414	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	415	+ genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
	418	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	419	+ genNormalsMINEItem.addActionListener(this);
	420	+ }
288	421	stripifyItem = menu.add(new MenuItem("Stripify"));
289	422	stripifyItem.addActionListener(this);
290	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +439,34 @@
306	439	reduce34MeshItem.addActionListener(this);
307	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	441	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
313	450
314	451	oe.menuBar.add(menu = new Menu("Attributes"));
315	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	458	menu.add("-");
318	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	460	liveleavesItem.addActionListener(this);
320	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
322	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	466	supportleavesItem.addActionListener(this);
324	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	468	unsupportleavesItem.addActionListener(this);
	469	+ }
326	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	471	hideleavesItem.addActionListener(this);
328	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +475,14 @@
331	475	markleavesItem.addActionListener(this);
332	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	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);
334	486	menu.add("-");
335	487	flipVItem = menu.add(new MenuItem("Flip V"));
336	488	flipVItem.addActionListener(this);
..	..	@@ -366,35 +518,40 @@
366	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	519	sortbynameItem.addActionListener(this);
368	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.
369	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	529	extractGeometriesItem.addActionListener(this);
371	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	531	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	532	+ }
377	533
378	534	oe.menuBar.add(menu = new Menu("Insert"));
379	535	buildCreateMenu(menu);
380	536
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	537	oe.menuBar.add(menu = new Menu("Tools"));
393	538	buildToolsMenu(menu);
394	539	}
395	540
396	541	void SetupUI2(ObjEditor oe)
397	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	+
398	555	//new Exception().printStackTrace();
399	556
400	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +580,217 @@
423	580	oe.radioPanel.add(dummyButton);
424	581	oe.buttonGroup.add(dummyButton);
425	582	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
429	586
430		- 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	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
431	624	liveCB.addItemListener(this);
432	625
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ oneStepButton.setToolTipText("Animate one step forward");
	628	+ oneStepButton.addActionListener(this);
	629	+
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	631	+ fastCB.setToolTipText("Fast mode");
451	632	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	633	+
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ screenfitButton.setToolTipText("Screen fit");
497	638	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
	643	+
499	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	645	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	646
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
	647	+ if (Globals.ADVANCED)
	648	+ {
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ snapobjectButton.addActionListener(this);
	651	+ snapobjectButton.setToolTipText("Snap Object");
	652	+ }
	653	+
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
516	655
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ twoButton.setToolTipText("Show center view only");
519	658	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	662	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	663	+ fourButton.setToolTipText("Show left panel only");
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ sixButton.setToolTipText("2-column layout left");
523	666	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ threeButton.setToolTipText("2-column layout right");
525	669	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ sevenButton.setToolTipText("3-column layout");
527	672	sevenButton.addActionListener(this);
528	673	//
529	674
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ rootButton.setToolTipText("Edit selection in new tab");
531	677	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	678	+
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ closeButton.setToolTipText("Close tab");
534	681	closeButton.addActionListener(this);
535	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	683	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	684
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
	766	+ editButton.addActionListener(this);
	767	+
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
547	770	uneditButton.addActionListener(this);
548	771
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
561	774	allParamsButton.addActionListener(this);
562	775
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ clearPanelButton.setToolTipText("Clear edit panel");
	778	+ clearPanelButton.addActionListener(this);
	779	+
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ unselectButton.setToolTipText("Unselect");
568	782	unselectButton.addActionListener(this);
569	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
	793	+
570	794	// oe.aConstraints.gridx += 1;
571	795	// oe.aConstraints.weighty = 0;
572	796	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +802,22 @@
578	802	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	803	// gcButton.addActionListener(this);
580	804
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	805	+ cGridBag jSPPanel = new cGridBag();
	806	+
	807	+ JScrollPane jSP;
592	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	810	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	811
	812	+ oe.treePanel.add(jSPPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+ oe.treePanel.add(copyOptionsPanel);
	816	+ oe.treePanel.Return();
	817	+
	818	+// mainPanel.setDividerLocation(0.5); //1.0);
	819	+// mainPanel.setResizeWeight(0.5);
	820	+
615	821	//jList.addListSelectionListener(this);
616	822	oe.jTree.addTreeSelectionListener(this);
617	823	//jTree.setRootVisible(false);
..	..	@@ -633,20 +839,157 @@
633	839	radio.layout = sevenButton;
634	840	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	841	}
	842	+
	843	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	844	+ {
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
	859	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	860	+ boxCB.setToolTipText("Display bounding boxes");
	861	+ boxCB.addItemListener(this);
	862	+
	863	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
	865	+ zoomBoxCB.addItemListener(this);
	866	+
	867	+ if (true) // Globals.ADVANCED)
	868	+ {
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
	876	+
	877	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	878	+ // localCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	883	+ crowdCB.setToolTipText("Used for crowds");
	884	+ crowdCB.addItemListener(this);
	885	+
	886	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	887	+ smoothCB.setToolTipText("Snapping delay");
	888	+ smoothCB.addItemListener(this);
	889	+
	890	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	891	+ slowCB.setToolTipText("Smooth interpolation");
	892	+ slowCB.addItemListener(this);
	893	+
	894	+// constraints.gridy += 1;
	895	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	896	+// speakerMocapCB.addItemListener(this);
	897	+
	898	+ panel.Return();
	899	+
	900	+ if (false)
	901	+ {
	902	+ // handled in scripts
	903	+ //constraints.gridy += 1;
	904	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	905	+ speakerCameraCB.addItemListener(this);
	906	+
	907	+ //constraints.gridy += 1;
	908	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	909	+ speakerFocusCB.addItemListener(this);
	910	+
	911	+ //constraints.gridy += 1;
	912	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	913	+ smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
	915	+ }
	916	+
	917	+//constraints.gridx += 1;
	918	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	919	+// debugCB.addItemListener(this);
	920	+
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
	925	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
	927	+ oeilCB.addItemListener(this);
	928	+
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
	949	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	950	+ lookAtCB.setToolTipText("Look-at target");
	951	+ lookAtCB.addItemListener(this);
	952	+ }
	953	+
	954	+ }
	955	+
	956	+ cGridBag fill = new cGridBag();
	957	+ fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
	962	+
	963	+ panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
	966	+
	967	+ }
636	968
637	969	void EditObject(Object3D obj)
638	970	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	971	+ cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
	980	+ radioButton.SetObject(obj);
	981	+ radioButton.layout = sevenButton;
	982	+ radioButton.SetCamera(cameraView.renderCamera, false);
	983	+ radioButton.addActionListener(this);
	984	+ radioPanel.add(radioButton);
	985	+ buttonGroup.add(radioButton);
	986	+ radioButton.doClick();
647	987	}
	988	+
648	989	void SetupViews(ObjEditor oe)
649	990	{
	991	+ theFrame = this;
	992	+
650	993	oe.SetupViews();
651	994
652	995	System.out.println("SetupViews");
..	..	@@ -655,22 +998,28 @@
655	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	999	}
657	1000
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
668	1014	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
674	1023
675	1024	// static int COLOR = 1;
676	1025	// static int MATERIAL = 2;
..	..	@@ -678,9 +1027,9 @@
678	1027
679	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1029
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
684	1033
685	1034	public void itemStateChanged(ItemEvent e)
686	1035	{
..	..	@@ -705,10 +1054,10 @@
705	1054	dropAttributes \|= Object3D.TEXTURE;
706	1055	else
707	1056	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1057	+ } else if(e.getSource() == liveCB)
710	1058	{
711	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
712	1061	}
713	1062	else if(e.getSource() == supportCB)
714	1063	{
..	..	@@ -744,6 +1093,10 @@
744	1093	cameraView.repaint();
745	1094	// refreshContents();
746	1095	}
	1096	+ else if(e.getSource() == zoomBoxCB)
	1097	+ {
	1098	+ cameraView.ToggleZoomBoxMode();
	1099	+ }
747	1100	else if(e.getSource() == smoothfocusCB)
748	1101	{
749	1102	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1122,18 @@
769	1122	{
770	1123	cameraView.ToggleOeil();
771	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
772	1137	else if(e.getSource() == lookAtCB)
773	1138	{
774	1139	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1150,8 @@
785	1150
786	1151	/**/
787	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1156	// We can't move the root node or an empty selection
791	1157	return;
..	..	@@ -857,7 +1223,9 @@
857	1223	// objEditor.DropFile((java.io.File[]) object, true);
858	1224	// return;
859	1225	// }
860		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1229	{
862	1230	// file(s)
863	1231	String[] names = string.split("\n");
..	..	@@ -884,7 +1252,7 @@
884	1252
885	1253	flashIt = false;
886	1254	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1257
890	1258	if (group.selection.size() == 1)
..	..	@@ -900,23 +1268,33 @@
900	1268
901	1269	assert target == objEditor.jTree;
902	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
903	1272	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1274	} catch (Exception e) {
906	1275	System.out.println("destinationPath : " + destinationPath);
907	1276	return;
908	1277	}
909	1278
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
911	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
912	1290	loadClipboard(true);
913	1291	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1292	+ pasteInto(false, false);
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
920	1298	}
921	1299	public void dropActionChanged(DropTargetDragEvent dtde)
922	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1399,107 @@
1021	1399	{
1022	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1401	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
	1420	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1421	+ kleinItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1038	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1429	ragdollItem.addActionListener(this);
1040	1430	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1431	ragdoll2Item.addActionListener(this);
	1432	+ }
1042	1433	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1434	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1435	meshItem.addActionListener(this);
1045	1436	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1437	// meshGroupItem.addActionListener(this);
	1438	+ if (Globals.ADVANCED)
	1439	+ {
1047	1440	springItem = menu.add(new MenuItem("Spring"));
1048	1441	springItem.addActionListener(this);
1049	1442	flagItem = menu.add(new MenuItem("Flag"));
1050	1443	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1444	blobItem = menu.add(new MenuItem("Blob"));
1056	1445	blobItem.addActionListener(this);
1057	1446	latheItem = menu.add(new MenuItem("Lathe"));
1058	1447	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1448	+ }
	1449	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1450	+ bezierItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1061	1455	menu.add("-");
1062	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1457	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1066	1460	doubleItem = menu.add(new MenuItem("Fork"));
1067	1461	doubleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1068	1464	tripleItem = menu.add(new MenuItem("Trident"));
1069	1465	tripleItem.addActionListener(this);
	1466	+ }
1070	1467	}
1071	1468
1072	1469	void buildToolsMenu(Menu menu)
1073	1470	{
1074	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1472	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1473	+ animationItem.setState(Globals.ANIMATION);
	1474	+
	1475	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1476	+ archiveItem.addActionListener(this);
1077	1477
1078	1478	menu.add("-");
1079	1479	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1480	parseverticesItem.addActionListener(this);
1081	1481	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1482	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1483	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1484	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1485	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1486	reduceMorphItem.addActionListener(this);
1089	1487	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1488	reduce34MorphItem.addActionListener(this);
1091		-
	1489	+ menu.add("-");
1092	1490	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1491	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1492
	1493	+ if (Globals.ADVANCED)
	1494	+ {
	1495	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1496	+ mirrorItem.addActionListener(this);
	1497	+ menu.add("-");
1096	1498	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1499	memoryItem.addActionListener(this);
1098	1500	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1501	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1502	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1503	dumpItem.addActionListener(this);
1102	1504	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1505	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1508,8 @@
1106	1508	resetParentItem.addActionListener(this);
1107	1509	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1510	repairParentItem.addActionListener(this);
	1511	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1512	+ repairShadowItem.addActionListener(this);
1109	1513	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1514	invariantsItem.addActionListener(this);
1111	1515	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1517,7 @@
1113	1517	menu.add("-");
1114	1518	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1519	editScriptItem.addActionListener(this);
	1520	+ }
1116	1521	}
1117	1522
1118	1523	void ScreenFit()
..	..	@@ -1235,9 +1640,24 @@
1235	1640	shadow.material = new cMaterial(obj.material);
1236	1641	shadow.material.diffuse = 0.0001f;
1237	1642	shadow.material.specular = 0.0001f;
	1643	+ //shadow.projectedVertices[1].x = 300;
1238	1644
1239	1645	makeSomething(shadow);
1240	1646	}
	1647	+
	1648	+ private void ClearUnpinned()
	1649	+ {
	1650	+ //for (Object3D obj : listUI)
	1651	+ for (int i=listUI.size(); --i>=0;)
	1652	+ {
	1653	+ Object3D obj = listUI.elementAt(i);
	1654	+ if (!obj.pinned)
	1655	+ {
	1656	+ obj.CloseUI();
	1657	+ listUI.remove(i);
	1658	+ }
	1659	+ }
	1660	+ }
1241	1661
1242	1662	/**
1243	1663	* applyExample
..	..	@@ -1441,9 +1861,9 @@
1441	1861
1442	1862	void Overwrite(int mask)
1443	1863	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1864	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1865	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	1866	+ Object3D content = Grafreed.clipboard.get(0);
1447	1867
1448	1868	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1869	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1886,7 @@
1466	1886	//
1467	1887	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1888	{
	1889	+ Object source = event.getSource();
1469	1890	/*
1470	1891	if (event.getSource() == nameField)
1471	1892	{
..	..	@@ -1477,11 +1898,11 @@
1477	1898	}
1478	1899	else
1479	1900	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1901	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1902	{
1482	1903	ScreenFit();
1483	1904	} else
1484		- if (event.getSource() == switchItem)
	1905	+ if (source == switchViewItem)
1485	1906	{
1486	1907	cVector v1 = new cVector();
1487	1908	cVector v2 = new cVector();
..	..	@@ -1490,11 +1911,11 @@
1490	1911	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1912	objEditor.cameraView.repaint();
1492	1913	} else
1493		- if (event.getSource() == rectoidItem)
	1914	+ if (source == rectoidItem \|\| source == boxButton)
1494	1915	{
1495	1916	makeSomething(new Box());
1496	1917	} else
1497		- if (event.getSource() == particleItem)
	1918	+ if (source == particleItem \|\| source == particlesButton)
1498	1919	{
1499	1920	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1921	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1936,9 @@
1515	1936	applyExample(particleGeom, "SMOKE");
1516	1937	makeSomething(particleGeom);
1517	1938	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1939	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1940	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1941	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1942
1522	1943	ragdoll.toParent = LA.newMatrix();
1523	1944	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1956,7 @@
1535	1956	} else
1536	1957	/*
1537	1958	*/
1538		- if (event.getSource() == heightFieldItem)
	1959	+ if (source == heightFieldItem)
1539	1960	{
1540	1961	Object3D obj = new Object3D();
1541	1962
..	..	@@ -1573,27 +1994,31 @@
1573	1994
1574	1995	makeSomething(obj);
1575	1996	} else
1576		- if (event.getSource() == gridItem)
	1997	+ if (source == gridItem \|\| source == gridButton)
1577	1998	{
1578	1999	makeSomething(new Grid());
1579	2000	} else
1580		- if (event.getSource() == ellipsoidItem)
	2001	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2002	{
1582	2003	makeSomething(new Sphere());
1583	2004	} else
1584		- if (event.getSource() == coneItem)
	2005	+ if (source == coneItem \|\| source == coneButton)
1585	2006	{
1586	2007	makeSomething(new Cone());
1587	2008	} else
1588		- if (event.getSource() == torusItem)
	2009	+ if (source == torusItem \|\| source == torusButton)
1589	2010	{
1590	2011	makeSomething(new Torus());
1591	2012	} else
1592		- if (event.getSource() == superItem)
	2013	+ if (source == superItem \|\| source == superButton)
1593	2014	{
1594	2015	makeSomething(new Superellipsoid());
1595	2016	} else
1596		- if (event.getSource() == blobItem)
	2017	+ if (source == kleinItem \|\| source == kleinButton)
	2018	+ {
	2019	+ makeSomething(new Klein());
	2020	+ } else
	2021	+ if (source == blobItem)
1597	2022	{
1598	2023	Blob blob = new Blob();
1599	2024	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2026,15 @@
1601	2026	//blob.retile();
1602	2027	makeSomething(blob);
1603	2028	} else
1604		- if (event.getSource() == latheItem)
	2029	+ if (source == latheItem)
1605	2030	{
1606	2031	makeSomething(new Lathe());
1607	2032	} else
1608		- if (event.getSource() == bezierItem)
	2033	+ if (source == bezierItem)
1609	2034	{
1610	2035	makeSomething(new BezierSurface());
1611	2036	} else
1612		- if (event.getSource() == checkerItem)
	2037	+ if (source == overlayItem \|\| source == overlayButton)
1613	2038	{
1614	2039	/*
1615	2040	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2049,7 @@
1624	2049	*/
1625	2050	makeSomething(new Checker());
1626	2051	} else
1627		- if (event.getSource() == meshItem)
	2052	+ if (source == meshItem)
1628	2053	{
1629	2054	Object3D itemtomake = new Object3D();
1630	2055	Object3D child;
..	..	@@ -1645,35 +2070,35 @@
1645	2070	makeSomething(child);
1646	2071	}
1647	2072	} else
1648		- if (event.getSource() == springItem)
	2073	+ if (source == springItem)
1649	2074	{
1650	2075	cSpring s = new cSpring();
1651	2076	s.setup();
1652	2077	makeSomething(s);
1653	2078	} else
1654		- if (event.getSource() == flagItem)
	2079	+ if (source == flagItem)
1655	2080	{
1656	2081	cSpring s = new cFlag();
1657	2082	s.setup();
1658	2083	makeSomething(s);
1659	2084	} else
1660		- if (event.getSource() == lightItem)
	2085	+ if (source == lightItem \|\| source == lightButton)
1661	2086	{
1662	2087	makeSomething(new Light());
1663	2088	} else
1664		- if (event.getSource() == csgItem)
	2089	+ if (source == csgItem)
1665	2090	{
1666	2091	group(new CSG());
1667	2092	} else
1668		- if (event.getSource() == templateItem)
	2093	+ if (source == templateItem)
1669	2094	{
1670	2095	group(new cTemplate());
1671	2096	} else
1672		- if (event.getSource() == attributeItem)
	2097	+ if (source == attributeItem)
1673	2098	{
1674	2099	makeSomething(new Attribute());
1675	2100	} else
1676		- if (event.getSource() == pointflowItem)
	2101	+ if (source == pointflowItem)
1677	2102	{
1678	2103	makeSomething(new PointFlow());
1679	2104	} else
..	..	@@ -1685,7 +2110,7 @@
1685	2110	} else
1686	2111	*/
1687	2112
1688		- if (event.getSource() == superLoopItem)
	2113	+ if (source == superLoopItem)
1689	2114	{
1690	2115	Composite g = new cGroup();
1691	2116	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2132,30 @@
1707	2132
1708	2133	group(g);
1709	2134	} else
1710		- if (event.getSource() == loopItem)
	2135	+ if (source == loopItem \|\| source == loopButton)
1711	2136	{
1712	2137	Composite csg = new GroupLeaf();
1713	2138	csg.count = 5;
1714	2139	group(csg);
1715		- Composite child = new cGroup();
	2140	+ Composite child = new cGroup("Branch");
1716	2141	csg.addChild(child);
1717	2142	child.addChild(csg);
1718	2143	} else
1719		- if (event.getSource() == doubleItem)
	2144	+ if (source == doubleItem)
1720	2145	{
1721		- Composite csg = new GroupLeaf();
	2146	+ Composite csg = new GroupLeaf("Fork");
1722	2147	csg.count = 5;
1723	2148	group(csg);
1724		- Composite child = new cGroup();
	2149	+ Composite child = new cGroup("Branch A");
1725	2150	csg.addChild(child);
1726	2151	child.addChild(csg);
1727		- child = new cGroup();
	2152	+ child = new cGroup("Branch B");
1728	2153	csg.addChild(child);
1729	2154	child.addChild(csg);
1730	2155	} else
1731		- if (event.getSource() == tripleItem)
	2156	+ if (source == tripleItem)
1732	2157	{
1733		- Composite csg = new GroupLeaf();
	2158	+ Composite csg = new GroupLeaf("Trident");
1734	2159	csg.count = 4;
1735	2160	group(csg);
1736	2161	Composite child = new cGroup();
..	..	@@ -1743,71 +2168,83 @@
1743	2168	csg.addChild(child);
1744	2169	child.addChild(csg);
1745	2170	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2171	+ if (source == computeAOItem)
1748	2172	{
1749		- ImportGFD();
	2173	+ Globals.drawMode = CameraPane.OCCLUSION;
	2174	+ Globals.theRenderer.repaint();
1750	2175	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2176	+ if (source == recompileItem)
1769	2177	{
1770	2178	Recompile();
1771	2179	refreshContents();
1772	2180	} else
1773		- if (event.getSource() == editScriptItem)
	2181	+ if (source == editScriptItem)
1774	2182	{
1775	2183	OpenDialog();
1776	2184	refreshContents();
1777	2185	} else
1778		- if (event.getSource() == invariantsItem)
	2186	+ if (source == invariantsItem)
1779	2187	{
1780	2188	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	2189	+ Grafreed.grafreeD.universe.invariants();
1782	2190	} else
1783		- if (event.getSource() == memoryItem)
	2191	+ if (source == memoryItem)
1784	2192	{
1785	2193	//System.out.println("Invariants:");
1786	2194	PrintMemory();
1787	2195	} else
1788		- if (event.getSource() == pathItem)
	2196	+ if (source == pathItem)
1789	2197	{
1790	2198	PrintPath();
1791	2199	} else
1792		- if (event.getSource() == analyzeItem)
	2200	+ if (source == analyzeItem)
1793	2201	{
1794	2202	AnalyzeObject();
1795	2203	} else
1796		- if (event.getSource() == dumpItem)
	2204	+ if (source == dumpItem)
1797	2205	{
1798	2206	DumpObject();
1799	2207	} else
1800		- if (event.getSource() == screenfitButton)
	2208	+ if (source == minButton)
	2209	+ {
	2210	+ Minimize();
	2211	+ } else
	2212	+ if (source == maxButton)
	2213	+ {
	2214	+ Maximize();
	2215	+ } else
	2216	+ if (source == fullButton)
	2217	+ {
	2218	+ ToggleFullScreen();
	2219	+ } else
	2220	+ if (source == undoButton)
	2221	+ {
	2222	+ Undo();
	2223	+ } else
	2224	+ if (source == redoButton)
	2225	+ {
	2226	+ Redo();
	2227	+ } else
	2228	+ if (source == saveButton)
	2229	+ {
	2230	+ Save();
	2231	+ } else
	2232	+ if (source == oneStepButton)
	2233	+ {
	2234	+ Globals.ONESTEP = true;
	2235	+ cameraView.repaint();
	2236	+ } else
	2237	+ if (source == screenfitButton)
1801	2238	{
1802	2239	//Reload(lastConverter, lastFilename, true);
1803	2240	ScreenFit();
1804	2241	} else
1805		- if (event.getSource() == screenfitpointButton)
	2242	+ if (source == screenfitpointButton)
1806	2243	{
1807	2244	//Reload(lastConverter, lastFilename, true);
1808	2245	ScreenFitPoint();
1809	2246	} else
1810		- if (event.getSource() == snapobjectButton)
	2247	+ if (source == snapobjectButton)
1811	2248	{
1812	2249	//Reload(lastConverter, lastFilename, true);
1813	2250	SnapObject();
..	..	@@ -1818,13 +2255,13 @@
1818	2255	// Recompile();
1819	2256	// refreshContents();
1820	2257	// } else
1821		- if (event.getSource() == gcButton)
	2258	+ if (source == gcButton)
1822	2259	{
1823	2260	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2261	System.gc();
1825	2262	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2263	} else
1827		- if (event.getSource() == editLeafItem)
	2264	+ if (source == editLeafItem)
1828	2265	{
1829	2266	Object3D obj;
1830	2267	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2275,74 @@
1838	2275	}
1839	2276	refreshContents(true);
1840	2277	} else
1841		- if (event.getSource() == openWindowItem)
	2278	+ if (source == openWindowItem)
1842	2279	{
1843	2280	EditSelection(true);
1844	2281	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2282	+ if (source == cutItem \|\| source == clearButton)
1846	2283	{
1847	2284	loadClipboard(true);
1848	2285	} else
1849		- if (event.getSource() == duplicateItem)
	2286	+ if (source == undoItem)
1850	2287	{
1851		- Object3D keep = GrafreeD.clipboard;
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
	2293	+ } else
	2294	+ if (source == duplicateItem)
	2295	+ {
	2296	+ Object3D keep = Grafreed.clipboard;
1852	2297	loadClipboard(false);
1853	2298	paste(false);
1854		- GrafreeD.clipboard = keep;
	2299	+ Grafreed.clipboard = keep;
1855	2300	} else
1856		- if (event.getSource() == cloneItem)
	2301	+ if (source == cloneItem)
1857	2302	{
1858	2303	CloneSelection(false);
1859	2304	} else
1860		- if (event.getSource() == cloneSupportItem)
	2305	+ if (source == cloneSupportItem)
1861	2306	{
1862	2307	CloneSelection(true);
1863	2308	} else
1864		- if (event.getSource() == copyItem)
	2309	+ if (source == copyItem)
1865	2310	{
1866	2311	loadClipboard(false);
1867	2312	} else
1868		- if (event.getSource() == pasteItem)
	2313	+ if (source == pasteItem)
1869	2314	{
1870	2315	paste(false);
1871	2316	} else
1872		- if (event.getSource() == pasteLinkItem)
	2317	+ if (source == pasteIntoItem)
1873	2318	{
1874		- pasteInto(false);
	2319	+ pasteInto(true, false);
1875	2320	} else
1876		- if (event.getSource() == pasteCloneItem)
	2321	+ if (source == pasteLinkItem)
1877	2322	{
1878		- pasteInto(true);
	2323	+ pasteInto(false, false);
1879	2324	} else
1880		- if (event.getSource() == pasteExpandItem)
	2325	+ if (source == pasteCloneItem)
	2326	+ {
	2327	+ pasteInto(true, true);
	2328	+ } else
	2329	+ if (source == pasteExpandItem)
1881	2330	{
1882	2331	paste(true);
1883	2332	} else
1884		- if (event.getSource() == synchronizeItem)
	2333	+ if (source == synchronizeItem)
1885	2334	{
1886	2335	Overwrite(Object3D.TRANSFORM);
1887	2336	} else
1888		- if (event.getSource() == overwriteNameItem)
	2337	+ if (source == overwriteNameItem)
1889	2338	{
1890	2339	Overwrite(Object3D.NAME);
1891	2340	} else
1892		- if (event.getSource() == overwriteUVItem)
	2341	+ if (source == overwriteUVItem)
1893	2342	{
1894	2343	Overwrite(Object3D.UV);
1895	2344	} else
1896		- if (event.getSource() == overwriteMatItem)
	2345	+ if (source == overwriteMatItem)
1897	2346	{
1898	2347	/* july 2015
1899	2348	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2362,7 @@
1913	2362
1914	2363	Overwrite(dropAttributes);
1915	2364	}
1916		- if (event.getSource() == overwriteGeoItem)
	2365	+ if (source == overwriteGeoItem)
1917	2366	{
1918	2367	Overwrite(Object3D.GEOMETRY);
1919	2368	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2379,7 @@
1930	2379	// refreshContents();
1931	2380	// }
1932	2381	} else
1933		- if (event.getSource() == generateMeshItem)
	2382	+ if (source == generateMeshItem)
1934	2383	{
1935	2384	//if (group.selection.size() == 1)
1936	2385	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2390,7 @@
1941	2390	ResetModel();
1942	2391	refreshContents();
1943	2392	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2393	+ if (source == extractGeometriesItem)
1945	2394	{
1946	2395	boolean one = false;
1947	2396
..	..	@@ -1968,7 +2417,7 @@
1968	2417	ResetModel();
1969	2418	refreshContents();
1970	2419	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2420	+ if (source == cloneGeometriesItem)
1972	2421	{
1973	2422	boolean one = false;
1974	2423
..	..	@@ -1994,32 +2443,37 @@
1994	2443	ResetModel();
1995	2444	refreshContents();
1996	2445	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2446	+ if (source == shareGeometriesItem)
1998	2447	{
1999	2448	boolean one = false;
2000	2449
2001	2450	if (group.selection.size() == 1)
2002	2451	one = true;
2003	2452
	2453	+ Object3D merge = null;
	2454	+
2004	2455	Object3D content = new cGroup();
2005	2456
2006	2457	for (int i=0; i<group.selection.size(); i++)
2007	2458	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2459	+ merge = new Merge(group.selection.get(i));
2009	2460
2010	2461	if (one)
2011		- makeSomething(sel, false);
	2462	+ makeSomething(merge, false);
2012	2463	else
2013		- content.addChild(sel);
	2464	+ content.addChild(merge);
2014	2465	}
2015	2466
2016	2467	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2468	+ makeSomething(content, true);
	2469	+ else
	2470	+ {
	2471	+ ResetModel();
	2472	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2473	+ refreshContents();
	2474	+ }
2021	2475	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2476	+ if (source == mergeGeometriesItem)
2023	2477	{
2024	2478	boolean one = false;
2025	2479
..	..	@@ -2049,7 +2503,7 @@
2049	2503	ResetModel();
2050	2504	refreshContents();
2051	2505	} else
2052		- if (event.getSource() == linkverticesItem)
	2506	+ if (source == linkverticesItem)
2053	2507	{
2054	2508	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2509	// {
..	..	@@ -2062,39 +2516,48 @@
2062	2516	// group.selection.get(0).setMasterThis(content); // should be identity
2063	2517	// refreshContents();
2064	2518	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2519	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	2520	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	2521	+ Object3D content = Grafreed.clipboard.get(0);
2068	2522
2069	2523	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2524	content = ((cGroup)content).get(0);
2071	2525
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2526	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2527	for (int i=0; i<group.selection.size(); i++)
2074	2528	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2529	+ boolean random = CameraPane.SWITCH;
	2530	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2531	group.selection.get(i).linkVerticesThis(content);
2078	2532	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2533	+ CameraPane.SWITCH = random;
2080	2534	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2535	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2536	refreshContents();
2083	2537	}
2084	2538	} else
2085		- if (event.getSource() == resetsupportItem)
	2539	+ if (source == resetsupportItem)
2086	2540	{
2087	2541	for (int i=0; i<group.selection.size(); i++)
2088	2542	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2543	+ boolean random = CameraPane.SWITCH;
	2544	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2545	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2546	+ CameraPane.SWITCH = random;
2093	2547	}
2094	2548
2095	2549	refreshContents();
2096	2550	} else
2097		- if (event.getSource() == resetreferencesItem)
	2551	+ if (source == relinkverticesItem)
	2552	+ {
	2553	+ boolean random = CameraPane.SWITCH;
	2554	+ CameraPane.SWITCH = false; // parse all random nodes
	2555	+ group.selection.RelinkToSupport();
	2556	+ CameraPane.SWITCH = random;
	2557	+
	2558	+ refreshContents();
	2559	+ } else
	2560	+ if (source == resetreferencesItem)
2098	2561	{
2099	2562	for (int i=0; i<group.selection.size(); i++)
2100	2563	{
..	..	@@ -2103,11 +2566,11 @@
2103	2566
2104	2567	refreshContents();
2105	2568	} else
2106		- if (event.getSource() == setMasterItem)
	2569	+ if (source == setMasterItem)
2107	2570	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2571	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	2572	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2111	2574
2112	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	2576	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +2579,13 @@
2116	2579	refreshContents();
2117	2580	}
2118	2581	} else
2119		- if (event.getSource() == poseMeshItem)
	2582	+ if (source == poseMeshItem)
2120	2583	{
2121	2584	if (group.selection.size() == 1)
2122	2585	{
2123		- if (GrafreeD.clipboard.size() == 1)
	2586	+ if (Grafreed.clipboard.size() == 1)
2124	2587	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	2588	+ Object3D content = Grafreed.clipboard.get(0);
2126	2589
2127	2590	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	2591	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +2598,19 @@
2135	2598	}
2136	2599
2137	2600	} else
2138		- if (event.getSource() == revertMeshItem)
	2601	+ if (source == revertMeshItem)
2139	2602	{
2140	2603	RevertMeshes();
2141	2604	} else
2142		- if (event.getSource() == resetMeshItem)
	2605	+ if (source == resetAllItem)
2143	2606	{
2144	2607	ResetAll();
2145	2608	} else
2146		- if (event.getSource() == stepAllItem)
	2609	+ if (source == stepAllItem)
2147	2610	{
2148	2611	StepAll();
2149	2612	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2613	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2614	{
2152	2615	//int indices[] = jList.getSelectedIndices();
2153	2616	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2618,46 @@
2155	2618
2156	2619	ClearSelection(false);
2157	2620	} else
2158		- if (event.getSource() == clearAllItem)
	2621	+ if (source == clearAllItem)
2159	2622	{
2160	2623	ClearSelection(true);
2161	2624	} else
2162		- if (event.getSource() == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2163	2626	{
2164		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2165	2628	} else
2166		- if (event.getSource() == frontItem)
	2629	+ if (source == hideItem)
	2630	+ {
	2631	+ group(new HiddenObject());
	2632	+ } else
	2633	+ if (source == frontItem)
2167	2634	{
2168	2635	front();
2169	2636	} else
2170		- if (event.getSource() == backItem)
	2637	+ if (source == backItem)
2171	2638	{
2172	2639	back();
2173	2640	} else
2174		- if (event.getSource() == cameraItem)
	2641	+ if (source == cameraItem)
2175	2642	{
2176	2643	makeSomething(new Camera());
2177	2644	} else
2178		- if (event.getSource() == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2179	2646	{
2180	2647	group(new Composite());
2181	2648	} else
2182		- if (event.getSource() == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2183	2650	{
2184	2651	RandomNode random = new RandomNode();
2185	2652	group(random);
2186	2653	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2654	+ random.name = random.get(0).name + "Switch";
2188	2655	} else
2189		- if (event.getSource() == physicsItem)
	2656	+ if (source == physicsItem)
2190	2657	{
2191	2658	group(new PhysicsNode());
2192	2659	} else
2193		- if (event.getSource() == frameselectorItem)
	2660	+ if (source == frameselectorItem)
2194	2661	{
2195	2662	for (int i=0; i<group.selection.size(); i++)
2196	2663	{
..	..	@@ -2202,7 +2669,7 @@
2202	2669	ResetModel();
2203	2670	refreshContents();
2204	2671	} else
2205		- if (event.getSource() == switchGeoItem)
	2672	+ if (source == switchGeoItem)
2206	2673	{
2207	2674	for (int i=0; i<group.selection.size(); i++)
2208	2675	{
..	..	@@ -2214,7 +2681,7 @@
2214	2681	ResetModel();
2215	2682	refreshContents();
2216	2683	} else
2217		- if (event.getSource() == switchTransfoItem)
	2684	+ if (source == switchTransfoItem)
2218	2685	{
2219	2686	for (int i=0; i<group.selection.size(); i++)
2220	2687	{
..	..	@@ -2226,7 +2693,7 @@
2226	2693	ResetModel();
2227	2694	refreshContents();
2228	2695	} else
2229		- if (event.getSource() == morphItem)
	2696	+ if (source == morphItem)
2230	2697	{
2231	2698	for (int i=0; i<group.selection.size(); i++)
2232	2699	{
..	..	@@ -2238,7 +2705,7 @@
2238	2705	ResetModel();
2239	2706	refreshContents();
2240	2707	} else
2241		- if (event.getSource() == scriptNodeItem)
	2708	+ if (source == scriptNodeItem)
2242	2709	{
2243	2710	boolean atleastone = false;
2244	2711
..	..	@@ -2277,195 +2744,252 @@
2277	2744	}
2278	2745	}
2279	2746	} else
2280		- if (event.getSource() == linkerItem)
	2747	+ if (source == linkerItem)
2281	2748	{
2282	2749	group(new cLinker());
2283	2750	} else
2284		- if (event.getSource() == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2285	2752	{
2286	2753	group(new TextureNode());
2287	2754	} else
2288		- if (event.getSource() == shadowXItem)
	2755	+ if (source == billboardItem)
	2756	+ {
	2757	+ group(new BillboardNode());
	2758	+ } else
	2759	+ if (source == shadowXItem)
2289	2760	{
2290	2761	CastShadow(0);
2291	2762	} else
2292		- if (event.getSource() == shadowYItem)
	2763	+ if (source == shadowYItem)
2293	2764	{
2294	2765	CastShadow(1);
2295	2766	} else
2296		- if (event.getSource() == shadowZItem)
	2767	+ if (source == shadowZItem)
2297	2768	{
2298	2769	CastShadow(2);
2299	2770	} else
2300		- if (event.getSource() == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2301	2772	{
2302		- ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
	2775	+ for (int i=0; i<group.selection.size(); i++)
	2776	+ {
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
	2782	+ }
	2783	+
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2303	2795	} else
2304		- if (event.getSource() == genUVItem)
	2796	+ if (source == genUVItem)
2305	2797	{
2306	2798	GenUV();
2307	2799	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2800	+ if (source == genNormalsCADItem)
2309	2801	{
2310	2802	GenNormals(true);
2311	2803	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2804	+ if (source == genNormalsMESHItem)
	2805	+ {
	2806	+ GenNormalsMESH();
	2807	+ } else
	2808	+ if (source == genNormalsORGANItem)
2313	2809	{
2314	2810	GenNormals(false);
2315	2811	} else
2316		- if (event.getSource() == stripifyItem)
	2812	+ if (source == genNormalsMINEItem)
	2813	+ {
	2814	+ GenNormalsMINE();
	2815	+ } else
	2816	+ if (source == stripifyItem)
2317	2817	{
2318	2818	Stripify();
2319	2819	} else
2320		- if (event.getSource() == unstripifyItem)
	2820	+ if (source == unstripifyItem)
2321	2821	{
2322	2822	Unstripify();
2323	2823	} else
2324		- if (event.getSource() == trimItem)
	2824	+ if (source == trimItem)
2325	2825	{
2326	2826	Trim();
2327	2827	} else
2328		- if (event.getSource() == untrimItem)
	2828	+ if (source == untrimItem)
2329	2829	{
2330	2830	Untrim();
2331	2831	} else
2332		- if (event.getSource() == clearColorsItem)
	2832	+ if (source == clearColorsItem)
2333	2833	{
2334	2834	ClearColors();
2335	2835	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2836	+ if (source == clearMaterialsItem)
2337	2837	{
2338	2838	ClearMaterials();
2339	2839	} else
2340		- if (event.getSource() == liveleavesItem)
	2840	+ if (source == liveleavesItem)
2341	2841	{
2342	2842	LiveLeaves(true);
2343	2843	} else
2344		- if (event.getSource() == unliveleavesItem)
	2844	+ if (source == unliveleavesItem)
2345	2845	{
2346	2846	LiveLeaves(false);
2347	2847	} else
2348		- if (event.getSource() == supportleavesItem)
	2848	+ if (source == supportleavesItem)
2349	2849	{
2350	2850	SupportLeaves(true);
2351	2851	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2852	+ if (source == unsupportleavesItem)
2353	2853	{
2354	2854	SupportLeaves(false);
2355	2855	} else
2356		- if (event.getSource() == hideleavesItem)
	2856	+ if (source == hideleavesItem)
2357	2857	{
2358	2858	HideLeaves(true);
2359	2859	} else
2360		- if (event.getSource() == showleavesItem)
	2860	+ if (source == showleavesItem)
2361	2861	{
2362	2862	HideLeaves(false);
2363	2863	} else
2364		- if (event.getSource() == markleavesItem)
	2864	+ if (source == markleavesItem)
2365	2865	{
2366	2866	MarkLeaves(true);
2367	2867	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2868	+ if (source == unmarkleavesItem)
2369	2869	{
2370	2870	MarkLeaves(false);
2371	2871	} else
2372		- if (event.getSource() == flipVItem)
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
	2887	+ } else
	2888	+ if (source == flipVItem)
2373	2889	{
2374	2890	FlipV(true);
2375	2891	} else
2376		- if (event.getSource() == unflipVItem)
	2892	+ if (source == unflipVItem)
2377	2893	{
2378	2894	FlipV(false);
2379	2895	} else
2380		- if (event.getSource() == lowTexturesItem)
	2896	+ if (source == lowTexturesItem)
2381	2897	{
2382	2898	SetTexRes(0);
2383	2899	} else
2384		- if (event.getSource() == normalTexturesItem)
	2900	+ if (source == normalTexturesItem)
2385	2901	{
2386	2902	SetTexRes(1);
2387	2903	} else
2388		- if (event.getSource() == highTexturesItem)
	2904	+ if (source == highTexturesItem)
2389	2905	{
2390	2906	SetTexRes(2);
2391	2907	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2908	+ if (source == veryhighTexturesItem)
2393	2909	{
2394	2910	SetTexRes(3);
2395	2911	} else
2396		- if (event.getSource() == maxTexturesItem)
	2912	+ if (source == maxTexturesItem)
2397	2913	{
2398	2914	SetTexRes(4);
2399	2915	} else
2400		- if (event.getSource() == panoTexturesItem)
	2916	+ if (source == panoTexturesItem)
2401	2917	{
2402	2918	SetTexRes(5);
2403	2919	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2920	+ if (source == reverseNormalsItem)
2405	2921	{
2406	2922	ReverseNormals();
2407	2923	} else
2408		- if (event.getSource() == parseverticesItem)
	2924	+ if (source == parseverticesItem)
2409	2925	{
2410	2926	ParseVertices();
2411	2927	} else
2412		- if (event.getSource() == textureFieldItem)
	2928	+ if (source == textureFieldItem)
2413	2929	{
2414	2930	TextureVertices();
2415	2931	} else
2416		- if (event.getSource() == alignItem)
	2932	+ if (source == alignItem)
2417	2933	{
2418	2934	Align();
2419	2935	} else
2420		- if (event.getSource() == mirrorItem)
	2936	+ if (source == mirrorItem)
2421	2937	{
2422	2938	MirrorPoses();
2423	2939	} else
2424		- if (event.getSource() == reduceMorphItem)
	2940	+ if (source == reduceMorphItem)
2425	2941	{
2426	2942	MeshReduction(false);
2427	2943	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2944	+ if (source == reduce34MorphItem)
2429	2945	{
2430	2946	MeshReduction(true);
2431	2947	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2948	+ if (source == reverseTrianglesItem)
2433	2949	{
2434	2950	ReverseTriangles();
2435	2951	} else
2436		- if (event.getSource() == reduceMeshItem)
	2952	+ if (source == reduceMeshItem)
2437	2953	{
2438	2954	ReduceMesh(false);
2439	2955	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2956	+ if (source == reduce34MeshItem)
2441	2957	{
2442	2958	ReduceMesh(true);
2443	2959	} else
2444		- if (event.getSource() == increaseMeshItem)
	2960	+ if (source == increaseMeshItem)
2445	2961	{
2446	2962	IncreaseMesh();
2447	2963	} else
2448		- if (event.getSource() == clipMeshItem)
	2964	+ if (source == clipMeshItem)
2449	2965	{
2450	2966	ClipMesh();
2451	2967	} else
2452		- if (event.getSource() == smoothMeshItem)
	2968	+ if (source == smoothMeshItem)
2453	2969	{
2454	2970	SmoothMesh();
2455	2971	} else
2456		- if (event.getSource() == transformgeometryItem)
	2972	+ if (source == transformGeometryItem)
2457	2973	{
2458	2974	TransformGeometry();
2459	2975	} else
2460		- if (event.getSource() == resetTransformItem)
	2976	+ if (source == transformChildrenItem)
	2977	+ {
	2978	+ TransformChildren();
	2979	+ } else
	2980	+ if (source == resetTransformItem)
2461	2981	{
2462	2982	ResetTransform();
2463	2983	} else
2464		- if (event.getSource() == resetCentroidItem)
	2984	+ if (source == resetCentroidItem)
2465	2985	{
2466		- ResetCentroid();
	2986	+ ResetCentroid(true);
2467	2987	} else
2468		- if (event.getSource() == resetParentItem)
	2988	+ if (source == resetCentroidXZItem)
	2989	+ {
	2990	+ ResetCentroid(false);
	2991	+ } else
	2992	+ if (source == resetParentItem)
2469	2993	{
2470	2994	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2995	{
..	..	@@ -2475,7 +2999,7 @@
2475	2999
2476	3000	refreshContents();
2477	3001	} else
2478		- if (event.getSource() == repairParentItem)
	3002	+ if (source == repairParentItem)
2479	3003	{
2480	3004	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	3005	{
..	..	@@ -2489,7 +3013,21 @@
2489	3013
2490	3014	refreshContents();
2491	3015	} else
2492		- if (event.getSource() == sortbysizeItem)
	3016	+ if (source == repairShadowItem)
	3017	+ {
	3018	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3019	+ {
	3020	+ Object3D obj = (Object3D)e.nextElement();
	3021	+ obj.RepairShadow();
	3022	+// for (int i=0; i<obj.size(); i++)
	3023	+// {
	3024	+// obj.get(i).parent = obj;
	3025	+// }
	3026	+ }
	3027	+
	3028	+ refreshContents();
	3029	+ } else
	3030	+ if (source == sortbysizeItem)
2493	3031	{
2494	3032	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	3033	{
..	..	@@ -2501,7 +3039,7 @@
2501	3039	ResetModel();
2502	3040	refreshContents();
2503	3041	} else
2504		- if (event.getSource() == sortbynameItem)
	3042	+ if (source == sortbynameItem)
2505	3043	{
2506	3044	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	3045	{
..	..	@@ -2513,7 +3051,7 @@
2513	3051	ResetModel();
2514	3052	refreshContents();
2515	3053	} else
2516		- if (event.getSource() == attachPigmentItem)
	3054	+ if (source == attachPigmentItem)
2517	3055	{
2518	3056	String texture = GetFile("Attach pigment");
2519	3057	Object3D obj;
..	..	@@ -2525,7 +3063,7 @@
2525	3063
2526	3064	refreshContents();
2527	3065	} else
2528		- if (event.getSource() == detachPigmentItem)
	3066	+ if (source == detachPigmentItem)
2529	3067	{
2530	3068	Object3D obj;
2531	3069	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +3074,7 @@
2536	3074
2537	3075	refreshContents();
2538	3076	} else
2539		- if (event.getSource() == attachBumpItem)
	3077	+ if (source == attachBumpItem)
2540	3078	{
2541	3079	String texture = GetFile("Attach bump");
2542	3080	Object3D obj;
..	..	@@ -2548,7 +3086,7 @@
2548	3086
2549	3087	refreshContents();
2550	3088	} else
2551		- if (event.getSource() == detachBumpItem)
	3089	+ if (source == detachBumpItem)
2552	3090	{
2553	3091	Object3D obj;
2554	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +3097,7 @@
2559	3097
2560	3098	refreshContents();
2561	3099	} else
2562		- if (event.getSource() == pigmentBumpItem)
	3100	+ if (source == pigmentBumpItem)
2563	3101	{
2564	3102	Object3D obj;
2565	3103	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +3108,237 @@
2570	3108
2571	3109	refreshContents();
2572	3110	} else
2573		- if (event.getSource() == flashSelectionButton)
	3111	+ if (source == flashSelectionButton)
2574	3112	{
2575	3113	CameraPane.flash = true;
2576	3114	refreshContents();
2577	3115	} else
2578		- if (event.getSource() == oneButton)
	3116	+ if (source == oneButton)
2579	3117	{
2580	3118	} else
2581		- if (event.getSource() == twoButton)
	3119	+ if (source == twoButton)
2582	3120	{
2583	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2584	3126	// bug
2585	3127	//gridPanel.setDividerLocation(1.0);
2586	3128	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	3129	+// bigThree.remove(scenePanel);
	3130	+// bigThree.remove(centralPanel);
	3131	+// bigThree.remove(XYZPanel);
	3132	+// aWindowConstraints.gridx = 0;
	3133	+// aWindowConstraints.gridy = 0;
	3134	+// aWindowConstraints.gridwidth = 1;
	3135	+// // aConstraints.gridheight = 3;
	3136	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3137	+// aWindowConstraints.weightx = 0;
	3138	+// aWindowConstraints.weighty = 1;
	3139	+// //bigThree.add(jtp, aWindowConstraints);
	3140	+// aWindowConstraints.weightx = 1;
	3141	+// aWindowConstraints.gridwidth = 3;
	3142	+// // aConstraints.gridheight = 3;
	3143	+// aWindowConstraints.gridx = 1;
	3144	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3145	+// bigThree.add(centralPanel, aWindowConstraints);
	3146	+// aWindowConstraints.weightx = 0;
	3147	+// aWindowConstraints.gridx = 4;
	3148	+// aWindowConstraints.gridwidth = 1;
	3149	+// // aConstraints.gridheight = 3;
	3150	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3151	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3152	+// scenePanel.setVisible(false);
	3153	+// centralPanel.setVisible(true);
	3154	+// XYZPanel.setVisible(false);
	3155	+ bigThree.ClearUI();
	3156	+ bigThree.add(centralPanel);
	3157	+ bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2611	3176	} else
2612		- if (event.getSource() == threeButton)
	3177	+ if (source == threeButton)
2613	3178	{
2614	3179	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
	3183	+
	3184	+// bigThree.remove(scenePanel);
	3185	+// bigThree.remove(centralPanel);
	3186	+// bigThree.remove(XYZPanel);
	3187	+// aWindowConstraints.gridx = 0;
	3188	+// aWindowConstraints.gridy = 0;
	3189	+// aWindowConstraints.gridwidth = 1;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3192	+// aWindowConstraints.weightx = 0;
	3193	+// aWindowConstraints.weighty = 1;
	3194	+// //bigThree.add(jtp, aWindowConstraints);
	3195	+// aWindowConstraints.weightx = 1;
	3196	+// aWindowConstraints.gridwidth = 3;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.gridx = 1;
	3199	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3200	+// bigThree.add(centralPanel, aWindowConstraints);
	3201	+// aWindowConstraints.weightx = 0;
	3202	+// aWindowConstraints.gridx = 4;
	3203	+// aWindowConstraints.gridwidth = 1;
	3204	+// // aConstraints.gridheight = 3;
	3205	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3206	+// bigThree.add(XYZPanel, aWindowConstraints);
	3207	+// bigThree.validate();
	3208	+// scenePanel.setVisible(false);
	3209	+// centralPanel.setVisible(true);
	3210	+// XYZPanel.setVisible(true);
	3211	+ bigThree.ClearUI();
	3212	+ bigThree.add(centralPanel);
	3213	+ bigThree.add(XYZPanel);
	3214	+ bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2639	3217	} else
2640		- if (event.getSource() == fourButton)
	3218	+ if (source == fourButton)
2641	3219	{
2642	3220	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
	3224	+
	3225	+// bigThree.remove(scenePanel);
	3226	+// bigThree.remove(centralPanel);
	3227	+// bigThree.remove(XYZPanel);
	3228	+// aWindowConstraints.gridx = 0;
	3229	+// aWindowConstraints.gridy = 0;
	3230	+// aWindowConstraints.gridwidth = 1;
	3231	+// // aWindowConstraints.gridheight = 3;
	3232	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.weighty = 1;
	3235	+// bigThree.add(scenePanel, aWindowConstraints);
	3236	+// aWindowConstraints.weightx = 1;
	3237	+// aWindowConstraints.gridwidth = 3;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.gridx = 1;
	3240	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3241	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3242	+// aWindowConstraints.weightx = 0;
	3243	+// aWindowConstraints.gridx = 4;
	3244	+// aWindowConstraints.gridwidth = 1;
	3245	+// // aWindowConstraints.gridheight = 3;
	3246	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3247	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3248	+// bigThree.validate();
	3249	+// scenePanel.setVisible(true);
	3250	+// centralPanel.setVisible(false);
	3251	+// XYZPanel.setVisible(false);
	3252	+ bigThree.ClearUI();
	3253	+ bigThree.add(scenePanel);
	3254	+ bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2667	3257	} else
2668		- if (event.getSource() == sixButton)
	3258	+ if (source == sixButton)
2669	3259	{
2670	3260	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
	3264	+
	3265	+// bigThree.remove(scenePanel);
	3266	+// bigThree.remove(centralPanel);
	3267	+// bigThree.remove(XYZPanel);
	3268	+// aWindowConstraints.gridx = 0;
	3269	+// aWindowConstraints.gridy = 0;
	3270	+// aWindowConstraints.gridwidth = 1;
	3271	+// // aConstraints.gridheight = 3;
	3272	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3273	+// aWindowConstraints.weightx = 0;
	3274	+// aWindowConstraints.weighty = 1;
	3275	+// bigThree.add(scenePanel, aWindowConstraints);
	3276	+// aWindowConstraints.weightx = 1;
	3277	+// aWindowConstraints.gridwidth = 3;
	3278	+// // aWindowConstraints.gridheight = 3;
	3279	+// aWindowConstraints.gridx = 1;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// bigThree.add(centralPanel, aWindowConstraints);
	3282	+// aWindowConstraints.weightx = 0;
	3283	+// aWindowConstraints.gridx = 4;
	3284	+// aWindowConstraints.gridwidth = 1;
	3285	+// // aWindowConstraints.gridheight = 3;
	3286	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3287	+// //bigThree.add(XYZPanel, aConstraints);
	3288	+// bigThree.validate();
	3289	+// scenePanel.setVisible(true);
	3290	+// centralPanel.setVisible(true);
	3291	+// XYZPanel.setVisible(false);
	3292	+ bigThree.ClearUI();
	3293	+ bigThree.add(scenePanel);
	3294	+ bigThree.add(centralPanel);
	3295	+ bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2695	3298	} else
2696		- if (event.getSource() == sevenButton)
	3299	+ if (source == sevenButton)
2697	3300	{
2698	3301	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
	3305	+
	3306	+// bigThree.remove(scenePanel);
	3307	+// bigThree.remove(centralPanel);
	3308	+// bigThree.remove(XYZPanel);
	3309	+// aWindowConstraints.gridx = 0;
	3310	+// aWindowConstraints.gridy = 0;
	3311	+// aWindowConstraints.gridwidth = 1;
	3312	+// // aWindowConstraints.gridheight = 3;
	3313	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3314	+// aWindowConstraints.weightx = 0;
	3315	+// aWindowConstraints.weighty = 1;
	3316	+// bigThree.add(scenePanel, aWindowConstraints);
	3317	+// aWindowConstraints.weightx = 1;
	3318	+// aWindowConstraints.gridwidth = 3;
	3319	+// // aWindowConstraints.gridheight = 3;
	3320	+// aWindowConstraints.gridx = 1;
	3321	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3322	+// bigThree.add(centralPanel, aWindowConstraints);
	3323	+// aWindowConstraints.weightx = 0;
	3324	+// aWindowConstraints.gridx = 4;
	3325	+// aWindowConstraints.gridwidth = 1;
	3326	+// // aConstraints.gridheight = 3;
	3327	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3328	+// bigThree.add(XYZPanel, aWindowConstraints);
	3329	+// bigThree.validate();
	3330	+// scenePanel.setVisible(true);
	3331	+// centralPanel.setVisible(true);
	3332	+// XYZPanel.setVisible(true);
	3333	+ bigThree.ClearUI();
	3334	+ bigThree.add(scenePanel);
	3335	+ bigThree.add(centralPanel);
	3336	+ bigThree.add(XYZPanel);
	3337	+ bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2723	3340	} else
2724		- if (event.getSource() == rootButton)
	3341	+ if (source == rootButton)
2725	3342	{
2726	3343	Object3D obj;
2727	3344	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2731,66 +3348,84 @@
2731	3348	EditObject(obj);
2732	3349	}
2733	3350
	3351	+ cameraView.requestFocusInWindow();
2734	3352	refreshContents(true);
2735	3353	} else
2736		- if (event.getSource() == closeButton)
	3354	+ if (source == closeButton)
2737	3355	{
2738	3356	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3357	cRadio ab;
2740	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2741	3359	{
2742	3360	ab = (cRadio)e.nextElement();
2743		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2744	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2745	3369	buttonGroup.remove(ab);
2746	3370	radioPanel.remove(ab);
2747	3371
2748		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2749	3374	// ab.GetObject().objectUI = null; // ?????????
2750	3375
2751	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2752	3377	break;
2753	3378	}
2754	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2755	3382	refreshContents(true);
2756	3383	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3384	+ if (source == editItem \|\| source == editButton)
2758	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2759	3392	EditSelection(false);
2760	3393	} else
2761		- if (event.getSource() == uneditButton)
	3394	+ if (source == uneditButton)
2762	3395	{
2763	3396	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	3397	{
2765	3398	Object3D child = (Object3D)e.nextElement();
2766	3399	if(child.editWindow != null)
2767	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2768	3402	child.CloseUI();
2769	3403	listUI.remove(child);
2770	3404
2771		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2772	3406	}
2773		- objEditor.ctrlPanel.revalidate();
	3407	+ objEditor.ctrlPanel.FlushUI();
2774	3408	//objEditor.jTree.clearSelection();
2775	3409	//objEditor.ResetSliders();
2776	3410	refreshContents(true);
2777	3411	} else
2778		- if (event.getSource() == clearPanelButton)
	3412	+ if (source == clearPanelButton)
2779	3413	{
2780	3414	assert(copy == group);
2781	3415	//copy.ClearUI();
2782	3416	for (Object3D obj : listUI)
2783	3417	{
	3418	+ obj.pinned = false;
2784	3419	obj.CloseUI();
2785	3420	}
2786	3421	listUI.clear();
2787	3422	refreshContents(true);
2788	3423	} else
2789		- if (event.getSource() == allParamsButton)
	3424	+ if (source == allParamsButton)
2790	3425	{
2791	3426	assert(copy == group);
2792	3427
2793		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2794	3429
2795	3430	for (Object3D obj : listUI)
2796	3431	{
..	..	@@ -2807,19 +3442,19 @@
2807	3442
2808	3443	refreshContents(true);
2809	3444	} else
2810		- if (event.getSource() == unselectButton)
	3445	+ if (source == unselectButton)
2811	3446	{
2812	3447	objEditor.jTree.clearSelection();
2813	3448	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3449	objEditor.ResetSliders();
2815	3450	refreshContents(true);
2816	3451	} else
2817		- if(event.getSource() instanceof cRadio)
	3452	+ if(source instanceof cRadio)
2818	3453	{
2819	3454	group.parent = keepparent;
2820	3455	group.attributes = 0;
2821	3456	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3457	+ /cRadio/ radio = (cRadio)source;
2823	3458	Object3D obj = radio.GetObject();
2824	3459	System.out.println("Edit " + obj);
2825	3460	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3474,7 @@
2839	3474	}
2840	3475
2841	3476	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3477	+ //Globals.theRenderer.object = group;
2843	3478	if(!useclient)
2844	3479	{
2845	3480	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,25 +3483,50 @@
2848	3483	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3484	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3485	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3486	+ //cameraView.lighttouched = true;
	3487	+ Globals.lighttouched = true;
2852	3488	topView.object = group;
2853	3489	frontView.object = group;
2854	3490	sideView.object = group;
2855	3491	}
2856		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
2857	3497	/*
2858	3498	currentLayout = radio.layout;
2859	3499	if (currentLayout == null)
2860	3500	currentLayout = sevenButton;
2861	3501	*/
2862	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
2863	3508	keepparent = group.parent;
2864	3509	// PARENT = NULL or not???
2865	3510	//group.parent = null; // ROOT
2866	3511	//group.attributes = -1;
2867	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
2868	3515	refreshContents(true);
2869		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
2870	3530	else
2871	3531	{
2872	3532	//return super.action(event, arg);
..	..	@@ -2875,7 +3535,6 @@
2875	3535	}
2876	3536
2877	3537	boolean useclient = false;
2878		- cRadio radio;
2879	3538
2880	3539	void ToggleRoot()
2881	3540	{
..	..	@@ -2884,7 +3543,7 @@
2884	3543	if (useclient)
2885	3544	{
2886	3545	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3546	+ Globals.lighttouched = true;
2888	3547	//topView.object = client;
2889	3548	//frontView.object = client;
2890	3549	//sideView.object = client;
..	..	@@ -2892,7 +3551,7 @@
2892	3551	else
2893	3552	{
2894	3553	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3554	+ Globals.lighttouched = true;
2896	3555	//topView.object = group;
2897	3556	//frontView.object = group;
2898	3557	//sideView.object = group;
..	..	@@ -2927,6 +3586,28 @@
2927	3586	refreshContents();
2928	3587	}
2929	3588
	3589	+ void TransformChildren()
	3590	+ {
	3591	+ Object3D obj;
	3592	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3593	+ {
	3594	+ obj = (Object3D)e.nextElement();
	3595	+ obj.KeepTextureMatrices();
	3596	+ obj.TransformChildren();
	3597	+ obj.RestoreTextureMatrices();
	3598	+
	3599	+// if (obj.parent == null)
	3600	+// {
	3601	+// System.out.println("NULL PARENT!");
	3602	+// new Exception().printStackTrace();
	3603	+// }
	3604	+// else
	3605	+// TouchTransform(obj);
	3606	+// //obj.parent.Touch();
	3607	+ }
	3608	+
	3609	+ refreshContents();
	3610	+ }
2930	3611
2931	3612	void ResetTransform()
2932	3613	{
..	..	@@ -3039,7 +3720,7 @@
3039	3720	refreshContents();
3040	3721	}
3041	3722
3042		- void ResetCentroid()
	3723	+ void ResetCentroid(boolean full)
3043	3724	{
3044	3725	Object3D obj;
3045	3726	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +3735,16 @@
3054	3735	LA.matIdentity(Object3D.mat);
3055	3736	obj.getBounds(minima, maxima, false);
3056	3737	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	3740	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	3741	obj.TransformMesh(Object3D.mat);
	3742	+
3060	3743	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3744	+ if (full)
	3745	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	3746	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3747	+
3063	3748	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	3749	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	3750	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +3773,8 @@
3088	3773
3089	3774	int size = obj.MemorySize();
3090	3775
3091		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3092	3778	}
3093	3779	}
3094	3780	catch (Exception e)
..	..	@@ -3125,9 +3811,9 @@
3125	3811	obj = (Object3D)e.nextElement();
3126	3812
3127	3813	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	3814	+ Grafreed.AnalyzeObject(obj);
3129	3815	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	3816	+ Grafreed.AnalyzeObject(obj.bRep);
3131	3817
3132	3818	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	3819	}
..	..	@@ -3169,6 +3855,20 @@
3169	3855	void GenNormals(boolean crease)
3170	3856	{
3171	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
	3865	+
	3866	+ refreshContents();
	3867	+ }
	3868	+
	3869	+ void GenNormalsMINE()
	3870	+ {
	3871	+ group.selection.GenNormalsMINE();
3172	3872
3173	3873	refreshContents();
3174	3874	}
..	..	@@ -3334,8 +4034,8 @@
3334	4034
3335	4035	void ParseVertices()
3336	4036	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	4037	+ boolean epsequal = Grafreed.epsequal;
	4038	+ Grafreed.epsequal = true;
3339	4039
3340	4040	for (int i=0; i<group.selection.size(); i++)
3341	4041	{
..	..	@@ -3360,7 +4060,7 @@
3360	4060	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	4061	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	4062
3363		- g.add(GrafreeD.clipboard);
	4063	+ g.add(Grafreed.clipboard);
3364	4064
3365	4065	buffer.add(g);
3366	4066	}
..	..	@@ -3375,7 +4075,7 @@
3375	4075	makeSomething(buffer, i==group.selection.size()-1);
3376	4076	}
3377	4077
3378		- GrafreeD.epsequal = epsequal;
	4078	+ Grafreed.epsequal = epsequal;
3379	4079
3380	4080	refreshContents();
3381	4081	}
..	..	@@ -3393,7 +4093,16 @@
3393	4093	String pigment = Object3D.GetPigment(tex);
3394	4094	//String bump = Object3D.GetBump(tex);
3395	4095
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3397	4106
3398	4107	double s = v.s;
3399	4108
..	..	@@ -3441,12 +4150,26 @@
3441	4150
3442	4151	void Align()
3443	4152	{
	4153	+ if (group.selection.size() == 0)
	4154	+ return;
	4155	+
	4156	+ cVector bbmin = new cVector();
	4157	+ cVector bbmax = new cVector();
	4158	+
	4159	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4160	+
	4161	+ double dx = bbmax.x - bbmin.x;
	4162	+ double dy = bbmax.y - bbmin.y;
	4163	+ double dz = bbmax.z - bbmin.z;
	4164	+
	4165	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4166	+
3444	4167	for (int i=0; i<group.selection.size(); i++)
3445	4168	{
3446	4169	Object3D obj = group.selection.get(i);
3447	4170
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4171	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4172	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	4173	}
3451	4174
3452	4175	refreshContents();
..	..	@@ -3467,11 +4190,11 @@
3467	4190
3468	4191	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	4192
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	4193	+ boolean random = CameraPane.SWITCH;
	4194	+ CameraPane.SWITCH = false; // parse all random nodes
3472	4195	lowres.linkVerticesThis(null);
3473	4196	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	4197	+ CameraPane.SWITCH = random;
3475	4198
3476	4199	System.err.flush();
3477	4200
..	..	@@ -3511,7 +4234,7 @@
3511	4234	return;
3512	4235
3513	4236	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	4237	+ Object3D ref = Grafreed.clipboard.get(0);
3515	4238
3516	4239	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	4240
..	..	@@ -3680,7 +4403,7 @@
3680	4403	group.selection.RelinkToSupport(); // july 2014
3681	4404	System.out.println("DONE.");
3682	4405	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4406	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	4407	}
3685	4408
3686	4409	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +4428,9 @@
3705	4428
3706	4429	void ClipMesh()
3707	4430	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4431	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	4432	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	4433	+ Object3D content = Grafreed.clipboard.get(0);
3711	4434
3712	4435	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	4436	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +4439,7 @@
3716	4439	// {
3717	4440	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	4441	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	4442	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	4443	}
3721	4444	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	4445	System.out.println("DONE.");
..	..	@@ -3763,6 +4486,18 @@
3763	4486	void MarkLeaves(boolean hide)
3764	4487	{
3765	4488	group.selection.MarkLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
3766	4501	refreshContents();
3767	4502	}
3768	4503
..	..	@@ -3837,10 +4572,6 @@
3837	4572	// }
3838	4573	// }
3839	4574
3840		- static boolean allparams = true;
3841		-
3842		- static Vector<Object3D> listUI = new Vector<Object3D>();
3843		-
3844	4575	void EditSelection(boolean newWindow)
3845	4576	{
3846	4577	// aConstraints.gridy = 0;
..	..	@@ -3848,10 +4579,10 @@
3848	4579	{
3849	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3850	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3851		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	4583
3853	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
3855	4586	{
3856	4587	// if (!(elem instanceof Composite))
3857	4588	// newWindow = false;
..	..	@@ -3933,7 +4664,8 @@
3933	4664	//new Exception().printStackTrace();
3934	4665
3935	4666	freezemodel = true;
3936		-
	4667	+ ClearUnpinned();
	4668	+
3937	4669	/**/
3938	4670	//switch (event.id)
3939	4671	{
..	..	@@ -3941,7 +4673,6 @@
3941	4673	//case 702: // Event.LIST_DESELECT
3942	4674	group.deselectAll();
3943	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	4676	if (tps != null)
3946	4677	{
3947	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,33 +4681,39 @@
3950	4681
3951	4682	//if (child.parent != null)
3952	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
3953	4685	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	4686	}
3958	4687	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4688	+// else
	4689	+// {
	4690	+// objEditor.SetMaterial(group); // .GetMaterial());
	4691	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4692	+// System.err.println("info : " + group.GetPath());
	4693	+// }
3965	4694
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3969	4696	CameraPane.flash = true;
3970	4697
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	4699	// a camera
3973	4700	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
	4706	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4707	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4708	}
3979	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
3980	4717	refreshContents();
3981	4718	//return true;
3982	4719	}
..	..	@@ -3985,6 +4722,35 @@
3985	4722
3986	4723	freezemodel = false;
3987	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
3988	4754
3989	4755	void linkSomething(Object3D thing)
3990	4756	{
..	..	@@ -4056,16 +4822,19 @@
4056	4822	{
4057	4823	if (group.selection.isEmpty())
4058	4824	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	4825	+
	4826	+ Grafreed.clipboardIsTempGroup = false;
4060	4827	Composite tGroup = null;
4061	4828	if (group.selection.size() > 0) // 1)
4062	4829	{
4063	4830	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	4831	+ Grafreed.clipboardIsTempGroup = true;
4065	4832	}
4066	4833
4067	4834	if (cut)
4068	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4069	4838	//int indices[] = jList.getSelectedIndices();
4070	4839	//for (int i = indices.length - 1; i >= 0; i--)
4071	4840	//jList.remove(indices[i]);
..	..	@@ -4101,16 +4870,16 @@
4101	4870	//System.out.println("cut " + child);
4102	4871	//System.out.println("parent = " + child.parent);
4103	4872	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4105	4874	tGroup.add/Child/(tmp);
4106	4875	else
4107		- GrafreeD.clipboard = tmp;
	4876	+ Grafreed.clipboard = tmp;
4108	4877	}
4109	4878	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	4879	+ if (Grafreed.clipboardIsTempGroup)
4111	4880	tGroup.add/Child/(child);
4112	4881	else
4113		- GrafreeD.clipboard = child;
	4882	+ Grafreed.clipboard = child;
4114	4883	}
4115	4884
4116	4885	//ResetModel();
..	..	@@ -4142,21 +4911,23 @@
4142	4911	//System.out.println("cut " + elem);
4143	4912	//System.out.println("parent = " + elem.parent);
4144	4913	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4146	4915	tGroup.add/Child/(tmp);
4147	4916	else
4148		- GrafreeD.clipboard = tmp;
	4917	+ Grafreed.clipboard = tmp;
4149	4918	}
4150	4919	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	4920	+ if (Grafreed.clipboardIsTempGroup)
4152	4921	tGroup.add/Child/(child);
4153	4922	else
4154		- GrafreeD.clipboard = child;
	4923	+ Grafreed.clipboard = child;
4155	4924	}
4156	4925
4157	4926	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	4927	+
	4928	+ if (Grafreed.clipboardIsTempGroup)
	4929	+ Grafreed.clipboard = tGroup;
	4930	+
4160	4931	if (cut)
4161	4932	{
4162	4933	ResetModel();
..	..	@@ -4170,7 +4941,7 @@
4170	4941	// return;
4171	4942	boolean first = true;
4172	4943
4173		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4174	4945	{
4175	4946	Composite temp;
4176	4947
..	..	@@ -4181,7 +4952,7 @@
4181	4952	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	4953	*/
4183	4954	Object3D elem;
4184		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4955	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4185	4956	{
4186	4957	Object3D child = (Object3D)e.nextElement();
4187	4958
..	..	@@ -4215,21 +4986,21 @@
4215	4986	//Object3D cb = Applet3D.clipboard;
4216	4987	//temp.addChild(cb);
4217	4988	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4989	+ assert(Grafreed.clipboard.parent == null);
	4990	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4991	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4992	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4993	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4223	4994	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	4995	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4996	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	4997	}
4227	4998
4228	4999	ResetModel();
4229	5000	refreshContents();
4230	5001	}
4231	5002
4232		- void pasteInto(boolean copyit)
	5003	+ void pasteInto(boolean copyit, boolean clone)
4233	5004	{
4234	5005	// if (GrafreeD.clipboard == null)
4235	5006	// return;
..	..	@@ -4258,15 +5029,22 @@
4258	5029	if (copyit)
4259	5030	{
4260	5031	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	5032	+ if (clone)
	5033	+ {
	5034	+ CloneClipboard(false); // sept 2014
	5035	+ }
	5036	+ else
	5037	+ {
	5038	+ paste(false);
	5039	+ }
4262	5040	}
4263	5041	else
4264	5042	{
4265	5043	boolean first = true;
4266	5044
4267		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4268	5046	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	5047	+ Composite temp = (Composite)Grafreed.clipboard;
4270	5048	Object3D copy;
4271	5049	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	5050	{
..	..	@@ -4276,7 +5054,7 @@
4276	5054	}
4277	5055	} else
4278	5056	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	5057	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	5058	}
4281	5059	}
4282	5060	}
..	..	@@ -4468,6 +5246,26 @@
4468	5246	makeSomething(csg);
4469	5247	}
4470	5248
	5249	+ void Ungroup(Object3D g)
	5250	+ {
	5251	+ if (g instanceof HiddenObject)
	5252	+ {
	5253	+ HiddenObject h = (HiddenObject) g;
	5254	+
	5255	+ for (int i=0; i<h.ActualSize(); i++)
	5256	+ {
	5257	+ objEditor.makeSomething(h.get(i), false);
	5258	+ }
	5259	+ }
	5260	+ else
	5261	+ {
	5262	+ for (int i=0; i<g.Size(); i++)
	5263	+ {
	5264	+ objEditor.makeSomething(g.get(i), false);
	5265	+ }
	5266	+ }
	5267	+ }
	5268	+
4471	5269	void ungroup()
4472	5270	{
4473	5271	/*
..	..	@@ -4661,21 +5459,6 @@
4661	5459	}
4662	5460	*/
4663	5461
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	5462	/*
4680	5463	public void Callback(Object obj)
4681	5464	{
..	..	@@ -4699,26 +5482,9 @@
4699	5482	}
4700	5483	*/
4701	5484
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	5485	String GetFile(String dialogName)
4720	5486	{
4721		- if (GrafreeD.standAlone)
	5487	+ if (Grafreed.standAlone)
4722	5488	{
4723	5489	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	5490	browser.show();
..	..	@@ -4782,10 +5548,33 @@
4782	5548	cButton flashSelectionButton;
4783	5549	cButton editButton;
4784	5550	cButton uneditButton;
	5551	+ JCheckBox allParamsButton;
4785	5552	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5553	cButton unselectButton;
4788	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
	5558	+ cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
	5577	+
4789	5578	cButton screenfitButton;
4790	5579	cButton screenfitpointButton;
4791	5580	cButton snapobjectButton;
..	..	@@ -4797,14 +5586,6 @@
4797	5586
4798	5587	cButton setsupportButton;
4799	5588
4800		- cButton twoButton;
4801		- cButton sixButton;
4802		- cButton threeButton;
4803		- cButton sevenButton;
4804		- cButton fourButton; // full panel
4805		- cButton oneButton; // full XYZ
4806		- //cButton currentLayout;
4807		-
4808	5589	//
4809	5590	//Composite
4810	5591	Object3D // to do !!
..	..	@@ -4814,9 +5595,11 @@
4814	5595	//JTree jTree;
4815	5596	private MenuItem lookAtItem;
4816	5597	private MenuItem lookFromItem;
4817		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
4818	5599	private MenuItem cutItem;
4819		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
4820	5603	private MenuItem cloneItem;
4821	5604	private MenuItem cloneSupportItem;
4822	5605	private MenuItem overwriteGeoItem;
..	..	@@ -4827,8 +5610,9 @@
4827	5610	private MenuItem resetsupportItem;
4828	5611	private MenuItem resetreferencesItem;
4829	5612	private MenuItem linkverticesItem;
	5613	+ private MenuItem relinkverticesItem;
4830	5614	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
4832	5616	private MenuItem stepAllItem;
4833	5617	private MenuItem revertMeshItem;
4834	5618	private MenuItem poseMeshItem;
..	..	@@ -4839,14 +5623,17 @@
4839	5623	private MenuItem mergeGeometriesItem;
4840	5624	private MenuItem copyItem;
4841	5625	private MenuItem pasteItem;
	5626	+ private MenuItem pasteIntoItem;
4842	5627	private MenuItem pasteLinkItem;
4843	5628	private MenuItem pasteCloneItem;
4844	5629	private MenuItem pasteExpandItem;
4845	5630	private MenuItem clearItem;
4846	5631	private MenuItem clearAllItem;
4847	5632	private MenuItem genUVItem;
	5633	+ private MenuItem genNormalsMESHItem;
4848	5634	private MenuItem genNormalsCADItem;
4849	5635	private MenuItem genNormalsORGANItem;
	5636	+ private MenuItem genNormalsMINEItem;
4850	5637	private MenuItem stripifyItem;
4851	5638	private MenuItem unstripifyItem;
4852	5639	private MenuItem trimItem;
..	..	@@ -4875,6 +5662,10 @@
4875	5662	private MenuItem showleavesItem;
4876	5663	private MenuItem markleavesItem;
4877	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
4878	5669
4879	5670	private MenuItem flipVItem;
4880	5671	private MenuItem unflipVItem;
..	..	@@ -4886,14 +5677,17 @@
4886	5677	private MenuItem panoTexturesItem;
4887	5678
4888	5679	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	5680	+ private MenuItem resetCentroidXZItem;
4890	5681	private MenuItem resetTransformItem;
	5682	+ private MenuItem transformGeometryItem;
	5683	+ private MenuItem transformChildrenItem;
	5684	+ private MenuItem hideItem;
4891	5685	private MenuItem grabItem;
4892	5686	private MenuItem backItem;
4893	5687	private MenuItem frontItem;
4894	5688	private MenuItem cameraItem;
4895	5689	private MenuItem compositeItem;
4896		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
4897	5691	private MenuItem physicsItem;
4898	5692	private MenuItem frameselectorItem;
4899	5693	private MenuItem scriptNodeItem;
..	..	@@ -4908,6 +5702,7 @@
4908	5702
4909	5703	private MenuItem resetParentItem;
4910	5704	private MenuItem repairParentItem;
	5705	+ private MenuItem repairShadowItem;
4911	5706	private MenuItem sortbysizeItem;
4912	5707	private MenuItem sortbynameItem;
4913	5708
..	..	@@ -4928,10 +5723,11 @@
4928	5723	private MenuItem coneItem;
4929	5724	private MenuItem torusItem;
4930	5725	private MenuItem superItem;
	5726	+ private MenuItem kleinItem;
4931	5727	private MenuItem blobItem;
4932	5728	private MenuItem latheItem;
4933	5729	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5730	+ private MenuItem overlayItem;
4935	5731	private MenuItem meshItem;
4936	5732	// private MenuItem meshGroupItem;
4937	5733	private MenuItem springItem;
..	..	@@ -4940,6 +5736,7 @@
4940	5736	private MenuItem csgItem;
4941	5737	private MenuItem templateItem;
4942	5738	private MenuItem textureItem;
	5739	+ private MenuItem billboardItem;
4943	5740	private MenuItem shadowXItem;
4944	5741	private MenuItem shadowYItem;
4945	5742	private MenuItem shadowZItem;
..	..	@@ -4952,11 +5749,6 @@
4952	5749	private MenuItem doubleItem;
4953	5750	private MenuItem tripleItem;
4954	5751
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	5752	private MenuItem computeAOItem;
4961	5753	private MenuItem recompileItem;
4962	5754	private MenuItem editScriptItem;
..	..	@@ -4966,4 +5758,8 @@
4966	5758	private MenuItem analyzeItem;
4967	5759	private MenuItem dumpItem;
4968	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
4969	5765	}