~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
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));
	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));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,30 +148,29 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
164	155	Menu menu;
165	156	oe.menuBar.add(menu = new Menu("Edit"));
166	157	//editItem = menu.add(new MenuItem("Edit"));
167	158	//editItem.addActionListener(this);
168		- 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"));
169	166	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	167	cloneItem = menu.add(new MenuItem("Clone"));
172	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
173	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	172	cloneSupportItem.addActionListener(this);
	173	+ }
175	174	menu.add("-");
176	175	cutItem = menu.add(new MenuItem("Cut"));
177	176	cutItem.addActionListener(this);
..	..	@@ -179,27 +178,123 @@
179	178	copyItem.addActionListener(this);
180	179	pasteItem = menu.add(new MenuItem("Paste"));
181	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
182	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	186	pasteLinkItem.addActionListener(this);
184	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	188	pasteCloneItem.addActionListener(this);
186	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
188	192	clearItem = menu.add(new MenuItem("Clear"));
189	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
190	198	clearAllItem = menu.add(new MenuItem("Clear All"));
191	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
192	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	+
193	289	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
198	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	293	revertMeshItem.addActionListener(this);
200	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	295	resetreferencesItem.addActionListener(this);
202	296	menu.add("-");
	297	+ }
203	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	299	overwriteGeoItem.addActionListener(this);
205	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +306,103 @@
211	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	307	overwriteUVItem.addActionListener(this);
213	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
214	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	312	generateMeshItem.addActionListener(this);
216	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	314	poseMeshItem.addActionListener(this);
218	315	menu.add("-");
	316	+ }
219	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	318	resetsupportItem.addActionListener(this);
221	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	320	linkverticesItem.addActionListener(this);
223	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
225	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	327	setMasterItem.addActionListener(this);
	328	+ }
227	329
228	330	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
231	333	backItem = menu.add(new MenuItem("Back"));
232	334	backItem.addActionListener(this);
233	335	frontItem = menu.add(new MenuItem("Front"));
234	336	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- 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"));
238	343	hideItem.addActionListener(this);
	344	+ }
239	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	346	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- 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	+ {
248	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	355	switchGeoItem.addActionListener(this);
250	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	357	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	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);
254	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	367	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	368	+ }
258	369
259	370	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
262	373	billboardItem = menu.add(new MenuItem("Billboard"));
263	374	billboardItem.addActionListener(this);
264	375	csgItem = menu.add(new MenuItem("CSG"));
265	376	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	378	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	380	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
272	386	linkerItem = menu.add(new MenuItem("Linker"));
273	387	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	388	attributeItem = menu.add(new MenuItem("Attribute"));
277	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
278	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	393	pointflowItem.addActionListener(this);
	394	+ }
280	395	menu.add("-");
281	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	397	resetTransformItem.addActionListener(this);
283	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	399	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- 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);
287	406
288	407	oe.menuBar.add(menu = new Menu("Geometry"));
289	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +413,11 @@
294	413	genNormalsCADItem.addActionListener(this);
295	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
297	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
299	421	stripifyItem = menu.add(new MenuItem("Stripify"));
300	422	stripifyItem.addActionListener(this);
301	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +439,34 @@
317	439	reduce34MeshItem.addActionListener(this);
318	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	441	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
324	450
325	451	oe.menuBar.add(menu = new Menu("Attributes"));
326	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	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);
328	458	menu.add("-");
329	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	460	liveleavesItem.addActionListener(this);
331	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
333	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	466	supportleavesItem.addActionListener(this);
335	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	468	unsupportleavesItem.addActionListener(this);
	469	+ }
337	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	471	hideleavesItem.addActionListener(this);
339	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +475,14 @@
342	475	markleavesItem.addActionListener(this);
343	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	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);
345	486	menu.add("-");
346	487	flipVItem = menu.add(new MenuItem("Flip V"));
347	488	flipVItem.addActionListener(this);
..	..	@@ -377,35 +518,40 @@
377	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	519	sortbynameItem.addActionListener(this);
379	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.
380	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	529	extractGeometriesItem.addActionListener(this);
382	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	531	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	532	+ }
388	533
389	534	oe.menuBar.add(menu = new Menu("Insert"));
390	535	buildCreateMenu(menu);
391	536
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	537	oe.menuBar.add(menu = new Menu("Tools"));
404	538	buildToolsMenu(menu);
405	539	}
406	540
407	541	void SetupUI2(ObjEditor oe)
408	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	+
409	555	//new Exception().printStackTrace();
410	556
411	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,110 +580,217 @@
434	580	oe.radioPanel.add(dummyButton);
435	581	oe.buttonGroup.add(dummyButton);
436	582	*/
437		- aConstraints.gridy += 1;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
438	586
439	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	588
441		- oe.aConstraints.gridwidth = 1;
442		- 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);
443	592
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
446	624	liveCB.addItemListener(this);
447	625
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450		- trackCB.setToolTipText("Enable tracking");
451		- trackCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ oneStepButton.setToolTipText("Animate one step forward");
	628	+ oneStepButton.addActionListener(this);
	629	+
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	631	+ fastCB.setToolTipText("Fast mode");
	632	+ fastCB.addItemListener(this);
	633	+
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	637	screenfitButton.setToolTipText("Screen fit");
456	638	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
	643	+
458	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	645	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	646
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472		- flashSelectionButton.setToolTipText("Show selection");
473		- flashSelectionButton.addActionListener(this);
	647	+ if (Globals.ADVANCED)
	648	+ {
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ snapobjectButton.addActionListener(this);
	651	+ snapobjectButton.setToolTipText("Snap Object");
	652	+ }
	653	+
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
474	655
475		- oe.toolbarPanel.add(new cButton(" ", false));
476		-
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	657	twoButton.setToolTipText("Show center view only");
484	658	twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	662	fourButton.addActionListener(this);
487	663	fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	665	sixButton.setToolTipText("2-column layout left");
490	666	sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	668	threeButton.setToolTipText("2-column layout right");
493	669	threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	671	sevenButton.setToolTipText("3-column layout");
496	672	sevenButton.addActionListener(this);
497	673	//
498	674
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ rootButton.setToolTipText("Edit selection in new tab");
501	677	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	678	+
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	680	closeButton.setToolTipText("Close tab");
505	681	closeButton.addActionListener(this);
506	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	683	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509		-
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512		- editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	684
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
	766	+ editButton.addActionListener(this);
	767	+
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
518	770	uneditButton.addActionListener(this);
519	771
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
532	774	allParamsButton.addActionListener(this);
533	775
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ clearPanelButton.setToolTipText("Clear edit panel");
	778	+ clearPanelButton.addActionListener(this);
	779	+
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ unselectButton.setToolTipText("Unselect");
539	782	unselectButton.addActionListener(this);
540	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
	793	+
