~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);
..	..	@@ -84,6 +84,10 @@
84	84
85	85	void CloneSelection(boolean supports)
86	86	{
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
87	91	// Object3D keep = GrafreeD.clipboard;
88	92	//Object3D obj;
89	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +98,19 @@
94	98
95	99	makeSomething(clone, i==group.selection.size()-1);
96	100	}
	101	+ Globals.SAVEONMAKE = keep;
97	102	}
98	103
99	104	void CloneClipboard(boolean supports)
100	105	{
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	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	111	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
109	114	}
110	115
111	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +124,7 @@
119	124	// obj.support = null;
120	125	if (!supports)
121	126	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	128	obj.parent = parent;
124	129	// obj.support = support;
125	130	// clone.support = support; // aout 2013
..	..	@@ -148,30 +153,29 @@
148	153
149	154	//JTextField nameField;
150	155
151		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
152	157	{
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);
	158	+ oe.jTree = new cTree();
	159	+
164	160	Menu menu;
165	161	oe.menuBar.add(menu = new Menu("Edit"));
166	162	//editItem = menu.add(new MenuItem("Edit"));
167	163	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	171	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	172	cloneItem = menu.add(new MenuItem("Clone"));
172	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
173	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	177	cloneSupportItem.addActionListener(this);
	178	+ }
175	179	menu.add("-");
176	180	cutItem = menu.add(new MenuItem("Cut"));
177	181	cutItem.addActionListener(this);
..	..	@@ -179,27 +183,123 @@
179	183	copyItem.addActionListener(this);
180	184	pasteItem = menu.add(new MenuItem("Paste"));
181	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
182	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	191	pasteLinkItem.addActionListener(this);
184	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	193	pasteCloneItem.addActionListener(this);
186	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
188	197	clearItem = menu.add(new MenuItem("Clear"));
189	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
190	203	clearAllItem = menu.add(new MenuItem("Clear All"));
191	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
192	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
193	294	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);
	295	+ if (Globals.ADVANCED)
	296	+ {
198	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	298	revertMeshItem.addActionListener(this);
200	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	300	resetreferencesItem.addActionListener(this);
202	301	menu.add("-");
	302	+ }
203	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	304	overwriteGeoItem.addActionListener(this);
205	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +311,104 @@
211	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	312	overwriteUVItem.addActionListener(this);
213	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
214	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	317	generateMeshItem.addActionListener(this);
216	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	319	poseMeshItem.addActionListener(this);
218	320	menu.add("-");
	321	+ }
219	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	323	resetsupportItem.addActionListener(this);
221	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	325	linkverticesItem.addActionListener(this);
223	326	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	327	relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
225	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	332	setMasterItem.addActionListener(this);
	333	+ }
227	334
228	335	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
231	338	backItem = menu.add(new MenuItem("Back"));
232	339	backItem.addActionListener(this);
233	340	frontItem = menu.add(new MenuItem("Front"));
234	341	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	348	hideItem.addActionListener(this);
	349	+ }
239	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	351	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
244	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	360	switchGeoItem.addActionListener(this);
246	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	362	switchTransfoItem.addActionListener(this);
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
	364	+ morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
248	367	physicsItem = menu.add(new MenuItem("Physics"));
249	368	physicsItem.addActionListener(this);
250	369	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	370	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	372	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	373	+ }
258	374
259	375	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
262	378	billboardItem = menu.add(new MenuItem("Billboard"));
263	379	billboardItem.addActionListener(this);
264	380	csgItem = menu.add(new MenuItem("CSG"));
265	381	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	383	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	385	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
272	394	linkerItem = menu.add(new MenuItem("Linker"));
273	395	linkerItem.addActionListener(this);
274	396	templateItem = menu.add(new MenuItem("Template"));
275	397	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	399	pointflowItem.addActionListener(this);
	400	+ }
280	401	menu.add("-");
281	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	403	resetTransformItem.addActionListener(this);
283	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	405	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
287	412
288	413	oe.menuBar.add(menu = new Menu("Geometry"));
289	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +419,11 @@
294	419	genNormalsCADItem.addActionListener(this);
295	420	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	421	genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
297	424	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	425	genNormalsMINEItem.addActionListener(this);
	426	+ }
299	427	stripifyItem = menu.add(new MenuItem("Stripify"));
300	428	stripifyItem.addActionListener(this);
301	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +445,34 @@
317	445	reduce34MeshItem.addActionListener(this);
318	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	447	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
324	456
325	457	oe.menuBar.add(menu = new Menu("Attributes"));
326	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
328	464	menu.add("-");
329	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	466	liveleavesItem.addActionListener(this);
331	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
333	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	472	supportleavesItem.addActionListener(this);
335	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	474	unsupportleavesItem.addActionListener(this);
	475	+ }
337	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	477	hideleavesItem.addActionListener(this);
339	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +481,14 @@
342	481	markleavesItem.addActionListener(this);
343	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
345	492	menu.add("-");
346	493	flipVItem = menu.add(new MenuItem("Flip V"));
347	494	flipVItem.addActionListener(this);
..	..	@@ -377,35 +524,40 @@
377	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	525	sortbynameItem.addActionListener(this);
379	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
380	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	535	extractGeometriesItem.addActionListener(this);
382	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	537	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);
	538	+ }
388	539
389	540	oe.menuBar.add(menu = new Menu("Insert"));
390	541	buildCreateMenu(menu);
391	542
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	543	oe.menuBar.add(menu = new Menu("Tools"));
404	544	buildToolsMenu(menu);
405	545	}
406	546
407	547	void SetupUI2(ObjEditor oe)
408	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
409	561	//new Exception().printStackTrace();
410	562
411	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,93 +586,216 @@
434	586	oe.radioPanel.add(dummyButton);
435	587	oe.buttonGroup.add(dummyButton);
436	588	*/
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
	592	+
