~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("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +580,214 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
437	586
438	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	588
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
442	592
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	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");
445	621	liveCB.addItemListener(this);
446	622
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, 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");
	629	+ fastCB.addItemListener(this);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	634	screenfitButton.setToolTipText("Screen fit");
455	635	screenfitButton.addActionListener(this);
456		- 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	+
457	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	642	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	643
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
	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));
473	652
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	654	twoButton.setToolTipText("Show center view only");
483	655	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	659	fourButton.addActionListener(this);
486	660	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	662	sixButton.setToolTipText("2-column layout left");
489	663	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	665	threeButton.setToolTipText("2-column layout right");
492	666	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	668	sevenButton.setToolTipText("3-column layout");
495	669	sevenButton.addActionListener(this);
496	670	//
497	671
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ rootButton.setToolTipText("Edit selection in new tab");
500	674	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	675	+
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	677	closeButton.setToolTipText("Close tab");
504	678	closeButton.addActionListener(this);
505	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	680	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	681
516		- 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 switch");
	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");
517	767	uneditButton.addActionListener(this);
518	768
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- 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");
531	771	allParamsButton.addActionListener(this);
532	772
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- 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");
538	779	unselectButton.addActionListener(this);
539	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	+
540	791	// oe.aConstraints.gridx += 1;
541	792	// oe.aConstraints.weighty = 0;
542	793	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +799,22 @@
548	799	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	800	// gcButton.addActionListener(this);
550	801
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	802	+ cGridBag jSPPanel = new cGridBag();
	803	+
	804	+ JScrollPane jSP;
562	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	807	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	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	+
585	818	//jList.addListSelectionListener(this);
586	819	oe.jTree.addTreeSelectionListener(this);
587	820	//jTree.setRootVisible(false);
..	..	@@ -604,83 +837,139 @@
604	837	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	838	}
606	839
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	840	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	841	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
	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");
617	868	supportCB.addItemListener(this);
618	869
619		- // constraints.gridy += 1;
620	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	871	// localCB.addItemListener(this);
622	872
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	873	+ panel.Return();
	874	+
	875	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	876	crowdCB.setToolTipText("Used for crowds");
626	877	crowdCB.addItemListener(this);
627	878
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	879	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	880	smoothCB.setToolTipText("Snapping delay");
631	881	smoothCB.addItemListener(this);
632	882
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	883	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	884	slowCB.setToolTipText("Smooth interpolation");
636	885	slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	886	+
646	887	// constraints.gridy += 1;
647	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	889	// speakerMocapCB.addItemListener(this);
649	890
	891	+ panel.Return();
	892	+
650	893	if (false)
651	894	{
652	895	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	896	+ //constraints.gridy += 1;
	897	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	898	speakerCameraCB.addItemListener(this);
656	899
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	900	+ //constraints.gridy += 1;
	901	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	902	speakerFocusCB.addItemListener(this);
660	903
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	904	+ //constraints.gridy += 1;
	905	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
664	908	}
665	909
666	910	//constraints.gridx += 1;
667	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	912	// debugCB.addItemListener(this);
669	913
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
	918	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
672	920	oeilCB.addItemListener(this);
673	921
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
	942	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	943	lookAtCB.setToolTipText("Look-at target");
677	944	lookAtCB.addItemListener(this);
	945	+ }
	946	+
	947	+ }
	948	+
	949	+ cGridBag fill = new cGridBag();
	950	+ fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
	955	+
	956	+ panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
678	959
679	960	}
680	961
681	962	void EditObject(Object3D obj)
682	963	{
683	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
684	973	radioButton.SetObject(obj);
685	974	radioButton.layout = sevenButton;
686	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +978,11 @@
689	978	buttonGroup.add(radioButton);
690	979	radioButton.doClick();
691	980	}
	981	+
