~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,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	286	+ }
	287	+
192	288	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);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +305,26 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
222	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
224	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	326	setMasterItem.addActionListener(this);
	327	+ }
226	328
227	329	oe.menuBar.add(menu = new Menu("Group"));
228	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +335,32 @@
233	335	frontItem.addActionListener(this);
234	336	compositeItem = menu.add(new MenuItem("Composite"));
235	337	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	339	hideItem.addActionListener(this);
238	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	341	ungroupItem.addActionListener(this);
240	342	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
242	344	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);
247	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	346	switchGeoItem.addActionListener(this);
249	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	348	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
253	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	360	scriptNodeItem.addActionListener(this);
255	361	cameraItem = menu.add(new MenuItem("Camera"));
256	362	cameraItem.addActionListener(this);
	363	+ }
257	364
258	365	oe.menuBar.add(menu = new Menu("Object"));
259	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +375,29 @@
268	375	shadowYItem.addActionListener(this);
269	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
271	381	linkerItem = menu.add(new MenuItem("Linker"));
272	382	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	383	attributeItem = menu.add(new MenuItem("Attribute"));
276	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
277	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	388	pointflowItem.addActionListener(this);
	389	+ }
279	390	menu.add("-");
280	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	392	resetTransformItem.addActionListener(this);
282	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	394	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
286	401
287	402	oe.menuBar.add(menu = new Menu("Geometry"));
288	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +408,11 @@
293	408	genNormalsCADItem.addActionListener(this);
294	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
296	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
298	416	stripifyItem = menu.add(new MenuItem("Stripify"));
299	417	stripifyItem.addActionListener(this);
300	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +434,34 @@
316	434	reduce34MeshItem.addActionListener(this);
317	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	436	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
323	445
324	446	oe.menuBar.add(menu = new Menu("Attributes"));
325	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
327	453	menu.add("-");
328	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	455	liveleavesItem.addActionListener(this);
330	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
332	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	461	supportleavesItem.addActionListener(this);
334	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	463	unsupportleavesItem.addActionListener(this);
	464	+ }
336	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	466	hideleavesItem.addActionListener(this);
338	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,29 +505,22 @@
376	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	506	sortbynameItem.addActionListener(this);
378	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
379	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	516	extractGeometriesItem.addActionListener(this);
381	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	518	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);
	519	+ }
387	520
388	521	oe.menuBar.add(menu = new Menu("Insert"));
389	522	buildCreateMenu(menu);
390	523
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	524	oe.menuBar.add(menu = new Menu("Tools"));
403	525	buildToolsMenu(menu);
404	526	}
..	..	@@ -433,176 +555,110 @@
433	555	oe.radioPanel.add(dummyButton);
434	556	oe.buttonGroup.add(dummyButton);
435	557	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	559
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
442	574	liveCB.addItemListener(this);
443	575
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
446	581	fastCB.setToolTipText("Fast mode");
447	582	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
515	585	trackCB.setToolTipText("Enable tracking");
516	586	trackCB.addItemListener(this);
517	587
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	589	screenfitButton.setToolTipText("Screen fit");
521	590	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	591	+
523	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	593	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	594
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
537	603	flashSelectionButton.setToolTipText("Show selection");
538	604	flashSelectionButton.addActionListener(this);
539	605
540		- oe.toolbarPanel.add(new cButton(" ", false));
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	607
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	609	twoButton.setToolTipText("Show center view only");
549	610	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	612	fourButton.addActionListener(this);
552	613	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	615	sixButton.setToolTipText("2-column layout left");
555	616	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	618	threeButton.setToolTipText("2-column layout right");
558	619	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	621	sevenButton.setToolTipText("3-column layout");
561	622	sevenButton.addActionListener(this);
562	623	//
563	624
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
566	627	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	630	closeButton.setToolTipText("Close tab");
570	631	closeButton.addActionListener(this);
571	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	633	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574	634
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
577	639	editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	640
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
583	643	uneditButton.addActionListener(this);
584	644
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
597	647	allParamsButton.addActionListener(this);
598	648
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
604	655	unselectButton.addActionListener(this);
605	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
606	662	// oe.aConstraints.gridx += 1;
607	663	// oe.aConstraints.weighty = 0;
608	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +670,37 @@
614	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	671	// gcButton.addActionListener(this);
616	672
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
628	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
630	678	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
635	682
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
640	687	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
643	691	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
646	695	textureCB.addItemListener(this);
647	696
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
650	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
651	704	//jList.addListSelectionListener(this);
652	705	oe.jTree.addTreeSelectionListener(this);
653	706	//jTree.setRootVisible(false);
..	..	@@ -669,6 +722,78 @@
669	722	radio.layout = sevenButton;
670	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	724	}
	725	+
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	727	+ {
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
	757	+// constraints.gridy += 1;
	758	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	759	+// speakerMocapCB.addItemListener(this);
	760	+
	761	+ if (false)
	762	+ {
	763	+ // handled in scripts
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	766	+ speakerCameraCB.addItemListener(this);
	767	+
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	770	+ speakerFocusCB.addItemListener(this);
	771	+
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	774	+ smoothfocusCB.addItemListener(this);
	775	+ }
	776	+
	777	+//constraints.gridx += 1;
	778	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	779	+// debugCB.addItemListener(this);
	780	+
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	782	+ oeilCB.addItemListener(this);
	783	+
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	785	+ lookAtCB.setToolTipText("Look-at target");
	786	+ lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
	795	+
	796	+ }
672	797
673	798	void EditObject(Object3D obj)
674	799	{
..	..	@@ -681,6 +806,7 @@
681	806	buttonGroup.add(radioButton);
682	807	radioButton.doClick();
683	808	}
	809	+