437	593	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	594
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	633	+ liveCB.setToolTipText("Enable animation");
441	634	liveCB.addItemListener(this);
442	635
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ oneStepButton.setToolTipText("Animate one step forward");
	638	+ oneStepButton.addActionListener(this);
	639	+
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	641	fastCB.setToolTipText("Fast mode");
445	642	fastCB.addItemListener(this);
446	643
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
454	649
455	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	651	// screenfitpointButton.addActionListener(this);
457	652
458	653	if (Globals.ADVANCED)
459	654	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	655	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	656	snapobjectButton.addActionListener(this);
462	657	snapobjectButton.setToolTipText("Snap Object");
463	658	}
464	659
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	661
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	663	twoButton.setToolTipText("Show center view only");
473	664	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	668	fourButton.addActionListener(this);
476	669	fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	671	sixButton.setToolTipText("2-column layout left");
479	672	sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	674	threeButton.setToolTipText("2-column layout right");
482	675	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	677	sevenButton.setToolTipText("3-column layout");
485	678	sevenButton.addActionListener(this);
486	679	//
487	680
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	682	rootButton.setToolTipText("Edit selection in new tab");
490	683	rootButton.addActionListener(this);
491	684
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	686	closeButton.setToolTipText("Close tab");
494	687	closeButton.addActionListener(this);
495	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	689	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	690	+
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
499	722
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
502	772	editButton.addActionListener(this);
503	773
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
506	776	uneditButton.addActionListener(this);
507	777
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
	780	+ allParamsButton.addActionListener(this);
	781	+
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	783	clearPanelButton.setToolTipText("Clear edit panel");
510	784	clearPanelButton.addActionListener(this);
511	785
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	787	unselectButton.setToolTipText("Unselect");
518	788	unselectButton.addActionListener(this);
519	789
520		- commandsPanel.preferredHeight = 1;
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
521	793
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
524	799
525	800	// oe.aConstraints.gridx += 1;
526	801	// oe.aConstraints.weighty = 0;
..	..	@@ -537,27 +812,12 @@
537	812
538	813	JScrollPane jSP;
539	814	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	816	ResetModel();
542	817
543	818	oe.treePanel.add(jSPPanel);
544	819	oe.treePanel.Return();
545	820
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	821	oe.treePanel.add(copyOptionsPanel);
562	822	oe.treePanel.Return();
563	823
..	..	@@ -588,13 +848,43 @@
588	848
589	849	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	850	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
	865	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	866	+ boxCB.setToolTipText("Display bounding boxes");
	867	+ boxCB.addItemListener(this);
	868	+
	869	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
	871	+ zoomBoxCB.addItemListener(this);
	872	+
	873	+ if (true) // Globals.ADVANCED)
	874	+ {
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
594	882
595	883	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	884	// localCB.addItemListener(this);
597	885
	886	+ panel.Return();
	887	+
598	888	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	889	crowdCB.setToolTipText("Used for crowds");
600	890	crowdCB.addItemListener(this);
..	..	@@ -607,18 +897,12 @@
607	897	slowCB.setToolTipText("Smooth interpolation");
608	898	slowCB.addItemListener(this);
609	899
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	900	// constraints.gridy += 1;
619	901	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	902	// speakerMocapCB.addItemListener(this);
621	903
	904	+ panel.Return();
	905	+
622	906	if (false)
623	907	{
624	908	// handled in scripts
..	..	@@ -633,30 +917,72 @@
633	917	//constraints.gridy += 1;
634	918	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	919	smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
636	921	}
637	922
638	923	//constraints.gridx += 1;
639	924	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	925	// debugCB.addItemListener(this);
641	926
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
642	931	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
643	933	oeilCB.addItemListener(this);
644	934
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
645	955	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	956	lookAtCB.setToolTipText("Look-at target");
647	957	lookAtCB.addItemListener(this);
	958	+ }
	959	+
	960	+ }
648	961
649	962	cGridBag fill = new cGridBag();
650		-
651	963	fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
652	968
653	969	panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
654	972
655	973	}
656	974
657	975	void EditObject(Object3D obj)
658	976	{
659	977	cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
660	986	radioButton.SetObject(obj);
661	987	radioButton.layout = sevenButton;
662	988	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -665,8 +991,11 @@
665	991	buttonGroup.add(radioButton);
666	992	radioButton.doClick();
667	993	}
	994	+