692	982	void SetupViews(ObjEditor oe)
693	983	{
	984	+ theFrame = this;
	985	+
694	986	oe.SetupViews();
695	987
696	988	System.out.println("SetupViews");
..	..	@@ -699,23 +991,27 @@
699	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	992	}
701	993
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
713	1006	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
719	1015
720	1016	// static int COLOR = 1;
721	1017	// static int MATERIAL = 2;
..	..	@@ -723,9 +1019,9 @@
723	1019
724	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1021
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
729	1025
730	1026	public void itemStateChanged(ItemEvent e)
731	1027	{
..	..	@@ -753,6 +1049,7 @@
753	1049	} else if(e.getSource() == liveCB)
754	1050	{
755	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
756	1053	}
757	1054	else if(e.getSource() == supportCB)
758	1055	{
..	..	@@ -817,6 +1114,14 @@
817	1114	{
818	1115	cameraView.ToggleOeil();
819	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
820	1125	else if(e.getSource() == lookAtCB)
821	1126	{
822	1127	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1138,8 @@
833	1138
834	1139	/**/
835	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1144	// We can't move the root node or an empty selection
839	1145	return;
..	..	@@ -905,7 +1211,9 @@
905	1211	// objEditor.DropFile((java.io.File[]) object, true);
906	1212	// return;
907	1213	// }
908		- if (string.charAt(0) == '/')
	1214	+
	1215	+ // File path for Mac and Windows
	1216	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1217	{
910	1218	// file(s)
911	1219	String[] names = string.split("\n");
..	..	@@ -932,7 +1240,7 @@
932	1240
933	1241	flashIt = false;
934	1242	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1243	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1244	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1245
938	1246	if (group.selection.size() == 1)
..	..	@@ -948,23 +1256,33 @@
948	1256
949	1257	assert target == objEditor.jTree;
950	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
951	1260	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1262	} catch (Exception e) {
954	1263	System.out.println("destinationPath : " + destinationPath);
955	1264	return;
956	1265	}
957	1266
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
959	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
960	1278	loadClipboard(true);
961	1279	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1280	+ pasteInto(false, false);
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
968	1286	}
969	1287	public void dropActionChanged(DropTargetDragEvent dtde)
970	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1387,104 @@
1069	1387	{
1070	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1389	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1084	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1409	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
	1414	+ if (Globals.ADVANCED)
	1415	+ {
1088	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1417	ragdollItem.addActionListener(this);
1090	1418	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1419	ragdoll2Item.addActionListener(this);
	1420	+ }
1092	1421	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1422	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1423	meshItem.addActionListener(this);
1095	1424	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1425	// meshGroupItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1097	1428	springItem = menu.add(new MenuItem("Spring"));
1098	1429	springItem.addActionListener(this);
1099	1430	flagItem = menu.add(new MenuItem("Flag"));
1100	1431	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1432	blobItem = menu.add(new MenuItem("Blob"));
1106	1433	blobItem.addActionListener(this);
1107	1434	latheItem = menu.add(new MenuItem("Lathe"));
1108	1435	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1436	+ }
	1437	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1438	+ bezierItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1111	1443	menu.add("-");
1112	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1445	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1116	1448	doubleItem = menu.add(new MenuItem("Fork"));
1117	1449	doubleItem.addActionListener(this);
	1450	+ if (Globals.ADVANCED)
	1451	+ {
1118	1452	tripleItem = menu.add(new MenuItem("Trident"));
1119	1453	tripleItem.addActionListener(this);
	1454	+ }
1120	1455	}
1121	1456
1122	1457	void buildToolsMenu(Menu menu)
1123	1458	{
1124	1459	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1460	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1461	+ animationItem.setState(Globals.ANIMATION);
1127	1462
1128	1463	menu.add("-");
1129	1464	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1465	parseverticesItem.addActionListener(this);
1131	1466	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1467	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1468	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1469	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1470	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1471	reduceMorphItem.addActionListener(this);
1139	1472	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1473	reduce34MorphItem.addActionListener(this);
1141		-
	1474	+ menu.add("-");
1142	1475	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1476	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1477
	1478	+ if (Globals.ADVANCED)
	1479	+ {
	1480	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1481	+ mirrorItem.addActionListener(this);
	1482	+ menu.add("-");
1146	1483	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1484	memoryItem.addActionListener(this);
1148	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1486	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1488	dumpItem.addActionListener(this);
1152	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1490	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1502,7 @@
1165	1502	menu.add("-");
1166	1503	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1504	editScriptItem.addActionListener(this);
	1505	+ }
1168	1506	}
1169	1507
1170	1508	void ScreenFit()
..	..	@@ -1287,9 +1625,24 @@
1287	1625	shadow.material = new cMaterial(obj.material);
1288	1626	shadow.material.diffuse = 0.0001f;
1289	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1290	1629
1291	1630	makeSomething(shadow);
1292	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1293	1646
1294	1647	/**
1295	1648	* applyExample
..	..	@@ -1493,9 +1846,9 @@
1493	1846
1494	1847	void Overwrite(int mask)
1495	1848	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1849	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1850	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1851	+ Object3D content = Grafreed.clipboard.get(0);
1499	1852
1500	1853	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1854	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1887,7 @@
1534	1887	{
1535	1888	ScreenFit();
1536	1889	} else
1537		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1538	1891	{
1539	1892	cVector v1 = new cVector();
1540	1893	cVector v2 = new cVector();
..	..	@@ -1543,11 +1896,11 @@
1543	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1897	objEditor.cameraView.repaint();
1545	1898	} else
1546		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1547	1900	{
1548	1901	makeSomething(new Box());
1549	1902	} else
1550		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1551	1904	{
1552	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +1979,27 @@
1626	1979
1627	1980	makeSomething(obj);
1628	1981	} else
1629		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1630	1983	{
1631	1984	makeSomething(new Grid());
1632	1985	} else
1633		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	1987	{
1635	1988	makeSomething(new Sphere());
1636	1989	} else
1637		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1638	1991	{
1639	1992	makeSomething(new Cone());
1640	1993	} else
1641		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1642	1995	{
1643	1996	makeSomething(new Torus());
1644	1997	} else
1645		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1646	1999	{
1647	2000	makeSomething(new Superellipsoid());
1648	2001	} else
1649		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1650	2003	{
1651	2004	makeSomething(new Klein());
1652	2005	} else
..	..	@@ -1666,7 +2019,7 @@
1666	2019	{
1667	2020	makeSomething(new BezierSurface());
1668	2021	} else
1669		- if (source == checkerItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1670	2023	{
1671	2024	/*
1672	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2067,7 @@
1714	2067	s.setup();
1715	2068	makeSomething(s);
1716	2069	} else
1717		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1718	2071	{
1719	2072	makeSomething(new Light());
1720	2073	} else
..	..	@@ -1764,7 +2117,7 @@
1764	2117
1765	2118	group(g);
1766	2119	} else
1767		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1768	2121	{
1769	2122	Composite csg = new GroupLeaf();
1770	2123	csg.count = 5;
..	..	@@ -1800,23 +2153,6 @@
1800	2153	csg.addChild(child);
1801	2154	child.addChild(csg);
1802	2155	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	2156	if (source == computeAOItem)
1821	2157	{
1822	2158	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +2171,7 @@
1835	2171	if (source == invariantsItem)
1836	2172	{
1837	2173	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2174	+ Grafreed.grafreeD.universe.invariants();
1839	2175	} else
1840	2176	if (source == memoryItem)
1841	2177	{
..	..	@@ -1853,6 +2189,35 @@
1853	2189	if (source == dumpItem)
1854	2190	{
1855	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
	2216	+ } else
	2217	+ if (source == oneStepButton)
	2218	+ {
	2219	+ Globals.ONESTEP = true;
	2220	+ cameraView.repaint();
1856	2221	} else
1857	2222	if (source == screenfitButton)
1858	2223	{
..	..	@@ -1903,12 +2268,20 @@
1903	2268	{
1904	2269	loadClipboard(true);
1905	2270	} else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
	2278	+ } else
1906	2279	if (source == duplicateItem)
1907	2280	{
1908		- Object3D keep = GrafreeD.clipboard;
	2281	+ Object3D keep = Grafreed.clipboard;
1909	2282	loadClipboard(false);
1910	2283	paste(false);
1911		- GrafreeD.clipboard = keep;
	2284	+ Grafreed.clipboard = keep;
1912	2285	} else
1913	2286	if (source == cloneItem)
1914	2287	{
..	..	@@ -1926,13 +2299,17 @@
1926	2299	{
1927	2300	paste(false);
1928	2301	} else
	2302	+ if (source == pasteIntoItem)
	2303	+ {
	2304	+ pasteInto(true, false);
	2305	+ } else
1929	2306	if (source == pasteLinkItem)
1930	2307	{
1931		- pasteInto(false);
	2308	+ pasteInto(false, false);
1932	2309	} else
1933	2310	if (source == pasteCloneItem)
1934	2311	{
1935		- pasteInto(true);
	2312	+ pasteInto(true, true);
1936	2313	} else
1937	2314	if (source == pasteExpandItem)
1938	2315	{
..	..	@@ -2124,9 +2501,9 @@
2124	2501	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2502	// refreshContents();
2126	2503	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2504	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2505	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2506	+ Object3D content = Grafreed.clipboard.get(0);
2130	2507
2131	2508	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2509	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2511,11 @@
2134	2511	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2512	for (int i=0; i<group.selection.size(); i++)
2136	2513	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2514	+ boolean random = CameraPane.SWITCH;
	2515	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2516	group.selection.get(i).linkVerticesThis(content);
2140	2517	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2518	+ CameraPane.SWITCH = random;
2142	2519	}
2143	2520	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2521	refreshContents();
..	..	@@ -2148,20 +2525,20 @@
2148	2525	{
2149	2526	for (int i=0; i<group.selection.size(); i++)
2150	2527	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2528	+ boolean random = CameraPane.SWITCH;
	2529	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2530	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2531	+ CameraPane.SWITCH = random;
2155	2532	}
2156	2533
2157	2534	refreshContents();
2158	2535	} else
2159	2536	if (source == relinkverticesItem)
2160	2537	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2538	+ boolean random = CameraPane.SWITCH;
	2539	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2540	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2541	+ CameraPane.SWITCH = random;
2165	2542
2166	2543	refreshContents();
2167	2544	} else
..	..	@@ -2176,9 +2553,9 @@
2176	2553	} else
2177	2554	if (source == setMasterItem)
2178	2555	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2556	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2557	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2182	2559
2183	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2561	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2568,9 @@
2191	2568	{
2192	2569	if (group.selection.size() == 1)
2193	2570	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2571	+ if (Grafreed.clipboard.size() == 1)
2195	2572	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2197	2574
2198	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2576	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2587,7 @@
2210	2587	{
2211	2588	RevertMeshes();
2212	2589	} else
2213		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2214	2591	{
2215	2592	ResetAll();
2216	2593	} else
..	..	@@ -2230,9 +2607,9 @@
2230	2607	{
2231	2608	ClearSelection(true);
2232	2609	} else
2233		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2234	2611	{
2235		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2236	2613	} else
2237	2614	if (source == hideItem)
2238	2615	{
..	..	@@ -2250,16 +2627,16 @@
2250	2627	{
2251	2628	makeSomething(new Camera());
2252	2629	} else
2253		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2254	2631	{
2255	2632	group(new Composite());
2256	2633	} else
2257		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2258	2635	{
2259	2636	RandomNode random = new RandomNode();
2260	2637	group(random);
2261	2638	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2639	+ random.name = random.get(0).name + "Switch";
2263	2640	} else
2264	2641	if (source == physicsItem)
2265	2642	{
..	..	@@ -2356,7 +2733,7 @@
2356	2733	{
2357	2734	group(new cLinker());
2358	2735	} else
2359		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2360	2737	{
2361	2738	group(new TextureNode());
2362	2739	} else
..	..	@@ -2376,7 +2753,7 @@
2376	2753	{
2377	2754	CastShadow(2);
2378	2755	} else
2379		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2757	{
2381	2758	//ungroup();
2382	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2398,7 +2775,7 @@
2398	2775	} else
2399	2776	if (source == genNormalsMESHItem)
2400	2777	{
2401		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2402	2779	} else
2403	2780	if (source == genNormalsORGANItem)
2404	2781	{
..	..	@@ -2463,6 +2840,22 @@
2463	2840	if (source == unmarkleavesItem)
2464	2841	{
2465	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2466	2859	} else
2467	2860	if (source == flipVItem)
2468	2861	{
..	..	@@ -2548,9 +2941,13 @@
2548	2941	{
2549	2942	SmoothMesh();
2550	2943	} else
2551		- if (source == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2552	2945	{
2553	2946	TransformGeometry();
	2947	+ } else
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
2554	2951	} else
2555	2952	if (source == resetTransformItem)
2556	2953	{
..	..	@@ -2558,7 +2955,11 @@
2558	2955	} else
2559	2956	if (source == resetCentroidItem)
2560	2957	{
2561		- ResetCentroid();
	2958	+ ResetCentroid(true);
	2959	+ } else
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
2562	2963	} else
2563	2964	if (source == resetParentItem)
2564	2965	{
..	..	@@ -2690,6 +3091,10 @@
2690	3091	if (source == twoButton)
2691	3092	{
2692	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2693	3098	// bug
2694	3099	//gridPanel.setDividerLocation(1.0);
2695	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3125,33 @@
2720	3125	// centralPanel.setVisible(true);
2721	3126	// XYZPanel.setVisible(false);
2722	3127	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3128	+ bigThree.add(centralPanel);
2724	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2725	3148	} else
2726	3149	if (source == threeButton)
2727	3150	{
2728	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2729	3155
2730	3156	// bigThree.remove(scenePanel);
2731	3157	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3181,18 @@
2755	3181	// centralPanel.setVisible(true);
2756	3182	// XYZPanel.setVisible(true);
2757	3183	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3184	+ bigThree.add(centralPanel);
	3185	+ bigThree.add(XYZPanel);
2760	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2761	3189	} else
2762	3190	if (source == fourButton)
2763	3191	{
2764	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2765	3196
2766	3197	// bigThree.remove(scenePanel);
2767	3198	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3222,17 @@
2791	3222	// centralPanel.setVisible(false);
2792	3223	// XYZPanel.setVisible(false);
2793	3224	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3225	+ bigThree.add(scenePanel);
2795	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2796	3229	} else
2797	3230	if (source == sixButton)
2798	3231	{
2799	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2800	3236
2801	3237	// bigThree.remove(scenePanel);
2802	3238	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3262,18 @@
2826	3262	// centralPanel.setVisible(true);
2827	3263	// XYZPanel.setVisible(false);
2828	3264	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3265	+ bigThree.add(scenePanel);
	3266	+ bigThree.add(centralPanel);
2831	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2832	3270	} else
2833	3271	if (source == sevenButton)
2834	3272	{
2835	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2836	3277
2837	3278	// bigThree.remove(scenePanel);
2838	3279	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3303,12 @@
2862	3303	// centralPanel.setVisible(true);
2863	3304	// XYZPanel.setVisible(true);
2864	3305	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3306	+ bigThree.add(scenePanel);
	3307	+ bigThree.add(centralPanel);
	3308	+ bigThree.add(XYZPanel);
2868	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2869	3312	} else
2870	3313	if (source == rootButton)
2871	3314	{
..	..	@@ -2877,6 +3320,7 @@
2877	3320	EditObject(obj);
2878	3321	}
2879	3322
	3323	+ cameraView.requestFocusInWindow();
2880	3324	refreshContents(true);
2881	3325	} else
2882	3326	if (source == closeButton)
..	..	@@ -2886,22 +3330,37 @@
2886	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3331	{
2888	3332	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2891	3341	buttonGroup.remove(ab);
2892	3342	radioPanel.remove(ab);
2893	3343
2894		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2895	3346	// ab.GetObject().objectUI = null; // ?????????
2896	3347
2897	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3349	break;
2899	3350	}
2900	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2901	3354	refreshContents(true);
2902	3355	} else
2903	3356	if (source == editItem \|\| source == editButton)
2904	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2905	3364	EditSelection(false);
2906	3365	} else
2907	3366	if (source == uneditButton)
..	..	@@ -2911,12 +3370,13 @@
2911	3370	Object3D child = (Object3D)e.nextElement();
2912	3371	if(child.editWindow != null)
2913	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2914	3374	child.CloseUI();
2915	3375	listUI.remove(child);
2916	3376
2917		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2918	3378	}
2919		- objEditor.ctrlPanel.revalidate();
	3379	+ objEditor.ctrlPanel.FlushUI();
2920	3380	//objEditor.jTree.clearSelection();
2921	3381	//objEditor.ResetSliders();
2922	3382	refreshContents(true);
..	..	@@ -2927,6 +3387,7 @@
2927	3387	//copy.ClearUI();
2928	3388	for (Object3D obj : listUI)
2929	3389	{
	3390	+ obj.pinned = false;
2930	3391	obj.CloseUI();
2931	3392	}
2932	3393	listUI.clear();
..	..	@@ -2936,7 +3397,7 @@
2936	3397	{
2937	3398	assert(copy == group);
2938	3399
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3401
2941	3402	for (Object3D obj : listUI)
2942	3403	{
..	..	@@ -3000,20 +3461,44 @@
3000	3461	frontView.object = group;
3001	3462	sideView.object = group;
3002	3463	}
3003		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
3004	3469	/*
3005	3470	currentLayout = radio.layout;
3006	3471	if (currentLayout == null)
3007	3472	currentLayout = sevenButton;
3008	3473	*/
3009	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3010	3480	keepparent = group.parent;
3011	3481	// PARENT = NULL or not???
3012	3482	//group.parent = null; // ROOT
3013	3483	//group.attributes = -1;
3014	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3015	3487	refreshContents(true);
3016		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3017	3502	else
3018	3503	{
3019	3504	//return super.action(event, arg);
..	..	@@ -3022,7 +3507,6 @@
3022	3507	}
3023	3508
3024	3509	boolean useclient = false;
3025		- cRadio radio;
3026	3510
3027	3511	void ToggleRoot()
3028	3512	{
..	..	@@ -3074,6 +3558,28 @@
3074	3558	refreshContents();
3075	3559	}
3076	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
3077	3583
3078	3584	void ResetTransform()
3079	3585	{
..	..	@@ -3186,7 +3692,7 @@
3186	3692	refreshContents();
3187	3693	}
3188	3694
3189		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3190	3696	{
3191	3697	Object3D obj;
3192	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3707,16 @@
3201	3707	LA.matIdentity(Object3D.mat);
3202	3708	obj.getBounds(minima, maxima, false);
3203	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3207	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3210	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3745,8 @@
3235	3745
3236	3746	int size = obj.MemorySize();
3237	3747
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3750	}
3240	3751	}
3241	3752	catch (Exception e)
..	..	@@ -3272,9 +3783,9 @@
3272	3783	obj = (Object3D)e.nextElement();
3273	3784
3274	3785	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3786	+ Grafreed.AnalyzeObject(obj);
3276	3787	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3788	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3789
3279	3790	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3791	}
..	..	@@ -3316,6 +3827,13 @@
3316	3827	void GenNormals(boolean crease)
3317	3828	{
3318	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3319	3837
3320	3838	refreshContents();
3321	3839	}
..	..	@@ -3488,8 +4006,8 @@
3488	4006
3489	4007	void ParseVertices()
3490	4008	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4009	+ boolean epsequal = Grafreed.epsequal;
	4010	+ Grafreed.epsequal = true;
