~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +580,217 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
441	624	liveCB.addItemListener(this);
442	625
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ oneStepButton.setToolTipText("Animate one step forward");
	628	+ oneStepButton.addActionListener(this);
	629	+
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	631	+ fastCB.setToolTipText("Fast mode");
461	632	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	633	+
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ screenfitButton.setToolTipText("Screen fit");
507	638	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
	643	+
509	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	645	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	646
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
	647	+ if (Globals.ADVANCED)
	648	+ {
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ snapobjectButton.addActionListener(this);
	651	+ snapobjectButton.setToolTipText("Snap Object");
	652	+ }
	653	+
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
526	655
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ twoButton.setToolTipText("Show center view only");
529	658	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	662	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	663	+ fourButton.setToolTipText("Show left panel only");
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ sixButton.setToolTipText("2-column layout left");
533	666	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ threeButton.setToolTipText("2-column layout right");
535	669	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ sevenButton.setToolTipText("3-column layout");
537	672	sevenButton.addActionListener(this);
538	673	//
539	674
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ rootButton.setToolTipText("Edit selection in new tab");
541	677	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	678	+
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ closeButton.setToolTipText("Close tab");
544	681	closeButton.addActionListener(this);
545	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	683	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	684
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
	766	+ editButton.addActionListener(this);
	767	+
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
557	770	uneditButton.addActionListener(this);
558	771
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
571	774	allParamsButton.addActionListener(this);
572	775
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ clearPanelButton.setToolTipText("Clear edit panel");
	778	+ clearPanelButton.addActionListener(this);
	779	+
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ unselectButton.setToolTipText("Unselect");
578	782	unselectButton.addActionListener(this);
579	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
	793	+
580	794	// oe.aConstraints.gridx += 1;
581	795	// oe.aConstraints.weighty = 0;
582	796	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +802,22 @@
588	802	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	803	// gcButton.addActionListener(this);
590	804
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	805	+ cGridBag jSPPanel = new cGridBag();
	806	+
	807	+ JScrollPane jSP;
602	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	810	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	811
	812	+ oe.treePanel.add(jSPPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+ oe.treePanel.add(copyOptionsPanel);
	816	+ oe.treePanel.Return();
	817	+
	818	+// mainPanel.setDividerLocation(0.5); //1.0);
	819	+// mainPanel.setResizeWeight(0.5);
	820	+
625	821	//jList.addListSelectionListener(this);
626	822	oe.jTree.addTreeSelectionListener(this);
627	823	//jTree.setRootVisible(false);
..	..	@@ -643,20 +839,157 @@
643	839	radio.layout = sevenButton;
644	840	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	841	}
	842	+
	843	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	844	+ {
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
	859	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	860	+ boxCB.setToolTipText("Display bounding boxes");
	861	+ boxCB.addItemListener(this);
	862	+
	863	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
	865	+ zoomBoxCB.addItemListener(this);
	866	+
	867	+ if (true) // Globals.ADVANCED)
	868	+ {
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
	876	+
	877	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	878	+ // localCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	883	+ crowdCB.setToolTipText("Used for crowds");
	884	+ crowdCB.addItemListener(this);
	885	+
	886	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	887	+ smoothCB.setToolTipText("Snapping delay");
	888	+ smoothCB.addItemListener(this);
	889	+
	890	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	891	+ slowCB.setToolTipText("Smooth interpolation");
	892	+ slowCB.addItemListener(this);
	893	+
	894	+// constraints.gridy += 1;
	895	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	896	+// speakerMocapCB.addItemListener(this);
	897	+
	898	+ panel.Return();
	899	+
	900	+ if (false)
	901	+ {
	902	+ // handled in scripts
	903	+ //constraints.gridy += 1;
	904	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	905	+ speakerCameraCB.addItemListener(this);
	906	+
	907	+ //constraints.gridy += 1;
	908	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	909	+ speakerFocusCB.addItemListener(this);
	910	+
	911	+ //constraints.gridy += 1;
	912	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	913	+ smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
	915	+ }
	916	+
	917	+//constraints.gridx += 1;
	918	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	919	+// debugCB.addItemListener(this);
	920	+
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
	925	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
	927	+ oeilCB.addItemListener(this);
	928	+
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
	949	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	950	+ lookAtCB.setToolTipText("Look-at target");
	951	+ lookAtCB.addItemListener(this);
	952	+ }
	953	+
	954	+ }
	955	+
	956	+ cGridBag fill = new cGridBag();
	957	+ fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
	962	+
	963	+ panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
	966	+
	967	+ }
646	968
647	969	void EditObject(Object3D obj)
648	970	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	971	+ cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
	980	+ radioButton.SetObject(obj);
	981	+ radioButton.layout = sevenButton;
	982	+ radioButton.SetCamera(cameraView.renderCamera, false);
	983	+ radioButton.addActionListener(this);
	984	+ radioPanel.add(radioButton);
	985	+ buttonGroup.add(radioButton);
	986	+ radioButton.doClick();
657	987	}
	988	+
658	989	void SetupViews(ObjEditor oe)
659	990	{
	991	+ theFrame = this;
	992	+
660	993	oe.SetupViews();
661	994
662	995	System.out.println("SetupViews");
..	..	@@ -665,22 +998,28 @@
665	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	999	}
667	1000
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
678	1014	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
684	1023
685	1024	// static int COLOR = 1;
686	1025	// static int MATERIAL = 2;
..	..	@@ -688,9 +1027,9 @@
688	1027
689	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1029
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
694	1033
695	1034	public void itemStateChanged(ItemEvent e)
696	1035	{
..	..	@@ -715,10 +1054,10 @@
715	1054	dropAttributes \|= Object3D.TEXTURE;
716	1055	else
717	1056	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1057	+ } else if(e.getSource() == liveCB)
720	1058	{
721	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
722	1061	}
723	1062	else if(e.getSource() == supportCB)
724	1063	{
..	..	@@ -754,6 +1093,10 @@
754	1093	cameraView.repaint();
755	1094	// refreshContents();
756	1095	}
	1096	+ else if(e.getSource() == zoomBoxCB)
	1097	+ {
	1098	+ cameraView.ToggleZoomBoxMode();
	1099	+ }
757	1100	else if(e.getSource() == smoothfocusCB)
758	1101	{
759	1102	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1122,18 @@
779	1122	{
780	1123	cameraView.ToggleOeil();
781	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
782	1137	else if(e.getSource() == lookAtCB)
783	1138	{
784	1139	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1150,8 @@
795	1150
796	1151	/**/
797	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1156	// We can't move the root node or an empty selection
801	1157	return;
..	..	@@ -867,7 +1223,9 @@
867	1223	// objEditor.DropFile((java.io.File[]) object, true);
868	1224	// return;
869	1225	// }
870		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1229	{
872	1230	// file(s)
873	1231	String[] names = string.split("\n");
..	..	@@ -894,7 +1252,7 @@
894	1252
895	1253	flashIt = false;
896	1254	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1257
900	1258	if (group.selection.size() == 1)
..	..	@@ -910,23 +1268,33 @@
910	1268
911	1269	assert target == objEditor.jTree;
912	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
913	1272	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1274	} catch (Exception e) {
916	1275	System.out.println("destinationPath : " + destinationPath);
917	1276	return;
918	1277	}
919	1278
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
921	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
922	1290	loadClipboard(true);
923	1291	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1292	+ pasteInto(false, false);
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
930	1298	}
931	1299	public void dropActionChanged(DropTargetDragEvent dtde)
932	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1399,107 @@
1031	1399	{
1032	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1401	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1046	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1421	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1050	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1429	ragdollItem.addActionListener(this);
1052	1430	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1431	ragdoll2Item.addActionListener(this);
	1432	+ }
1054	1433	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1434	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1435	meshItem.addActionListener(this);
1057	1436	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1437	// meshGroupItem.addActionListener(this);
	1438	+ if (Globals.ADVANCED)
	1439	+ {
1059	1440	springItem = menu.add(new MenuItem("Spring"));
1060	1441	springItem.addActionListener(this);
1061	1442	flagItem = menu.add(new MenuItem("Flag"));
1062	1443	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1444	blobItem = menu.add(new MenuItem("Blob"));
1068	1445	blobItem.addActionListener(this);
1069	1446	latheItem = menu.add(new MenuItem("Lathe"));
1070	1447	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- lightItem.addActionListener(this);
	1448	+ }
	1449	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1450	+ bezierItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1073	1455	menu.add("-");
1074	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1457	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1078	1460	doubleItem = menu.add(new MenuItem("Fork"));
1079	1461	doubleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1080	1464	tripleItem = menu.add(new MenuItem("Trident"));
1081	1465	tripleItem.addActionListener(this);
	1466	+ }
1082	1467	}
1083	1468
1084	1469	void buildToolsMenu(Menu menu)
1085	1470	{
1086	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1472	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1473	+ animationItem.setState(Globals.ANIMATION);
	1474	+
	1475	+ menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
	1476	+ archiveItem.addItemListener(this);
1089	1477
1090	1478	menu.add("-");
1091	1479	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1480	parseverticesItem.addActionListener(this);
1093	1481	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1482	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1483	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1484	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1485	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1486	reduceMorphItem.addActionListener(this);
1101	1487	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1488	reduce34MorphItem.addActionListener(this);
1103		-
	1489	+ menu.add("-");
1104	1490	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1491	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1492
	1493	+ if (Globals.ADVANCED)
	1494	+ {
	1495	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1496	+ mirrorItem.addActionListener(this);
	1497	+ menu.add("-");
1108	1498	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1499	memoryItem.addActionListener(this);
1110	1500	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1501	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1502	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1503	dumpItem.addActionListener(this);
1114	1504	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1505	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1508,8 @@
1118	1508	resetParentItem.addActionListener(this);
1119	1509	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1510	repairParentItem.addActionListener(this);
	1511	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1512	+ repairShadowItem.addActionListener(this);
1121	1513	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1514	invariantsItem.addActionListener(this);
1123	1515	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1517,7 @@
1125	1517	menu.add("-");
1126	1518	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1519	editScriptItem.addActionListener(this);
	1520	+ }
1128	1521	}
1129	1522
1130	1523	void ScreenFit()
..	..	@@ -1247,9 +1640,24 @@
1247	1640	shadow.material = new cMaterial(obj.material);
1248	1641	shadow.material.diffuse = 0.0001f;
1249	1642	shadow.material.specular = 0.0001f;
	1643	+ //shadow.projectedVertices[1].x = 300;