668	995	void SetupViews(ObjEditor oe)
669	996	{
	997	+ theFrame = this;
	998	+
670	999	oe.SetupViews();
671	1000
672	1001	System.out.println("SetupViews");
..	..	@@ -675,23 +1004,28 @@
675	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1005	}
677	1006
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
689	1020	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
695	1029
696	1030	// static int COLOR = 1;
697	1031	// static int MATERIAL = 2;
..	..	@@ -699,9 +1033,9 @@
699	1033
700	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1035
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
705	1039
706	1040	public void itemStateChanged(ItemEvent e)
707	1041	{
..	..	@@ -729,6 +1063,7 @@
729	1063	} else if(e.getSource() == liveCB)
730	1064	{
731	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
732	1067	}
733	1068	else if(e.getSource() == supportCB)
734	1069	{
..	..	@@ -793,6 +1128,18 @@
793	1128	{
794	1129	cameraView.ToggleOeil();
795	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
796	1143	else if(e.getSource() == lookAtCB)
797	1144	{
798	1145	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1156,8 @@
809	1156
810	1157	/**/
811	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1162	// We can't move the root node or an empty selection
815	1163	return;
..	..	@@ -872,8 +1220,6 @@
872	1220	}
873	1221	}
874	1222
875		- String string = (String) object;
876		-
877	1223	System.out.println("Transfer = " + object + "; drop : " + target);
878	1224	// if( object instanceof java.io.File[])
879	1225	// {
..	..	@@ -881,7 +1227,11 @@
881	1227	// objEditor.DropFile((java.io.File[]) object, true);
882	1228	// return;
883	1229	// }
884		- if (string.charAt(0) == '/')
	1230	+
	1231	+ String string = object.toString();
	1232	+
	1233	+ // File path for Mac and Windows
	1234	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1235	{
886	1236	// file(s)
887	1237	String[] names = string.split("\n");
..	..	@@ -908,7 +1258,7 @@
908	1258
909	1259	flashIt = false;
910	1260	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1261	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1262	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1263
914	1264	if (group.selection.size() == 1)
..	..	@@ -924,23 +1274,33 @@
924	1274
925	1275	assert target == objEditor.jTree;
926	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
927	1278	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1280	} catch (Exception e) {
930	1281	System.out.println("destinationPath : " + destinationPath);
931	1282	return;
932	1283	}
933	1284
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
935	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
936	1296	loadClipboard(true);
937	1297	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1298	+ pasteInto(false, false);
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
944	1304	}
945	1305	public void dropActionChanged(DropTargetDragEvent dtde)
946	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1045,54 +1405,71 @@
1045	1405	{
1046	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1407	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
1060	1426	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1427	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
	1432	+ if (Globals.ADVANCED)
	1433	+ {
1064	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1435	ragdollItem.addActionListener(this);
1066	1436	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1437	ragdoll2Item.addActionListener(this);
	1438	+ }
1068	1439	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1440	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1441	meshItem.addActionListener(this);
1071	1442	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1443	// meshGroupItem.addActionListener(this);
	1444	+ if (Globals.ADVANCED)
	1445	+ {
1073	1446	springItem = menu.add(new MenuItem("Spring"));
1074	1447	springItem.addActionListener(this);
1075	1448	flagItem = menu.add(new MenuItem("Flag"));
1076	1449	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1450	blobItem = menu.add(new MenuItem("Blob"));
1082	1451	blobItem.addActionListener(this);
1083	1452	latheItem = menu.add(new MenuItem("Lathe"));
1084	1453	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1454	+ }
	1455	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1456	+ bezierItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1087	1461	menu.add("-");
1088	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1463	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1092	1466	doubleItem = menu.add(new MenuItem("Fork"));
1093	1467	doubleItem.addActionListener(this);
	1468	+ if (Globals.ADVANCED)
	1469	+ {
1094	1470	tripleItem = menu.add(new MenuItem("Trident"));
1095	1471	tripleItem.addActionListener(this);
	1472	+ }
1096	1473	}
1097	1474
1098	1475	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1478,34 @@
1101	1478	animationItem.addItemListener(this);
1102	1479	animationItem.setState(Globals.ANIMATION);
1103	1480
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
	1483	+
1104	1484	menu.add("-");
1105	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	1486	parseverticesItem.addActionListener(this);
1107	1487	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1488	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1489	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1490	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1491	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1492	reduceMorphItem.addActionListener(this);
1115	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1494	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	1495	menu.add("-");
1121		-
1122	1496	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1497	memoryItem.addActionListener(this);
	1498	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1499	+ computeAOItem.addActionListener(this);
	1500	+
	1501	+ if (Globals.ADVANCED)
	1502	+ {
	1503	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1504	+ mirrorItem.addActionListener(this);
	1505	+ menu.add("-");
1124	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1507	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1509	dumpItem.addActionListener(this);
1128	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1511	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1523,7 @@
1141	1523	menu.add("-");
1142	1524	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1525	editScriptItem.addActionListener(this);
	1526	+ }
