~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,213 @@
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 = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Edit selection");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Unedit selection");
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("Edit all params");
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	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
	789	+
540	790	// oe.aConstraints.gridx += 1;
541	791	// oe.aConstraints.weighty = 0;
542	792	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +798,22 @@
548	798	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	799	// gcButton.addActionListener(this);
550	800
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;
	801	+ cGridBag jSPPanel = new cGridBag();
	802	+
	803	+ JScrollPane jSP;
562	804	//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);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	806	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	807
	808	+ oe.treePanel.add(jSPPanel);
	809	+ oe.treePanel.Return();
	810	+
	811	+ oe.treePanel.add(copyOptionsPanel);
	812	+ oe.treePanel.Return();
	813	+
	814	+// mainPanel.setDividerLocation(0.5); //1.0);
	815	+// mainPanel.setResizeWeight(0.5);
	816	+
585	817	//jList.addListSelectionListener(this);
586	818	oe.jTree.addTreeSelectionListener(this);
587	819	//jTree.setRootVisible(false);
..	..	@@ -604,83 +836,139 @@
604	836	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	837	}
606	838
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	839	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	840	{
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");
617		- supportCB.addItemListener(this);
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
618	844
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
622	848
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
	855	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	856	boxCB.setToolTipText("Display bounding boxes");
640	857	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	858	+
	859	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	860	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	861	zoomBoxCB.addItemListener(this);
645	862
	863	+ if (true) // Globals.ADVANCED)
	864	+ {
	865	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	866	+ supportCB.setToolTipText("Enable rigging");
	867	+ supportCB.addItemListener(this);
	868	+
	869	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	870	+ // localCB.addItemListener(this);
	871	+
	872	+ panel.Return();
	873	+
	874	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	875	+ crowdCB.setToolTipText("Used for crowds");
	876	+ crowdCB.addItemListener(this);
	877	+
	878	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	879	+ smoothCB.setToolTipText("Snapping delay");
	880	+ smoothCB.addItemListener(this);
	881	+
	882	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	883	+ slowCB.setToolTipText("Smooth interpolation");
	884	+ slowCB.addItemListener(this);
	885	+
646	886	// constraints.gridy += 1;
647	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	888	// speakerMocapCB.addItemListener(this);
649	889
	890	+ panel.Return();
	891	+
650	892	if (false)
651	893	{
652	894	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	895	+ //constraints.gridy += 1;
	896	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	897	speakerCameraCB.addItemListener(this);
656	898
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	899	+ //constraints.gridy += 1;
	900	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	901	speakerFocusCB.addItemListener(this);
660	902
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	903	+ //constraints.gridy += 1;
	904	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
664	907	}
665	908
666	909	//constraints.gridx += 1;
667	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	911	// debugCB.addItemListener(this);
669	912
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
	917	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
672	919	oeilCB.addItemListener(this);
673	920
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
	941	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	942	lookAtCB.setToolTipText("Look-at target");
677	943	lookAtCB.addItemListener(this);
	944	+ }
	945	+
	946	+ }
	947	+
	948	+ cGridBag fill = new cGridBag();
	949	+ fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
	954	+
	955	+ panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
678	958
679	959	}
680	960
681	961	void EditObject(Object3D obj)
682	962	{
683	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
684	972	radioButton.SetObject(obj);
685	973	radioButton.layout = sevenButton;
686	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +977,11 @@
689	977	buttonGroup.add(radioButton);
690	978	radioButton.doClick();
691	979	}
	980	+