3493	4011
3494	4012	for (int i=0; i<group.selection.size(); i++)
3495	4013	{
..	..	@@ -3514,7 +4032,7 @@
3514	4032	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4033	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4034
3517		- g.add(GrafreeD.clipboard);
	4035	+ g.add(Grafreed.clipboard);
3518	4036
3519	4037	buffer.add(g);
3520	4038	}
..	..	@@ -3529,7 +4047,7 @@
3529	4047	makeSomething(buffer, i==group.selection.size()-1);
3530	4048	}
3531	4049
3532		- GrafreeD.epsequal = epsequal;
	4050	+ Grafreed.epsequal = epsequal;
3533	4051
3534	4052	refreshContents();
3535	4053	}
..	..	@@ -3547,7 +4065,16 @@
3547	4065	String pigment = Object3D.GetPigment(tex);
3548	4066	//String bump = Object3D.GetBump(tex);
3549	4067
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3551	4078
3552	4079	double s = v.s;
3553	4080
..	..	@@ -3635,11 +4162,11 @@
3635	4162
3636	4163	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4164
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4167	lowres.linkVerticesThis(null);
3641	4168	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3643	4170
3644	4171	System.err.flush();
3645	4172
..	..	@@ -3679,7 +4206,7 @@
3679	4206	return;
3680	4207
3681	4208	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4209	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4210
3684	4211	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4212
..	..	@@ -3873,9 +4400,9 @@
3873	4400
3874	4401	void ClipMesh()
3875	4402	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4404	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4405	+ Object3D content = Grafreed.clipboard.get(0);
3879	4406
3880	4407	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4408	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4411,7 @@
3884	4411	// {
3885	4412	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4413	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4414	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4415	}
3889	4416	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4417	System.out.println("DONE.");
..	..	@@ -3931,6 +4458,18 @@
3931	4458	void MarkLeaves(boolean hide)
3932	4459	{
3933	4460	group.selection.MarkLeaves(hide);
	4461	+ refreshContents();
	4462	+ }
	4463	+
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
3934	4473	refreshContents();
3935	4474	}
3936	4475
..	..	@@ -4005,10 +4544,6 @@
4005	4544	// }
4006	4545	// }
4007	4546
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4547	void EditSelection(boolean newWindow)
4013	4548	{
4014	4549	// aConstraints.gridy = 0;
..	..	@@ -4016,10 +4551,10 @@
4016	4551	{
4017	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4555
4021	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4023	4558	{
4024	4559	// if (!(elem instanceof Composite))
4025	4560	// newWindow = false;
..	..	@@ -4101,7 +4636,8 @@
4101	4636	//new Exception().printStackTrace();
4102	4637
4103	4638	freezemodel = true;
4104		-
	4639	+ ClearUnpinned();
	4640	+
4105	4641	/**/
4106	4642	//switch (event.id)
4107	4643	{
..	..	@@ -4109,7 +4645,6 @@
4109	4645	//case 702: // Event.LIST_DESELECT
4110	4646	group.deselectAll();
4111	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4648	if (tps != null)
4114	4649	{
4115	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4653,39 @@
4118	4653
4119	4654	//if (child.parent != null)
4120	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4121	4657	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4658	}
4126	4659	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4660	+// else
	4661	+// {
	4662	+// objEditor.SetMaterial(group); // .GetMaterial());
	4663	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4664	+// System.err.println("info : " + group.GetPath());
	4665	+// }
4133	4666
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4668	CameraPane.flash = true;
4138	4669
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4671	// a camera
4141	4672	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4144	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4680	}
4147	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4148	4689	refreshContents();
4149	4690	//return true;
4150	4691	}
..	..	@@ -4153,6 +4694,35 @@
4153	4694
4154	4695	freezemodel = false;
4155	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4156	4726
4157	4727	void linkSomething(Object3D thing)
4158	4728	{
..	..	@@ -4224,16 +4794,19 @@
4224	4794	{
4225	4795	if (group.selection.isEmpty())
4226	4796	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4797	+
	4798	+ Grafreed.clipboardIsTempGroup = false;
4228	4799	Composite tGroup = null;
4229	4800	if (group.selection.size() > 0) // 1)
4230	4801	{
4231	4802	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4803	+ Grafreed.clipboardIsTempGroup = true;
4233	4804	}
4234	4805
4235	4806	if (cut)
4236	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4237	4810	//int indices[] = jList.getSelectedIndices();
4238	4811	//for (int i = indices.length - 1; i >= 0; i--)
4239	4812	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4842,16 @@
4269	4842	//System.out.println("cut " + child);
4270	4843	//System.out.println("parent = " + child.parent);
4271	4844	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4845	+ if (Grafreed.clipboardIsTempGroup)
4273	4846	tGroup.add/Child/(tmp);
4274	4847	else
4275		- GrafreeD.clipboard = tmp;
	4848	+ Grafreed.clipboard = tmp;
4276	4849	}
4277	4850	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4851	+ if (Grafreed.clipboardIsTempGroup)
4279	4852	tGroup.add/Child/(child);
4280	4853	else
4281		- GrafreeD.clipboard = child;
	4854	+ Grafreed.clipboard = child;
4282	4855	}
4283	4856
4284	4857	//ResetModel();
..	..	@@ -4310,21 +4883,23 @@
4310	4883	//System.out.println("cut " + elem);
4311	4884	//System.out.println("parent = " + elem.parent);
4312	4885	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4886	+ if (Grafreed.clipboardIsTempGroup)
4314	4887	tGroup.add/Child/(tmp);
4315	4888	else
4316		- GrafreeD.clipboard = tmp;
	4889	+ Grafreed.clipboard = tmp;
4317	4890	}
4318	4891	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4892	+ if (Grafreed.clipboardIsTempGroup)
4320	4893	tGroup.add/Child/(child);
4321	4894	else
4322		- GrafreeD.clipboard = child;
	4895	+ Grafreed.clipboard = child;
4323	4896	}
4324	4897
4325	4898	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4899	+
	4900	+ if (Grafreed.clipboardIsTempGroup)
	4901	+ Grafreed.clipboard = tGroup;
	4902	+