1250	1644
1251	1645	makeSomething(shadow);
1252	1646	}
	1647	+
	1648	+ private void ClearUnpinned()
	1649	+ {
	1650	+ //for (Object3D obj : listUI)
	1651	+ for (int i=listUI.size(); --i>=0;)
	1652	+ {
	1653	+ Object3D obj = listUI.elementAt(i);
	1654	+ if (!obj.pinned)
	1655	+ {
	1656	+ obj.CloseUI();
	1657	+ listUI.remove(i);
	1658	+ }
	1659	+ }
	1660	+ }
1253	1661
1254	1662	/**
1255	1663	* applyExample
..	..	@@ -1453,9 +1861,9 @@
1453	1861
1454	1862	void Overwrite(int mask)
1455	1863	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1864	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1865	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1866	+ Object3D content = Grafreed.clipboard.get(0);
1459	1867
1460	1868	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1869	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1886,7 @@
1478	1886	//
1479	1887	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1888	{
	1889	+ Object source = event.getSource();
1481	1890	/*
1482	1891	if (event.getSource() == nameField)
1483	1892	{
..	..	@@ -1489,11 +1898,11 @@
1489	1898	}
1490	1899	else
1491	1900	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1901	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1902	{
1494	1903	ScreenFit();
1495	1904	} else
1496		- if (event.getSource() == switchItem)
	1905	+ if (source == switchViewItem)
1497	1906	{
1498	1907	cVector v1 = new cVector();
1499	1908	cVector v2 = new cVector();
..	..	@@ -1502,11 +1911,11 @@
1502	1911	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1912	objEditor.cameraView.repaint();
1504	1913	} else
1505		- if (event.getSource() == rectoidItem)
	1914	+ if (source == rectoidItem \|\| source == boxButton)
1506	1915	{
1507	1916	makeSomething(new Box());
1508	1917	} else
1509		- if (event.getSource() == particleItem)
	1918	+ if (source == particleItem \|\| source == particlesButton)
1510	1919	{
1511	1920	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1921	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1936,9 @@
1527	1936	applyExample(particleGeom, "SMOKE");
1528	1937	makeSomething(particleGeom);
1529	1938	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1939	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1940	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1941	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1942
1534	1943	ragdoll.toParent = LA.newMatrix();
1535	1944	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1956,7 @@
1547	1956	} else
1548	1957	/*
1549	1958	*/
1550		- if (event.getSource() == heightFieldItem)
	1959	+ if (source == heightFieldItem)
1551	1960	{
1552	1961	Object3D obj = new Object3D();
1553	1962
..	..	@@ -1585,31 +1994,31 @@
1585	1994
1586	1995	makeSomething(obj);
1587	1996	} else
1588		- if (event.getSource() == gridItem)
	1997	+ if (source == gridItem \|\| source == gridButton)
1589	1998	{
1590	1999	makeSomething(new Grid());
1591	2000	} else
1592		- if (event.getSource() == ellipsoidItem)
	2001	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2002	{
1594	2003	makeSomething(new Sphere());
1595	2004	} else
1596		- if (event.getSource() == coneItem)
	2005	+ if (source == coneItem \|\| source == coneButton)
1597	2006	{
1598	2007	makeSomething(new Cone());
1599	2008	} else
1600		- if (event.getSource() == torusItem)
	2009	+ if (source == torusItem \|\| source == torusButton)
1601	2010	{
1602	2011	makeSomething(new Torus());
1603	2012	} else
1604		- if (event.getSource() == superItem)
	2013	+ if (source == superItem \|\| source == superButton)
1605	2014	{
1606	2015	makeSomething(new Superellipsoid());
1607	2016	} else
1608		- if (event.getSource() == kleinItem)
	2017	+ if (source == kleinItem \|\| source == kleinButton)
1609	2018	{
1610	2019	makeSomething(new Klein());
1611	2020	} else
1612		- if (event.getSource() == blobItem)
	2021	+ if (source == blobItem)
1613	2022	{
1614	2023	Blob blob = new Blob();
1615	2024	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2026,15 @@
1617	2026	//blob.retile();
1618	2027	makeSomething(blob);
1619	2028	} else
1620		- if (event.getSource() == latheItem)
	2029	+ if (source == latheItem)
1621	2030	{
1622	2031	makeSomething(new Lathe());
1623	2032	} else
1624		- if (event.getSource() == bezierItem)
	2033	+ if (source == bezierItem)
1625	2034	{
1626	2035	makeSomething(new BezierSurface());
1627	2036	} else
1628		- if (event.getSource() == checkerItem)
	2037	+ if (source == overlayItem \|\| source == overlayButton)
1629	2038	{
1630	2039	/*
1631	2040	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2049,7 @@
1640	2049	*/
1641	2050	makeSomething(new Checker());
1642	2051	} else
1643		- if (event.getSource() == meshItem)
	2052	+ if (source == meshItem)
1644	2053	{
1645	2054	Object3D itemtomake = new Object3D();
1646	2055	Object3D child;
..	..	@@ -1661,35 +2070,35 @@
1661	2070	makeSomething(child);
1662	2071	}
1663	2072	} else
1664		- if (event.getSource() == springItem)
	2073	+ if (source == springItem)
1665	2074	{
1666	2075	cSpring s = new cSpring();
1667	2076	s.setup();
1668	2077	makeSomething(s);
1669	2078	} else
1670		- if (event.getSource() == flagItem)
	2079	+ if (source == flagItem)
1671	2080	{
1672	2081	cSpring s = new cFlag();
1673	2082	s.setup();
1674	2083	makeSomething(s);
1675	2084	} else
1676		- if (event.getSource() == lightItem)
	2085	+ if (source == lightItem \|\| source == lightButton)
1677	2086	{
1678	2087	makeSomething(new Light());
1679	2088	} else
1680		- if (event.getSource() == csgItem)
	2089	+ if (source == csgItem)
1681	2090	{
1682	2091	group(new CSG());
1683	2092	} else
1684		- if (event.getSource() == templateItem)
	2093	+ if (source == templateItem)
1685	2094	{
1686	2095	group(new cTemplate());
1687	2096	} else
1688		- if (event.getSource() == attributeItem)
	2097	+ if (source == attributeItem)
1689	2098	{
1690	2099	makeSomething(new Attribute());
1691	2100	} else
1692		- if (event.getSource() == pointflowItem)
	2101	+ if (source == pointflowItem)
1693	2102	{
1694	2103	makeSomething(new PointFlow());
1695	2104	} else
..	..	@@ -1701,7 +2110,7 @@
1701	2110	} else
1702	2111	*/
1703	2112
1704		- if (event.getSource() == superLoopItem)
	2113	+ if (source == superLoopItem)
1705	2114	{
1706	2115	Composite g = new cGroup();
1707	2116	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2132,30 @@
1723	2132
1724	2133	group(g);
1725	2134	} else
1726		- if (event.getSource() == loopItem)
	2135	+ if (source == loopItem \|\| source == loopButton)
1727	2136	{
1728	2137	Composite csg = new GroupLeaf();
1729	2138	csg.count = 5;
1730	2139	group(csg);
1731		- Composite child = new cGroup();
	2140	+ Composite child = new cGroup("Branch");
1732	2141	csg.addChild(child);
1733	2142	child.addChild(csg);
1734	2143	} else
1735		- if (event.getSource() == doubleItem)
	2144	+ if (source == doubleItem)
1736	2145	{
1737		- Composite csg = new GroupLeaf();
	2146	+ Composite csg = new GroupLeaf("Fork");
1738	2147	csg.count = 5;
1739	2148	group(csg);
1740		- Composite child = new cGroup();
	2149	+ Composite child = new cGroup("Branch A");
1741	2150	csg.addChild(child);
1742	2151	child.addChild(csg);
1743		- child = new cGroup();
	2152	+ child = new cGroup("Branch B");
1744	2153	csg.addChild(child);
1745	2154	child.addChild(csg);
1746	2155	} else
1747		- if (event.getSource() == tripleItem)
	2156	+ if (source == tripleItem)