541	794	// oe.aConstraints.gridx += 1;
542	795	// oe.aConstraints.weighty = 0;
543	796	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,40 +802,22 @@
549	802	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	803	// gcButton.addActionListener(this);
551	804
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	805	+ cGridBag jSPPanel = new cGridBag();
	806	+
	807	+ JScrollPane jSP;
563	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
565	810	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
570		-
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575		- colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578		- materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581		- textureCB.addItemListener(this);
582		-
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585	811
	812	+ oe.treePanel.add(jSPPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+ oe.treePanel.add(copyOptionsPanel);
	816	+ oe.treePanel.Return();
	817	+
	818	+// mainPanel.setDividerLocation(0.5); //1.0);
	819	+// mainPanel.setResizeWeight(0.5);
	820	+
586	821	//jList.addListSelectionListener(this);
587	822	oe.jTree.addTreeSelectionListener(this);
588	823	//jTree.setRootVisible(false);
..	..	@@ -607,47 +842,61 @@
607	842
608	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	844	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
619	848
620		- // constraints.gridy += 1;
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
	859	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	860	+ boxCB.setToolTipText("Display bounding boxes");
	861	+ boxCB.addItemListener(this);
	862	+
	863	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
	865	+ zoomBoxCB.addItemListener(this);
	866	+
	867	+ if (true) // Globals.ADVANCED)
	868	+ {
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
	876	+
621	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622	878	// localCB.addItemListener(this);
623	879
624		- //constraints.gridy += 1;
	880	+ panel.Return();
	881	+
625	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626	883	crowdCB.setToolTipText("Used for crowds");
627	884	crowdCB.addItemListener(this);
628	885
629		- //constraints.gridy += 1;
630	886	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631	887	smoothCB.setToolTipText("Snapping delay");
632	888	smoothCB.addItemListener(this);
633	889
634		- //constraints.gridy += 1;
635	890	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636	891	slowCB.setToolTipText("Smooth interpolation");
637	892	slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640		- boxCB.setToolTipText("Display bounding boxes");
641		- boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
643		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645		- zoomBoxCB.addItemListener(this);
646		-
	893	+
647	894	// constraints.gridy += 1;
648	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	896	// speakerMocapCB.addItemListener(this);
650	897
	898	+ panel.Return();
	899	+
651	900	if (false)
652	901	{
653	902	// handled in scripts
..	..	@@ -662,26 +911,72 @@
662	911	//constraints.gridy += 1;
663	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
664	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
665	915	}
666	916
667	917	//constraints.gridx += 1;
668	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	919	// debugCB.addItemListener(this);
670	920
671		- //constraints.gridy += 1;
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
672	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
673	927	oeilCB.addItemListener(this);
674	928
675		- //constraints.gridy += 1;
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
676	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	950	lookAtCB.setToolTipText("Look-at target");
678	951	lookAtCB.addItemListener(this);
	952	+ }
	953	+
	954	+ }
	955	+
	956	+ cGridBag fill = new cGridBag();
	957	+ fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
	962	+
	963	+ panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
679	966
680	967	}
681	968
682	969	void EditObject(Object3D obj)
683	970	{
684	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
685	980	radioButton.SetObject(obj);
686	981	radioButton.layout = sevenButton;
687	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -690,8 +985,11 @@
690	985	buttonGroup.add(radioButton);
691	986	radioButton.doClick();
692	987	}
	988	+