684	810	void SetupViews(ObjEditor oe)
685	811	{
686	812	oe.SetupViews();
..	..	@@ -897,7 +1023,9 @@
897	1023	// objEditor.DropFile((java.io.File[]) object, true);
898	1024	// return;
899	1025	// }
900		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1029	{
902	1030	// file(s)
903	1031	String[] names = string.split("\n");
..	..	@@ -924,7 +1052,7 @@
924	1052
925	1053	flashIt = false;
926	1054	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1057
930	1058	if (group.selection.size() == 1)
..	..	@@ -951,11 +1079,11 @@
951	1079	{
952	1080	loadClipboard(true);
953	1081	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
	1082	+ pasteInto(false, false);
955	1083	} else {
956	1084	loadClipboard(false);
957	1085	objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
	1086	+ pasteInto(false, false); // true); // ???
959	1087	}
960	1088	}
961	1089	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1077,27 +1205,33 @@
1077	1205	kleinItem.addActionListener(this);
1078	1206	particleItem = menu.add(new MenuItem("Particle system"));
1079	1207	particleItem.addActionListener(this);
	1208	+ if (Globals.ADVANCED)
	1209	+ {
1080	1210	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1211	ragdollItem.addActionListener(this);
1082	1212	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1213	ragdoll2Item.addActionListener(this);
	1214	+ }
1084	1215	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1216	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1217	meshItem.addActionListener(this);
1087	1218	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1219	// meshGroupItem.addActionListener(this);
	1220	+ if (Globals.ADVANCED)
	1221	+ {
1089	1222	springItem = menu.add(new MenuItem("Spring"));
1090	1223	springItem.addActionListener(this);
1091	1224	flagItem = menu.add(new MenuItem("Flag"));
1092	1225	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1226	blobItem = menu.add(new MenuItem("Blob"));
1098	1227	blobItem.addActionListener(this);
1099	1228	latheItem = menu.add(new MenuItem("Lathe"));
1100	1229	latheItem.addActionListener(this);
	1230	+ }
	1231	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1232	+ bezierItem.addActionListener(this);
	1233	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1234	+ overlayItem.addActionListener(this);
1101	1235	lightItem = menu.add(new MenuItem("Light"));
1102	1236	lightItem.addActionListener(this);
1103	1237	menu.add("-");
..	..	@@ -1107,34 +1241,39 @@
1107	1241	loopItem.addActionListener(this);
1108	1242	doubleItem = menu.add(new MenuItem("Fork"));
1109	1243	doubleItem.addActionListener(this);
	1244	+ if (Globals.ADVANCED)
	1245	+ {
1110	1246	tripleItem = menu.add(new MenuItem("Trident"));
1111	1247	tripleItem.addActionListener(this);
	1248	+ }
1112	1249	}
1113	1250
1114	1251	void buildToolsMenu(Menu menu)
1115	1252	{
1116	1253	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1254	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1255	+ animationItem.setState(Globals.ANIMATION);
1119	1256
1120	1257	menu.add("-");
1121	1258	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1259	parseverticesItem.addActionListener(this);
1123	1260	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1261	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1263	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1265	reduceMorphItem.addActionListener(this);
1131	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1267	reduce34MorphItem.addActionListener(this);
1133		-
	1268	+ menu.add("-");
1134	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1270	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1271
	1272	+ if (Globals.ADVANCED)
	1273	+ {
	1274	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1275	+ mirrorItem.addActionListener(this);
	1276	+ menu.add("-");
1138	1277	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1278	memoryItem.addActionListener(this);
1140	1279	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1157,6 +1296,7 @@
1157	1296	menu.add("-");
1158	1297	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1298	editScriptItem.addActionListener(this);
	1299	+ }
1160	1300	}
1161	1301
1162	1302	void ScreenFit()
..	..	@@ -1485,9 +1625,9 @@
1485	1625
1486	1626	void Overwrite(int mask)
1487	1627	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1629	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1491	1631
1492	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1633	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1650,7 @@
1510	1650	//
1511	1651	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1652	{
	1653	+ Object source = event.getSource();
1513	1654	/*
1514	1655	if (event.getSource() == nameField)
1515	1656	{
..	..	@@ -1521,11 +1662,11 @@
1521	1662	}
1522	1663	else
1523	1664	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1665	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1666	{
1526	1667	ScreenFit();
1527	1668	} else
1528		- if (event.getSource() == switchItem)
	1669	+ if (source == switchItem)
1529	1670	{
1530	1671	cVector v1 = new cVector();
1531	1672	cVector v2 = new cVector();
..	..	@@ -1534,11 +1675,11 @@
1534	1675	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1676	objEditor.cameraView.repaint();
1536	1677	} else
1537		- if (event.getSource() == rectoidItem)
	1678	+ if (source == rectoidItem)
1538	1679	{
1539	1680	makeSomething(new Box());
1540	1681	} else
1541		- if (event.getSource() == particleItem)
	1682	+ if (source == particleItem)
1542	1683	{
1543	1684	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1685	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1700,9 @@
1559	1700	applyExample(particleGeom, "SMOKE");
1560	1701	makeSomething(particleGeom);
1561	1702	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1703	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1704	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1705	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1706
1566	1707	ragdoll.toParent = LA.newMatrix();
1567	1708	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1720,7 @@
1579	1720	} else
1580	1721	/*
1581	1722	*/
1582		- if (event.getSource() == heightFieldItem)
	1723	+ if (source == heightFieldItem)
1583	1724	{
1584	1725	Object3D obj = new Object3D();
1585	1726
..	..	@@ -1617,31 +1758,31 @@
1617	1758
1618	1759	makeSomething(obj);
1619	1760	} else
1620		- if (event.getSource() == gridItem)
	1761	+ if (source == gridItem)
1621	1762	{
1622	1763	makeSomething(new Grid());
1623	1764	} else
1624		- if (event.getSource() == ellipsoidItem)
	1765	+ if (source == ellipsoidItem)
1625	1766	{
1626	1767	makeSomething(new Sphere());
1627	1768	} else
1628		- if (event.getSource() == coneItem)
	1769	+ if (source == coneItem)
1629	1770	{
1630	1771	makeSomething(new Cone());
1631	1772	} else
1632		- if (event.getSource() == torusItem)
	1773	+ if (source == torusItem)
1633	1774	{
1634	1775	makeSomething(new Torus());
1635	1776	} else
1636		- if (event.getSource() == superItem)
	1777	+ if (source == superItem)
1637	1778	{
1638	1779	makeSomething(new Superellipsoid());
1639	1780	} else
1640		- if (event.getSource() == kleinItem)
	1781	+ if (source == kleinItem)
1641	1782	{
1642	1783	makeSomething(new Klein());
1643	1784	} else
1644		- if (event.getSource() == blobItem)
	1785	+ if (source == blobItem)
1645	1786	{
1646	1787	Blob blob = new Blob();
1647	1788	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1790,15 @@
1649	1790	//blob.retile();
1650	1791	makeSomething(blob);
1651	1792	} else
1652		- if (event.getSource() == latheItem)
	1793	+ if (source == latheItem)
1653	1794	{
1654	1795	makeSomething(new Lathe());
1655	1796	} else
1656		- if (event.getSource() == bezierItem)
	1797	+ if (source == bezierItem)
1657	1798	{
1658	1799	makeSomething(new BezierSurface());
1659	1800	} else
1660		- if (event.getSource() == checkerItem)
	1801	+ if (source == overlayItem)
1661	1802	{
1662	1803	/*
1663	1804	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1813,7 @@
1672	1813	*/
1673	1814	makeSomething(new Checker());
1674	1815	} else
1675		- if (event.getSource() == meshItem)
	1816	+ if (source == meshItem)
1676	1817	{
1677	1818	Object3D itemtomake = new Object3D();
1678	1819	Object3D child;
..	..	@@ -1693,35 +1834,35 @@
1693	1834	makeSomething(child);
1694	1835	}
1695	1836	} else
1696		- if (event.getSource() == springItem)
	1837	+ if (source == springItem)
1697	1838	{
1698	1839	cSpring s = new cSpring();
1699	1840	s.setup();
1700	1841	makeSomething(s);
1701	1842	} else
1702		- if (event.getSource() == flagItem)
	1843	+ if (source == flagItem)
1703	1844	{
1704	1845	cSpring s = new cFlag();
1705	1846	s.setup();
1706	1847	makeSomething(s);
1707	1848	} else
1708		- if (event.getSource() == lightItem)
	1849	+ if (source == lightItem)
1709	1850	{
1710	1851	makeSomething(new Light());
1711	1852	} else
1712		- if (event.getSource() == csgItem)
	1853	+ if (source == csgItem)
1713	1854	{
1714	1855	group(new CSG());
1715	1856	} else
1716		- if (event.getSource() == templateItem)
	1857	+ if (source == templateItem)
1717	1858	{
1718	1859	group(new cTemplate());
1719	1860	} else
1720		- if (event.getSource() == attributeItem)
	1861	+ if (source == attributeItem)
1721	1862	{
1722	1863	makeSomething(new Attribute());
1723	1864	} else
1724		- if (event.getSource() == pointflowItem)
	1865	+ if (source == pointflowItem)
1725	1866	{
1726	1867	makeSomething(new PointFlow());
1727	1868	} else
..	..	@@ -1733,7 +1874,7 @@
1733	1874	} else
1734	1875	*/
1735	1876
1736		- if (event.getSource() == superLoopItem)
	1877	+ if (source == superLoopItem)
1737	1878	{
1738	1879	Composite g = new cGroup();
1739	1880	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1896,7 @@
1755	1896
1756	1897	group(g);
1757	1898	} else
1758		- if (event.getSource() == loopItem)
	1899	+ if (source == loopItem)
1759	1900	{
1760	1901	Composite csg = new GroupLeaf();
1761	1902	csg.count = 5;
..	..	@@ -1764,7 +1905,7 @@
1764	1905	csg.addChild(child);
1765	1906	child.addChild(csg);
1766	1907	} else
1767		- if (event.getSource() == doubleItem)
	1908	+ if (source == doubleItem)
1768	1909	{
1769	1910	Composite csg = new GroupLeaf();
1770	1911	csg.count = 5;
..	..	@@ -1776,7 +1917,7 @@
1776	1917	csg.addChild(child);
1777	1918	child.addChild(csg);
1778	1919	} else
1779		- if (event.getSource() == tripleItem)
	1920	+ if (source == tripleItem)