1748	2157	{
1749		- Composite csg = new GroupLeaf();
	2158	+ Composite csg = new GroupLeaf("Trident");
1750	2159	csg.count = 4;
1751	2160	group(csg);
1752	2161	Composite child = new cGroup();
..	..	@@ -1759,71 +2168,83 @@
1759	2168	csg.addChild(child);
1760	2169	child.addChild(csg);
1761	2170	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2171	+ if (source == computeAOItem)
1764	2172	{
1765		- ImportGFD();
	2173	+ Globals.drawMode = CameraPane.OCCLUSION;
	2174	+ Globals.theRenderer.repaint();
1766	2175	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2176	+ if (source == recompileItem)
1785	2177	{
1786	2178	Recompile();
1787	2179	refreshContents();
1788	2180	} else
1789		- if (event.getSource() == editScriptItem)
	2181	+ if (source == editScriptItem)
1790	2182	{
1791	2183	OpenDialog();
1792	2184	refreshContents();
1793	2185	} else
1794		- if (event.getSource() == invariantsItem)
	2186	+ if (source == invariantsItem)
1795	2187	{
1796	2188	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2189	+ Grafreed.grafreeD.universe.invariants();
1798	2190	} else
1799		- if (event.getSource() == memoryItem)
	2191	+ if (source == memoryItem)
1800	2192	{
1801	2193	//System.out.println("Invariants:");
1802	2194	PrintMemory();
1803	2195	} else
1804		- if (event.getSource() == pathItem)
	2196	+ if (source == pathItem)
1805	2197	{
1806	2198	PrintPath();
1807	2199	} else
1808		- if (event.getSource() == analyzeItem)
	2200	+ if (source == analyzeItem)
1809	2201	{
1810	2202	AnalyzeObject();
1811	2203	} else
1812		- if (event.getSource() == dumpItem)
	2204	+ if (source == dumpItem)
1813	2205	{
1814	2206	DumpObject();
1815	2207	} else
1816		- if (event.getSource() == screenfitButton)
	2208	+ if (source == minButton)
	2209	+ {
	2210	+ Minimize();
	2211	+ } else
	2212	+ if (source == maxButton)
	2213	+ {
	2214	+ Maximize();
	2215	+ } else
	2216	+ if (source == fullButton)
	2217	+ {
	2218	+ ToggleFullScreen();
	2219	+ } else
	2220	+ if (source == undoButton)
	2221	+ {
	2222	+ Undo();
	2223	+ } else
	2224	+ if (source == redoButton)
	2225	+ {
	2226	+ Redo();
	2227	+ } else
	2228	+ if (source == saveButton)
	2229	+ {
	2230	+ Save();
	2231	+ } else
	2232	+ if (source == oneStepButton)
	2233	+ {
	2234	+ Globals.ONESTEP = true;
	2235	+ cameraView.repaint();
	2236	+ } else
	2237	+ if (source == screenfitButton)
1817	2238	{
1818	2239	//Reload(lastConverter, lastFilename, true);
1819	2240	ScreenFit();
1820	2241	} else
1821		- if (event.getSource() == screenfitpointButton)
	2242	+ if (source == screenfitpointButton)
1822	2243	{
1823	2244	//Reload(lastConverter, lastFilename, true);
1824	2245	ScreenFitPoint();
1825	2246	} else
1826		- if (event.getSource() == snapobjectButton)
	2247	+ if (source == snapobjectButton)
1827	2248	{
1828	2249	//Reload(lastConverter, lastFilename, true);
1829	2250	SnapObject();
..	..	@@ -1834,13 +2255,13 @@
1834	2255	// Recompile();
1835	2256	// refreshContents();
1836	2257	// } else
1837		- if (event.getSource() == gcButton)
	2258	+ if (source == gcButton)
1838	2259	{
1839	2260	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2261	System.gc();
1841	2262	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2263	} else
1843		- if (event.getSource() == editLeafItem)
	2264	+ if (source == editLeafItem)
1844	2265	{
1845	2266	Object3D obj;
1846	2267	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2275,74 @@
1854	2275	}
1855	2276	refreshContents(true);
1856	2277	} else
1857		- if (event.getSource() == openWindowItem)
	2278	+ if (source == openWindowItem)
1858	2279	{
1859	2280	EditSelection(true);
1860	2281	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2282	+ if (source == cutItem \|\| source == clearButton)
1862	2283	{
1863	2284	loadClipboard(true);
1864	2285	} else
1865		- if (event.getSource() == duplicateItem)
	2286	+ if (source == undoItem)
1866	2287	{
1867		- Object3D keep = GrafreeD.clipboard;
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
	2293	+ } else
	2294	+ if (source == duplicateItem)
	2295	+ {
	2296	+ Object3D keep = Grafreed.clipboard;
1868	2297	loadClipboard(false);
1869	2298	paste(false);
1870		- GrafreeD.clipboard = keep;
	2299	+ Grafreed.clipboard = keep;
1871	2300	} else
1872		- if (event.getSource() == cloneItem)
	2301	+ if (source == cloneItem)
1873	2302	{
1874	2303	CloneSelection(false);
1875	2304	} else
1876		- if (event.getSource() == cloneSupportItem)
	2305	+ if (source == cloneSupportItem)
1877	2306	{
1878	2307	CloneSelection(true);
1879	2308	} else
1880		- if (event.getSource() == copyItem)
	2309	+ if (source == copyItem)
1881	2310	{
1882	2311	loadClipboard(false);
1883	2312	} else
1884		- if (event.getSource() == pasteItem)
	2313	+ if (source == pasteItem)
1885	2314	{
1886	2315	paste(false);
1887	2316	} else
1888		- if (event.getSource() == pasteLinkItem)
	2317	+ if (source == pasteIntoItem)
1889	2318	{
1890		- pasteInto(false);
	2319	+ pasteInto(true, false);
1891	2320	} else
1892		- if (event.getSource() == pasteCloneItem)
	2321	+ if (source == pasteLinkItem)
1893	2322	{
1894		- pasteInto(true);
	2323	+ pasteInto(false, false);
1895	2324	} else
1896		- if (event.getSource() == pasteExpandItem)
	2325	+ if (source == pasteCloneItem)
	2326	+ {
	2327	+ pasteInto(true, true);
	2328	+ } else
	2329	+ if (source == pasteExpandItem)
1897	2330	{
1898	2331	paste(true);
1899	2332	} else
1900		- if (event.getSource() == synchronizeItem)
	2333	+ if (source == synchronizeItem)
1901	2334	{
1902	2335	Overwrite(Object3D.TRANSFORM);
1903	2336	} else
1904		- if (event.getSource() == overwriteNameItem)
	2337	+ if (source == overwriteNameItem)
1905	2338	{
1906	2339	Overwrite(Object3D.NAME);
1907	2340	} else
1908		- if (event.getSource() == overwriteUVItem)
	2341	+ if (source == overwriteUVItem)
1909	2342	{
1910	2343	Overwrite(Object3D.UV);
1911	2344	} else
1912		- if (event.getSource() == overwriteMatItem)
	2345	+ if (source == overwriteMatItem)
1913	2346	{
1914	2347	/* july 2015
1915	2348	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2362,7 @@
1929	2362
1930	2363	Overwrite(dropAttributes);
1931	2364	}
1932		- if (event.getSource() == overwriteGeoItem)
	2365	+ if (source == overwriteGeoItem)
1933	2366	{
1934	2367	Overwrite(Object3D.GEOMETRY);
1935	2368	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2379,7 @@
1946	2379	// refreshContents();
1947	2380	// }
1948	2381	} else
1949		- if (event.getSource() == generateMeshItem)
	2382	+ if (source == generateMeshItem)
1950	2383	{
1951	2384	//if (group.selection.size() == 1)
1952	2385	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2390,7 @@
1957	2390	ResetModel();
1958	2391	refreshContents();
1959	2392	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2393	+ if (source == extractGeometriesItem)
1961	2394	{
1962	2395	boolean one = false;
1963	2396
..	..	@@ -1984,7 +2417,7 @@
1984	2417	ResetModel();
1985	2418	refreshContents();
1986	2419	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2420	+ if (source == cloneGeometriesItem)
1988	2421	{
1989	2422	boolean one = false;
1990	2423
..	..	@@ -2010,7 +2443,7 @@
2010	2443	ResetModel();
2011	2444	refreshContents();
2012	2445	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2446	+ if (source == shareGeometriesItem)
2014	2447	{
2015	2448	boolean one = false;
2016	2449
..	..	@@ -2040,7 +2473,7 @@
2040	2473	refreshContents();
2041	2474	}
2042	2475	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2476	+ if (source == mergeGeometriesItem)
2044	2477	{
2045	2478	boolean one = false;
2046	2479
..	..	@@ -2070,7 +2503,7 @@
2070	2503	ResetModel();
2071	2504	refreshContents();
2072	2505	} else
2073		- if (event.getSource() == linkverticesItem)
	2506	+ if (source == linkverticesItem)
2074	2507	{
2075	2508	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2509	// {
..	..	@@ -2083,48 +2516,48 @@
2083	2516	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2517	// refreshContents();
2085	2518	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2519	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2520	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2521	+ Object3D content = Grafreed.clipboard.get(0);
2089	2522
2090	2523	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2524	content = ((cGroup)content).get(0);
2092	2525
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2526	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2527	for (int i=0; i<group.selection.size(); i++)
2095	2528	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2529	+ boolean random = CameraPane.SWITCH;
	2530	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2531	group.selection.get(i).linkVerticesThis(content);
2099	2532	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2533	+ CameraPane.SWITCH = random;
2101	2534	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2535	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2536	refreshContents();
2104	2537	}
2105	2538	} else
2106		- if (event.getSource() == resetsupportItem)
	2539	+ if (source == resetsupportItem)
2107	2540	{
2108	2541	for (int i=0; i<group.selection.size(); i++)
2109	2542	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2543	+ boolean random = CameraPane.SWITCH;
	2544	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2545	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2546	+ CameraPane.SWITCH = random;
2114	2547	}
2115	2548
2116	2549	refreshContents();
2117	2550	} else
2118		- if (event.getSource() == relinkverticesItem)
	2551	+ if (source == relinkverticesItem)
2119	2552	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2553	+ boolean random = CameraPane.SWITCH;
	2554	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2555	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2556	+ CameraPane.SWITCH = random;
2124	2557
2125	2558	refreshContents();
2126	2559	} else
2127		- if (event.getSource() == resetreferencesItem)
	2560	+ if (source == resetreferencesItem)
2128	2561	{
2129	2562	for (int i=0; i<group.selection.size(); i++)
2130	2563	{
..	..	@@ -2133,11 +2566,11 @@
2133	2566
2134	2567	refreshContents();
2135	2568	} else
2136		- if (event.getSource() == setMasterItem)
	2569	+ if (source == setMasterItem)
2137	2570	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2571	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2572	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2141	2574
2142	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2576	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2579,13 @@
2146	2579	refreshContents();
2147	2580	}
2148	2581	} else
2149		- if (event.getSource() == poseMeshItem)
	2582	+ if (source == poseMeshItem)
2150	2583	{
2151	2584	if (group.selection.size() == 1)
2152	2585	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2586	+ if (Grafreed.clipboard.size() == 1)
2154	2587	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2588	+ Object3D content = Grafreed.clipboard.get(0);
2156	2589
2157	2590	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2591	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2598,19 @@
2165	2598	}
2166	2599
2167	2600	} else
2168		- if (event.getSource() == revertMeshItem)
	2601	+ if (source == revertMeshItem)
2169	2602	{
2170	2603	RevertMeshes();
2171	2604	} else
2172		- if (event.getSource() == resetMeshItem)
	2605	+ if (source == resetAllItem)
2173	2606	{
2174	2607	ResetAll();
2175	2608	} else
2176		- if (event.getSource() == stepAllItem)
	2609	+ if (source == stepAllItem)
2177	2610	{
2178	2611	StepAll();
2179	2612	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2613	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2614	{
2182	2615	//int indices[] = jList.getSelectedIndices();
2183	2616	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2618,46 @@
2185	2618
2186	2619	ClearSelection(false);
2187	2620	} else
2188		- if (event.getSource() == clearAllItem)
	2621	+ if (source == clearAllItem)
2189	2622	{
2190	2623	ClearSelection(true);
2191	2624	} else
2192		- if (event.getSource() == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2193	2626	{
2194		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2195	2628	} else
2196		- if (event.getSource() == hideItem)
	2629	+ if (source == hideItem)
2197	2630	{
2198	2631	group(new HiddenObject());
2199	2632	} else
2200		- if (event.getSource() == frontItem)
	2633	+ if (source == frontItem)
2201	2634	{
2202	2635	front();
2203	2636	} else
2204		- if (event.getSource() == backItem)
	2637	+ if (source == backItem)
2205	2638	{
2206	2639	back();
2207	2640	} else
2208		- if (event.getSource() == cameraItem)
	2641	+ if (source == cameraItem)
2209	2642	{
2210	2643	makeSomething(new Camera());
2211	2644	} else
2212		- if (event.getSource() == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2213	2646	{
2214	2647	group(new Composite());
2215	2648	} else
2216		- if (event.getSource() == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2217	2650	{
2218	2651	RandomNode random = new RandomNode();
2219	2652	group(random);
2220	2653	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2654	+ random.name = random.get(0).name + "Switch";
2222	2655	} else
2223		- if (event.getSource() == physicsItem)
	2656	+ if (source == physicsItem)
2224	2657	{
2225	2658	group(new PhysicsNode());
2226	2659	} else
2227		- if (event.getSource() == frameselectorItem)
	2660	+ if (source == frameselectorItem)
2228	2661	{
2229	2662	for (int i=0; i<group.selection.size(); i++)
2230	2663	{
..	..	@@ -2236,7 +2669,7 @@
2236	2669	ResetModel();
2237	2670	refreshContents();
2238	2671	} else
2239		- if (event.getSource() == switchGeoItem)
	2672	+ if (source == switchGeoItem)
2240	2673	{
2241	2674	for (int i=0; i<group.selection.size(); i++)
2242	2675	{
..	..	@@ -2248,7 +2681,7 @@
2248	2681	ResetModel();
2249	2682	refreshContents();
2250	2683	} else
2251		- if (event.getSource() == switchTransfoItem)
	2684	+ if (source == switchTransfoItem)
2252	2685	{
2253	2686	for (int i=0; i<group.selection.size(); i++)
2254	2687	{
..	..	@@ -2260,7 +2693,7 @@
2260	2693	ResetModel();
2261	2694	refreshContents();
2262	2695	} else
2263		- if (event.getSource() == morphItem)
	2696	+ if (source == morphItem)
2264	2697	{
2265	2698	for (int i=0; i<group.selection.size(); i++)
2266	2699	{
..	..	@@ -2272,7 +2705,7 @@
2272	2705	ResetModel();
2273	2706	refreshContents();
2274	2707	} else
2275		- if (event.getSource() == scriptNodeItem)
	2708	+ if (source == scriptNodeItem)
2276	2709	{
2277	2710	boolean atleastone = false;
2278	2711
..	..	@@ -2311,215 +2744,252 @@
2311	2744	}
2312	2745	}
2313	2746	} else
2314		- if (event.getSource() == linkerItem)
	2747	+ if (source == linkerItem)
2315	2748	{
2316	2749	group(new cLinker());
2317	2750	} else
2318		- if (event.getSource() == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2319	2752	{
2320	2753	group(new TextureNode());
2321	2754	} else
2322		- if (event.getSource() == billboardItem)
	2755	+ if (source == billboardItem)
2323	2756	{
2324	2757	group(new BillboardNode());
2325	2758	} else
2326		- if (event.getSource() == shadowXItem)
	2759	+ if (source == shadowXItem)
2327	2760	{
2328	2761	CastShadow(0);
2329	2762	} else
2330		- if (event.getSource() == shadowYItem)
	2763	+ if (source == shadowYItem)
2331	2764	{
2332	2765	CastShadow(1);
2333	2766	} else
2334		- if (event.getSource() == shadowZItem)
	2767	+ if (source == shadowZItem)
2335	2768	{
2336	2769	CastShadow(2);
2337	2770	} else
2338		- if (event.getSource() == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	2772	{
2340		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2341	2775	for (int i=0; i<group.selection.size(); i++)
2342	2776	{
2343		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2344	2782	}
2345	2783
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2349	2795	} else
2350		- if (event.getSource() == genUVItem)
	2796	+ if (source == genUVItem)
2351	2797	{
2352	2798	GenUV();
2353	2799	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2800	+ if (source == genNormalsCADItem)
2355	2801	{
2356	2802	GenNormals(true);
2357	2803	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2804	+ if (source == genNormalsMESHItem)
2359	2805	{
2360		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2361	2807	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2808	+ if (source == genNormalsORGANItem)
2363	2809	{
2364	2810	GenNormals(false);
2365	2811	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2812	+ if (source == genNormalsMINEItem)
2367	2813	{
2368	2814	GenNormalsMINE();
2369	2815	} else
2370		- if (event.getSource() == stripifyItem)
	2816	+ if (source == stripifyItem)
2371	2817	{
2372	2818	Stripify();
2373	2819	} else
2374		- if (event.getSource() == unstripifyItem)
	2820	+ if (source == unstripifyItem)
2375	2821	{
2376	2822	Unstripify();
2377	2823	} else
2378		- if (event.getSource() == trimItem)
	2824	+ if (source == trimItem)
2379	2825	{
2380	2826	Trim();
2381	2827	} else
2382		- if (event.getSource() == untrimItem)
	2828	+ if (source == untrimItem)
2383	2829	{
2384	2830	Untrim();
2385	2831	} else
2386		- if (event.getSource() == clearColorsItem)
	2832	+ if (source == clearColorsItem)
2387	2833	{
2388	2834	ClearColors();
2389	2835	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2836	+ if (source == clearMaterialsItem)
2391	2837	{
2392	2838	ClearMaterials();
2393	2839	} else
2394		- if (event.getSource() == liveleavesItem)
	2840	+ if (source == liveleavesItem)
2395	2841	{
2396	2842	LiveLeaves(true);
2397	2843	} else
2398		- if (event.getSource() == unliveleavesItem)
	2844	+ if (source == unliveleavesItem)
2399	2845	{
2400	2846	LiveLeaves(false);
2401	2847	} else
2402		- if (event.getSource() == supportleavesItem)
	2848	+ if (source == supportleavesItem)
2403	2849	{
2404	2850	SupportLeaves(true);
2405	2851	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2852	+ if (source == unsupportleavesItem)
2407	2853	{
2408	2854	SupportLeaves(false);
2409	2855	} else
2410		- if (event.getSource() == hideleavesItem)
	2856	+ if (source == hideleavesItem)
2411	2857	{
2412	2858	HideLeaves(true);
2413	2859	} else
2414		- if (event.getSource() == showleavesItem)
	2860	+ if (source == showleavesItem)
2415	2861	{
2416	2862	HideLeaves(false);
2417	2863	} else
2418		- if (event.getSource() == markleavesItem)
	2864	+ if (source == markleavesItem)
2419	2865	{
2420	2866	MarkLeaves(true);
2421	2867	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2868	+ if (source == unmarkleavesItem)
2423	2869	{
2424	2870	MarkLeaves(false);
2425	2871	} else
2426		- if (event.getSource() == flipVItem)
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
	2887	+ } else
	2888	+ if (source == flipVItem)
2427	2889	{
2428	2890	FlipV(true);
2429	2891	} else
2430		- if (event.getSource() == unflipVItem)
	2892	+ if (source == unflipVItem)
2431	2893	{
2432	2894	FlipV(false);
2433	2895	} else
2434		- if (event.getSource() == lowTexturesItem)
	2896	+ if (source == lowTexturesItem)
2435	2897	{
2436	2898	SetTexRes(0);
2437	2899	} else
2438		- if (event.getSource() == normalTexturesItem)
	2900	+ if (source == normalTexturesItem)
2439	2901	{
2440	2902	SetTexRes(1);
2441	2903	} else
2442		- if (event.getSource() == highTexturesItem)
	2904	+ if (source == highTexturesItem)
2443	2905	{
2444	2906	SetTexRes(2);
2445	2907	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2908	+ if (source == veryhighTexturesItem)
2447	2909	{
2448	2910	SetTexRes(3);
2449	2911	} else
2450		- if (event.getSource() == maxTexturesItem)
	2912	+ if (source == maxTexturesItem)
2451	2913	{
2452	2914	SetTexRes(4);
2453	2915	} else
2454		- if (event.getSource() == panoTexturesItem)
	2916	+ if (source == panoTexturesItem)
2455	2917	{
2456	2918	SetTexRes(5);
2457	2919	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2920	+ if (source == reverseNormalsItem)
2459	2921	{
2460	2922	ReverseNormals();
2461	2923	} else
2462		- if (event.getSource() == parseverticesItem)
	2924	+ if (source == parseverticesItem)
2463	2925	{
2464	2926	ParseVertices();
2465	2927	} else
2466		- if (event.getSource() == textureFieldItem)
	2928	+ if (source == textureFieldItem)
2467	2929	{
2468	2930	TextureVertices();
2469	2931	} else
2470		- if (event.getSource() == alignItem)
	2932	+ if (source == alignItem)
2471	2933	{
2472	2934	Align();
2473	2935	} else
2474		- if (event.getSource() == mirrorItem)
	2936	+ if (source == mirrorItem)
2475	2937	{
2476	2938	MirrorPoses();
2477	2939	} else
2478		- if (event.getSource() == reduceMorphItem)
	2940	+ if (source == reduceMorphItem)
2479	2941	{
2480	2942	MeshReduction(false);
2481	2943	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2944	+ if (source == reduce34MorphItem)
2483	2945	{
2484	2946	MeshReduction(true);
2485	2947	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2948	+ if (source == reverseTrianglesItem)
2487	2949	{
2488	2950	ReverseTriangles();
2489	2951	} else
2490		- if (event.getSource() == reduceMeshItem)
	2952	+ if (source == reduceMeshItem)
2491	2953	{
2492	2954	ReduceMesh(false);
2493	2955	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2956	+ if (source == reduce34MeshItem)
2495	2957	{
2496	2958	ReduceMesh(true);
2497	2959	} else
2498		- if (event.getSource() == increaseMeshItem)
	2960	+ if (source == increaseMeshItem)
2499	2961	{
2500	2962	IncreaseMesh();
2501	2963	} else
2502		- if (event.getSource() == clipMeshItem)
	2964	+ if (source == clipMeshItem)
2503	2965	{
2504	2966	ClipMesh();
2505	2967	} else
2506		- if (event.getSource() == smoothMeshItem)
	2968	+ if (source == smoothMeshItem)
2507	2969	{
2508	2970	SmoothMesh();
2509	2971	} else
2510		- if (event.getSource() == transformgeometryItem)
	2972	+ if (source == transformGeometryItem)
2511	2973	{
2512	2974	TransformGeometry();
2513	2975	} else
2514		- if (event.getSource() == resetTransformItem)
	2976	+ if (source == transformChildrenItem)
	2977	+ {
	2978	+ TransformChildren();
	2979	+ } else
	2980	+ if (source == resetTransformItem)
2515	2981	{
2516	2982	ResetTransform();
2517	2983	} else
2518		- if (event.getSource() == resetCentroidItem)
	2984	+ if (source == resetCentroidItem)
2519	2985	{
2520		- ResetCentroid();
	2986	+ ResetCentroid(true);
2521	2987	} else
2522		- if (event.getSource() == resetParentItem)
	2988	+ if (source == resetCentroidXZItem)
	2989	+ {
	2990	+ ResetCentroid(false);
	2991	+ } else
	2992	+ if (source == resetParentItem)
2523	2993	{
2524	2994	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2995	{
..	..	@@ -2529,7 +2999,7 @@
2529	2999
2530	3000	refreshContents();
2531	3001	} else
2532		- if (event.getSource() == repairParentItem)
	3002	+ if (source == repairParentItem)
2533	3003	{
2534	3004	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3005	{
..	..	@@ -2543,7 +3013,21 @@
2543	3013
2544	3014	refreshContents();
2545	3015	} else
2546		- if (event.getSource() == sortbysizeItem)
	3016	+ if (source == repairShadowItem)
	3017	+ {
	3018	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3019	+ {
	3020	+ Object3D obj = (Object3D)e.nextElement();
	3021	+ obj.RepairShadow();
	3022	+// for (int i=0; i<obj.size(); i++)
	3023	+// {
	3024	+// obj.get(i).parent = obj;
	3025	+// }
	3026	+ }
	3027	+
	3028	+ refreshContents();
	3029	+ } else
	3030	+ if (source == sortbysizeItem)
2547	3031	{
2548	3032	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3033	{
..	..	@@ -2555,7 +3039,7 @@
2555	3039	ResetModel();
2556	3040	refreshContents();
2557	3041	} else
2558		- if (event.getSource() == sortbynameItem)
	3042	+ if (source == sortbynameItem)
2559	3043	{
2560	3044	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3045	{
..	..	@@ -2567,7 +3051,7 @@
2567	3051	ResetModel();
2568	3052	refreshContents();
2569	3053	} else
2570		- if (event.getSource() == attachPigmentItem)
	3054	+ if (source == attachPigmentItem)
2571	3055	{
2572	3056	String texture = GetFile("Attach pigment");
2573	3057	Object3D obj;
..	..	@@ -2579,7 +3063,7 @@
2579	3063
2580	3064	refreshContents();
2581	3065	} else
2582		- if (event.getSource() == detachPigmentItem)
	3066	+ if (source == detachPigmentItem)
2583	3067	{
2584	3068	Object3D obj;
2585	3069	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3074,7 @@
2590	3074
2591	3075	refreshContents();
2592	3076	} else
2593		- if (event.getSource() == attachBumpItem)
	3077	+ if (source == attachBumpItem)
2594	3078	{
2595	3079	String texture = GetFile("Attach bump");
2596	3080	Object3D obj;
..	..	@@ -2602,7 +3086,7 @@
2602	3086
2603	3087	refreshContents();
2604	3088	} else
2605		- if (event.getSource() == detachBumpItem)
	3089	+ if (source == detachBumpItem)
2606	3090	{
2607	3091	Object3D obj;
2608	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +3097,7 @@
2613	3097
2614	3098	refreshContents();
2615	3099	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3100	+ if (source == pigmentBumpItem)
2617	3101	{
2618	3102	Object3D obj;
2619	3103	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3108,237 @@
2624	3108
2625	3109	refreshContents();
2626	3110	} else
2627		- if (event.getSource() == flashSelectionButton)
	3111	+ if (source == flashSelectionButton)
2628	3112	{
2629	3113	CameraPane.flash = true;
2630	3114	refreshContents();
2631	3115	} else
2632		- if (event.getSource() == oneButton)
	3116	+ if (source == oneButton)
2633	3117	{
2634	3118	} else
2635		- if (event.getSource() == twoButton)
	3119	+ if (source == twoButton)
2636	3120	{
2637	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2638	3126	// bug
2639	3127	//gridPanel.setDividerLocation(1.0);
2640	3128	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3129	+// bigThree.remove(scenePanel);
	3130	+// bigThree.remove(centralPanel);
	3131	+// bigThree.remove(XYZPanel);
	3132	+// aWindowConstraints.gridx = 0;
	3133	+// aWindowConstraints.gridy = 0;
	3134	+// aWindowConstraints.gridwidth = 1;
	3135	+// // aConstraints.gridheight = 3;
	3136	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3137	+// aWindowConstraints.weightx = 0;
	3138	+// aWindowConstraints.weighty = 1;
	3139	+// //bigThree.add(jtp, aWindowConstraints);
	3140	+// aWindowConstraints.weightx = 1;
	3141	+// aWindowConstraints.gridwidth = 3;
	3142	+// // aConstraints.gridheight = 3;
	3143	+// aWindowConstraints.gridx = 1;
	3144	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3145	+// bigThree.add(centralPanel, aWindowConstraints);
	3146	+// aWindowConstraints.weightx = 0;
	3147	+// aWindowConstraints.gridx = 4;
	3148	+// aWindowConstraints.gridwidth = 1;
	3149	+// // aConstraints.gridheight = 3;
	3150	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3151	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3152	+// scenePanel.setVisible(false);
	3153	+// centralPanel.setVisible(true);
	3154	+// XYZPanel.setVisible(false);
	3155	+ bigThree.ClearUI();
	3156	+ bigThree.add(centralPanel);
	3157	+ bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2665	3176	} else
2666		- if (event.getSource() == threeButton)
	3177	+ if (source == threeButton)
2667	3178	{
2668	3179	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
	3183	+
	3184	+// bigThree.remove(scenePanel);
	3185	+// bigThree.remove(centralPanel);
	3186	+// bigThree.remove(XYZPanel);
	3187	+// aWindowConstraints.gridx = 0;
	3188	+// aWindowConstraints.gridy = 0;
	3189	+// aWindowConstraints.gridwidth = 1;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3192	+// aWindowConstraints.weightx = 0;
	3193	+// aWindowConstraints.weighty = 1;
	3194	+// //bigThree.add(jtp, aWindowConstraints);
	3195	+// aWindowConstraints.weightx = 1;
	3196	+// aWindowConstraints.gridwidth = 3;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.gridx = 1;
	3199	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3200	+// bigThree.add(centralPanel, aWindowConstraints);
	3201	+// aWindowConstraints.weightx = 0;
	3202	+// aWindowConstraints.gridx = 4;
	3203	+// aWindowConstraints.gridwidth = 1;
	3204	+// // aConstraints.gridheight = 3;
	3205	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3206	+// bigThree.add(XYZPanel, aWindowConstraints);
	3207	+// bigThree.validate();
	3208	+// scenePanel.setVisible(false);
	3209	+// centralPanel.setVisible(true);
	3210	+// XYZPanel.setVisible(true);
	3211	+ bigThree.ClearUI();
	3212	+ bigThree.add(centralPanel);
	3213	+ bigThree.add(XYZPanel);
	3214	+ bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2693	3217	} else
2694		- if (event.getSource() == fourButton)
	3218	+ if (source == fourButton)
2695	3219	{
2696	3220	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
	3224	+
	3225	+// bigThree.remove(scenePanel);
	3226	+// bigThree.remove(centralPanel);
	3227	+// bigThree.remove(XYZPanel);
	3228	+// aWindowConstraints.gridx = 0;
	3229	+// aWindowConstraints.gridy = 0;
	3230	+// aWindowConstraints.gridwidth = 1;
	3231	+// // aWindowConstraints.gridheight = 3;
	3232	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.weighty = 1;
	3235	+// bigThree.add(scenePanel, aWindowConstraints);
	3236	+// aWindowConstraints.weightx = 1;
	3237	+// aWindowConstraints.gridwidth = 3;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.gridx = 1;
	3240	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3241	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3242	+// aWindowConstraints.weightx = 0;
	3243	+// aWindowConstraints.gridx = 4;
	3244	+// aWindowConstraints.gridwidth = 1;
	3245	+// // aWindowConstraints.gridheight = 3;
	3246	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3247	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3248	+// bigThree.validate();
	3249	+// scenePanel.setVisible(true);
	3250	+// centralPanel.setVisible(false);
	3251	+// XYZPanel.setVisible(false);
	3252	+ bigThree.ClearUI();
	3253	+ bigThree.add(scenePanel);
	3254	+ bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2721	3257	} else
2722		- if (event.getSource() == sixButton)
	3258	+ if (source == sixButton)
2723	3259	{
2724	3260	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
	3264	+
	3265	+// bigThree.remove(scenePanel);
	3266	+// bigThree.remove(centralPanel);
	3267	+// bigThree.remove(XYZPanel);
	3268	+// aWindowConstraints.gridx = 0;
	3269	+// aWindowConstraints.gridy = 0;
	3270	+// aWindowConstraints.gridwidth = 1;
	3271	+// // aConstraints.gridheight = 3;
	3272	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3273	+// aWindowConstraints.weightx = 0;
	3274	+// aWindowConstraints.weighty = 1;
	3275	+// bigThree.add(scenePanel, aWindowConstraints);
	3276	+// aWindowConstraints.weightx = 1;
	3277	+// aWindowConstraints.gridwidth = 3;
	3278	+// // aWindowConstraints.gridheight = 3;
	3279	+// aWindowConstraints.gridx = 1;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// bigThree.add(centralPanel, aWindowConstraints);
	3282	+// aWindowConstraints.weightx = 0;
	3283	+// aWindowConstraints.gridx = 4;
	3284	+// aWindowConstraints.gridwidth = 1;
	3285	+// // aWindowConstraints.gridheight = 3;
	3286	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3287	+// //bigThree.add(XYZPanel, aConstraints);
	3288	+// bigThree.validate();
	3289	+// scenePanel.setVisible(true);
	3290	+// centralPanel.setVisible(true);
	3291	+// XYZPanel.setVisible(false);
	3292	+ bigThree.ClearUI();
	3293	+ bigThree.add(scenePanel);
	3294	+ bigThree.add(centralPanel);
	3295	+ bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2749	3298	} else
2750		- if (event.getSource() == sevenButton)
	3299	+ if (source == sevenButton)
2751	3300	{
2752	3301	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
	3305	+
	3306	+// bigThree.remove(scenePanel);
	3307	+// bigThree.remove(centralPanel);
	3308	+// bigThree.remove(XYZPanel);
	3309	+// aWindowConstraints.gridx = 0;
	3310	+// aWindowConstraints.gridy = 0;
	3311	+// aWindowConstraints.gridwidth = 1;
	3312	+// // aWindowConstraints.gridheight = 3;
	3313	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3314	+// aWindowConstraints.weightx = 0;
	3315	+// aWindowConstraints.weighty = 1;
	3316	+// bigThree.add(scenePanel, aWindowConstraints);
	3317	+// aWindowConstraints.weightx = 1;
	3318	+// aWindowConstraints.gridwidth = 3;
	3319	+// // aWindowConstraints.gridheight = 3;
	3320	+// aWindowConstraints.gridx = 1;
	3321	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3322	+// bigThree.add(centralPanel, aWindowConstraints);
	3323	+// aWindowConstraints.weightx = 0;
	3324	+// aWindowConstraints.gridx = 4;
	3325	+// aWindowConstraints.gridwidth = 1;
	3326	+// // aConstraints.gridheight = 3;
	3327	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3328	+// bigThree.add(XYZPanel, aWindowConstraints);
	3329	+// bigThree.validate();
	3330	+// scenePanel.setVisible(true);
	3331	+// centralPanel.setVisible(true);
	3332	+// XYZPanel.setVisible(true);
	3333	+ bigThree.ClearUI();
	3334	+ bigThree.add(scenePanel);
	3335	+ bigThree.add(centralPanel);
	3336	+ bigThree.add(XYZPanel);
	3337	+ bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2777	3340	} else
2778		- if (event.getSource() == rootButton)
	3341	+ if (source == rootButton)
2779	3342	{
2780	3343	Object3D obj;
2781	3344	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3348,84 @@
2785	3348	EditObject(obj);
2786	3349	}
2787	3350
	3351	+ cameraView.requestFocusInWindow();
2788	3352	refreshContents(true);
2789	3353	} else
2790		- if (event.getSource() == closeButton)
	3354	+ if (source == closeButton)
2791	3355	{
2792	3356	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3357	cRadio ab;
2794	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3359	{
2796	3360	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2799	3369	buttonGroup.remove(ab);
2800	3370	radioPanel.remove(ab);
2801	3371
2802		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2803	3374	// ab.GetObject().objectUI = null; // ?????????
2804	3375
2805	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3377	break;
2807	3378	}
2808	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2809	3382	refreshContents(true);
2810	3383	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3384	+ if (source == editItem \|\| source == editButton)
2812	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2813	3392	EditSelection(false);
2814	3393	} else
2815		- if (event.getSource() == uneditButton)
	3394	+ if (source == uneditButton)
2816	3395	{
2817	3396	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3397	{
2819	3398	Object3D child = (Object3D)e.nextElement();
2820	3399	if(child.editWindow != null)
2821	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2822	3402	child.CloseUI();
2823	3403	listUI.remove(child);
2824	3404
2825		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2826	3406	}
2827		- objEditor.ctrlPanel.revalidate();
	3407	+ objEditor.ctrlPanel.FlushUI();
2828	3408	//objEditor.jTree.clearSelection();
2829	3409	//objEditor.ResetSliders();
2830	3410	refreshContents(true);
2831	3411	} else
2832		- if (event.getSource() == clearPanelButton)
	3412	+ if (source == clearPanelButton)
2833	3413	{
2834	3414	assert(copy == group);
2835	3415	//copy.ClearUI();
2836	3416	for (Object3D obj : listUI)
2837	3417	{
	3418	+ obj.pinned = false;
2838	3419	obj.CloseUI();
2839	3420	}
2840	3421	listUI.clear();
2841	3422	refreshContents(true);
2842	3423	} else
2843		- if (event.getSource() == allParamsButton)
	3424	+ if (source == allParamsButton)
2844	3425	{
2845	3426	assert(copy == group);
2846	3427
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3429
2849	3430	for (Object3D obj : listUI)
2850	3431	{
..	..	@@ -2861,19 +3442,19 @@
2861	3442
2862	3443	refreshContents(true);
2863	3444	} else
2864		- if (event.getSource() == unselectButton)
	3445	+ if (source == unselectButton)
2865	3446	{
2866	3447	objEditor.jTree.clearSelection();
2867	3448	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3449	objEditor.ResetSliders();
2869	3450	refreshContents(true);
2870	3451	} else
2871		- if(event.getSource() instanceof cRadio)
	3452	+ if(source instanceof cRadio)
2872	3453	{
2873	3454	group.parent = keepparent;
2874	3455	group.attributes = 0;
2875	3456	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3457	+ /cRadio/ radio = (cRadio)source;
2877	3458	Object3D obj = radio.GetObject();
2878	3459	System.out.println("Edit " + obj);
2879	3460	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3474,7 @@
2893	3474	}
2894	3475
2895	3476	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3477	+ //Globals.theRenderer.object = group;
2897	3478	if(!useclient)
2898	3479	{
2899	3480	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3483,50 @@
2902	3483	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3484	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3485	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3486	+ //cameraView.lighttouched = true;
	3487	+ Globals.lighttouched = true;
2906	3488	topView.object = group;
2907	3489	frontView.object = group;
2908	3490	sideView.object = group;
2909	3491	}
2910		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
2911	3497	/*
2912	3498	currentLayout = radio.layout;
2913	3499	if (currentLayout == null)
2914	3500	currentLayout = sevenButton;
2915	3501	*/
2916	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
2917	3508	keepparent = group.parent;
2918	3509	// PARENT = NULL or not???
2919	3510	//group.parent = null; // ROOT
2920	3511	//group.attributes = -1;
2921	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
2922	3515	refreshContents(true);
2923		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
2924	3530	else
2925	3531	{
2926	3532	//return super.action(event, arg);
..	..	@@ -2929,7 +3535,6 @@
2929	3535	}
2930	3536
2931	3537	boolean useclient = false;
2932		- cRadio radio;
2933	3538
2934	3539	void ToggleRoot()
2935	3540	{
..	..	@@ -2938,7 +3543,7 @@
2938	3543	if (useclient)
2939	3544	{
2940	3545	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3546	+ Globals.lighttouched = true;
2942	3547	//topView.object = client;
2943	3548	//frontView.object = client;
2944	3549	//sideView.object = client;
..	..	@@ -2946,7 +3551,7 @@
2946	3551	else
2947	3552	{
2948	3553	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3554	+ Globals.lighttouched = true;
2950	3555	//topView.object = group;
2951	3556	//frontView.object = group;
2952	3557	//sideView.object = group;
..	..	@@ -2981,6 +3586,28 @@
2981	3586	refreshContents();
2982	3587	}
2983	3588
	3589	+ void TransformChildren()
	3590	+ {
	3591	+ Object3D obj;
	3592	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3593	+ {
	3594	+ obj = (Object3D)e.nextElement();
	3595	+ obj.KeepTextureMatrices();
	3596	+ obj.TransformChildren();
	3597	+ obj.RestoreTextureMatrices();
	3598	+
	3599	+// if (obj.parent == null)
	3600	+// {
	3601	+// System.out.println("NULL PARENT!");
	3602	+// new Exception().printStackTrace();
	3603	+// }
	3604	+// else
	3605	+// TouchTransform(obj);
	3606	+// //obj.parent.Touch();
	3607	+ }
	3608	+
	3609	+ refreshContents();
	3610	+ }
2984	3611
2985	3612	void ResetTransform()
2986	3613	{
..	..	@@ -3093,7 +3720,7 @@
3093	3720	refreshContents();
3094	3721	}
3095	3722
3096		- void ResetCentroid()
	3723	+ void ResetCentroid(boolean full)
3097	3724	{
3098	3725	Object3D obj;
3099	3726	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3735,16 @@
3108	3735	LA.matIdentity(Object3D.mat);
3109	3736	obj.getBounds(minima, maxima, false);
3110	3737	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3740	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3741	obj.TransformMesh(Object3D.mat);
	3742	+
3114	3743	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3744	+ if (full)
	3745	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3746	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3747	+
3117	3748	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3749	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3750	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3773,8 @@
3142	3773
3143	3774	int size = obj.MemorySize();
3144	3775
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	3778	}
3147	3779	}
3148	3780	catch (Exception e)
..	..	@@ -3179,9 +3811,9 @@
3179	3811	obj = (Object3D)e.nextElement();
3180	3812
3181	3813	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3814	+ Grafreed.AnalyzeObject(obj);
3183	3815	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3816	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3817
3186	3818	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3819	}
..	..	@@ -3223,6 +3855,13 @@
3223	3855	void GenNormals(boolean crease)
3224	3856	{
3225	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3226	3865
3227	3866	refreshContents();
3228	3867	}
..	..	@@ -3395,8 +4034,8 @@
3395	4034
3396	4035	void ParseVertices()
3397	4036	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4037	+ boolean epsequal = Grafreed.epsequal;
	4038	+ Grafreed.epsequal = true;
3400	4039
3401	4040	for (int i=0; i<group.selection.size(); i++)
3402	4041	{
..	..	@@ -3421,7 +4060,7 @@
3421	4060	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4061	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4062
3424		- g.add(GrafreeD.clipboard);
	4063	+ g.add(Grafreed.clipboard);
3425	4064
3426	4065	buffer.add(g);
3427	4066	}
..	..	@@ -3436,7 +4075,7 @@
3436	4075	makeSomething(buffer, i==group.selection.size()-1);
3437	4076	}
3438	4077
3439		- GrafreeD.epsequal = epsequal;
	4078	+ Grafreed.epsequal = epsequal;
3440	4079
3441	4080	refreshContents();
3442	4081	}
..	..	@@ -3454,7 +4093,16 @@
3454	4093	String pigment = Object3D.GetPigment(tex);
3455	4094	//String bump = Object3D.GetBump(tex);
3456	4095
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3458	4106
3459	4107	double s = v.s;
3460	4108
..	..	@@ -3542,11 +4190,11 @@
3542	4190
3543	4191	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4192
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4193	+ boolean random = CameraPane.SWITCH;
	4194	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4195	lowres.linkVerticesThis(null);
3548	4196	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4197	+ CameraPane.SWITCH = random;
3550	4198
3551	4199	System.err.flush();
3552	4200
..	..	@@ -3586,7 +4234,7 @@
3586	4234	return;
3587	4235
3588	4236	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4237	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4238
3591	4239	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4240
..	..	@@ -3755,7 +4403,7 @@
3755	4403	group.selection.RelinkToSupport(); // july 2014
3756	4404	System.out.println("DONE.");
3757	4405	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4406	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4407	}
3760	4408
3761	4409	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4428,9 @@
3780	4428
3781	4429	void ClipMesh()
3782	4430	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4431	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4432	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4433	+ Object3D content = Grafreed.clipboard.get(0);
3786	4434
3787	4435	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4436	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4439,7 @@
3791	4439	// {
3792	4440	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4441	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4442	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4443	}
3796	4444	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4445	System.out.println("DONE.");
..	..	@@ -3838,6 +4486,18 @@
3838	4486	void MarkLeaves(boolean hide)
3839	4487	{
3840	4488	group.selection.MarkLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
3841	4501	refreshContents();
3842	4502	}
3843	4503
..	..	@@ -3912,10 +4572,6 @@
3912	4572	// }
3913	4573	// }
3914	4574
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4575	void EditSelection(boolean newWindow)
3920	4576	{
3921	4577	// aConstraints.gridy = 0;
..	..	@@ -3923,10 +4579,10 @@
3923	4579	{
3924	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4583
3928	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
3930	4586	{
3931	4587	// if (!(elem instanceof Composite))
3932	4588	// newWindow = false;
..	..	@@ -4008,7 +4664,8 @@
4008	4664	//new Exception().printStackTrace();
4009	4665
4010	4666	freezemodel = true;
4011		-
	4667	+ ClearUnpinned();
	4668	+
4012	4669	/**/
4013	4670	//switch (event.id)
4014	4671	{
..	..	@@ -4016,7 +4673,6 @@
4016	4673	//case 702: // Event.LIST_DESELECT
4017	4674	group.deselectAll();
4018	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4676	if (tps != null)
4021	4677	{
4022	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +4681,39 @@
4025	4681
4026	4682	//if (child.parent != null)
4027	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4028	4685	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4686	}
4033	4687	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4688	+// else
	4689	+// {
	4690	+// objEditor.SetMaterial(group); // .GetMaterial());
	4691	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4692	+// System.err.println("info : " + group.GetPath());
	4693	+// }
4040	4694
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	4696	CameraPane.flash = true;
4045	4697
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4699	// a camera
4048	4700	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
	4706	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4707	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4708	}
4054	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4055	4717	refreshContents();
4056	4718	//return true;
4057	4719	}
..	..	@@ -4060,6 +4722,35 @@
4060	4722
4061	4723	freezemodel = false;
4062	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4063	4754
4064	4755	void linkSomething(Object3D thing)
4065	4756	{
..	..	@@ -4131,16 +4822,19 @@
4131	4822	{
4132	4823	if (group.selection.isEmpty())
4133	4824	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4825	+
	4826	+ Grafreed.clipboardIsTempGroup = false;
4135	4827	Composite tGroup = null;
4136	4828	if (group.selection.size() > 0) // 1)
4137	4829	{
4138	4830	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4831	+ Grafreed.clipboardIsTempGroup = true;
4140	4832	}
4141	4833
4142	4834	if (cut)
4143	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4144	4838	//int indices[] = jList.getSelectedIndices();
4145	4839	//for (int i = indices.length - 1; i >= 0; i--)
4146	4840	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4870,16 @@
4176	4870	//System.out.println("cut " + child);
4177	4871	//System.out.println("parent = " + child.parent);
4178	4872	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4180	4874	tGroup.add/Child/(tmp);
4181	4875	else
4182		- GrafreeD.clipboard = tmp;
	4876	+ Grafreed.clipboard = tmp;
4183	4877	}
4184	4878	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4879	+ if (Grafreed.clipboardIsTempGroup)
4186	4880	tGroup.add/Child/(child);
4187	4881	else
4188		- GrafreeD.clipboard = child;
	4882	+ Grafreed.clipboard = child;
4189	4883	}
4190	4884
4191	4885	//ResetModel();
..	..	@@ -4217,21 +4911,23 @@
4217	4911	//System.out.println("cut " + elem);
4218	4912	//System.out.println("parent = " + elem.parent);
4219	4913	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4221	4915	tGroup.add/Child/(tmp);
4222	4916	else
4223		- GrafreeD.clipboard = tmp;
	4917	+ Grafreed.clipboard = tmp;
4224	4918	}
4225	4919	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4920	+ if (Grafreed.clipboardIsTempGroup)
4227	4921	tGroup.add/Child/(child);
4228	4922	else
4229		- GrafreeD.clipboard = child;
	4923	+ Grafreed.clipboard = child;
4230	4924	}
4231	4925
4232	4926	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4927	+
	4928	+ if (Grafreed.clipboardIsTempGroup)
	4929	+ Grafreed.clipboard = tGroup;
	4930	+