693	989	void SetupViews(ObjEditor oe)
694	990	{
	991	+ theFrame = this;
	992	+
695	993	oe.SetupViews();
696	994
697	995	System.out.println("SetupViews");
..	..	@@ -700,23 +998,28 @@
700	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
701	999	}
702	1000
703		- JCheckBox liveCB;
704		- JCheckBox supportCB;
705		- JCheckBox localCB;
706		- JCheckBox crowdCB;
707		- JCheckBox smoothCB;
708		- JCheckBox fastCB;
709		- JCheckBox slowCB;
710		- JCheckBox boxCB;
711		- JCheckBox zoomBoxCB;
712		- JCheckBox trackCB;
713		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
714	1014	// JCheckBox speakerMocapCB;
715		- JCheckBox speakerCameraCB;
716		- JCheckBox speakerFocusCB;
717		- JCheckBox debugCB;
718		- JCheckBox oeilCB;
719		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
720	1023
721	1024	// static int COLOR = 1;
722	1025	// static int MATERIAL = 2;
..	..	@@ -724,9 +1027,9 @@
724	1027
725	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
726	1029
727		- JCheckBox colorCB;
728		- JCheckBox materialCB;
729		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
730	1033
731	1034	public void itemStateChanged(ItemEvent e)
732	1035	{
..	..	@@ -754,6 +1057,7 @@
754	1057	} else if(e.getSource() == liveCB)
755	1058	{
756	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
757	1061	}
758	1062	else if(e.getSource() == supportCB)
759	1063	{
..	..	@@ -818,6 +1122,18 @@
818	1122	{
819	1123	cameraView.ToggleOeil();
820	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
821	1137	else if(e.getSource() == lookAtCB)
822	1138	{
823	1139	cameraView.ToggleLookAt();
..	..	@@ -834,7 +1150,8 @@
834	1150
835	1151	/**/
836	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
838	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
839	1156	// We can't move the root node or an empty selection
840	1157	return;
..	..	@@ -906,7 +1223,9 @@
906	1223	// objEditor.DropFile((java.io.File[]) object, true);
907	1224	// return;
908	1225	// }
909		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1229	{
911	1230	// file(s)
912	1231	String[] names = string.split("\n");
..	..	@@ -933,7 +1252,7 @@
933	1252
934	1253	flashIt = false;
935	1254	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1257
939	1258	if (group.selection.size() == 1)
..	..	@@ -949,23 +1268,33 @@
949	1268
950	1269	assert target == objEditor.jTree;
951	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
952	1272	try {
953		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
954	1274	} catch (Exception e) {
955	1275	System.out.println("destinationPath : " + destinationPath);
956	1276	return;
957	1277	}
958	1278
959		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
960	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
961	1290	loadClipboard(true);
962	1291	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
964		- } else {
965		- loadClipboard(false);
966		- objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
968		- }
	1292	+ pasteInto(false, false);
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
969	1298	}
970	1299	public void dropActionChanged(DropTargetDragEvent dtde)
971	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1070,85 +1399,107 @@
1070	1399	{
1071	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1072	1401	//heightFieldItem.addActionListener(this);
1073		- gridItem = menu.add(new MenuItem("Grid"));
1074		- gridItem.addActionListener(this);
1075		- rectoidItem = menu.add(new MenuItem("Box"));
1076		- rectoidItem.addActionListener(this);
1077		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078		- ellipsoidItem.addActionListener(this);
1079		- coneItem = menu.add(new MenuItem("Cone"));
1080		- coneItem.addActionListener(this);
1081		- torusItem = menu.add(new MenuItem("Torus"));
1082		- torusItem.addActionListener(this);
1083		- superItem = menu.add(new MenuItem("Superellipsoid"));
1084		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1085	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1086	1421	kleinItem.addActionListener(this);
1087		- particleItem = menu.add(new MenuItem("Particle system"));
1088		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1089	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1429	ragdollItem.addActionListener(this);
1091	1430	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1431	ragdoll2Item.addActionListener(this);
	1432	+ }
1093	1433	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1434	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1435	meshItem.addActionListener(this);
1096	1436	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1437	// meshGroupItem.addActionListener(this);
	1438	+ if (Globals.ADVANCED)
	1439	+ {
1098	1440	springItem = menu.add(new MenuItem("Spring"));
1099	1441	springItem.addActionListener(this);
1100	1442	flagItem = menu.add(new MenuItem("Flag"));
1101	1443	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1444	blobItem = menu.add(new MenuItem("Blob"));
1107	1445	blobItem.addActionListener(this);
1108	1446	latheItem = menu.add(new MenuItem("Lathe"));
1109	1447	latheItem.addActionListener(this);
1110		- lightItem = menu.add(new MenuItem("Light"));
1111		- lightItem.addActionListener(this);
	1448	+ }
	1449	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1450	+ bezierItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1112	1455	menu.add("-");
1113	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1114	1457	//superLoopItem.addActionListener(this);
1115		- loopItem = menu.add(new MenuItem("Loop"));
1116		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1117	1460	doubleItem = menu.add(new MenuItem("Fork"));
1118	1461	doubleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1119	1464	tripleItem = menu.add(new MenuItem("Trident"));
1120	1465	tripleItem.addActionListener(this);
	1466	+ }
1121	1467	}
1122	1468
1123	1469	void buildToolsMenu(Menu menu)
1124	1470	{
1125	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1472	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1473	+ animationItem.setState(Globals.ANIMATION);
	1474	+
	1475	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1476	+ archiveItem.addActionListener(this);
1128	1477
1129	1478	menu.add("-");
1130	1479	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1480	parseverticesItem.addActionListener(this);
1132	1481	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1482	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1483	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1484	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1485	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1486	reduceMorphItem.addActionListener(this);
1140	1487	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1488	reduce34MorphItem.addActionListener(this);
1142		-
	1489	+ menu.add("-");
1143	1490	menu.add(computeAOItem = new MenuItem("Compute AO"));
1144	1491	computeAOItem.addActionListener(this);
1145		- menu.add("-");
1146	1492
	1493	+ if (Globals.ADVANCED)
	1494	+ {
	1495	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1496	+ mirrorItem.addActionListener(this);
	1497	+ menu.add("-");
1147	1498	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1499	memoryItem.addActionListener(this);
1149	1500	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	1501	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	1502	+ menu.add(dumpItem = new MenuItem("Print"));
1152	1503	dumpItem.addActionListener(this);
1153	1504	// menu.add(pathItem = new MenuItem("From-to path"));
1154	1505	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +1517,7 @@
1166	1517	menu.add("-");
1167	1518	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	1519	editScriptItem.addActionListener(this);
	1520	+ }
1169	1521	}
1170	1522
1171	1523	void ScreenFit()
..	..	@@ -1288,9 +1640,24 @@
1288	1640	shadow.material = new cMaterial(obj.material);
1289	1641	shadow.material.diffuse = 0.0001f;
1290	1642	shadow.material.specular = 0.0001f;
	1643	+ //shadow.projectedVertices[1].x = 300;
1291	1644
1292	1645	makeSomething(shadow);
1293	1646	}
	1647	+
	1648	+ private void ClearUnpinned()
	1649	+ {
	1650	+ //for (Object3D obj : listUI)
	1651	+ for (int i=listUI.size(); --i>=0;)
	1652	+ {
	1653	+ Object3D obj = listUI.elementAt(i);
	1654	+ if (!obj.pinned)
	1655	+ {
	1656	+ obj.CloseUI();
	1657	+ listUI.remove(i);
	1658	+ }
	1659	+ }
	1660	+ }