4328	4903	if (cut)
4329	4904	{
4330	4905	ResetModel();
..	..	@@ -4338,7 +4913,7 @@
4338	4913	// return;
4339	4914	boolean first = true;
4340	4915
4341		- if (GrafreeD.clipboardIsTempGroup)
	4916	+ if (Grafreed.clipboardIsTempGroup)
4342	4917	{
4343	4918	Composite temp;
4344	4919
..	..	@@ -4349,7 +4924,7 @@
4349	4924	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4925	*/
4351	4926	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4927	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4928	{
4354	4929	Object3D child = (Object3D)e.nextElement();
4355	4930
..	..	@@ -4383,21 +4958,21 @@
4383	4958	//Object3D cb = Applet3D.clipboard;
4384	4959	//temp.addChild(cb);
4385	4960	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4961	+ assert(Grafreed.clipboard.parent == null);
	4962	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4963	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4964	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4965	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4966	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4967	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4968	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4969	}
4395	4970
4396	4971	ResetModel();
4397	4972	refreshContents();
4398	4973	}
4399	4974
4400		- void pasteInto(boolean copyit)
	4975	+ void pasteInto(boolean copyit, boolean clone)
4401	4976	{
4402	4977	// if (GrafreeD.clipboard == null)
4403	4978	// return;
..	..	@@ -4426,15 +5001,22 @@
4426	5001	if (copyit)
4427	5002	{
4428	5003	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5004	+ if (clone)
	5005	+ {
	5006	+ CloneClipboard(false); // sept 2014
	5007	+ }
	5008	+ else
	5009	+ {
	5010	+ paste(false);
	5011	+ }
4430	5012	}
4431	5013	else
4432	5014	{
4433	5015	boolean first = true;
4434	5016
4435		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4436	5018	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5019	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5020	Object3D copy;
4439	5021	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5022	{
..	..	@@ -4444,7 +5026,7 @@
4444	5026	}
4445	5027	} else
4446	5028	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5029	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5030	}
4449	5031	}
4450	5032	}
..	..	@@ -4849,21 +5431,6 @@
4849	5431	}
4850	5432	*/
4851	5433
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5434	/*
4868	5435	public void Callback(Object obj)
4869	5436	{
..	..	@@ -4887,26 +5454,9 @@
4887	5454	}
4888	5455	*/
4889	5456
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5457	String GetFile(String dialogName)
4908	5458	{
4909		- if (GrafreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4910	5460	{
4911	5461	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5462	browser.show();
..	..	@@ -4970,10 +5520,36 @@
4970	5520	cButton flashSelectionButton;
4971	5521	cButton editButton;
4972	5522	cButton uneditButton;
	5523	+ JCheckBox allParamsButton;
4973	5524	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5525	cButton unselectButton;
4976	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
	5533	+ cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
	5552	+
4977	5553	cButton screenfitButton;
4978	5554	cButton screenfitpointButton;
4979	5555	cButton snapobjectButton;
..	..	@@ -4985,14 +5561,6 @@
4985	5561
4986	5562	cButton setsupportButton;
4987	5563
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	5564	//
4997	5565	//Composite
4998	5566	Object3D // to do !!
..	..	@@ -5002,9 +5570,11 @@
5002	5570	//JTree jTree;
5003	5571	private MenuItem lookAtItem;
5004	5572	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5006	5574	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
5008	5578	private MenuItem cloneItem;
5009	5579	private MenuItem cloneSupportItem;
5010	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5587,7 @@
5017	5587	private MenuItem linkverticesItem;
5018	5588	private MenuItem relinkverticesItem;
5019	5589	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5021	5591	private MenuItem stepAllItem;
5022	5592	private MenuItem revertMeshItem;
5023	5593	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5598,7 @@
5028	5598	private MenuItem mergeGeometriesItem;
5029	5599	private MenuItem copyItem;
5030	5600	private MenuItem pasteItem;
	5601	+ private MenuItem pasteIntoItem;
5031	5602	private MenuItem pasteLinkItem;
5032	5603	private MenuItem pasteCloneItem;
5033	5604	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5637,10 @@
5066	5637	private MenuItem showleavesItem;
5067	5638	private MenuItem markleavesItem;
5068	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5069	5644
5070	5645	private MenuItem flipVItem;
5071	5646	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5652,17 @@
5077	5652	private MenuItem panoTexturesItem;
5078	5653
5079	5654	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
5081	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
5082	5659	private MenuItem hideItem;
5083	5660	private MenuItem grabItem;
5084	5661	private MenuItem backItem;
5085	5662	private MenuItem frontItem;
5086	5663	private MenuItem cameraItem;
5087	5664	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5089	5666	private MenuItem physicsItem;
5090	5667	private MenuItem frameselectorItem;
5091	5668	private MenuItem scriptNodeItem;
..	..	@@ -5125,7 +5702,7 @@
5125	5702	private MenuItem blobItem;
5126	5703	private MenuItem latheItem;
5127	5704	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5705	+ private MenuItem overlayItem;
5129	5706	private MenuItem meshItem;
5130	5707	// private MenuItem meshGroupItem;
5131	5708	private MenuItem springItem;
..	..	@@ -5147,11 +5724,6 @@
5147	5724	private MenuItem doubleItem;
5148	5725	private MenuItem tripleItem;
5149	5726
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5727	private MenuItem computeAOItem;
5156	5728	private MenuItem recompileItem;
5157	5729	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5733,8 @@
5161	5733	private MenuItem analyzeItem;
5162	5734	private MenuItem dumpItem;
5163	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5164	5740	}