4235	4931	if (cut)
4236	4932	{
4237	4933	ResetModel();
..	..	@@ -4245,7 +4941,7 @@
4245	4941	// return;
4246	4942	boolean first = true;
4247	4943
4248		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4249	4945	{
4250	4946	Composite temp;
4251	4947
..	..	@@ -4256,7 +4952,7 @@
4256	4952	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	4953	*/
4258	4954	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4955	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	4956	{
4261	4957	Object3D child = (Object3D)e.nextElement();
4262	4958
..	..	@@ -4290,21 +4986,21 @@
4290	4986	//Object3D cb = Applet3D.clipboard;
4291	4987	//temp.addChild(cb);
4292	4988	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4989	+ assert(Grafreed.clipboard.parent == null);
	4990	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4991	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4992	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4993	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	4994	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	4995	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4996	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	4997	}
4302	4998
4303	4999	ResetModel();
4304	5000	refreshContents();
4305	5001	}
4306	5002
4307		- void pasteInto(boolean copyit)
	5003	+ void pasteInto(boolean copyit, boolean clone)
4308	5004	{
4309	5005	// if (GrafreeD.clipboard == null)
4310	5006	// return;
..	..	@@ -4333,15 +5029,22 @@
4333	5029	if (copyit)
4334	5030	{
4335	5031	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5032	+ if (clone)
	5033	+ {
	5034	+ CloneClipboard(false); // sept 2014
	5035	+ }
	5036	+ else
	5037	+ {
	5038	+ paste(false);
	5039	+ }
4337	5040	}
4338	5041	else
4339	5042	{
4340	5043	boolean first = true;
4341	5044
4342		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4343	5046	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5047	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5048	Object3D copy;
4346	5049	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5050	{
..	..	@@ -4351,7 +5054,7 @@
4351	5054	}
4352	5055	} else
4353	5056	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5057	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5058	}
4356	5059	}
4357	5060	}
..	..	@@ -4756,21 +5459,6 @@
4756	5459	}
4757	5460	*/
4758	5461
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5462	/*
4775	5463	public void Callback(Object obj)
4776	5464	{
..	..	@@ -4794,26 +5482,9 @@
4794	5482	}
4795	5483	*/
4796	5484
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5485	String GetFile(String dialogName)
4815	5486	{
4816		- if (GrafreeD.standAlone)
	5487	+ if (Grafreed.standAlone)
4817	5488	{
4818	5489	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5490	browser.show();
..	..	@@ -4877,10 +5548,33 @@
4877	5548	cButton flashSelectionButton;
4878	5549	cButton editButton;
4879	5550	cButton uneditButton;
	5551	+ JCheckBox allParamsButton;
4880	5552	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5553	cButton unselectButton;
4883	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
	5558	+ cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
	5577	+
4884	5578	cButton screenfitButton;
4885	5579	cButton screenfitpointButton;
4886	5580	cButton snapobjectButton;
..	..	@@ -4892,14 +5586,6 @@
4892	5586
4893	5587	cButton setsupportButton;
4894	5588
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5589	//
4904	5590	//Composite
4905	5591	Object3D // to do !!
..	..	@@ -4909,9 +5595,11 @@
4909	5595	//JTree jTree;
4910	5596	private MenuItem lookAtItem;
4911	5597	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
4913	5599	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
4915	5603	private MenuItem cloneItem;
4916	5604	private MenuItem cloneSupportItem;
4917	5605	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5612,7 @@
4924	5612	private MenuItem linkverticesItem;
4925	5613	private MenuItem relinkverticesItem;
4926	5614	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
4928	5616	private MenuItem stepAllItem;
4929	5617	private MenuItem revertMeshItem;
4930	5618	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5623,7 @@
4935	5623	private MenuItem mergeGeometriesItem;
4936	5624	private MenuItem copyItem;
4937	5625	private MenuItem pasteItem;
	5626	+ private MenuItem pasteIntoItem;
4938	5627	private MenuItem pasteLinkItem;
4939	5628	private MenuItem pasteCloneItem;
4940	5629	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5662,10 @@
4973	5662	private MenuItem showleavesItem;
4974	5663	private MenuItem markleavesItem;
4975	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
4976	5669
4977	5670	private MenuItem flipVItem;
4978	5671	private MenuItem unflipVItem;
..	..	@@ -4984,15 +5677,17 @@
4984	5677	private MenuItem panoTexturesItem;
4985	5678
4986	5679	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5680	+ private MenuItem resetCentroidXZItem;
4988	5681	private MenuItem resetTransformItem;
	5682	+ private MenuItem transformGeometryItem;
	5683	+ private MenuItem transformChildrenItem;
4989	5684	private MenuItem hideItem;
4990	5685	private MenuItem grabItem;
4991	5686	private MenuItem backItem;
4992	5687	private MenuItem frontItem;
4993	5688	private MenuItem cameraItem;
4994	5689	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
4996	5691	private MenuItem physicsItem;
4997	5692	private MenuItem frameselectorItem;
4998	5693	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +5702,7 @@
5007	5702
5008	5703	private MenuItem resetParentItem;
5009	5704	private MenuItem repairParentItem;
	5705	+ private MenuItem repairShadowItem;
5010	5706	private MenuItem sortbysizeItem;
5011	5707	private MenuItem sortbynameItem;
5012	5708
..	..	@@ -5031,7 +5727,7 @@
5031	5727	private MenuItem blobItem;
5032	5728	private MenuItem latheItem;
5033	5729	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5730	+ private MenuItem overlayItem;
5035	5731	private MenuItem meshItem;
5036	5732	// private MenuItem meshGroupItem;
5037	5733	private MenuItem springItem;
..	..	@@ -5053,11 +5749,6 @@
5053	5749	private MenuItem doubleItem;
5054	5750	private MenuItem tripleItem;
5055	5751
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5752	private MenuItem computeAOItem;
5062	5753	private MenuItem recompileItem;
5063	5754	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5758,8 @@
5067	5758	private MenuItem analyzeItem;
5068	5759	private MenuItem dumpItem;
5069	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
5070	5765	}