1294	1661
1295	1662	/**
1296	1663	* applyExample
..	..	@@ -1494,9 +1861,9 @@
1494	1861
1495	1862	void Overwrite(int mask)
1496	1863	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1864	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	1865	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	1866	+ Object3D content = Grafreed.clipboard.get(0);
1500	1867
1501	1868	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	1869	content = ((cGroup)content).get(0);
..	..	@@ -1535,7 +1902,7 @@
1535	1902	{
1536	1903	ScreenFit();
1537	1904	} else
1538		- if (source == switchItem)
	1905	+ if (source == switchViewItem)
1539	1906	{
1540	1907	cVector v1 = new cVector();
1541	1908	cVector v2 = new cVector();
..	..	@@ -1544,11 +1911,11 @@
1544	1911	objEditor.cameraView.renderCamera.setAim(v2, v1);
1545	1912	objEditor.cameraView.repaint();
1546	1913	} else
1547		- if (source == rectoidItem)
	1914	+ if (source == rectoidItem \|\| source == boxButton)
1548	1915	{
1549	1916	makeSomething(new Box());
1550	1917	} else
1551		- if (source == particleItem)
	1918	+ if (source == particleItem \|\| source == particlesButton)
1552	1919	{
1553	1920	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1554	1921	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1627,27 +1994,27 @@
1627	1994
1628	1995	makeSomething(obj);
1629	1996	} else
1630		- if (source == gridItem)
	1997	+ if (source == gridItem \|\| source == gridButton)
1631	1998	{
1632	1999	makeSomething(new Grid());
1633	2000	} else
1634		- if (source == ellipsoidItem)
	2001	+ if (source == ellipsoidItem \|\| source == sphereButton)
1635	2002	{
1636	2003	makeSomething(new Sphere());
1637	2004	} else
1638		- if (source == coneItem)
	2005	+ if (source == coneItem \|\| source == coneButton)
1639	2006	{
1640	2007	makeSomething(new Cone());
1641	2008	} else
1642		- if (source == torusItem)
	2009	+ if (source == torusItem \|\| source == torusButton)
1643	2010	{
1644	2011	makeSomething(new Torus());
1645	2012	} else
1646		- if (source == superItem)
	2013	+ if (source == superItem \|\| source == superButton)
1647	2014	{
1648	2015	makeSomething(new Superellipsoid());
1649	2016	} else
1650		- if (source == kleinItem)
	2017	+ if (source == kleinItem \|\| source == kleinButton)
1651	2018	{
1652	2019	makeSomething(new Klein());
1653	2020	} else
..	..	@@ -1667,7 +2034,7 @@
1667	2034	{
1668	2035	makeSomething(new BezierSurface());
1669	2036	} else
1670		- if (source == checkerItem)
	2037	+ if (source == overlayItem \|\| source == overlayButton)
1671	2038	{
1672	2039	/*
1673	2040	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1715,7 +2082,7 @@
1715	2082	s.setup();
1716	2083	makeSomething(s);
1717	2084	} else
1718		- if (source == lightItem)
	2085	+ if (source == lightItem \|\| source == lightButton)
1719	2086	{
1720	2087	makeSomething(new Light());
1721	2088	} else
..	..	@@ -1765,30 +2132,30 @@
1765	2132
1766	2133	group(g);
1767	2134	} else
1768		- if (source == loopItem)
	2135	+ if (source == loopItem \|\| source == loopButton)
1769	2136	{
1770	2137	Composite csg = new GroupLeaf();
1771	2138	csg.count = 5;
1772	2139	group(csg);
1773		- Composite child = new cGroup();
	2140	+ Composite child = new cGroup("Branch");
1774	2141	csg.addChild(child);
1775	2142	child.addChild(csg);
1776	2143	} else
1777	2144	if (source == doubleItem)
1778	2145	{
1779		- Composite csg = new GroupLeaf();
	2146	+ Composite csg = new GroupLeaf("Fork");
1780	2147	csg.count = 5;
1781	2148	group(csg);
1782		- Composite child = new cGroup();
	2149	+ Composite child = new cGroup("Branch A");
1783	2150	csg.addChild(child);
1784	2151	child.addChild(csg);
1785		- child = new cGroup();
	2152	+ child = new cGroup("Branch B");
1786	2153	csg.addChild(child);
1787	2154	child.addChild(csg);
1788	2155	} else
1789	2156	if (source == tripleItem)
1790	2157	{
1791		- Composite csg = new GroupLeaf();
	2158	+ Composite csg = new GroupLeaf("Trident");
1792	2159	csg.count = 4;
1793	2160	group(csg);
1794	2161	Composite child = new cGroup();
..	..	@@ -1800,23 +2167,6 @@
1800	2167	child = new cGroup();
1801	2168	csg.addChild(child);
1802	2169	child.addChild(csg);
1803		- } else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820	2170	} else
1821	2171	if (source == computeAOItem)
1822	2172	{
..	..	@@ -1836,7 +2186,7 @@
1836	2186	if (source == invariantsItem)
1837	2187	{
1838	2188	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	2189	+ Grafreed.grafreeD.universe.invariants();
1840	2190	} else
1841	2191	if (source == memoryItem)
1842	2192	{
..	..	@@ -1854,6 +2204,35 @@
1854	2204	if (source == dumpItem)
1855	2205	{
1856	2206	DumpObject();
	2207	+ } else
	2208	+ if (source == minButton)
	2209	+ {
	2210	+ Minimize();
	2211	+ } else
	2212	+ if (source == maxButton)
	2213	+ {
	2214	+ Maximize();
	2215	+ } else
	2216	+ if (source == fullButton)
	2217	+ {
	2218	+ ToggleFullScreen();
	2219	+ } else
	2220	+ if (source == undoButton)
	2221	+ {
	2222	+ Undo();
	2223	+ } else
	2224	+ if (source == redoButton)
	2225	+ {
	2226	+ Redo();
	2227	+ } else
	2228	+ if (source == saveButton)
	2229	+ {
	2230	+ Save();
	2231	+ } else
	2232	+ if (source == oneStepButton)
	2233	+ {
	2234	+ Globals.ONESTEP = true;
	2235	+ cameraView.repaint();
1857	2236	} else
1858	2237	if (source == screenfitButton)
1859	2238	{
..	..	@@ -1904,12 +2283,20 @@
1904	2283	{
1905	2284	loadClipboard(true);
1906	2285	} else
	2286	+ if (source == undoItem)
	2287	+ {
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
	2293	+ } else
1907	2294	if (source == duplicateItem)
1908	2295	{
1909		- Object3D keep = GrafreeD.clipboard;
	2296	+ Object3D keep = Grafreed.clipboard;
1910	2297	loadClipboard(false);
1911	2298	paste(false);
1912		- GrafreeD.clipboard = keep;
	2299	+ Grafreed.clipboard = keep;
1913	2300	} else
1914	2301	if (source == cloneItem)
1915	2302	{
..	..	@@ -1927,13 +2314,17 @@
1927	2314	{
1928	2315	paste(false);
1929	2316	} else
	2317	+ if (source == pasteIntoItem)
	2318	+ {
	2319	+ pasteInto(true, false);
	2320	+ } else
1930	2321	if (source == pasteLinkItem)
1931	2322	{
1932		- pasteInto(false);
	2323	+ pasteInto(false, false);
1933	2324	} else
1934	2325	if (source == pasteCloneItem)
1935	2326	{
1936		- pasteInto(true);
	2327	+ pasteInto(true, true);
1937	2328	} else
1938	2329	if (source == pasteExpandItem)
1939	2330	{
..	..	@@ -2125,9 +2516,9 @@
2125	2516	// group.selection.get(0).setMasterThis(content); // should be identity
2126	2517	// refreshContents();
2127	2518	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2519	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	2520	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	2521	+ Object3D content = Grafreed.clipboard.get(0);
2131	2522
2132	2523	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	2524	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +2526,11 @@
2135	2526	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	2527	for (int i=0; i<group.selection.size(); i++)
2137	2528	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2529	+ boolean random = CameraPane.SWITCH;
	2530	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2531	group.selection.get(i).linkVerticesThis(content);
2141	2532	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	2533	+ CameraPane.SWITCH = random;
2143	2534	}
2144	2535	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	2536	refreshContents();
..	..	@@ -2149,20 +2540,20 @@
2149	2540	{
2150	2541	for (int i=0; i<group.selection.size(); i++)
2151	2542	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2543	+ boolean random = CameraPane.SWITCH;
	2544	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2545	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	2546	+ CameraPane.SWITCH = random;
2156	2547	}
2157	2548
2158	2549	refreshContents();
2159	2550	} else
2160	2551	if (source == relinkverticesItem)
2161	2552	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	2553	+ boolean random = CameraPane.SWITCH;
	2554	+ CameraPane.SWITCH = false; // parse all random nodes
2164	2555	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	2556	+ CameraPane.SWITCH = random;
2166	2557
2167	2558	refreshContents();
2168	2559	} else
..	..	@@ -2177,9 +2568,9 @@
2177	2568	} else
2178	2569	if (source == setMasterItem)
2179	2570	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2571	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	2572	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2183	2574
2184	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2576	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +2583,9 @@
2192	2583	{
2193	2584	if (group.selection.size() == 1)
2194	2585	{
2195		- if (GrafreeD.clipboard.size() == 1)
	2586	+ if (Grafreed.clipboard.size() == 1)
2196	2587	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	2588	+ Object3D content = Grafreed.clipboard.get(0);
2198	2589
2199	2590	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	2591	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +2602,7 @@
2211	2602	{
2212	2603	RevertMeshes();
2213	2604	} else
2214		- if (source == resetMeshItem)
	2605	+ if (source == resetAllItem)
2215	2606	{
2216	2607	ResetAll();
2217	2608	} else
..	..	@@ -2231,9 +2622,9 @@
2231	2622	{
2232	2623	ClearSelection(true);
2233	2624	} else
2234		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2235	2626	{
2236		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2237	2628	} else
2238	2629	if (source == hideItem)
2239	2630	{
..	..	@@ -2251,16 +2642,16 @@
2251	2642	{
2252	2643	makeSomething(new Camera());
2253	2644	} else
2254		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2255	2646	{
2256	2647	group(new Composite());
2257	2648	} else
2258		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2259	2650	{
2260	2651	RandomNode random = new RandomNode();
2261	2652	group(random);
2262	2653	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	2654	+ random.name = random.get(0).name + "Switch";
2264	2655	} else
2265	2656	if (source == physicsItem)
2266	2657	{
..	..	@@ -2357,7 +2748,7 @@
2357	2748	{
2358	2749	group(new cLinker());
2359	2750	} else
2360		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2361	2752	{
2362	2753	group(new TextureNode());
2363	2754	} else
..	..	@@ -2377,17 +2768,30 @@
2377	2768	{
2378	2769	CastShadow(2);
2379	2770	} else
2380		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2381	2772	{
2382		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2383	2775	for (int i=0; i<group.selection.size(); i++)
2384	2776	{
2385		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2386	2782	}
2387	2783
2388		- ClearSelection(false);
2389		-
2390		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2391	2795	} else
2392	2796	if (source == genUVItem)
2393	2797	{
..	..	@@ -2399,7 +2803,7 @@
2399	2803	} else
2400	2804	if (source == genNormalsMESHItem)
2401	2805	{
2402		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2403	2807	} else
2404	2808	if (source == genNormalsORGANItem)
2405	2809	{
..	..	@@ -2464,6 +2868,22 @@
2464	2868	if (source == unmarkleavesItem)
2465	2869	{
2466	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2467	2887	} else
2468	2888	if (source == flipVItem)
2469	2889	{
..	..	@@ -2549,9 +2969,13 @@
2549	2969	{
2550	2970	SmoothMesh();
2551	2971	} else
2552		- if (source == transformgeometryItem)
	2972	+ if (source == transformGeometryItem)
2553	2973	{
2554	2974	TransformGeometry();
	2975	+ } else
	2976	+ if (source == transformChildrenItem)
	2977	+ {
	2978	+ TransformChildren();
2555	2979	} else
2556	2980	if (source == resetTransformItem)
2557	2981	{
..	..	@@ -2559,7 +2983,11 @@
2559	2983	} else
2560	2984	if (source == resetCentroidItem)
2561	2985	{
2562		- ResetCentroid();
	2986	+ ResetCentroid(true);
	2987	+ } else
	2988	+ if (source == resetCentroidXZItem)
	2989	+ {
	2990	+ ResetCentroid(false);
2563	2991	} else
2564	2992	if (source == resetParentItem)
2565	2993	{
..	..	@@ -2691,6 +3119,10 @@
2691	3119	if (source == twoButton)
2692	3120	{
2693	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2694	3126	// bug
2695	3127	//gridPanel.setDividerLocation(1.0);
2696	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2723,10 +3155,31 @@
2723	3155	bigThree.ClearUI();
2724	3156	bigThree.add(centralPanel);
2725	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2726	3176	} else
2727	3177	if (source == threeButton)
2728	3178	{
2729	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2730	3183
2731	3184	// bigThree.remove(scenePanel);
2732	3185	// bigThree.remove(centralPanel);
..	..	@@ -2759,10 +3212,15 @@
2759	3212	bigThree.add(centralPanel);
2760	3213	bigThree.add(XYZPanel);
2761	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2762	3217	} else
2763	3218	if (source == fourButton)
2764	3219	{
2765	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2766	3224
2767	3225	// bigThree.remove(scenePanel);
2768	3226	// bigThree.remove(centralPanel);
..	..	@@ -2794,10 +3252,15 @@
2794	3252	bigThree.ClearUI();
2795	3253	bigThree.add(scenePanel);
2796	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2797	3257	} else
2798	3258	if (source == sixButton)
2799	3259	{
2800	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2801	3264
2802	3265	// bigThree.remove(scenePanel);
2803	3266	// bigThree.remove(centralPanel);
..	..	@@ -2830,10 +3293,15 @@
2830	3293	bigThree.add(scenePanel);
2831	3294	bigThree.add(centralPanel);
2832	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2833	3298	} else
2834	3299	if (source == sevenButton)
2835	3300	{
2836	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2837	3305
2838	3306	// bigThree.remove(scenePanel);
2839	3307	// bigThree.remove(centralPanel);
..	..	@@ -2867,6 +3335,8 @@
2867	3335	bigThree.add(centralPanel);
2868	3336	bigThree.add(XYZPanel);
2869	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2870	3340	} else
2871	3341	if (source == rootButton)
2872	3342	{
..	..	@@ -2878,6 +3348,7 @@
2878	3348	EditObject(obj);
2879	3349	}
2880	3350
	3351	+ cameraView.requestFocusInWindow();
2881	3352	refreshContents(true);
2882	3353	} else
2883	3354	if (source == closeButton)
..	..	@@ -2887,22 +3358,37 @@
2887	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2888	3359	{
2889	3360	ab = (cRadio)e.nextElement();
2890		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2891	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2892	3369	buttonGroup.remove(ab);
2893	3370	radioPanel.remove(ab);
2894	3371
2895		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2896	3374	// ab.GetObject().objectUI = null; // ?????????
2897	3375
2898	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2899	3377	break;
2900	3378	}
2901	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2902	3382	refreshContents(true);
2903	3383	} else
2904	3384	if (source == editItem \|\| source == editButton)
2905	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2906	3392	EditSelection(false);
2907	3393	} else
2908	3394	if (source == uneditButton)
..	..	@@ -2912,12 +3398,13 @@
2912	3398	Object3D child = (Object3D)e.nextElement();
2913	3399	if(child.editWindow != null)
2914	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2915	3402	child.CloseUI();
2916	3403	listUI.remove(child);
2917	3404
2918		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2919	3406	}
2920		- objEditor.ctrlPanel.validate();
	3407	+ objEditor.ctrlPanel.FlushUI();
2921	3408	//objEditor.jTree.clearSelection();
2922	3409	//objEditor.ResetSliders();
2923	3410	refreshContents(true);
..	..	@@ -2928,6 +3415,7 @@
2928	3415	//copy.ClearUI();
2929	3416	for (Object3D obj : listUI)
2930	3417	{
	3418	+ obj.pinned = false;
2931	3419	obj.CloseUI();
2932	3420	}
2933	3421	listUI.clear();
..	..	@@ -2937,7 +3425,7 @@
2937	3425	{
2938	3426	assert(copy == group);
2939	3427
2940		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2941	3429
2942	3430	for (Object3D obj : listUI)
2943	3431	{
..	..	@@ -3001,20 +3489,44 @@
3001	3489	frontView.object = group;
3002	3490	sideView.object = group;
3003	3491	}
3004		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
3005	3497	/*
3006	3498	currentLayout = radio.layout;
3007	3499	if (currentLayout == null)
3008	3500	currentLayout = sevenButton;
3009	3501	*/
3010	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3011	3508	keepparent = group.parent;
3012	3509	// PARENT = NULL or not???
3013	3510	//group.parent = null; // ROOT
3014	3511	//group.attributes = -1;
3015	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3016	3515	refreshContents(true);
3017		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
3018	3530	else
3019	3531	{
3020	3532	//return super.action(event, arg);
..	..	@@ -3023,7 +3535,6 @@
3023	3535	}
3024	3536
3025	3537	boolean useclient = false;
3026		- cRadio radio;
3027	3538
3028	3539	void ToggleRoot()
3029	3540	{
..	..	@@ -3075,6 +3586,28 @@
3075	3586	refreshContents();
3076	3587	}
3077	3588
	3589	+ void TransformChildren()
	3590	+ {
	3591	+ Object3D obj;
	3592	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3593	+ {
	3594	+ obj = (Object3D)e.nextElement();
	3595	+ obj.KeepTextureMatrices();
	3596	+ obj.TransformChildren();
	3597	+ obj.RestoreTextureMatrices();
	3598	+
	3599	+// if (obj.parent == null)
	3600	+// {
	3601	+// System.out.println("NULL PARENT!");
	3602	+// new Exception().printStackTrace();
	3603	+// }
	3604	+// else
	3605	+// TouchTransform(obj);
	3606	+// //obj.parent.Touch();
	3607	+ }
	3608	+
	3609	+ refreshContents();
	3610	+ }