1780	1921	{
1781	1922	Composite csg = new GroupLeaf();
1782	1923	csg.count = 4;
..	..	@@ -1791,71 +1932,71 @@
1791	1932	csg.addChild(child);
1792	1933	child.addChild(csg);
1793	1934	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	1935	+ if (source == computeAOItem)
1812	1936	{
1813	1937	Globals.drawMode = CameraPane.OCCLUSION;
1814	1938	Globals.theRenderer.repaint();
1815	1939	} else
1816		- if (event.getSource() == recompileItem)
	1940	+ if (source == recompileItem)
1817	1941	{
1818	1942	Recompile();
1819	1943	refreshContents();
1820	1944	} else
1821		- if (event.getSource() == editScriptItem)
	1945	+ if (source == editScriptItem)
1822	1946	{
1823	1947	OpenDialog();
1824	1948	refreshContents();
1825	1949	} else
1826		- if (event.getSource() == invariantsItem)
	1950	+ if (source == invariantsItem)
1827	1951	{
1828	1952	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1830	1954	} else
1831		- if (event.getSource() == memoryItem)
	1955	+ if (source == memoryItem)
1832	1956	{
1833	1957	//System.out.println("Invariants:");
1834	1958	PrintMemory();
1835	1959	} else
1836		- if (event.getSource() == pathItem)
	1960	+ if (source == pathItem)
1837	1961	{
1838	1962	PrintPath();
1839	1963	} else
1840		- if (event.getSource() == analyzeItem)
	1964	+ if (source == analyzeItem)
1841	1965	{
1842	1966	AnalyzeObject();
1843	1967	} else
1844		- if (event.getSource() == dumpItem)
	1968	+ if (source == dumpItem)
1845	1969	{
1846	1970	DumpObject();
1847	1971	} else
1848		- if (event.getSource() == screenfitButton)
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
	1983	+ } else
	1984	+ if (source == oneStepButton)
	1985	+ {
	1986	+ Globals.ONESTEP = true;
	1987	+ cameraView.repaint();
	1988	+ } else
	1989	+ if (source == screenfitButton)
1849	1990	{
1850	1991	//Reload(lastConverter, lastFilename, true);
1851	1992	ScreenFit();
1852	1993	} else
1853		- if (event.getSource() == screenfitpointButton)
	1994	+ if (source == screenfitpointButton)
1854	1995	{
1855	1996	//Reload(lastConverter, lastFilename, true);
1856	1997	ScreenFitPoint();
1857	1998	} else
1858		- if (event.getSource() == snapobjectButton)
	1999	+ if (source == snapobjectButton)
1859	2000	{
1860	2001	//Reload(lastConverter, lastFilename, true);
1861	2002	SnapObject();
..	..	@@ -1866,13 +2007,13 @@
1866	2007	// Recompile();
1867	2008	// refreshContents();
1868	2009	// } else
1869		- if (event.getSource() == gcButton)
	2010	+ if (source == gcButton)
1870	2011	{
1871	2012	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2013	System.gc();
1873	2014	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2015	} else
1875		- if (event.getSource() == editLeafItem)
	2016	+ if (source == editLeafItem)
1876	2017	{
1877	2018	Object3D obj;
1878	2019	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2027,74 @@
1886	2027	}
1887	2028	refreshContents(true);
1888	2029	} else
1889		- if (event.getSource() == openWindowItem)
	2030	+ if (source == openWindowItem)