1144	1527	}
1145	1528
1146	1529	void ScreenFit()
..	..	@@ -1263,9 +1646,24 @@
1263	1646	shadow.material = new cMaterial(obj.material);
1264	1647	shadow.material.diffuse = 0.0001f;
1265	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1266	1650
1267	1651	makeSomething(shadow);
1268	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1269	1667
1270	1668	/**
1271	1669	* applyExample
..	..	@@ -1469,9 +1867,9 @@
1469	1867
1470	1868	void Overwrite(int mask)
1471	1869	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1870	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1871	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1872	+ Object3D content = Grafreed.clipboard.get(0);
1475	1873
1476	1874	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1875	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +1908,7 @@
1510	1908	{
1511	1909	ScreenFit();
1512	1910	} else
1513		- if (source == switchItem)
	1911	+ if (source == switchViewItem)
1514	1912	{
1515	1913	cVector v1 = new cVector();
1516	1914	cVector v2 = new cVector();
..	..	@@ -1519,11 +1917,11 @@
1519	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	1918	objEditor.cameraView.repaint();
1521	1919	} else
1522		- if (source == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1523	1921	{
1524	1922	makeSomething(new Box());
1525	1923	} else
1526		- if (source == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1527	1925	{
1528	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2000,27 @@
1602	2000
1603	2001	makeSomething(obj);
1604	2002	} else
1605		- if (source == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1606	2004	{
1607	2005	makeSomething(new Grid());
1608	2006	} else
1609		- if (source == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2008	{
1611	2009	makeSomething(new Sphere());
1612	2010	} else
1613		- if (source == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1614	2012	{
1615	2013	makeSomething(new Cone());
1616	2014	} else
1617		- if (source == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1618	2016	{
1619	2017	makeSomething(new Torus());
1620	2018	} else
1621		- if (source == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1622	2020	{
1623	2021	makeSomething(new Superellipsoid());
1624	2022	} else
1625		- if (source == kleinItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
1626	2024	{
1627	2025	makeSomething(new Klein());
1628	2026	} else
..	..	@@ -1642,7 +2040,7 @@
1642	2040	{
1643	2041	makeSomething(new BezierSurface());
1644	2042	} else
1645		- if (source == checkerItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1646	2044	{
1647	2045	/*
1648	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,7 +2088,7 @@
1690	2088	s.setup();
1691	2089	makeSomething(s);
1692	2090	} else
1693		- if (source == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1694	2092	{
1695	2093	makeSomething(new Light());
1696	2094	} else
..	..	@@ -1740,30 +2138,30 @@
1740	2138
1741	2139	group(g);
1742	2140	} else
1743		- if (source == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1744	2142	{
1745	2143	Composite csg = new GroupLeaf();
1746	2144	csg.count = 5;
1747	2145	group(csg);
1748		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1749	2147	csg.addChild(child);
1750	2148	child.addChild(csg);
1751	2149	} else
1752	2150	if (source == doubleItem)
1753	2151	{
1754		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1755	2153	csg.count = 5;
1756	2154	group(csg);
1757		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1758	2156	csg.addChild(child);
1759	2157	child.addChild(csg);
1760		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1761	2159	csg.addChild(child);
1762	2160	child.addChild(csg);
1763	2161	} else
1764	2162	if (source == tripleItem)
1765	2163	{
1766		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1767	2165	csg.count = 4;
1768	2166	group(csg);
1769	2167	Composite child = new cGroup();
..	..	@@ -1775,23 +2173,6 @@
1775	2173	child = new cGroup();
1776	2174	csg.addChild(child);
1777	2175	child.addChild(csg);
1778		- } else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795	2176	} else
1796	2177	if (source == computeAOItem)
1797	2178	{
..	..	@@ -1811,7 +2192,7 @@
1811	2192	if (source == invariantsItem)
1812	2193	{
1813	2194	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2195	+ Grafreed.grafreeD.universe.invariants();
1815	2196	} else
1816	2197	if (source == memoryItem)
1817	2198	{
..	..	@@ -1830,19 +2211,47 @@
1830	2211	{
1831	2212	DumpObject();
1832	2213	} else
	2214	+ if (source == minButton)
	2215	+ {
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
	2240	+ if (source == oneStepButton)
	2241	+ {
	2242	+ Globals.ONESTEP = true;
	2243	+ cameraView.repaint();
	2244	+ } else
1833	2245	if (source == screenfitButton)
1834	2246	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2247	ScreenFit();
1837	2248	} else
1838	2249	if (source == screenfitpointButton)
1839	2250	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2251	ScreenFitPoint();
1842	2252	} else
1843	2253	if (source == snapobjectButton)
1844	2254	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2255	SnapObject();
1847	2256	} else
1848	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2288,20 @@
1879	2288	{
1880	2289	loadClipboard(true);
1881	2290	} else
	2291	+ if (source == undoItem)
	2292	+ {
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
	2298	+ } else
1882	2299	if (source == duplicateItem)
1883	2300	{
1884		- Object3D keep = GrafreeD.clipboard;
	2301	+ Object3D keep = Grafreed.clipboard;
1885	2302	loadClipboard(false);
1886	2303	paste(false);
1887		- GrafreeD.clipboard = keep;
	2304	+ Grafreed.clipboard = keep;
1888	2305	} else
1889	2306	if (source == cloneItem)
1890	2307	{
..	..	@@ -1902,13 +2319,17 @@
1902	2319	{
1903	2320	paste(false);
1904	2321	} else
	2322	+ if (source == pasteIntoItem)
	2323	+ {
	2324	+ pasteInto(true, false);
	2325	+ } else
1905	2326	if (source == pasteLinkItem)
1906	2327	{
1907		- pasteInto(false);
	2328	+ pasteInto(false, false);
1908	2329	} else
1909	2330	if (source == pasteCloneItem)
1910	2331	{
1911		- pasteInto(true);
	2332	+ pasteInto(true, true);
1912	2333	} else
1913	2334	if (source == pasteExpandItem)
1914	2335	{
..	..	@@ -2100,9 +2521,9 @@
2100	2521	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2522	// refreshContents();
2102	2523	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2524	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2525	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2526	+ Object3D content = Grafreed.clipboard.get(0);
2106	2527
2107	2528	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2529	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2531,11 @@
2110	2531	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2532	for (int i=0; i<group.selection.size(); i++)
2112	2533	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2534	+ boolean random = CameraPane.SWITCH;
	2535	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2536	group.selection.get(i).linkVerticesThis(content);
2116	2537	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2538	+ CameraPane.SWITCH = random;
2118	2539	}
2119	2540	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2541	refreshContents();
..	..	@@ -2124,20 +2545,20 @@
2124	2545	{
2125	2546	for (int i=0; i<group.selection.size(); i++)
2126	2547	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2548	+ boolean random = CameraPane.SWITCH;
	2549	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2550	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2551	+ CameraPane.SWITCH = random;
2131	2552	}
2132	2553
2133	2554	refreshContents();
2134	2555	} else
2135	2556	if (source == relinkverticesItem)
2136	2557	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2558	+ boolean random = CameraPane.SWITCH;
	2559	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2560	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2561	+ CameraPane.SWITCH = random;
2141	2562
2142	2563	refreshContents();
2143	2564	} else
..	..	@@ -2152,9 +2573,9 @@
2152	2573	} else
2153	2574	if (source == setMasterItem)
2154	2575	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2576	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2577	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2578	+ Object3D content = Grafreed.clipboard.get(0);
2158	2579
2159	2580	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2581	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2588,9 @@
2167	2588	{
2168	2589	if (group.selection.size() == 1)
2169	2590	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2591	+ if (Grafreed.clipboard.size() == 1)
2171	2592	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2593	+ Object3D content = Grafreed.clipboard.get(0);
2173	2594
2174	2595	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2596	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2607,7 @@
2186	2607	{
2187	2608	RevertMeshes();
2188	2609	} else
2189		- if (source == resetMeshItem)
	2610	+ if (source == resetAllItem)
2190	2611	{
2191	2612	ResetAll();
2192	2613	} else
..	..	@@ -2206,9 +2627,9 @@
2206	2627	{
2207	2628	ClearSelection(true);
2208	2629	} else
2209		- if (source == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2210	2631	{
2211		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2212	2633	} else
2213	2634	if (source == hideItem)
2214	2635	{
..	..	@@ -2226,11 +2647,11 @@
2226	2647	{
2227	2648	makeSomething(new Camera());
2228	2649	} else
2229		- if (source == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2230	2651	{
2231	2652	group(new Composite());
2232	2653	} else
2233		- if (source == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2234	2655	{
2235	2656	RandomNode random = new RandomNode();
2236	2657	group(random);
..	..	@@ -2332,7 +2753,7 @@
2332	2753	{
2333	2754	group(new cLinker());
2334	2755	} else
2335		- if (source == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2336	2757	{
2337	2758	group(new TextureNode());
2338	2759	} else
..	..	@@ -2352,17 +2773,30 @@
2352	2773	{
2353	2774	CastShadow(2);
2354	2775	} else
2355		- if (source == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	2777	{
2357		- //ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
2358	2780	for (int i=0; i<group.selection.size(); i++)
2359	2781	{
2360		- Ungroup(group.selection.get(i));
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
2361	2787	}
2362	2788
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2366	2800	} else
2367	2801	if (source == genUVItem)
2368	2802	{
..	..	@@ -2374,7 +2808,7 @@
2374	2808	} else
2375	2809	if (source == genNormalsMESHItem)
2376	2810	{
2377		- GenNormals(true); // TODO
	2811	+ GenNormalsMESH();
2378	2812	} else
2379	2813	if (source == genNormalsORGANItem)
2380	2814	{
..	..	@@ -2439,6 +2873,22 @@
2439	2873	if (source == unmarkleavesItem)
2440	2874	{
2441	2875	MarkLeaves(false);
	2876	+ } else
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
2442	2892	} else
2443	2893	if (source == flipVItem)
2444	2894	{
..	..	@@ -2524,9 +2974,13 @@
2524	2974	{
2525	2975	SmoothMesh();
2526	2976	} else
2527		- if (source == transformgeometryItem)
	2977	+ if (source == transformGeometryItem)
2528	2978	{
2529	2979	TransformGeometry();
	2980	+ } else
	2981	+ if (source == transformChildrenItem)
	2982	+ {
	2983	+ TransformChildren();
2530	2984	} else
2531	2985	if (source == resetTransformItem)
2532	2986	{
..	..	@@ -2534,7 +2988,11 @@
2534	2988	} else
2535	2989	if (source == resetCentroidItem)
2536	2990	{
2537		- ResetCentroid();
	2991	+ ResetCentroid(true);
	2992	+ } else
	2993	+ if (source == resetCentroidXZItem)
	2994	+ {
	2995	+ ResetCentroid(false);
2538	2996	} else
2539	2997	if (source == resetParentItem)
2540	2998	{
..	..	@@ -2666,6 +3124,10 @@
2666	3124	if (source == twoButton)
2667	3125	{
2668	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2669	3131	// bug
2670	3132	//gridPanel.setDividerLocation(1.0);
2671	3133	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2698,10 +3160,31 @@
2698	3160	bigThree.ClearUI();
2699	3161	bigThree.add(centralPanel);
2700	3162	bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2701	3181	} else
2702	3182	if (source == threeButton)
2703	3183	{
2704	3184	radio.layout = threeButton;
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
2705	3188
2706	3189	// bigThree.remove(scenePanel);
2707	3190	// bigThree.remove(centralPanel);
..	..	@@ -2734,10 +3217,15 @@
2734	3217	bigThree.add(centralPanel);
2735	3218	bigThree.add(XYZPanel);
2736	3219	bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2737	3222	} else
2738	3223	if (source == fourButton)
2739	3224	{
2740	3225	radio.layout = fourButton;
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
2741	3229
2742	3230	// bigThree.remove(scenePanel);
2743	3231	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3257,15 @@
2769	3257	bigThree.ClearUI();
2770	3258	bigThree.add(scenePanel);
2771	3259	bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2772	3262	} else
2773	3263	if (source == sixButton)
2774	3264	{
2775	3265	radio.layout = sixButton;
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
2776	3269
2777	3270	// bigThree.remove(scenePanel);
2778	3271	// bigThree.remove(centralPanel);
..	..	@@ -2805,10 +3298,15 @@
2805	3298	bigThree.add(scenePanel);
2806	3299	bigThree.add(centralPanel);
2807	3300	bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2808	3303	} else
2809	3304	if (source == sevenButton)
2810	3305	{
2811	3306	radio.layout = sevenButton;
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
2812	3310
2813	3311	// bigThree.remove(scenePanel);
2814	3312	// bigThree.remove(centralPanel);
..	..	@@ -2842,6 +3340,8 @@
2842	3340	bigThree.add(centralPanel);
2843	3341	bigThree.add(XYZPanel);
2844	3342	bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2845	3345	} else
2846	3346	if (source == rootButton)
2847	3347	{
..	..	@@ -2853,6 +3353,7 @@
2853	3353	EditObject(obj);
2854	3354	}
2855	3355
	3356	+ cameraView.requestFocusInWindow();
2856	3357	refreshContents(true);
2857	3358	} else
2858	3359	if (source == closeButton)
..	..	@@ -2862,22 +3363,37 @@
2862	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3364	{
2864	3365	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2867	3374	buttonGroup.remove(ab);
2868	3375	radioPanel.remove(ab);
2869	3376
2870		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2871	3379	// ab.GetObject().objectUI = null; // ?????????
2872	3380
2873	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3382	break;
2875	3383	}
2876	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2877	3387	refreshContents(true);
2878	3388	} else
2879	3389	if (source == editItem \|\| source == editButton)
2880	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2881	3397	EditSelection(false);
2882	3398	} else
2883	3399	if (source == uneditButton)
..	..	@@ -2887,12 +3403,13 @@
2887	3403	Object3D child = (Object3D)e.nextElement();
2888	3404	if(child.editWindow != null)
2889	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2890	3407	child.CloseUI();
2891	3408	listUI.remove(child);
2892	3409
2893		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2894	3411	}
2895		- objEditor.ctrlPanel.validate();
	3412	+ objEditor.ctrlPanel.FlushUI();
2896	3413	//objEditor.jTree.clearSelection();
2897	3414	//objEditor.ResetSliders();
2898	3415	refreshContents(true);
..	..	@@ -2903,6 +3420,7 @@
2903	3420	//copy.ClearUI();
2904	3421	for (Object3D obj : listUI)
2905	3422	{
	3423	+ obj.pinned = false;
2906	3424	obj.CloseUI();
2907	3425	}
2908	3426	listUI.clear();
..	..	@@ -2912,7 +3430,7 @@
2912	3430	{
2913	3431	assert(copy == group);
2914	3432
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	3434
2917	3435	for (Object3D obj : listUI)
2918	3436	{
..	..	@@ -2976,20 +3494,44 @@
2976	3494	frontView.object = group;
2977	3495	sideView.object = group;
2978	3496	}
2979		- group.editWindow = this;
	3497	+
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
	3501	+
2980	3502	/*
2981	3503	currentLayout = radio.layout;
2982	3504	if (currentLayout == null)
2983	3505	currentLayout = sevenButton;
2984	3506	*/
2985	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
2986	3513	keepparent = group.parent;
2987	3514	// PARENT = NULL or not???
2988	3515	//group.parent = null; // ROOT
2989	3516	//group.attributes = -1;
2990	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
2991	3520	refreshContents(true);
2992		- }
	3521	+ } else if (event.getSource() == editCameraItem)
	3522	+ {
	3523	+ cameraView.ProtectCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3527	+ {
	3528	+ cameraView.RevertCamera();
	3529	+ cameraView.repaint();
	3530	+ return;
	3531	+ // } else if (event.getSource() == textureButton)
	3532	+ // {
	3533	+ // return; // true;
	3534	+ }
2993	3535	else
2994	3536	{
2995	3537	//return super.action(event, arg);
..	..	@@ -2998,7 +3540,6 @@
2998	3540	}
2999	3541
3000	3542	boolean useclient = false;
3001		- cRadio radio;
3002	3543
3003	3544	void ToggleRoot()
3004	3545	{
..	..	@@ -3050,6 +3591,28 @@
3050	3591	refreshContents();
3051	3592	}
3052	3593
	3594	+ void TransformChildren()
	3595	+ {
	3596	+ Object3D obj;
	3597	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3598	+ {
	3599	+ obj = (Object3D)e.nextElement();
	3600	+ obj.KeepTextureMatrices();
	3601	+ obj.TransformChildren();
	3602	+ obj.RestoreTextureMatrices();
	3603	+
	3604	+// if (obj.parent == null)
	3605	+// {
	3606	+// System.out.println("NULL PARENT!");
	3607	+// new Exception().printStackTrace();
	3608	+// }
	3609	+// else
	3610	+// TouchTransform(obj);
	3611	+// //obj.parent.Touch();
	3612	+ }
	3613	+
	3614	+ refreshContents();
	3615	+ }
3053	3616
3054	3617	void ResetTransform()
3055	3618	{
..	..	@@ -3162,7 +3725,7 @@
3162	3725	refreshContents();
3163	3726	}
3164	3727
3165		- void ResetCentroid()
	3728	+ void ResetCentroid(boolean full)
3166	3729	{
3167	3730	Object3D obj;
3168	3731	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3740,16 @@
3177	3740	LA.matIdentity(Object3D.mat);
3178	3741	obj.getBounds(minima, maxima, false);
3179	3742	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3743	+ if (full)
	3744	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3745	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3746	obj.TransformMesh(Object3D.mat);
	3747	+
3183	3748	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3749	+ if (full)
	3750	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3751	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3752	+
3186	3753	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3754	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3755	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +3778,8 @@
3211	3778
3212	3779	int size = obj.MemorySize();
3213	3780
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	3783	}
3216	3784	}
3217	3785	catch (Exception e)
..	..	@@ -3248,9 +3816,9 @@
3248	3816	obj = (Object3D)e.nextElement();
3249	3817
3250	3818	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3819	+ Grafreed.AnalyzeObject(obj);
3252	3820	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3821	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3822
3255	3823	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3824	}
..	..	@@ -3292,6 +3860,13 @@
3292	3860	void GenNormals(boolean crease)
3293	3861	{
3294	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
3295	3870
3296	3871	refreshContents();
3297	3872	}
..	..	@@ -3464,8 +4039,8 @@
3464	4039
3465	4040	void ParseVertices()
3466	4041	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4042	+ boolean epsequal = Grafreed.epsequal;
	4043	+ Grafreed.epsequal = true;