3078	3611
3079	3612	void ResetTransform()
3080	3613	{
..	..	@@ -3187,7 +3720,7 @@
3187	3720	refreshContents();
3188	3721	}
3189	3722
3190		- void ResetCentroid()
	3723	+ void ResetCentroid(boolean full)
3191	3724	{
3192	3725	Object3D obj;
3193	3726	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +3735,16 @@
3202	3735	LA.matIdentity(Object3D.mat);
3203	3736	obj.getBounds(minima, maxima, false);
3204	3737	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	3740	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	3741	obj.TransformMesh(Object3D.mat);
	3742	+
3208	3743	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3744	+ if (full)
	3745	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	3746	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3747	+
3211	3748	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	3749	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	3750	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +3773,8 @@
3236	3773
3237	3774	int size = obj.MemorySize();
3238	3775
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	3778	}
3241	3779	}
3242	3780	catch (Exception e)
..	..	@@ -3273,9 +3811,9 @@
3273	3811	obj = (Object3D)e.nextElement();
3274	3812
3275	3813	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	3814	+ Grafreed.AnalyzeObject(obj);
3277	3815	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	3816	+ Grafreed.AnalyzeObject(obj.bRep);
3279	3817
3280	3818	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	3819	}
..	..	@@ -3317,6 +3855,13 @@
3317	3855	void GenNormals(boolean crease)
3318	3856	{
3319	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3320	3865
3321	3866	refreshContents();
3322	3867	}
..	..	@@ -3489,8 +4034,8 @@
3489	4034
3490	4035	void ParseVertices()
3491	4036	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	4037	+ boolean epsequal = Grafreed.epsequal;
	4038	+ Grafreed.epsequal = true;