1890	2031	{
1891	2032	EditSelection(true);
1892	2033	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2034	+ if (source == cutItem \|\| source == clearButton)
1894	2035	{
1895	2036	loadClipboard(true);
1896	2037	} else
1897		- if (event.getSource() == duplicateItem)
	2038	+ if (source == undoItem)
1898	2039	{
1899		- Object3D keep = GrafreeD.clipboard;
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
	2046	+ if (source == duplicateItem)
	2047	+ {
	2048	+ Object3D keep = Grafreed.clipboard;
1900	2049	loadClipboard(false);
1901	2050	paste(false);
1902		- GrafreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1903	2052	} else
1904		- if (event.getSource() == cloneItem)
	2053	+ if (source == cloneItem)
1905	2054	{
1906	2055	CloneSelection(false);
1907	2056	} else
1908		- if (event.getSource() == cloneSupportItem)
	2057	+ if (source == cloneSupportItem)
1909	2058	{
1910	2059	CloneSelection(true);
1911	2060	} else
1912		- if (event.getSource() == copyItem)
	2061	+ if (source == copyItem)
1913	2062	{
1914	2063	loadClipboard(false);
1915	2064	} else
1916		- if (event.getSource() == pasteItem)
	2065	+ if (source == pasteItem)
1917	2066	{
1918	2067	paste(false);
1919	2068	} else
1920		- if (event.getSource() == pasteLinkItem)
	2069	+ if (source == pasteIntoItem)
1921	2070	{
1922		- pasteInto(false);
	2071	+ pasteInto(true, false);
1923	2072	} else
1924		- if (event.getSource() == pasteCloneItem)
	2073	+ if (source == pasteLinkItem)
1925	2074	{
1926		- pasteInto(true);
	2075	+ pasteInto(false, false);
1927	2076	} else
1928		- if (event.getSource() == pasteExpandItem)
	2077	+ if (source == pasteCloneItem)
	2078	+ {
	2079	+ pasteInto(true, true);
	2080	+ } else
	2081	+ if (source == pasteExpandItem)
1929	2082	{
1930	2083	paste(true);
1931	2084	} else
1932		- if (event.getSource() == synchronizeItem)
	2085	+ if (source == synchronizeItem)
1933	2086	{
1934	2087	Overwrite(Object3D.TRANSFORM);
1935	2088	} else
1936		- if (event.getSource() == overwriteNameItem)
	2089	+ if (source == overwriteNameItem)
1937	2090	{
1938	2091	Overwrite(Object3D.NAME);
1939	2092	} else
1940		- if (event.getSource() == overwriteUVItem)
	2093	+ if (source == overwriteUVItem)
1941	2094	{
1942	2095	Overwrite(Object3D.UV);
1943	2096	} else
1944		- if (event.getSource() == overwriteMatItem)
	2097	+ if (source == overwriteMatItem)
1945	2098	{
1946	2099	/* july 2015
1947	2100	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2114,7 @@
1961	2114
1962	2115	Overwrite(dropAttributes);
1963	2116	}
1964		- if (event.getSource() == overwriteGeoItem)
	2117	+ if (source == overwriteGeoItem)
1965	2118	{
1966	2119	Overwrite(Object3D.GEOMETRY);
1967	2120	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2131,7 @@
1978	2131	// refreshContents();
1979	2132	// }
1980	2133	} else
1981		- if (event.getSource() == generateMeshItem)
	2134	+ if (source == generateMeshItem)
1982	2135	{
1983	2136	//if (group.selection.size() == 1)
1984	2137	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2142,7 @@
1989	2142	ResetModel();
1990	2143	refreshContents();
1991	2144	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2145	+ if (source == extractGeometriesItem)
1993	2146	{
1994	2147	boolean one = false;
1995	2148
..	..	@@ -2016,7 +2169,7 @@
2016	2169	ResetModel();
2017	2170	refreshContents();
2018	2171	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2172	+ if (source == cloneGeometriesItem)
2020	2173	{
2021	2174	boolean one = false;
2022	2175
..	..	@@ -2042,7 +2195,7 @@
2042	2195	ResetModel();
2043	2196	refreshContents();
2044	2197	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2198	+ if (source == shareGeometriesItem)
2046	2199	{
2047	2200	boolean one = false;
2048	2201
..	..	@@ -2072,7 +2225,7 @@
2072	2225	refreshContents();
2073	2226	}
2074	2227	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2228	+ if (source == mergeGeometriesItem)
2076	2229	{
2077	2230	boolean one = false;
2078	2231
..	..	@@ -2102,7 +2255,7 @@
2102	2255	ResetModel();
2103	2256	refreshContents();
2104	2257	} else
2105		- if (event.getSource() == linkverticesItem)
	2258	+ if (source == linkverticesItem)
2106	2259	{
2107	2260	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2261	// {
..	..	@@ -2115,9 +2268,9 @@
2115	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2269	// refreshContents();
2117	2270	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2272	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2121	2274
2122	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2276	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2278,38 @@
2125	2278	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2279	for (int i=0; i<group.selection.size(); i++)
2127	2280	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2281	+ boolean random = CameraPane.SWITCH;
	2282	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2283	group.selection.get(i).linkVerticesThis(content);
2131	2284	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2285	+ CameraPane.SWITCH = random;
2133	2286	}
2134	2287	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2288	refreshContents();
2136	2289	}
2137	2290	} else
2138		- if (event.getSource() == resetsupportItem)
	2291	+ if (source == resetsupportItem)
2139	2292	{
2140	2293	for (int i=0; i<group.selection.size(); i++)
2141	2294	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2295	+ boolean random = CameraPane.SWITCH;
	2296	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2297	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2298	+ CameraPane.SWITCH = random;
2146	2299	}
2147	2300
2148	2301	refreshContents();
2149	2302	} else
2150		- if (event.getSource() == relinkverticesItem)
	2303	+ if (source == relinkverticesItem)
2151	2304	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2305	+ boolean random = CameraPane.SWITCH;
	2306	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2307	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2308	+ CameraPane.SWITCH = random;
2156	2309
2157	2310	refreshContents();
2158	2311	} else
2159		- if (event.getSource() == resetreferencesItem)
	2312	+ if (source == resetreferencesItem)
2160	2313	{
2161	2314	for (int i=0; i<group.selection.size(); i++)
2162	2315	{
..	..	@@ -2165,11 +2318,11 @@
2165	2318
2166	2319	refreshContents();
2167	2320	} else
2168		- if (event.getSource() == setMasterItem)
	2321	+ if (source == setMasterItem)
2169	2322	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2324	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2173	2326
2174	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2328	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2331,13 @@
2178	2331	refreshContents();
2179	2332	}
2180	2333	} else
2181		- if (event.getSource() == poseMeshItem)
	2334	+ if (source == poseMeshItem)
2182	2335	{
2183	2336	if (group.selection.size() == 1)
2184	2337	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2186	2339	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2188	2341
2189	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2343	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2350,19 @@
2197	2350	}
2198	2351
2199	2352	} else
2200		- if (event.getSource() == revertMeshItem)
	2353	+ if (source == revertMeshItem)
2201	2354	{
2202	2355	RevertMeshes();
2203	2356	} else
2204		- if (event.getSource() == resetMeshItem)
	2357	+ if (source == resetAllItem)
2205	2358	{
2206	2359	ResetAll();
2207	2360	} else
2208		- if (event.getSource() == stepAllItem)
	2361	+ if (source == stepAllItem)
2209	2362	{
2210	2363	StepAll();
2211	2364	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2365	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2366	{
2214	2367	//int indices[] = jList.getSelectedIndices();
2215	2368	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2370,46 @@
2217	2370
2218	2371	ClearSelection(false);
2219	2372	} else
2220		- if (event.getSource() == clearAllItem)
	2373	+ if (source == clearAllItem)
2221	2374	{
2222	2375	ClearSelection(true);
2223	2376	} else
2224		- if (event.getSource() == grabItem)
	2377	+ if (source == grabItem)
2225	2378	{
2226	2379	group(new cGroup(), true);
2227	2380	} else
2228		- if (event.getSource() == hideItem)
	2381	+ if (source == hideItem)
2229	2382	{
2230	2383	group(new HiddenObject());
2231	2384	} else
2232		- if (event.getSource() == frontItem)
	2385	+ if (source == frontItem)
2233	2386	{
2234	2387	front();
2235	2388	} else
2236		- if (event.getSource() == backItem)
	2389	+ if (source == backItem)
2237	2390	{
2238	2391	back();
2239	2392	} else
2240		- if (event.getSource() == cameraItem)
	2393	+ if (source == cameraItem)
2241	2394	{
2242	2395	makeSomething(new Camera());
2243	2396	} else
2244		- if (event.getSource() == compositeItem)
	2397	+ if (source == compositeItem)
2245	2398	{
2246	2399	group(new Composite());
2247	2400	} else
2248		- if (event.getSource() == randomItem)
	2401	+ if (source == randomItem)
2249	2402	{
2250	2403	RandomNode random = new RandomNode();
2251	2404	group(random);
2252	2405	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2406	+ random.name = random.get(0).name + "Switch";
2254	2407	} else
2255		- if (event.getSource() == physicsItem)
	2408	+ if (source == physicsItem)
2256	2409	{
2257	2410	group(new PhysicsNode());
2258	2411	} else
2259		- if (event.getSource() == frameselectorItem)
	2412	+ if (source == frameselectorItem)
2260	2413	{
2261	2414	for (int i=0; i<group.selection.size(); i++)
2262	2415	{
..	..	@@ -2268,7 +2421,7 @@
2268	2421	ResetModel();
2269	2422	refreshContents();
2270	2423	} else
2271		- if (event.getSource() == switchGeoItem)
	2424	+ if (source == switchGeoItem)
2272	2425	{
2273	2426	for (int i=0; i<group.selection.size(); i++)
2274	2427	{
..	..	@@ -2280,7 +2433,7 @@
2280	2433	ResetModel();
2281	2434	refreshContents();
2282	2435	} else
2283		- if (event.getSource() == switchTransfoItem)
	2436	+ if (source == switchTransfoItem)
2284	2437	{
2285	2438	for (int i=0; i<group.selection.size(); i++)
2286	2439	{
..	..	@@ -2292,7 +2445,7 @@
2292	2445	ResetModel();
2293	2446	refreshContents();
2294	2447	} else
2295		- if (event.getSource() == morphItem)
	2448	+ if (source == morphItem)
2296	2449	{
2297	2450	for (int i=0; i<group.selection.size(); i++)
2298	2451	{
..	..	@@ -2304,7 +2457,7 @@
2304	2457	ResetModel();
2305	2458	refreshContents();
2306	2459	} else
2307		- if (event.getSource() == scriptNodeItem)
	2460	+ if (source == scriptNodeItem)
2308	2461	{
2309	2462	boolean atleastone = false;
2310	2463
..	..	@@ -2343,31 +2496,31 @@
2343	2496	}
2344	2497	}
2345	2498	} else
2346		- if (event.getSource() == linkerItem)
	2499	+ if (source == linkerItem)
2347	2500	{
2348	2501	group(new cLinker());
2349	2502	} else
2350		- if (event.getSource() == textureItem)
	2503	+ if (source == textureItem)
2351	2504	{
2352	2505	group(new TextureNode());
2353	2506	} else
2354		- if (event.getSource() == billboardItem)
	2507	+ if (source == billboardItem)
2355	2508	{
2356	2509	group(new BillboardNode());
2357	2510	} else
2358		- if (event.getSource() == shadowXItem)
	2511	+ if (source == shadowXItem)
2359	2512	{
2360	2513	CastShadow(0);
2361	2514	} else
2362		- if (event.getSource() == shadowYItem)
	2515	+ if (source == shadowYItem)
2363	2516	{
2364	2517	CastShadow(1);
2365	2518	} else
2366		- if (event.getSource() == shadowZItem)
	2519	+ if (source == shadowZItem)
2367	2520	{
2368	2521	CastShadow(2);
2369	2522	} else
2370		- if (event.getSource() == ungroupItem)
	2523	+ if (source == ungroupItem)
2371	2524	{
2372	2525	//ungroup();
2373	2526	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2532,187 @@
2379	2532
2380	2533	refreshContents();
2381	2534	} else
2382		- if (event.getSource() == genUVItem)
	2535	+ if (source == genUVItem)
2383	2536	{
2384	2537	GenUV();
2385	2538	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2539	+ if (source == genNormalsCADItem)
2387	2540	{
2388	2541	GenNormals(true);
2389	2542	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2543	+ if (source == genNormalsMESHItem)
2391	2544	{
2392	2545	GenNormals(true); // TODO
2393	2546	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2547	+ if (source == genNormalsORGANItem)
2395	2548	{
2396	2549	GenNormals(false);
2397	2550	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2551	+ if (source == genNormalsMINEItem)
2399	2552	{
2400	2553	GenNormalsMINE();
2401	2554	} else
2402		- if (event.getSource() == stripifyItem)
	2555	+ if (source == stripifyItem)
2403	2556	{
2404	2557	Stripify();
2405	2558	} else
2406		- if (event.getSource() == unstripifyItem)
	2559	+ if (source == unstripifyItem)
2407	2560	{
2408	2561	Unstripify();
2409	2562	} else
2410		- if (event.getSource() == trimItem)
	2563	+ if (source == trimItem)
2411	2564	{
2412	2565	Trim();
2413	2566	} else
2414		- if (event.getSource() == untrimItem)
	2567	+ if (source == untrimItem)
2415	2568	{
2416	2569	Untrim();
2417	2570	} else
2418		- if (event.getSource() == clearColorsItem)
	2571	+ if (source == clearColorsItem)
2419	2572	{
2420	2573	ClearColors();
2421	2574	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2575	+ if (source == clearMaterialsItem)
2423	2576	{
2424	2577	ClearMaterials();
2425	2578	} else
2426		- if (event.getSource() == liveleavesItem)
	2579	+ if (source == liveleavesItem)
2427	2580	{
2428	2581	LiveLeaves(true);
2429	2582	} else
2430		- if (event.getSource() == unliveleavesItem)
	2583	+ if (source == unliveleavesItem)
2431	2584	{
2432	2585	LiveLeaves(false);
2433	2586	} else
2434		- if (event.getSource() == supportleavesItem)
	2587	+ if (source == supportleavesItem)
2435	2588	{
2436	2589	SupportLeaves(true);
2437	2590	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2591	+ if (source == unsupportleavesItem)
2439	2592	{
2440	2593	SupportLeaves(false);
2441	2594	} else
2442		- if (event.getSource() == hideleavesItem)
	2595	+ if (source == hideleavesItem)
2443	2596	{
2444	2597	HideLeaves(true);
2445	2598	} else
2446		- if (event.getSource() == showleavesItem)
	2599	+ if (source == showleavesItem)
2447	2600	{
2448	2601	HideLeaves(false);
2449	2602	} else
2450		- if (event.getSource() == markleavesItem)
	2603	+ if (source == markleavesItem)
2451	2604	{
2452	2605	MarkLeaves(true);
2453	2606	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2607	+ if (source == unmarkleavesItem)
2455	2608	{
2456	2609	MarkLeaves(false);
2457	2610	} else
2458		- if (event.getSource() == flipVItem)
	2611	+ if (source == flipVItem)
2459	2612	{
2460	2613	FlipV(true);
2461	2614	} else
2462		- if (event.getSource() == unflipVItem)
	2615	+ if (source == unflipVItem)
2463	2616	{
2464	2617	FlipV(false);
2465	2618	} else
2466		- if (event.getSource() == lowTexturesItem)
	2619	+ if (source == lowTexturesItem)
2467	2620	{
2468	2621	SetTexRes(0);
2469	2622	} else
2470		- if (event.getSource() == normalTexturesItem)
	2623	+ if (source == normalTexturesItem)
2471	2624	{
2472	2625	SetTexRes(1);
2473	2626	} else
2474		- if (event.getSource() == highTexturesItem)
	2627	+ if (source == highTexturesItem)
2475	2628	{
2476	2629	SetTexRes(2);
2477	2630	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2631	+ if (source == veryhighTexturesItem)
2479	2632	{
2480	2633	SetTexRes(3);
2481	2634	} else
2482		- if (event.getSource() == maxTexturesItem)
	2635	+ if (source == maxTexturesItem)
2483	2636	{
2484	2637	SetTexRes(4);
2485	2638	} else
2486		- if (event.getSource() == panoTexturesItem)
	2639	+ if (source == panoTexturesItem)
2487	2640	{
2488	2641	SetTexRes(5);
2489	2642	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2643	+ if (source == reverseNormalsItem)
2491	2644	{
2492	2645	ReverseNormals();
2493	2646	} else
2494		- if (event.getSource() == parseverticesItem)
	2647	+ if (source == parseverticesItem)
2495	2648	{
2496	2649	ParseVertices();
2497	2650	} else
2498		- if (event.getSource() == textureFieldItem)
	2651	+ if (source == textureFieldItem)
2499	2652	{
2500	2653	TextureVertices();
2501	2654	} else
2502		- if (event.getSource() == alignItem)
	2655	+ if (source == alignItem)
2503	2656	{
2504	2657	Align();
2505	2658	} else
2506		- if (event.getSource() == mirrorItem)
	2659	+ if (source == mirrorItem)
2507	2660	{
2508	2661	MirrorPoses();
2509	2662	} else
2510		- if (event.getSource() == reduceMorphItem)
	2663	+ if (source == reduceMorphItem)
2511	2664	{
2512	2665	MeshReduction(false);
2513	2666	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2667	+ if (source == reduce34MorphItem)
2515	2668	{
2516	2669	MeshReduction(true);
2517	2670	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2671	+ if (source == reverseTrianglesItem)
2519	2672	{
2520	2673	ReverseTriangles();
2521	2674	} else
2522		- if (event.getSource() == reduceMeshItem)
	2675	+ if (source == reduceMeshItem)
2523	2676	{
2524	2677	ReduceMesh(false);
2525	2678	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2679	+ if (source == reduce34MeshItem)
2527	2680	{
2528	2681	ReduceMesh(true);
2529	2682	} else
2530		- if (event.getSource() == increaseMeshItem)
	2683	+ if (source == increaseMeshItem)
2531	2684	{
2532	2685	IncreaseMesh();
2533	2686	} else
2534		- if (event.getSource() == clipMeshItem)
	2687	+ if (source == clipMeshItem)
2535	2688	{
2536	2689	ClipMesh();
2537	2690	} else
2538		- if (event.getSource() == smoothMeshItem)
	2691	+ if (source == smoothMeshItem)
2539	2692	{
2540	2693	SmoothMesh();
2541	2694	} else
2542		- if (event.getSource() == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2543	2696	{
2544	2697	TransformGeometry();
2545	2698	} else
2546		- if (event.getSource() == resetTransformItem)
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
	2702	+ } else
	2703	+ if (source == resetTransformItem)
2547	2704	{
2548	2705	ResetTransform();
2549	2706	} else
2550		- if (event.getSource() == resetCentroidItem)
	2707	+ if (source == resetCentroidItem)
2551	2708	{
2552		- ResetCentroid();
	2709	+ ResetCentroid(true);
2553	2710	} else
2554		- if (event.getSource() == resetParentItem)
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
	2714	+ } else
	2715	+ if (source == resetParentItem)
2555	2716	{
2556	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2718	{
..	..	@@ -2561,7 +2722,7 @@
2561	2722
2562	2723	refreshContents();
2563	2724	} else
2564		- if (event.getSource() == repairParentItem)
	2725	+ if (source == repairParentItem)
2565	2726	{
2566	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2728	{
..	..	@@ -2575,7 +2736,7 @@
2575	2736
2576	2737	refreshContents();
2577	2738	} else
2578		- if (event.getSource() == repairShadowItem)
	2739	+ if (source == repairShadowItem)
2579	2740	{
2580	2741	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2742	{
..	..	@@ -2589,7 +2750,7 @@
2589	2750
2590	2751	refreshContents();
2591	2752	} else
2592		- if (event.getSource() == sortbysizeItem)
	2753	+ if (source == sortbysizeItem)
2593	2754	{
2594	2755	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2756	{
..	..	@@ -2601,7 +2762,7 @@
2601	2762	ResetModel();
2602	2763	refreshContents();
2603	2764	} else
2604		- if (event.getSource() == sortbynameItem)
	2765	+ if (source == sortbynameItem)
2605	2766	{
2606	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2768	{
..	..	@@ -2613,7 +2774,7 @@
2613	2774	ResetModel();
2614	2775	refreshContents();
2615	2776	} else
2616		- if (event.getSource() == attachPigmentItem)
	2777	+ if (source == attachPigmentItem)
2617	2778	{
2618	2779	String texture = GetFile("Attach pigment");
2619	2780	Object3D obj;
..	..	@@ -2625,7 +2786,7 @@
2625	2786
2626	2787	refreshContents();
2627	2788	} else
2628		- if (event.getSource() == detachPigmentItem)
	2789	+ if (source == detachPigmentItem)
2629	2790	{
2630	2791	Object3D obj;
2631	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2797,7 @@
2636	2797
2637	2798	refreshContents();
2638	2799	} else
2639		- if (event.getSource() == attachBumpItem)
	2800	+ if (source == attachBumpItem)
2640	2801	{
2641	2802	String texture = GetFile("Attach bump");
2642	2803	Object3D obj;
..	..	@@ -2648,7 +2809,7 @@
2648	2809
2649	2810	refreshContents();
2650	2811	} else
2651		- if (event.getSource() == detachBumpItem)
	2812	+ if (source == detachBumpItem)
2652	2813	{
2653	2814	Object3D obj;
2654	2815	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2820,7 @@
2659	2820
2660	2821	refreshContents();
2661	2822	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2823	+ if (source == pigmentBumpItem)
2663	2824	{
2664	2825	Object3D obj;
2665	2826	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2831,195 @@
2670	2831
2671	2832	refreshContents();
2672	2833	} else
2673		- if (event.getSource() == flashSelectionButton)
	2834	+ if (source == flashSelectionButton)
2674	2835	{
2675	2836	CameraPane.flash = true;
2676	2837	refreshContents();
2677	2838	} else
2678		- if (event.getSource() == oneButton)
	2839	+ if (source == oneButton)
2679	2840	{
2680	2841	} else
2681		- if (event.getSource() == twoButton)
	2842	+ if (source == twoButton)
2682	2843	{
2683	2844	radio.layout = twoButton;
2684	2845	// bug
2685	2846	//gridPanel.setDividerLocation(1.0);
2686	2847	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2848	+// bigThree.remove(scenePanel);
	2849	+// bigThree.remove(centralPanel);
	2850	+// bigThree.remove(XYZPanel);
	2851	+// aWindowConstraints.gridx = 0;
	2852	+// aWindowConstraints.gridy = 0;
	2853	+// aWindowConstraints.gridwidth = 1;
	2854	+// // aConstraints.gridheight = 3;
	2855	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2856	+// aWindowConstraints.weightx = 0;
	2857	+// aWindowConstraints.weighty = 1;
	2858	+// //bigThree.add(jtp, aWindowConstraints);
	2859	+// aWindowConstraints.weightx = 1;
	2860	+// aWindowConstraints.gridwidth = 3;
	2861	+// // aConstraints.gridheight = 3;
	2862	+// aWindowConstraints.gridx = 1;
	2863	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2864	+// bigThree.add(centralPanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.gridx = 4;
	2867	+// aWindowConstraints.gridwidth = 1;
	2868	+// // aConstraints.gridheight = 3;
	2869	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2870	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2871	+// scenePanel.setVisible(false);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(centralPanel);
	2876	+ bigThree.FlushUI();
2711	2877	} else
2712		- if (event.getSource() == threeButton)
	2878	+ if (source == threeButton)
2713	2879	{
2714	2880	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2881	+
	2882	+// bigThree.remove(scenePanel);
	2883	+// bigThree.remove(centralPanel);
	2884	+// bigThree.remove(XYZPanel);
	2885	+// aWindowConstraints.gridx = 0;
	2886	+// aWindowConstraints.gridy = 0;
	2887	+// aWindowConstraints.gridwidth = 1;
	2888	+// // aConstraints.gridheight = 3;
	2889	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.weighty = 1;
	2892	+// //bigThree.add(jtp, aWindowConstraints);
	2893	+// aWindowConstraints.weightx = 1;
	2894	+// aWindowConstraints.gridwidth = 3;
	2895	+// // aConstraints.gridheight = 3;
	2896	+// aWindowConstraints.gridx = 1;
	2897	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2898	+// bigThree.add(centralPanel, aWindowConstraints);
	2899	+// aWindowConstraints.weightx = 0;
	2900	+// aWindowConstraints.gridx = 4;
	2901	+// aWindowConstraints.gridwidth = 1;
	2902	+// // aConstraints.gridheight = 3;
	2903	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2904	+// bigThree.add(XYZPanel, aWindowConstraints);
	2905	+// bigThree.validate();
	2906	+// scenePanel.setVisible(false);
	2907	+// centralPanel.setVisible(true);
	2908	+// XYZPanel.setVisible(true);
	2909	+ bigThree.ClearUI();
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.add(XYZPanel);
	2912	+ bigThree.FlushUI();
2739	2913	} else
2740		- if (event.getSource() == fourButton)
	2914	+ if (source == fourButton)
2741	2915	{
2742	2916	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- bigThree.revalidate();
	2917	+
	2918	+// bigThree.remove(scenePanel);
	2919	+// bigThree.remove(centralPanel);
	2920	+// bigThree.remove(XYZPanel);
	2921	+// aWindowConstraints.gridx = 0;
	2922	+// aWindowConstraints.gridy = 0;
	2923	+// aWindowConstraints.gridwidth = 1;
	2924	+// // aWindowConstraints.gridheight = 3;
	2925	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.weighty = 1;
	2928	+// bigThree.add(scenePanel, aWindowConstraints);
	2929	+// aWindowConstraints.weightx = 1;
	2930	+// aWindowConstraints.gridwidth = 3;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.gridx = 1;
	2933	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2934	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2935	+// aWindowConstraints.weightx = 0;
	2936	+// aWindowConstraints.gridx = 4;
	2937	+// aWindowConstraints.gridwidth = 1;
	2938	+// // aWindowConstraints.gridheight = 3;
	2939	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2940	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2941	+// bigThree.validate();
	2942	+// scenePanel.setVisible(true);
	2943	+// centralPanel.setVisible(false);
	2944	+// XYZPanel.setVisible(false);
	2945	+ bigThree.ClearUI();
	2946	+ bigThree.add(scenePanel);
	2947	+ bigThree.FlushUI();
2767	2948	} else
2768		- if (event.getSource() == sixButton)
	2949	+ if (source == sixButton)
2769	2950	{
2770	2951	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	2952	+
	2953	+// bigThree.remove(scenePanel);
	2954	+// bigThree.remove(centralPanel);
	2955	+// bigThree.remove(XYZPanel);
	2956	+// aWindowConstraints.gridx = 0;
	2957	+// aWindowConstraints.gridy = 0;
	2958	+// aWindowConstraints.gridwidth = 1;
	2959	+// // aConstraints.gridheight = 3;
	2960	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2961	+// aWindowConstraints.weightx = 0;
	2962	+// aWindowConstraints.weighty = 1;
	2963	+// bigThree.add(scenePanel, aWindowConstraints);
	2964	+// aWindowConstraints.weightx = 1;
	2965	+// aWindowConstraints.gridwidth = 3;
	2966	+// // aWindowConstraints.gridheight = 3;
	2967	+// aWindowConstraints.gridx = 1;
	2968	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2969	+// bigThree.add(centralPanel, aWindowConstraints);
	2970	+// aWindowConstraints.weightx = 0;
	2971	+// aWindowConstraints.gridx = 4;
	2972	+// aWindowConstraints.gridwidth = 1;
	2973	+// // aWindowConstraints.gridheight = 3;
	2974	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2975	+// //bigThree.add(XYZPanel, aConstraints);
	2976	+// bigThree.validate();
	2977	+// scenePanel.setVisible(true);
	2978	+// centralPanel.setVisible(true);
	2979	+// XYZPanel.setVisible(false);
	2980	+ bigThree.ClearUI();
	2981	+ bigThree.add(scenePanel);
	2982	+ bigThree.add(centralPanel);
	2983	+ bigThree.FlushUI();
2795	2984	} else
2796		- if (event.getSource() == sevenButton)
	2985	+ if (source == sevenButton)
2797	2986	{
2798	2987	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	2988	+
	2989	+// bigThree.remove(scenePanel);
	2990	+// bigThree.remove(centralPanel);
	2991	+// bigThree.remove(XYZPanel);
	2992	+// aWindowConstraints.gridx = 0;
	2993	+// aWindowConstraints.gridy = 0;
	2994	+// aWindowConstraints.gridwidth = 1;
	2995	+// // aWindowConstraints.gridheight = 3;
	2996	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2997	+// aWindowConstraints.weightx = 0;
	2998	+// aWindowConstraints.weighty = 1;
	2999	+// bigThree.add(scenePanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 1;
	3001	+// aWindowConstraints.gridwidth = 3;
	3002	+// // aWindowConstraints.gridheight = 3;
	3003	+// aWindowConstraints.gridx = 1;
	3004	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3005	+// bigThree.add(centralPanel, aWindowConstraints);
	3006	+// aWindowConstraints.weightx = 0;
	3007	+// aWindowConstraints.gridx = 4;
	3008	+// aWindowConstraints.gridwidth = 1;
	3009	+// // aConstraints.gridheight = 3;
	3010	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3011	+// bigThree.add(XYZPanel, aWindowConstraints);
	3012	+// bigThree.validate();
	3013	+// scenePanel.setVisible(true);
	3014	+// centralPanel.setVisible(true);
	3015	+// XYZPanel.setVisible(true);
	3016	+ bigThree.ClearUI();
	3017	+ bigThree.add(scenePanel);
	3018	+ bigThree.add(centralPanel);
	3019	+ bigThree.add(XYZPanel);
	3020	+ bigThree.FlushUI();
2823	3021	} else
2824		- if (event.getSource() == rootButton)
	3022	+ if (source == rootButton)
2825	3023	{
2826	3024	Object3D obj;
2827	3025	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2833,7 +3031,7 @@
2833	3031
2834	3032	refreshContents(true);
2835	3033	} else
2836		- if (event.getSource() == closeButton)
	3034	+ if (source == closeButton)
2837	3035	{
2838	3036	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3037	cRadio ab;
..	..	@@ -2854,11 +3052,11 @@
2854	3052	}
2855	3053	refreshContents(true);
2856	3054	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3055	+ if (source == editItem \|\| source == editButton)
2858	3056	{
2859	3057	EditSelection(false);
2860	3058	} else
2861		- if (event.getSource() == uneditButton)
	3059	+ if (source == uneditButton)
2862	3060	{
2863	3061	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3062	{
..	..	@@ -2868,14 +3066,14 @@
2868	3066	child.CloseUI();
2869	3067	listUI.remove(child);
2870	3068
2871		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2872	3070	}
2873		- objEditor.ctrlPanel.revalidate();
	3071	+ objEditor.ctrlPanel.FlushUI();
2874	3072	//objEditor.jTree.clearSelection();
2875	3073	//objEditor.ResetSliders();
2876	3074	refreshContents(true);
2877	3075	} else
2878		- if (event.getSource() == clearPanelButton)
	3076	+ if (source == clearPanelButton)
2879	3077	{
2880	3078	assert(copy == group);
2881	3079	//copy.ClearUI();
..	..	@@ -2886,7 +3084,7 @@
2886	3084	listUI.clear();
2887	3085	refreshContents(true);
2888	3086	} else
2889		- if (event.getSource() == allParamsButton)
	3087	+ if (source == allParamsButton)
2890	3088	{
2891	3089	assert(copy == group);
2892	3090
..	..	@@ -2907,19 +3105,19 @@
2907	3105
2908	3106	refreshContents(true);
2909	3107	} else
2910		- if (event.getSource() == unselectButton)
	3108	+ if (source == unselectButton)
2911	3109	{
2912	3110	objEditor.jTree.clearSelection();
2913	3111	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3112	objEditor.ResetSliders();
2915	3113	refreshContents(true);
2916	3114	} else
2917		- if(event.getSource() instanceof cRadio)
	3115	+ if(source instanceof cRadio)
2918	3116	{
2919	3117	group.parent = keepparent;
2920	3118	group.attributes = 0;
2921	3119	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3120	+ /cRadio/ radio = (cRadio)source;
2923	3121	Object3D obj = radio.GetObject();
2924	3122	System.out.println("Edit " + obj);
2925	3123	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2954,7 +3152,10 @@
2954	3152	frontView.object = group;
2955	3153	sideView.object = group;
2956	3154	}
	3155	+
	3156	+// fix "+" issue
2957	3157	group.editWindow = this;
	3158	+
2958	3159	/*
2959	3160	currentLayout = radio.layout;
2960	3161	if (currentLayout == null)
..	..	@@ -2967,7 +3168,20 @@
2967	3168	//group.attributes = -1;
2968	3169	ResetModel();
2969	3170	refreshContents(true);
2970		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
2971	3185	else
2972	3186	{
2973	3187	//return super.action(event, arg);
..	..	@@ -3028,6 +3242,28 @@
3028	3242	refreshContents();
3029	3243	}
3030	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
3031	3267
3032	3268	void ResetTransform()
3033	3269	{
..	..	@@ -3140,7 +3376,7 @@
3140	3376	refreshContents();
3141	3377	}
3142	3378
3143		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3144	3380	{
3145	3381	Object3D obj;
3146	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3391,16 @@
3155	3391	LA.matIdentity(Object3D.mat);
3156	3392	obj.getBounds(minima, maxima, false);
3157	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3161	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3164	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3226,9 +3466,9 @@
3226	3466	obj = (Object3D)e.nextElement();
3227	3467
3228	3468	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3469	+ Grafreed.AnalyzeObject(obj);
3230	3470	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3471	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3472
3233	3473	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3474	}
..	..	@@ -3442,8 +3682,8 @@
3442	3682
3443	3683	void ParseVertices()
3444	3684	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3685	+ boolean epsequal = Grafreed.epsequal;
	3686	+ Grafreed.epsequal = true;
3447	3687
3448	3688	for (int i=0; i<group.selection.size(); i++)
3449	3689	{
..	..	@@ -3468,7 +3708,7 @@
3468	3708	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3709	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3710
3471		- g.add(GrafreeD.clipboard);
	3711	+ g.add(Grafreed.clipboard);
3472	3712
3473	3713	buffer.add(g);
3474	3714	}
..	..	@@ -3483,7 +3723,7 @@
3483	3723	makeSomething(buffer, i==group.selection.size()-1);
3484	3724	}
3485	3725
3486		- GrafreeD.epsequal = epsequal;
	3726	+ Grafreed.epsequal = epsequal;
3487	3727
3488	3728	refreshContents();
3489	3729	}
..	..	@@ -3501,7 +3741,16 @@
3501	3741	String pigment = Object3D.GetPigment(tex);
3502	3742	//String bump = Object3D.GetBump(tex);
3503	3743
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3744	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3745	+
	3746	+ try
	3747	+ {
	3748	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3749	+ }
	3750	+ catch (Exception e)
	3751	+ {
	3752	+ System.err.println("FAIL: " + node);
	3753	+ }
3505	3754
3506	3755	double s = v.s;
3507	3756
..	..	@@ -3589,11 +3838,11 @@
3589	3838
3590	3839	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	3840
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	3841	+ boolean random = CameraPane.SWITCH;
	3842	+ CameraPane.SWITCH = false; // parse all random nodes
3594	3843	lowres.linkVerticesThis(null);
3595	3844	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	3845	+ CameraPane.SWITCH = random;
3597	3846
3598	3847	System.err.flush();
3599	3848
..	..	@@ -3633,7 +3882,7 @@
3633	3882	return;
3634	3883
3635	3884	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	3885	+ Object3D ref = Grafreed.clipboard.get(0);
3637	3886
3638	3887	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	3888
..	..	@@ -3827,9 +4076,9 @@
3827	4076
3828	4077	void ClipMesh()
3829	4078	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4079	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4080	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4081	+ Object3D content = Grafreed.clipboard.get(0);
3833	4082
3834	4083	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4084	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4087,7 @@
3838	4087	// {
3839	4088	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4089	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4090	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4091	}
3843	4092	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4093	System.out.println("DONE.");
..	..	@@ -3973,7 +4222,7 @@
3973	4222	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4223
3975	4224	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4225	+ if(elem != group \|\| !newWindow)
3977	4226	{
3978	4227	// if (!(elem instanceof Composite))
3979	4228	// newWindow = false;
..	..	@@ -4078,23 +4327,26 @@
4078	4327	System.err.println("info : " + child.GetPath());
4079	4328	}
4080	4329	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4330	+// else
	4331	+// {
	4332	+// objEditor.SetMaterial(group); // .GetMaterial());
	4333	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4334	+// System.err.println("info : " + group.GetPath());
	4335	+// }
4087	4336
4088	4337	objEditor.SetText(); // jan 2014
4089	4338
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4339	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4340	CameraPane.flash = true;
4092	4341
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4342	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4343	// a camera
4095	4344	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4345	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4346	+ {
	4347	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4348	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4349	+ }
4098	4350	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4351	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4352	}
..	..	@@ -4178,16 +4430,18 @@
4178	4430	{
4179	4431	if (group.selection.isEmpty())
4180	4432	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4433	+
	4434	+ Grafreed.clipboardIsTempGroup = false;
4182	4435	Composite tGroup = null;
4183	4436	if (group.selection.size() > 0) // 1)
4184	4437	{
4185	4438	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4439	+ Grafreed.clipboardIsTempGroup = true;
4187	4440	}
4188	4441
4189	4442	if (cut)
4190	4443	{
	4444	+ Save();
4191	4445	//int indices[] = jList.getSelectedIndices();
4192	4446	//for (int i = indices.length - 1; i >= 0; i--)
4193	4447	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4477,16 @@
4223	4477	//System.out.println("cut " + child);
4224	4478	//System.out.println("parent = " + child.parent);
4225	4479	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4480	+ if (Grafreed.clipboardIsTempGroup)
4227	4481	tGroup.add/Child/(tmp);
4228	4482	else
4229		- GrafreeD.clipboard = tmp;
	4483	+ Grafreed.clipboard = tmp;
4230	4484	}
4231	4485	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4486	+ if (Grafreed.clipboardIsTempGroup)
4233	4487	tGroup.add/Child/(child);
4234	4488	else
4235		- GrafreeD.clipboard = child;
	4489	+ Grafreed.clipboard = child;
4236	4490	}
4237	4491
4238	4492	//ResetModel();
..	..	@@ -4264,21 +4518,23 @@
4264	4518	//System.out.println("cut " + elem);
4265	4519	//System.out.println("parent = " + elem.parent);
4266	4520	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4268	4522	tGroup.add/Child/(tmp);
4269	4523	else
4270		- GrafreeD.clipboard = tmp;
	4524	+ Grafreed.clipboard = tmp;
4271	4525	}
4272	4526	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4527	+ if (Grafreed.clipboardIsTempGroup)
4274	4528	tGroup.add/Child/(child);
4275	4529	else
4276		- GrafreeD.clipboard = child;
	4530	+ Grafreed.clipboard = child;
4277	4531	}
4278	4532
4279	4533	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4534	+
	4535	+ if (Grafreed.clipboardIsTempGroup)
	4536	+ Grafreed.clipboard = tGroup;
	4537	+
4282	4538	if (cut)
4283	4539	{
4284	4540	ResetModel();
..	..	@@ -4292,7 +4548,7 @@
4292	4548	// return;
4293	4549	boolean first = true;
4294	4550
4295		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4296	4552	{
4297	4553	Composite temp;
4298	4554
..	..	@@ -4303,7 +4559,7 @@
4303	4559	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4560	*/
4305	4561	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4562	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	4563	{
4308	4564	Object3D child = (Object3D)e.nextElement();
4309	4565
..	..	@@ -4337,21 +4593,21 @@
4337	4593	//Object3D cb = Applet3D.clipboard;
4338	4594	//temp.addChild(cb);
4339	4595	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4596	+ assert(Grafreed.clipboard.parent == null);
	4597	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4598	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4599	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4600	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	4601	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4602	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4603	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4604	}
4349	4605
4350	4606	ResetModel();
4351	4607	refreshContents();
4352	4608	}
4353	4609
4354		- void pasteInto(boolean copyit)
	4610	+ void pasteInto(boolean copyit, boolean clone)
4355	4611	{
4356	4612	// if (GrafreeD.clipboard == null)
4357	4613	// return;
..	..	@@ -4380,15 +4636,22 @@
4380	4636	if (copyit)
4381	4637	{
4382	4638	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4639	+ if (clone)
	4640	+ {
	4641	+ CloneClipboard(false); // sept 2014
	4642	+ }
	4643	+ else
	4644	+ {
	4645	+ paste(false);
	4646	+ }
4384	4647	}
4385	4648	else
4386	4649	{
4387	4650	boolean first = true;
4388	4651
4389		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4390	4653	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4654	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4655	Object3D copy;
4393	4656	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4657	{
..	..	@@ -4398,7 +4661,7 @@
4398	4661	}
4399	4662	} else
4400	4663	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4664	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4665	}
4403	4666	}
4404	4667	}
..	..	@@ -4803,21 +5066,6 @@
4803	5066	}
4804	5067	*/
4805	5068
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5069	/*
4822	5070	public void Callback(Object obj)
4823	5071	{
..	..	@@ -4841,26 +5089,9 @@
4841	5089	}
4842	5090	*/
4843	5091
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5092	String GetFile(String dialogName)
4862	5093	{
4863		- if (GrafreeD.standAlone)
	5094	+ if (Grafreed.standAlone)
4864	5095	{
4865	5096	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5097	browser.show();
..	..	@@ -4924,10 +5155,15 @@
4924	5155	cButton flashSelectionButton;
4925	5156	cButton editButton;
4926	5157	cButton uneditButton;
	5158	+ JCheckBox allParamsButton;
4927	5159	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5160	cButton unselectButton;
4930	5161
	5162	+ cButton saveButton;
	5163	+ cButton undoButton;
	5164	+ cButton redoButton;
	5165	+ cButton oneStepButton;
	5166	+
4931	5167	cButton screenfitButton;
4932	5168	cButton screenfitpointButton;
4933	5169	cButton snapobjectButton;
..	..	@@ -4958,6 +5194,8 @@
4958	5194	private MenuItem lookFromItem;
4959	5195	private MenuItem switchItem;
4960	5196	private MenuItem cutItem;
	5197	+ private MenuItem undoItem;
	5198	+ private MenuItem redoItem;
4961	5199	private MenuItem duplicateItem;
4962	5200	private MenuItem cloneItem;
4963	5201	private MenuItem cloneSupportItem;
..	..	@@ -4971,7 +5209,7 @@
4971	5209	private MenuItem linkverticesItem;
4972	5210	private MenuItem relinkverticesItem;
4973	5211	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5212	+ private MenuItem resetAllItem;
4975	5213	private MenuItem stepAllItem;
4976	5214	private MenuItem revertMeshItem;
4977	5215	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5220,7 @@
4982	5220	private MenuItem mergeGeometriesItem;
4983	5221	private MenuItem copyItem;
4984	5222	private MenuItem pasteItem;
	5223	+ private MenuItem pasteIntoItem;
4985	5224	private MenuItem pasteLinkItem;
4986	5225	private MenuItem pasteCloneItem;
4987	5226	private MenuItem pasteExpandItem;
..	..	@@ -5031,8 +5270,10 @@
5031	5270	private MenuItem panoTexturesItem;
5032	5271
5033	5272	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5273	+ private MenuItem resetCentroidXZItem;
5035	5274	private MenuItem resetTransformItem;
	5275	+ private MenuItem transformGeometryItem;
	5276	+ private MenuItem transformChildrenItem;
5036	5277	private MenuItem hideItem;
5037	5278	private MenuItem grabItem;
5038	5279	private MenuItem backItem;
..	..	@@ -5079,7 +5320,7 @@
5079	5320	private MenuItem blobItem;
5080	5321	private MenuItem latheItem;
5081	5322	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5323	+ private MenuItem overlayItem;
5083	5324	private MenuItem meshItem;
5084	5325	// private MenuItem meshGroupItem;
5085	5326	private MenuItem springItem;
..	..	@@ -5101,11 +5342,6 @@
5101	5342	private MenuItem doubleItem;
5102	5343	private MenuItem tripleItem;
5103	5344
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5345	private MenuItem computeAOItem;
5110	5346	private MenuItem recompileItem;
5111	5347	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5351,8 @@
5115	5351	private MenuItem analyzeItem;
5116	5352	private MenuItem dumpItem;
5117	5353	//boolean freezemodel = false;
	5354	+
	5355	+ Menu cameraMenu;
	5356	+ MenuItem editCameraItem;
	5357	+ MenuItem revertCameraItem;
5118	5358	}