3469	4044
3470	4045	for (int i=0; i<group.selection.size(); i++)
3471	4046	{
..	..	@@ -3490,7 +4065,7 @@
3490	4065	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4066	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4067
3493		- g.add(GrafreeD.clipboard);
	4068	+ g.add(Grafreed.clipboard);
3494	4069
3495	4070	buffer.add(g);
3496	4071	}
..	..	@@ -3505,7 +4080,7 @@
3505	4080	makeSomething(buffer, i==group.selection.size()-1);
3506	4081	}
3507	4082
3508		- GrafreeD.epsequal = epsequal;
	4083	+ Grafreed.epsequal = epsequal;
3509	4084
3510	4085	refreshContents();
3511	4086	}
..	..	@@ -3523,7 +4098,16 @@
3523	4098	String pigment = Object3D.GetPigment(tex);
3524	4099	//String bump = Object3D.GetBump(tex);
3525	4100
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4102	+
	4103	+ try
	4104	+ {
	4105	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4106	+ }
	4107	+ catch (Exception e)
	4108	+ {
	4109	+ System.err.println("FAIL: " + node);
	4110	+ }
3527	4111
3528	4112	double s = v.s;
3529	4113
..	..	@@ -3611,11 +4195,11 @@
3611	4195
3612	4196	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4197
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4198	+ boolean random = CameraPane.SWITCH;
	4199	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4200	lowres.linkVerticesThis(null);