3494	4039
3495	4040	for (int i=0; i<group.selection.size(); i++)
3496	4041	{
..	..	@@ -3515,7 +4060,7 @@
3515	4060	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	4061	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	4062
3518		- g.add(GrafreeD.clipboard);
	4063	+ g.add(Grafreed.clipboard);
3519	4064
3520	4065	buffer.add(g);
3521	4066	}
..	..	@@ -3530,7 +4075,7 @@
3530	4075	makeSomething(buffer, i==group.selection.size()-1);
3531	4076	}
3532	4077
3533		- GrafreeD.epsequal = epsequal;
	4078	+ Grafreed.epsequal = epsequal;
3534	4079
3535	4080	refreshContents();
3536	4081	}
..	..	@@ -3548,7 +4093,16 @@
3548	4093	String pigment = Object3D.GetPigment(tex);
3549	4094	//String bump = Object3D.GetBump(tex);
3550	4095
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3552	4106
3553	4107	double s = v.s;
3554	4108
..	..	@@ -3636,11 +4190,11 @@
3636	4190
3637	4191	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	4192
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	4193	+ boolean random = CameraPane.SWITCH;
	4194	+ CameraPane.SWITCH = false; // parse all random nodes
3641	4195	lowres.linkVerticesThis(null);
3642	4196	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	4197	+ CameraPane.SWITCH = random;
3644	4198
3645	4199	System.err.flush();
3646	4200
..	..	@@ -3680,7 +4234,7 @@
3680	4234	return;
3681	4235
3682	4236	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	4237	+ Object3D ref = Grafreed.clipboard.get(0);
3684	4238
3685	4239	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	4240
..	..	@@ -3874,9 +4428,9 @@
3874	4428
3875	4429	void ClipMesh()
3876	4430	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4431	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4432	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4433	+ Object3D content = Grafreed.clipboard.get(0);
3880	4434
3881	4435	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4436	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +4439,7 @@
3885	4439	// {
3886	4440	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	4441	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	4442	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	4443	}
3890	4444	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	4445	System.out.println("DONE.");
..	..	@@ -3932,6 +4486,18 @@
3932	4486	void MarkLeaves(boolean hide)
3933	4487	{
3934	4488	group.selection.MarkLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
3935	4501	refreshContents();
3936	4502	}
3937	4503
..	..	@@ -4006,10 +4572,6 @@
4006	4572	// }
4007	4573	// }
4008	4574
4009		- static boolean allparams = true;
4010		-
4011		- static Vector<Object3D> listUI = new Vector<Object3D>();
4012		-
4013	4575	void EditSelection(boolean newWindow)
4014	4576	{
4015	4577	// aConstraints.gridy = 0;
..	..	@@ -4017,10 +4579,10 @@
4017	4579	{
4018	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4019	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	4583
4022	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
4024	4586	{
4025	4587	// if (!(elem instanceof Composite))
4026	4588	// newWindow = false;
..	..	@@ -4102,7 +4664,8 @@
4102	4664	//new Exception().printStackTrace();
4103	4665
4104	4666	freezemodel = true;
4105		-
	4667	+ ClearUnpinned();
	4668	+
4106	4669	/**/
4107	4670	//switch (event.id)
4108	4671	{
..	..	@@ -4110,7 +4673,6 @@
4110	4673	//case 702: // Event.LIST_DESELECT
4111	4674	group.deselectAll();
4112	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	4676	if (tps != null)
4115	4677	{
4116	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,33 +4681,39 @@
4119	4681
4120	4682	//if (child.parent != null)
4121	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4122	4685	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	4686	}
4127	4687	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	4688	+// else
	4689	+// {
	4690	+// objEditor.SetMaterial(group); // .GetMaterial());
	4691	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4692	+// System.err.println("info : " + group.GetPath());
	4693	+// }
4134	4694
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	4696	CameraPane.flash = true;
4139	4697
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	4699	// a camera
4142	4700	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
4145	4706	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	4708	}
4148	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4149	4717	refreshContents();
4150	4718	//return true;
4151	4719	}
..	..	@@ -4154,6 +4722,35 @@
4154	4722
4155	4723	freezemodel = false;
4156	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4157	4754
4158	4755	void linkSomething(Object3D thing)
4159	4756	{
..	..	@@ -4225,16 +4822,19 @@
4225	4822	{
4226	4823	if (group.selection.isEmpty())
4227	4824	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	4825	+
	4826	+ Grafreed.clipboardIsTempGroup = false;
4229	4827	Composite tGroup = null;
4230	4828	if (group.selection.size() > 0) // 1)
4231	4829	{
4232	4830	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	4831	+ Grafreed.clipboardIsTempGroup = true;
4234	4832	}
4235	4833
4236	4834	if (cut)
4237	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4238	4838	//int indices[] = jList.getSelectedIndices();
4239	4839	//for (int i = indices.length - 1; i >= 0; i--)
4240	4840	//jList.remove(indices[i]);
..	..	@@ -4270,16 +4870,16 @@
4270	4870	//System.out.println("cut " + child);
4271	4871	//System.out.println("parent = " + child.parent);
4272	4872	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4274	4874	tGroup.add/Child/(tmp);
4275	4875	else
4276		- GrafreeD.clipboard = tmp;
	4876	+ Grafreed.clipboard = tmp;
4277	4877	}
4278	4878	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	4879	+ if (Grafreed.clipboardIsTempGroup)
4280	4880	tGroup.add/Child/(child);
4281	4881	else
4282		- GrafreeD.clipboard = child;
	4882	+ Grafreed.clipboard = child;
4283	4883	}
4284	4884
4285	4885	//ResetModel();
..	..	@@ -4311,21 +4911,23 @@
4311	4911	//System.out.println("cut " + elem);
4312	4912	//System.out.println("parent = " + elem.parent);
4313	4913	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4315	4915	tGroup.add/Child/(tmp);
4316	4916	else
4317		- GrafreeD.clipboard = tmp;
	4917	+ Grafreed.clipboard = tmp;
4318	4918	}
4319	4919	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	4920	+ if (Grafreed.clipboardIsTempGroup)
4321	4921	tGroup.add/Child/(child);
4322	4922	else
4323		- GrafreeD.clipboard = child;
	4923	+ Grafreed.clipboard = child;
4324	4924	}
4325	4925
4326	4926	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	4927	+
	4928	+ if (Grafreed.clipboardIsTempGroup)
	4929	+ Grafreed.clipboard = tGroup;
	4930	+