692	981	void SetupViews(ObjEditor oe)
693	982	{
	983	+ theFrame = this;
	984	+
694	985	oe.SetupViews();
695	986
696	987	System.out.println("SetupViews");
..	..	@@ -699,23 +990,27 @@
699	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	991	}
701	992
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;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
713	1005	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
719	1014
720	1015	// static int COLOR = 1;
721	1016	// static int MATERIAL = 2;
..	..	@@ -723,9 +1018,9 @@
723	1018
724	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1020
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
729	1024
730	1025	public void itemStateChanged(ItemEvent e)
731	1026	{
..	..	@@ -753,6 +1048,7 @@
753	1048	} else if(e.getSource() == liveCB)
754	1049	{
755	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
756	1052	}
757	1053	else if(e.getSource() == supportCB)
758	1054	{
..	..	@@ -817,6 +1113,14 @@
817	1113	{
818	1114	cameraView.ToggleOeil();
819	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
820	1124	else if(e.getSource() == lookAtCB)
821	1125	{
822	1126	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1137,8 @@
833	1137
834	1138	/**/
835	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1143	// We can't move the root node or an empty selection
839	1144	return;
..	..	@@ -905,7 +1210,9 @@
905	1210	// objEditor.DropFile((java.io.File[]) object, true);
906	1211	// return;
907	1212	// }
908		- if (string.charAt(0) == '/')
	1213	+
	1214	+ // File path for Mac and Windows
	1215	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1216	{
910	1217	// file(s)
911	1218	String[] names = string.split("\n");
..	..	@@ -932,7 +1239,7 @@
932	1239
933	1240	flashIt = false;
934	1241	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1242	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1243	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1244
938	1245	if (group.selection.size() == 1)
..	..	@@ -948,23 +1255,33 @@
948	1255
949	1256	assert target == objEditor.jTree;
950	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
951	1259	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1261	} catch (Exception e) {
954	1262	System.out.println("destinationPath : " + destinationPath);
955	1263	return;
956	1264	}
957	1265
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
959	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
960	1277	loadClipboard(true);
961	1278	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1279	+ pasteInto(false, false);
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
968	1285	}
969	1286	public void dropActionChanged(DropTargetDragEvent dtde)
970	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1386,104 @@
1069	1386	{
1070	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1388	//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);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1084	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1408	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
	1413	+ if (Globals.ADVANCED)
	1414	+ {
1088	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1416	ragdollItem.addActionListener(this);
1090	1417	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1418	ragdoll2Item.addActionListener(this);
	1419	+ }
1092	1420	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1421	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1422	meshItem.addActionListener(this);
1095	1423	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1424	// meshGroupItem.addActionListener(this);
	1425	+ if (Globals.ADVANCED)
	1426	+ {
1097	1427	springItem = menu.add(new MenuItem("Spring"));
1098	1428	springItem.addActionListener(this);
1099	1429	flagItem = menu.add(new MenuItem("Flag"));
1100	1430	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	1431	blobItem = menu.add(new MenuItem("Blob"));
1106	1432	blobItem.addActionListener(this);
1107	1433	latheItem = menu.add(new MenuItem("Lathe"));
1108	1434	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1435	+ }
	1436	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1437	+ bezierItem.addActionListener(this);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1111	1442	menu.add("-");
1112	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1444	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1116	1447	doubleItem = menu.add(new MenuItem("Fork"));
1117	1448	doubleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1118	1451	tripleItem = menu.add(new MenuItem("Trident"));
1119	1452	tripleItem.addActionListener(this);
	1453	+ }
1120	1454	}
1121	1455
1122	1456	void buildToolsMenu(Menu menu)
1123	1457	{
1124	1458	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1459	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1460	+ animationItem.setState(Globals.ANIMATION);
1127	1461
1128	1462	menu.add("-");
1129	1463	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1464	parseverticesItem.addActionListener(this);
1131	1465	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1466	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1467	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1468	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1469	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1470	reduceMorphItem.addActionListener(this);
1139	1471	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1472	reduce34MorphItem.addActionListener(this);
1141		-
	1473	+ menu.add("-");
1142	1474	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1475	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1476
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1480	+ mirrorItem.addActionListener(this);
	1481	+ menu.add("-");
1146	1482	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1483	memoryItem.addActionListener(this);
1148	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1485	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1487	dumpItem.addActionListener(this);
1152	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1489	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1501,7 @@
1165	1501	menu.add("-");
1166	1502	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1503	editScriptItem.addActionListener(this);
	1504	+ }
1168	1505	}
1169	1506
1170	1507	void ScreenFit()
..	..	@@ -1287,6 +1624,7 @@
1287	1624	shadow.material = new cMaterial(obj.material);
1288	1625	shadow.material.diffuse = 0.0001f;
1289	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1290	1628
1291	1629	makeSomething(shadow);
1292	1630	}
..	..	@@ -1493,9 +1831,9 @@
1493	1831
1494	1832	void Overwrite(int mask)
1495	1833	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1834	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1835	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1836	+ Object3D content = Grafreed.clipboard.get(0);
1499	1837
1500	1838	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1839	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1872,7 @@
1534	1872	{
1535	1873	ScreenFit();
1536	1874	} else
1537		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1538	1876	{
1539	1877	cVector v1 = new cVector();
1540	1878	cVector v2 = new cVector();
..	..	@@ -1543,11 +1881,11 @@
1543	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1882	objEditor.cameraView.repaint();
1545	1883	} else
1546		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1547	1885	{
1548	1886	makeSomething(new Box());
1549	1887	} else
1550		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1551	1889	{
1552	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +1964,27 @@
1626	1964
1627	1965	makeSomething(obj);
1628	1966	} else
1629		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1630	1968	{
1631	1969	makeSomething(new Grid());
1632	1970	} else
1633		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	1972	{
1635	1973	makeSomething(new Sphere());
1636	1974	} else
1637		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1638	1976	{
1639	1977	makeSomething(new Cone());
1640	1978	} else
1641		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1642	1980	{
1643	1981	makeSomething(new Torus());
1644	1982	} else
1645		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1646	1984	{
1647	1985	makeSomething(new Superellipsoid());
1648	1986	} else
1649		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1650	1988	{
1651	1989	makeSomething(new Klein());
1652	1990	} else
..	..	@@ -1666,7 +2004,7 @@
1666	2004	{
1667	2005	makeSomething(new BezierSurface());
1668	2006	} else
1669		- if (source == checkerItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1670	2008	{
1671	2009	/*
1672	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2052,7 @@
1714	2052	s.setup();
1715	2053	makeSomething(s);
1716	2054	} else
1717		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1718	2056	{
1719	2057	makeSomething(new Light());
1720	2058	} else
..	..	@@ -1764,7 +2102,7 @@
1764	2102
1765	2103	group(g);
1766	2104	} else
1767		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1768	2106	{
1769	2107	Composite csg = new GroupLeaf();
1770	2108	csg.count = 5;
..	..	@@ -1800,23 +2138,6 @@
1800	2138	csg.addChild(child);
1801	2139	child.addChild(csg);
1802	2140	} 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	2141	if (source == computeAOItem)
1821	2142	{
1822	2143	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +2156,7 @@
1835	2156	if (source == invariantsItem)
1836	2157	{
1837	2158	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2159	+ Grafreed.grafreeD.universe.invariants();
1839	2160	} else
1840	2161	if (source == memoryItem)
1841	2162	{
..	..	@@ -1853,6 +2174,35 @@
1853	2174	if (source == dumpItem)
1854	2175	{
1855	2176	DumpObject();
	2177	+ } else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
	2201	+ } else
	2202	+ if (source == oneStepButton)
	2203	+ {
	2204	+ Globals.ONESTEP = true;
	2205	+ cameraView.repaint();
1856	2206	} else
1857	2207	if (source == screenfitButton)
1858	2208	{
..	..	@@ -1903,12 +2253,20 @@
1903	2253	{
1904	2254	loadClipboard(true);
1905	2255	} else
	2256	+ if (source == undoItem)
	2257	+ {
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
	2263	+ } else
1906	2264	if (source == duplicateItem)
1907	2265	{
1908		- Object3D keep = GrafreeD.clipboard;
	2266	+ Object3D keep = Grafreed.clipboard;
1909	2267	loadClipboard(false);
1910	2268	paste(false);
1911		- GrafreeD.clipboard = keep;
	2269	+ Grafreed.clipboard = keep;
1912	2270	} else
1913	2271	if (source == cloneItem)
1914	2272	{
..	..	@@ -1926,13 +2284,17 @@
1926	2284	{
1927	2285	paste(false);
1928	2286	} else
	2287	+ if (source == pasteIntoItem)
	2288	+ {
	2289	+ pasteInto(true, false);
	2290	+ } else
1929	2291	if (source == pasteLinkItem)
1930	2292	{
1931		- pasteInto(false);
	2293	+ pasteInto(false, false);
1932	2294	} else
1933	2295	if (source == pasteCloneItem)
1934	2296	{
1935		- pasteInto(true);
	2297	+ pasteInto(true, true);
1936	2298	} else
1937	2299	if (source == pasteExpandItem)
1938	2300	{
..	..	@@ -2124,9 +2486,9 @@
2124	2486	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2487	// refreshContents();
2126	2488	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2489	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2490	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2491	+ Object3D content = Grafreed.clipboard.get(0);
2130	2492
2131	2493	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2494	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2496,11 @@
2134	2496	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2497	for (int i=0; i<group.selection.size(); i++)
2136	2498	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2501	group.selection.get(i).linkVerticesThis(content);
2140	2502	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2503	+ CameraPane.SWITCH = random;
2142	2504	}
2143	2505	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2506	refreshContents();
..	..	@@ -2148,20 +2510,20 @@
2148	2510	{
2149	2511	for (int i=0; i<group.selection.size(); i++)
2150	2512	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2513	+ boolean random = CameraPane.SWITCH;
	2514	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2515	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2516	+ CameraPane.SWITCH = random;
2155	2517	}
2156	2518
2157	2519	refreshContents();
2158	2520	} else
2159	2521	if (source == relinkverticesItem)
2160	2522	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2525	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2526	+ CameraPane.SWITCH = random;
2165	2527
2166	2528	refreshContents();
2167	2529	} else
..	..	@@ -2176,9 +2538,9 @@
2176	2538	} else
2177	2539	if (source == setMasterItem)
2178	2540	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2541	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2542	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2543	+ Object3D content = Grafreed.clipboard.get(0);
2182	2544
2183	2545	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2546	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2553,9 @@
2191	2553	{
2192	2554	if (group.selection.size() == 1)
2193	2555	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2556	+ if (Grafreed.clipboard.size() == 1)
2195	2557	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2197	2559
2198	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2561	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2572,7 @@
2210	2572	{
2211	2573	RevertMeshes();
2212	2574	} else
2213		- if (source == resetMeshItem)
	2575	+ if (source == resetAllItem)
2214	2576	{
2215	2577	ResetAll();
2216	2578	} else
..	..	@@ -2230,9 +2592,9 @@
2230	2592	{
2231	2593	ClearSelection(true);
2232	2594	} else
2233		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2234	2596	{
2235		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2236	2598	} else
2237	2599	if (source == hideItem)
2238	2600	{
..	..	@@ -2250,16 +2612,16 @@
2250	2612	{
2251	2613	makeSomething(new Camera());
2252	2614	} else
2253		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2254	2616	{
2255	2617	group(new Composite());
2256	2618	} else
2257		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2258	2620	{
2259	2621	RandomNode random = new RandomNode();
2260	2622	group(random);
2261	2623	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2624	+ random.name = random.get(0).name + "Switch";
2263	2625	} else
2264	2626	if (source == physicsItem)
2265	2627	{
..	..	@@ -2356,7 +2718,7 @@
2356	2718	{
2357	2719	group(new cLinker());
2358	2720	} else
2359		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2360	2722	{
2361	2723	group(new TextureNode());
2362	2724	} else
..	..	@@ -2376,7 +2738,7 @@
2376	2738	{
2377	2739	CastShadow(2);
2378	2740	} else
2379		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2742	{
2381	2743	//ungroup();
2382	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2398,7 +2760,7 @@
2398	2760	} else
2399	2761	if (source == genNormalsMESHItem)
2400	2762	{
2401		- GenNormals(true); // TODO
	2763	+ GenNormalsMESH();
2402	2764	} else
2403	2765	if (source == genNormalsORGANItem)
2404	2766	{
..	..	@@ -2463,6 +2825,22 @@
2463	2825	if (source == unmarkleavesItem)
2464	2826	{
2465	2827	MarkLeaves(false);
	2828	+ } else
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
2466	2844	} else
2467	2845	if (source == flipVItem)
2468	2846	{
..	..	@@ -2548,9 +2926,13 @@
2548	2926	{
2549	2927	SmoothMesh();
2550	2928	} else
2551		- if (source == transformgeometryItem)
	2929	+ if (source == transformGeometryItem)
2552	2930	{
2553	2931	TransformGeometry();
	2932	+ } else
	2933	+ if (source == transformChildrenItem)
	2934	+ {
	2935	+ TransformChildren();
2554	2936	} else
2555	2937	if (source == resetTransformItem)
2556	2938	{
..	..	@@ -2558,7 +2940,11 @@
2558	2940	} else
2559	2941	if (source == resetCentroidItem)
2560	2942	{
2561		- ResetCentroid();
	2943	+ ResetCentroid(true);
	2944	+ } else
	2945	+ if (source == resetCentroidXZItem)
	2946	+ {
	2947	+ ResetCentroid(false);
2562	2948	} else
2563	2949	if (source == resetParentItem)
2564	2950	{
..	..	@@ -2690,6 +3076,10 @@
2690	3076	if (source == twoButton)
2691	3077	{
2692	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2693	3083	// bug
2694	3084	//gridPanel.setDividerLocation(1.0);
2695	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2722,10 +3112,31 @@
2722	3112	bigThree.ClearUI();
2723	3113	bigThree.add(centralPanel);
2724	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2725	3133	} else
2726	3134	if (source == threeButton)
2727	3135	{
2728	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2729	3140
2730	3141	// bigThree.remove(scenePanel);
2731	3142	// bigThree.remove(centralPanel);
..	..	@@ -2758,10 +3169,15 @@
2758	3169	bigThree.add(centralPanel);
2759	3170	bigThree.add(XYZPanel);
2760	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2761	3174	} else
2762	3175	if (source == fourButton)
2763	3176	{
2764	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2765	3181
2766	3182	// bigThree.remove(scenePanel);
2767	3183	// bigThree.remove(centralPanel);
..	..	@@ -2793,10 +3209,15 @@
2793	3209	bigThree.ClearUI();
2794	3210	bigThree.add(scenePanel);
2795	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2796	3214	} else
2797	3215	if (source == sixButton)
2798	3216	{
2799	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2800	3221
2801	3222	// bigThree.remove(scenePanel);
2802	3223	// bigThree.remove(centralPanel);
..	..	@@ -2829,10 +3250,15 @@
2829	3250	bigThree.add(scenePanel);
2830	3251	bigThree.add(centralPanel);
2831	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2832	3255	} else
2833	3256	if (source == sevenButton)
2834	3257	{
2835	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
2836	3262
2837	3263	// bigThree.remove(scenePanel);
2838	3264	// bigThree.remove(centralPanel);
..	..	@@ -2866,6 +3292,8 @@
2866	3292	bigThree.add(centralPanel);
2867	3293	bigThree.add(XYZPanel);
2868	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2869	3297	} else
2870	3298	if (source == rootButton)
2871	3299	{
..	..	@@ -2877,6 +3305,7 @@
2877	3305	EditObject(obj);
2878	3306	}
2879	3307
	3308	+ cameraView.requestFocusInWindow();
2880	3309	refreshContents(true);
2881	3310	} else
2882	3311	if (source == closeButton)
..	..	@@ -2886,22 +3315,37 @@
2886	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3316	{
2888	3317	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
2891	3326	buttonGroup.remove(ab);
2892	3327	radioPanel.remove(ab);
2893	3328
2894		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
2895	3331	// ab.GetObject().objectUI = null; // ?????????
2896	3332
2897	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3334	break;
2899	3335	}
2900	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
2901	3339	refreshContents(true);
2902	3340	} else
2903	3341	if (source == editItem \|\| source == editButton)
2904	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
2905	3349	EditSelection(false);
2906	3350	} else
2907	3351	if (source == uneditButton)
..	..	@@ -2911,12 +3355,13 @@
2911	3355	Object3D child = (Object3D)e.nextElement();
2912	3356	if(child.editWindow != null)
2913	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
2914	3359	child.CloseUI();
2915	3360	listUI.remove(child);
2916	3361
2917		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
2918	3363	}
2919		- objEditor.ctrlPanel.revalidate();
	3364	+ objEditor.ctrlPanel.FlushUI();
2920	3365	//objEditor.jTree.clearSelection();
2921	3366	//objEditor.ResetSliders();
2922	3367	refreshContents(true);
..	..	@@ -2927,6 +3372,7 @@
2927	3372	//copy.ClearUI();
2928	3373	for (Object3D obj : listUI)
2929	3374	{
	3375	+ obj.pinned = true;
2930	3376	obj.CloseUI();
2931	3377	}
2932	3378	listUI.clear();
..	..	@@ -2936,7 +3382,7 @@
2936	3382	{
2937	3383	assert(copy == group);
2938	3384
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3386
2941	3387	for (Object3D obj : listUI)
2942	3388	{
..	..	@@ -3000,7 +3446,11 @@
3000	3446	frontView.object = group;
3001	3447	sideView.object = group;
3002	3448	}
3003		- group.editWindow = this;
	3449	+
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
	3453	+
3004	3454	/*
3005	3455	currentLayout = radio.layout;
3006	3456	if (currentLayout == null)
..	..	@@ -3012,8 +3462,23 @@
3012	3462	//group.parent = null; // ROOT
3013	3463	//group.attributes = -1;
3014	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
3015	3467	refreshContents(true);
3016		- }
	3468	+ } else if (event.getSource() == editCameraItem)
	3469	+ {
	3470	+ cameraView.ProtectCamera();
	3471	+ cameraView.repaint();
	3472	+ return;
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3474	+ {
	3475	+ cameraView.RevertCamera();
	3476	+ cameraView.repaint();
	3477	+ return;
	3478	+ // } else if (event.getSource() == textureButton)
	3479	+ // {
	3480	+ // return; // true;
	3481	+ }
3017	3482	else
3018	3483	{
3019	3484	//return super.action(event, arg);
..	..	@@ -3022,7 +3487,6 @@
3022	3487	}
3023	3488
3024	3489	boolean useclient = false;
3025		- cRadio radio;
3026	3490
3027	3491	void ToggleRoot()
3028	3492	{
..	..	@@ -3074,6 +3538,28 @@
3074	3538	refreshContents();
3075	3539	}
3076	3540
	3541	+ void TransformChildren()
	3542	+ {
	3543	+ Object3D obj;
	3544	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3545	+ {
	3546	+ obj = (Object3D)e.nextElement();
	3547	+ obj.KeepTextureMatrices();
	3548	+ obj.TransformChildren();
	3549	+ obj.RestoreTextureMatrices();
	3550	+
	3551	+// if (obj.parent == null)
	3552	+// {
	3553	+// System.out.println("NULL PARENT!");
	3554	+// new Exception().printStackTrace();
	3555	+// }
	3556	+// else
	3557	+// TouchTransform(obj);
	3558	+// //obj.parent.Touch();
	3559	+ }
	3560	+
	3561	+ refreshContents();
	3562	+ }
3077	3563
3078	3564	void ResetTransform()
3079	3565	{
..	..	@@ -3186,7 +3672,7 @@
3186	3672	refreshContents();
3187	3673	}
3188	3674
3189		- void ResetCentroid()
	3675	+ void ResetCentroid(boolean full)
3190	3676	{
3191	3677	Object3D obj;
3192	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3687,16 @@
3201	3687	LA.matIdentity(Object3D.mat);
3202	3688	obj.getBounds(minima, maxima, false);
3203	3689	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3690	+ if (full)
	3691	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3692	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3693	obj.TransformMesh(Object3D.mat);
	3694	+
3207	3695	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3696	+ if (full)
	3697	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3698	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3699	+
3210	3700	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3701	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3702	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3725,8 @@
3235	3725
3236	3726	int size = obj.MemorySize();
3237	3727
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3730	}
3240	3731	}
3241	3732	catch (Exception e)
..	..	@@ -3272,9 +3763,9 @@
3272	3763	obj = (Object3D)e.nextElement();
3273	3764
3274	3765	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3766	+ Grafreed.AnalyzeObject(obj);
3276	3767	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3768	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3769
3279	3770	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3771	}
..	..	@@ -3316,6 +3807,13 @@
3316	3807	void GenNormals(boolean crease)
3317	3808	{
3318	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
3319	3817
3320	3818	refreshContents();
3321	3819	}
..	..	@@ -3488,8 +3986,8 @@
3488	3986
3489	3987	void ParseVertices()
3490	3988	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3989	+ boolean epsequal = Grafreed.epsequal;
	3990	+ Grafreed.epsequal = true;
3493	3991
3494	3992	for (int i=0; i<group.selection.size(); i++)
3495	3993	{
..	..	@@ -3514,7 +4012,7 @@
3514	4012	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4013	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4014
3517		- g.add(GrafreeD.clipboard);
	4015	+ g.add(Grafreed.clipboard);
3518	4016
3519	4017	buffer.add(g);
3520	4018	}
..	..	@@ -3529,7 +4027,7 @@
3529	4027	makeSomething(buffer, i==group.selection.size()-1);
3530	4028	}
3531	4029
3532		- GrafreeD.epsequal = epsequal;
	4030	+ Grafreed.epsequal = epsequal;
3533	4031
3534	4032	refreshContents();
3535	4033	}
..	..	@@ -3547,7 +4045,16 @@
3547	4045	String pigment = Object3D.GetPigment(tex);
3548	4046	//String bump = Object3D.GetBump(tex);
3549	4047
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4048	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4049	+
	4050	+ try
	4051	+ {
	4052	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4053	+ }
	4054	+ catch (Exception e)
	4055	+ {
	4056	+ System.err.println("FAIL: " + node);
	4057	+ }
3551	4058
3552	4059	double s = v.s;
3553	4060
..	..	@@ -3635,11 +4142,11 @@
3635	4142
3636	4143	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4144
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4145	+ boolean random = CameraPane.SWITCH;
	4146	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4147	lowres.linkVerticesThis(null);
3641	4148	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4149	+ CameraPane.SWITCH = random;
3643	4150
3644	4151	System.err.flush();
3645	4152
..	..	@@ -3679,7 +4186,7 @@
3679	4186	return;
3680	4187
3681	4188	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4189	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4190
3684	4191	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4192
..	..	@@ -3873,9 +4380,9 @@
3873	4380
3874	4381	void ClipMesh()
3875	4382	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4383	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4384	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4385	+ Object3D content = Grafreed.clipboard.get(0);
3879	4386
3880	4387	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4388	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4391,7 @@
3884	4391	// {
3885	4392	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4393	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4394	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4395	}
3889	4396	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4397	System.out.println("DONE.");
..	..	@@ -3931,6 +4438,18 @@
3931	4438	void MarkLeaves(boolean hide)
3932	4439	{
3933	4440	group.selection.MarkLeaves(hide);
	4441	+ refreshContents();
	4442	+ }
	4443	+
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
3934	4453	refreshContents();
3935	4454	}
3936	4455
..	..	@@ -4005,10 +4524,6 @@
4005	4524	// }
4006	4525	// }
4007	4526
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4527	void EditSelection(boolean newWindow)
4013	4528	{
4014	4529	// aConstraints.gridy = 0;
..	..	@@ -4016,10 +4531,10 @@
4016	4531	{
4017	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4535
4021	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4537	+ if(elem != group \|\| !newWindow)
4023	4538	{
4024	4539	// if (!(elem instanceof Composite))
4025	4540	// newWindow = false;
..	..	@@ -4102,6 +4617,17 @@
4102	4617
4103	4618	freezemodel = true;
4104	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4105	4631	/**/
4106	4632	//switch (event.id)
4107	4633	{
..	..	@@ -4109,7 +4635,6 @@
4109	4635	//case 702: // Event.LIST_DESELECT
4110	4636	group.deselectAll();
4111	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4638	if (tps != null)
4114	4639	{
4115	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4643,39 @@
4118	4643
4119	4644	//if (child.parent != null)
4120	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4121	4647	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4648	}
4126	4649	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4650	+// else
	4651	+// {
	4652	+// objEditor.SetMaterial(group); // .GetMaterial());
	4653	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4654	+// System.err.println("info : " + group.GetPath());
	4655	+// }
4133	4656
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4658	CameraPane.flash = true;
4138	4659
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4661	// a camera
4141	4662	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
4144	4668	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4670	}
4147	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4148	4679	refreshContents();
4149	4680	//return true;
4150	4681	}
..	..	@@ -4153,6 +4684,33 @@
4153	4684
4154	4685	freezemodel = false;
4155	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4156	4714
4157	4715	void linkSomething(Object3D thing)
4158	4716	{
..	..	@@ -4224,16 +4782,19 @@
4224	4782	{
4225	4783	if (group.selection.isEmpty())
4226	4784	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4785	+
	4786	+ Grafreed.clipboardIsTempGroup = false;
4228	4787	Composite tGroup = null;
4229	4788	if (group.selection.size() > 0) // 1)
4230	4789	{
4231	4790	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4791	+ Grafreed.clipboardIsTempGroup = true;
4233	4792	}
4234	4793
4235	4794	if (cut)
4236	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
4237	4798	//int indices[] = jList.getSelectedIndices();
4238	4799	//for (int i = indices.length - 1; i >= 0; i--)
4239	4800	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4830,16 @@
4269	4830	//System.out.println("cut " + child);
4270	4831	//System.out.println("parent = " + child.parent);
4271	4832	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4833	+ if (Grafreed.clipboardIsTempGroup)
4273	4834	tGroup.add/Child/(tmp);
4274	4835	else
4275		- GrafreeD.clipboard = tmp;
	4836	+ Grafreed.clipboard = tmp;
4276	4837	}
4277	4838	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4839	+ if (Grafreed.clipboardIsTempGroup)
4279	4840	tGroup.add/Child/(child);
4280	4841	else
4281		- GrafreeD.clipboard = child;
	4842	+ Grafreed.clipboard = child;
4282	4843	}
4283	4844
4284	4845	//ResetModel();
..	..	@@ -4310,21 +4871,23 @@
4310	4871	//System.out.println("cut " + elem);
4311	4872	//System.out.println("parent = " + elem.parent);
4312	4873	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4874	+ if (Grafreed.clipboardIsTempGroup)
4314	4875	tGroup.add/Child/(tmp);
4315	4876	else
4316		- GrafreeD.clipboard = tmp;
	4877	+ Grafreed.clipboard = tmp;
4317	4878	}
4318	4879	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4880	+ if (Grafreed.clipboardIsTempGroup)
4320	4881	tGroup.add/Child/(child);
4321	4882	else
4322		- GrafreeD.clipboard = child;
	4883	+ Grafreed.clipboard = child;