3617	4201	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4202	+ CameraPane.SWITCH = random;
3619	4203
3620	4204	System.err.flush();
3621	4205
..	..	@@ -3655,7 +4239,7 @@
3655	4239	return;
3656	4240
3657	4241	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4242	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4243
3660	4244	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4245
..	..	@@ -3849,9 +4433,9 @@
3849	4433
3850	4434	void ClipMesh()
3851	4435	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4437	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4438	+ Object3D content = Grafreed.clipboard.get(0);
3855	4439
3856	4440	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4441	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4444,7 @@
3860	4444	// {
3861	4445	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4446	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4447	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4448	}
3865	4449	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4450	System.out.println("DONE.");
..	..	@@ -3907,6 +4491,18 @@
3907	4491	void MarkLeaves(boolean hide)
3908	4492	{
3909	4493	group.selection.MarkLeaves(hide);
	4494	+ refreshContents();
	4495	+ }
	4496	+
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
3910	4506	refreshContents();
3911	4507	}
3912	4508
..	..	@@ -3981,10 +4577,6 @@
3981	4577	// }
3982	4578	// }
3983	4579
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	4580	void EditSelection(boolean newWindow)
3989	4581	{
3990	4582	// aConstraints.gridy = 0;
..	..	@@ -3992,10 +4584,10 @@
3992	4584	{
3993	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4588
3997	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4590	+ if(elem != group \|\| !newWindow)
3999	4591	{
4000	4592	// if (!(elem instanceof Composite))
4001	4593	// newWindow = false;
..	..	@@ -4077,7 +4669,8 @@
4077	4669	//new Exception().printStackTrace();
4078	4670
4079	4671	freezemodel = true;
4080		-
	4672	+ ClearUnpinned();
	4673	+
4081	4674	/**/
4082	4675	//switch (event.id)
4083	4676	{
..	..	@@ -4085,7 +4678,6 @@
4085	4678	//case 702: // Event.LIST_DESELECT
4086	4679	group.deselectAll();
4087	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	4681	if (tps != null)
4090	4682	{
4091	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +4686,8 @@
4094	4686
4095	4687	//if (child.parent != null)
4096	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
4097	4690	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	4691	}
4102	4692	}
4103	4693	// else
..	..	@@ -4107,20 +4697,28 @@
4107	4697	// System.err.println("info : " + group.GetPath());
4108	4698	// }
4109	4699
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	4701	CameraPane.flash = true;
4114	4702
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4704	// a camera
4117	4705	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4707	+ {
	4708	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4709	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4710	+ }
4120	4711	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4712	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4713	}
4123	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
4124	4722	refreshContents();
4125	4723	//return true;
4126	4724	}
..	..	@@ -4129,6 +4727,35 @@
4129	4727
4130	4728	freezemodel = false;
4131	4729	}
	4730	+
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
4132	4759
4133	4760	void linkSomething(Object3D thing)
4134	4761	{
..	..	@@ -4200,16 +4827,19 @@
4200	4827	{
4201	4828	if (group.selection.isEmpty())
4202	4829	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4830	+
	4831	+ Grafreed.clipboardIsTempGroup = false;
4204	4832	Composite tGroup = null;
4205	4833	if (group.selection.size() > 0) // 1)
4206	4834	{
4207	4835	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4836	+ Grafreed.clipboardIsTempGroup = true;
4209	4837	}
4210	4838
4211	4839	if (cut)
4212	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4213	4843	//int indices[] = jList.getSelectedIndices();
4214	4844	//for (int i = indices.length - 1; i >= 0; i--)
4215	4845	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4875,16 @@
4245	4875	//System.out.println("cut " + child);
4246	4876	//System.out.println("parent = " + child.parent);
4247	4877	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4878	+ if (Grafreed.clipboardIsTempGroup)
4249	4879	tGroup.add/Child/(tmp);
4250	4880	else
4251		- GrafreeD.clipboard = tmp;
	4881	+ Grafreed.clipboard = tmp;
4252	4882	}
4253	4883	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4884	+ if (Grafreed.clipboardIsTempGroup)
4255	4885	tGroup.add/Child/(child);
4256	4886	else
4257		- GrafreeD.clipboard = child;
	4887	+ Grafreed.clipboard = child;
4258	4888	}
4259	4889
4260	4890	//ResetModel();
..	..	@@ -4286,21 +4916,23 @@
4286	4916	//System.out.println("cut " + elem);
4287	4917	//System.out.println("parent = " + elem.parent);
4288	4918	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	4919	+ if (Grafreed.clipboardIsTempGroup)
4290	4920	tGroup.add/Child/(tmp);
4291	4921	else
4292		- GrafreeD.clipboard = tmp;
	4922	+ Grafreed.clipboard = tmp;