4329	4931	if (cut)
4330	4932	{
4331	4933	ResetModel();
..	..	@@ -4339,7 +4941,7 @@
4339	4941	// return;
4340	4942	boolean first = true;
4341	4943
4342		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4343	4945	{
4344	4946	Composite temp;
4345	4947
..	..	@@ -4350,7 +4952,7 @@
4350	4952	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	4953	*/
4352	4954	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4955	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	4956	{
4355	4957	Object3D child = (Object3D)e.nextElement();
4356	4958
..	..	@@ -4384,21 +4986,21 @@
4384	4986	//Object3D cb = Applet3D.clipboard;
4385	4987	//temp.addChild(cb);
4386	4988	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4989	+ assert(Grafreed.clipboard.parent == null);
	4990	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4991	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4992	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4993	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	4994	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	4995	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4996	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	4997	}
4396	4998
4397	4999	ResetModel();
4398	5000	refreshContents();
4399	5001	}
4400	5002
4401		- void pasteInto(boolean copyit)
	5003	+ void pasteInto(boolean copyit, boolean clone)
4402	5004	{
4403	5005	// if (GrafreeD.clipboard == null)
4404	5006	// return;
..	..	@@ -4427,15 +5029,22 @@
4427	5029	if (copyit)
4428	5030	{
4429	5031	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	5032	+ if (clone)
	5033	+ {
	5034	+ CloneClipboard(false); // sept 2014
	5035	+ }
	5036	+ else
	5037	+ {
	5038	+ paste(false);
	5039	+ }
4431	5040	}
4432	5041	else
4433	5042	{
4434	5043	boolean first = true;
4435	5044
4436		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4437	5046	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	5047	+ Composite temp = (Composite)Grafreed.clipboard;
4439	5048	Object3D copy;
4440	5049	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	5050	{
..	..	@@ -4445,7 +5054,7 @@
4445	5054	}
4446	5055	} else
4447	5056	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	5057	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	5058	}
4450	5059	}
4451	5060	}
..	..	@@ -4850,21 +5459,6 @@
4850	5459	}
4851	5460	*/
4852	5461
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	5462	/*
4869	5463	public void Callback(Object obj)
4870	5464	{
..	..	@@ -4888,26 +5482,9 @@
4888	5482	}
4889	5483	*/
4890	5484
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	5485	String GetFile(String dialogName)
4909	5486	{
4910		- if (GrafreeD.standAlone)
	5487	+ if (Grafreed.standAlone)
4911	5488	{
4912	5489	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	5490	browser.show();
..	..	@@ -4971,10 +5548,33 @@
4971	5548	cButton flashSelectionButton;
4972	5549	cButton editButton;
4973	5550	cButton uneditButton;
	5551	+ JCheckBox allParamsButton;
4974	5552	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	5553	cButton unselectButton;
4977	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
	5558	+ cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
	5577	+
4978	5578	cButton screenfitButton;
4979	5579	cButton screenfitpointButton;
4980	5580	cButton snapobjectButton;
..	..	@@ -4986,14 +5586,6 @@
4986	5586
4987	5587	cButton setsupportButton;
4988	5588
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996		-
4997	5589	//
4998	5590	//Composite
4999	5591	Object3D // to do !!
..	..	@@ -5003,9 +5595,11 @@
5003	5595	//JTree jTree;
5004	5596	private MenuItem lookAtItem;
5005	5597	private MenuItem lookFromItem;
5006		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5007	5599	private MenuItem cutItem;
5008		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
5009	5603	private MenuItem cloneItem;
5010	5604	private MenuItem cloneSupportItem;
5011	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5018,7 +5612,7 @@
5018	5612	private MenuItem linkverticesItem;
5019	5613	private MenuItem relinkverticesItem;
5020	5614	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
5022	5616	private MenuItem stepAllItem;
5023	5617	private MenuItem revertMeshItem;
5024	5618	private MenuItem poseMeshItem;
..	..	@@ -5029,6 +5623,7 @@
5029	5623	private MenuItem mergeGeometriesItem;
5030	5624	private MenuItem copyItem;
5031	5625	private MenuItem pasteItem;
	5626	+ private MenuItem pasteIntoItem;
5032	5627	private MenuItem pasteLinkItem;
5033	5628	private MenuItem pasteCloneItem;
5034	5629	private MenuItem pasteExpandItem;
..	..	@@ -5067,6 +5662,10 @@
5067	5662	private MenuItem showleavesItem;
5068	5663	private MenuItem markleavesItem;
5069	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5070	5669
5071	5670	private MenuItem flipVItem;
5072	5671	private MenuItem unflipVItem;
..	..	@@ -5078,15 +5677,17 @@
5078	5677	private MenuItem panoTexturesItem;
5079	5678
5080	5679	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	5680	+ private MenuItem resetCentroidXZItem;
5082	5681	private MenuItem resetTransformItem;
	5682	+ private MenuItem transformGeometryItem;
	5683	+ private MenuItem transformChildrenItem;
5083	5684	private MenuItem hideItem;
5084	5685	private MenuItem grabItem;
5085	5686	private MenuItem backItem;
5086	5687	private MenuItem frontItem;
5087	5688	private MenuItem cameraItem;
5088	5689	private MenuItem compositeItem;
5089		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5090	5691	private MenuItem physicsItem;
5091	5692	private MenuItem frameselectorItem;
5092	5693	private MenuItem scriptNodeItem;
..	..	@@ -5126,7 +5727,7 @@
5126	5727	private MenuItem blobItem;
5127	5728	private MenuItem latheItem;
5128	5729	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	5730	+ private MenuItem overlayItem;
5130	5731	private MenuItem meshItem;
5131	5732	// private MenuItem meshGroupItem;
5132	5733	private MenuItem springItem;
..	..	@@ -5148,11 +5749,6 @@
5148	5749	private MenuItem doubleItem;
5149	5750	private MenuItem tripleItem;
5150	5751
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	5752	private MenuItem computeAOItem;
5157	5753	private MenuItem recompileItem;
5158	5754	private MenuItem editScriptItem;
..	..	@@ -5162,4 +5758,8 @@
5162	5758	private MenuItem analyzeItem;
5163	5759	private MenuItem dumpItem;
5164	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
5165	5765	}