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