4293	4923	}
4294	4924	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	4925	+ if (Grafreed.clipboardIsTempGroup)
4296	4926	tGroup.add/Child/(child);
4297	4927	else
4298		- GrafreeD.clipboard = child;
	4928	+ Grafreed.clipboard = child;
4299	4929	}
4300	4930
4301	4931	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	4932	+
	4933	+ if (Grafreed.clipboardIsTempGroup)
	4934	+ Grafreed.clipboard = tGroup;
	4935	+
4304	4936	if (cut)
4305	4937	{
4306	4938	ResetModel();
..	..	@@ -4310,11 +4942,15 @@
4310	4942
4311	4943	void paste(boolean expand)
4312	4944	{
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
4313	4949	// if (GrafreeD.clipboard == null)
4314	4950	// return;
4315	4951	boolean first = true;
4316	4952
4317		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4318	4954	{
4319	4955	Composite temp;
4320	4956
..	..	@@ -4325,7 +4961,7 @@
4325	4961	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	4962	*/
4327	4963	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4964	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	4965	{
4330	4966	Object3D child = (Object3D)e.nextElement();
4331	4967
..	..	@@ -4359,21 +4995,22 @@
4359	4995	//Object3D cb = Applet3D.clipboard;
4360	4996	//temp.addChild(cb);
4361	4997	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4998	+ assert(Grafreed.clipboard.parent == null);
	4999	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5000	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5001	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5002	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5003	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5004	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5005	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5006	}
4371	5007
	5008	+ Globals.SAVEONMAKE = keep;
4372	5009	ResetModel();
4373	5010	refreshContents();
4374	5011	}
4375	5012
4376		- void pasteInto(boolean copyit)
	5013	+ void pasteInto(boolean copyit, boolean clone)
4377	5014	{
4378	5015	// if (GrafreeD.clipboard == null)
4379	5016	// return;
..	..	@@ -4402,15 +5039,22 @@
4402	5039	if (copyit)
4403	5040	{
4404	5041	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5042	+ if (clone)
	5043	+ {
	5044	+ CloneClipboard(false); // sept 2014
	5045	+ }
	5046	+ else
	5047	+ {
	5048	+ paste(false);
	5049	+ }
4406	5050	}
4407	5051	else
4408	5052	{
4409	5053	boolean first = true;
4410	5054
4411		- if (GrafreeD.clipboardIsTempGroup)
	5055	+ if (Grafreed.clipboardIsTempGroup)
4412	5056	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5057	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5058	Object3D copy;
4415	5059	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5060	{
..	..	@@ -4420,7 +5064,7 @@
4420	5064	}
4421	5065	} else
4422	5066	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5067	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5068	}
4425	5069	}
4426	5070	}
..	..	@@ -4497,6 +5141,10 @@
4497	5141
4498	5142	void group(Object3D csg, boolean grab)
4499	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4500	5148	if (//false) // why??
4501	5149	!group.selection.isEmpty())
4502	5150	{
..	..	@@ -4610,10 +5258,15 @@
4610	5258	//node.add(csg);
4611	5259	//makeSomething(node);
4612	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4613	5262	}
4614	5263
4615	5264	void Ungroup(Object3D g)
4616	5265	{
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
4617	5270	if (g instanceof HiddenObject)
4618	5271	{
4619	5272	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5283,7 @@
4630	5283	objEditor.makeSomething(g.get(i), false);
4631	5284	}
4632	5285	}
	5286	+ Globals.SAVEONMAKE = keep;