4323	4884	}
4324	4885
4325	4886	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4887	+
	4888	+ if (Grafreed.clipboardIsTempGroup)
	4889	+ Grafreed.clipboard = tGroup;
	4890	+
4328	4891	if (cut)
4329	4892	{
4330	4893	ResetModel();
..	..	@@ -4338,7 +4901,7 @@
4338	4901	// return;
4339	4902	boolean first = true;
4340	4903
4341		- if (GrafreeD.clipboardIsTempGroup)
	4904	+ if (Grafreed.clipboardIsTempGroup)
4342	4905	{
4343	4906	Composite temp;
4344	4907
..	..	@@ -4349,7 +4912,7 @@
4349	4912	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4913	*/
4351	4914	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4915	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4916	{
4354	4917	Object3D child = (Object3D)e.nextElement();
4355	4918
..	..	@@ -4383,21 +4946,21 @@
4383	4946	//Object3D cb = Applet3D.clipboard;
4384	4947	//temp.addChild(cb);
4385	4948	//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());
	4949	+ assert(Grafreed.clipboard.parent == null);
	4950	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4951	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4952	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4953	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4954	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4955	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4956	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4957	}
4395	4958
4396	4959	ResetModel();
4397	4960	refreshContents();
4398	4961	}
4399	4962
4400		- void pasteInto(boolean copyit)
	4963	+ void pasteInto(boolean copyit, boolean clone)
4401	4964	{
4402	4965	// if (GrafreeD.clipboard == null)
4403	4966	// return;
..	..	@@ -4426,15 +4989,22 @@
4426	4989	if (copyit)
4427	4990	{
4428	4991	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4992	+ if (clone)
	4993	+ {
	4994	+ CloneClipboard(false); // sept 2014
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ paste(false);
	4999	+ }
4430	5000	}
4431	5001	else
4432	5002	{
4433	5003	boolean first = true;
4434	5004
4435		- if (GrafreeD.clipboardIsTempGroup)
	5005	+ if (Grafreed.clipboardIsTempGroup)
4436	5006	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5007	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5008	Object3D copy;
4439	5009	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5010	{
..	..	@@ -4444,7 +5014,7 @@
4444	5014	}
4445	5015	} else
4446	5016	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5017	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5018	}
4449	5019	}
4450	5020	}
..	..	@@ -4849,21 +5419,6 @@
4849	5419	}
4850	5420	*/
4851	5421
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	5422	/*
4868	5423	public void Callback(Object obj)
4869	5424	{
..	..	@@ -4887,26 +5442,9 @@
4887	5442	}
4888	5443	*/
4889	5444
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	5445	String GetFile(String dialogName)
4908	5446	{
4909		- if (GrafreeD.standAlone)
	5447	+ if (Grafreed.standAlone)
4910	5448	{
4911	5449	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5450	browser.show();
..	..	@@ -4970,10 +5508,36 @@
4970	5508	cButton flashSelectionButton;
4971	5509	cButton editButton;
4972	5510	cButton uneditButton;
	5511	+ JCheckBox allParamsButton;
4973	5512	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5513	cButton unselectButton;
4976	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
	5521	+ cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
	5540	+
4977	5541	cButton screenfitButton;
4978	5542	cButton screenfitpointButton;
4979	5543	cButton snapobjectButton;
..	..	@@ -4985,14 +5549,6 @@
4985	5549
4986	5550	cButton setsupportButton;
4987	5551
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	5552	//
4997	5553	//Composite
4998	5554	Object3D // to do !!
..	..	@@ -5002,9 +5558,11 @@
5002	5558	//JTree jTree;
5003	5559	private MenuItem lookAtItem;
5004	5560	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5006	5562	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
5008	5566	private MenuItem cloneItem;
5009	5567	private MenuItem cloneSupportItem;
5010	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5575,7 @@
5017	5575	private MenuItem linkverticesItem;
5018	5576	private MenuItem relinkverticesItem;
5019	5577	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5578	+ private MenuItem resetAllItem;
5021	5579	private MenuItem stepAllItem;
5022	5580	private MenuItem revertMeshItem;
5023	5581	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5586,7 @@
5028	5586	private MenuItem mergeGeometriesItem;
5029	5587	private MenuItem copyItem;
5030	5588	private MenuItem pasteItem;
	5589	+ private MenuItem pasteIntoItem;
5031	5590	private MenuItem pasteLinkItem;
5032	5591	private MenuItem pasteCloneItem;
5033	5592	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5625,10 @@
5066	5625	private MenuItem showleavesItem;
5067	5626	private MenuItem markleavesItem;
5068	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
5069	5632
5070	5633	private MenuItem flipVItem;
5071	5634	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5640,17 @@
5077	5640	private MenuItem panoTexturesItem;
5078	5641
5079	5642	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5643	+ private MenuItem resetCentroidXZItem;
5081	5644	private MenuItem resetTransformItem;
	5645	+ private MenuItem transformGeometryItem;
	5646	+ private MenuItem transformChildrenItem;
5082	5647	private MenuItem hideItem;
5083	5648	private MenuItem grabItem;
5084	5649	private MenuItem backItem;
5085	5650	private MenuItem frontItem;
5086	5651	private MenuItem cameraItem;
5087	5652	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5089	5654	private MenuItem physicsItem;
5090	5655	private MenuItem frameselectorItem;
5091	5656	private MenuItem scriptNodeItem;
..	..	@@ -5125,7 +5690,7 @@
5125	5690	private MenuItem blobItem;
5126	5691	private MenuItem latheItem;
5127	5692	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5693	+ private MenuItem overlayItem;
5129	5694	private MenuItem meshItem;
5130	5695	// private MenuItem meshGroupItem;
5131	5696	private MenuItem springItem;
..	..	@@ -5147,11 +5712,6 @@
5147	5712	private MenuItem doubleItem;
5148	5713	private MenuItem tripleItem;
5149	5714
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5715	private MenuItem computeAOItem;
5156	5716	private MenuItem recompileItem;
5157	5717	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5721,8 @@
5161	5721	private MenuItem analyzeItem;
5162	5722	private MenuItem dumpItem;
5163	5723	//boolean freezemodel = false;
	5724	+
	5725	+ Menu cameraMenu;
	5726	+ MenuItem editCameraItem;
	5727	+ MenuItem restoreCameraItem;
5164	5728	}