4633	5287	}
4634	5288
4635	5289	void ungroup()
..	..	@@ -4825,21 +5479,6 @@
4825	5479	}
4826	5480	*/
4827	5481
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5482	/*
4844	5483	public void Callback(Object obj)
4845	5484	{
..	..	@@ -4863,26 +5502,9 @@
4863	5502	}
4864	5503	*/
4865	5504
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5505	String GetFile(String dialogName)
4884	5506	{
4885		- if (GrafreeD.standAlone)
	5507	+ if (Grafreed.standAlone)
4886	5508	{
4887	5509	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5510	browser.show();
..	..	@@ -4946,10 +5568,33 @@
4946	5568	cButton flashSelectionButton;
4947	5569	cButton editButton;
4948	5570	cButton uneditButton;
	5571	+ JCheckBox allParamsButton;
4949	5572	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5573	cButton unselectButton;
4952	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
	5578	+ cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
	5597	+
4953	5598	cButton screenfitButton;
4954	5599	cButton screenfitpointButton;
4955	5600	cButton snapobjectButton;
..	..	@@ -4961,14 +5606,6 @@
4961	5606
4962	5607	cButton setsupportButton;
4963	5608
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	5609	//
4973	5610	//Composite
4974	5611	Object3D // to do !!
..	..	@@ -4978,9 +5615,11 @@
4978	5615	//JTree jTree;
4979	5616	private MenuItem lookAtItem;
4980	5617	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
4982	5619	private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
4984	5623	private MenuItem cloneItem;
4985	5624	private MenuItem cloneSupportItem;
4986	5625	private MenuItem overwriteGeoItem;
..	..	@@ -4993,7 +5632,7 @@
4993	5632	private MenuItem linkverticesItem;
4994	5633	private MenuItem relinkverticesItem;
4995	5634	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5635	+ private MenuItem resetAllItem;
4997	5636	private MenuItem stepAllItem;
4998	5637	private MenuItem revertMeshItem;
4999	5638	private MenuItem poseMeshItem;
..	..	@@ -5004,6 +5643,7 @@
5004	5643	private MenuItem mergeGeometriesItem;
5005	5644	private MenuItem copyItem;
5006	5645	private MenuItem pasteItem;
	5646	+ private MenuItem pasteIntoItem;
5007	5647	private MenuItem pasteLinkItem;
5008	5648	private MenuItem pasteCloneItem;
5009	5649	private MenuItem pasteExpandItem;
..	..	@@ -5042,6 +5682,10 @@
5042	5682	private MenuItem showleavesItem;
5043	5683	private MenuItem markleavesItem;
5044	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
5045	5689
5046	5690	private MenuItem flipVItem;
5047	5691	private MenuItem unflipVItem;
..	..	@@ -5053,15 +5697,17 @@
5053	5697	private MenuItem panoTexturesItem;
5054	5698
5055	5699	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5700	+ private MenuItem resetCentroidXZItem;
5057	5701	private MenuItem resetTransformItem;
	5702	+ private MenuItem transformGeometryItem;
	5703	+ private MenuItem transformChildrenItem;
5058	5704	private MenuItem hideItem;
5059	5705	private MenuItem grabItem;
5060	5706	private MenuItem backItem;
5061	5707	private MenuItem frontItem;
5062	5708	private MenuItem cameraItem;
5063	5709	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
5065	5711	private MenuItem physicsItem;
5066	5712	private MenuItem frameselectorItem;
5067	5713	private MenuItem scriptNodeItem;
..	..	@@ -5101,7 +5747,7 @@
5101	5747	private MenuItem blobItem;
5102	5748	private MenuItem latheItem;
5103	5749	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5750	+ private MenuItem overlayItem;
5105	5751	private MenuItem meshItem;
5106	5752	// private MenuItem meshGroupItem;
5107	5753	private MenuItem springItem;
..	..	@@ -5123,11 +5769,6 @@
5123	5769	private MenuItem doubleItem;
5124	5770	private MenuItem tripleItem;
5125	5771
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5772	private MenuItem computeAOItem;
5132	5773	private MenuItem recompileItem;
5133	5774	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5778,8 @@
5137	5778	private MenuItem analyzeItem;
5138	5779	private MenuItem dumpItem;
5139	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
5140	5785	}