~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,129 @@
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	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
	162	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	163	+ duplicateItem.addActionListener(this);
	164	+ cloneItem = menu.add(new MenuItem("Clone"));
	165	+ cloneItem.addActionListener(this);
	166	+ if (Globals.ADVANCED)
	167	+ {
	168	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	169	+ cloneSupportItem.addActionListener(this);
	170	+ }
	171	+ menu.add("-");
	172	+ cutItem = menu.add(new MenuItem("Cut"));
	173	+ cutItem.addActionListener(this);
	174	+ copyItem = menu.add(new MenuItem("Copy"));
	175	+ copyItem.addActionListener(this);
	176	+ pasteItem = menu.add(new MenuItem("Paste"));
	177	+ pasteItem.addActionListener(this);
	178	+ menu.add("-");
	179	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(CameraPane.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//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		-
	285	+ }
	286	+
192	287	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);
	288	+ if (Globals.ADVANCED)
	289	+ {
197	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	291	revertMeshItem.addActionListener(this);
199	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	293	resetreferencesItem.addActionListener(this);
201	294	menu.add("-");
	295	+ }
202	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	297	overwriteGeoItem.addActionListener(this);
204	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +304,26 @@
210	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	305	overwriteUVItem.addActionListener(this);
212	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
213	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	310	generateMeshItem.addActionListener(this);
215	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	312	poseMeshItem.addActionListener(this);
217	313	menu.add("-");
	314	+ }
218	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	316	resetsupportItem.addActionListener(this);
220	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	318	linkverticesItem.addActionListener(this);
222	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
224	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	325	setMasterItem.addActionListener(this);
	326	+ }
226	327
227	328	oe.menuBar.add(menu = new Menu("Group"));
228	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +334,32 @@
233	334	frontItem.addActionListener(this);
234	335	compositeItem = menu.add(new MenuItem("Composite"));
235	336	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	338	hideItem.addActionListener(this);
238	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	340	ungroupItem.addActionListener(this);
240	341	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
242	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	345	switchGeoItem.addActionListener(this);
249	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	347	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
253	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	359	scriptNodeItem.addActionListener(this);
255	360	cameraItem = menu.add(new MenuItem("Camera"));
256	361	cameraItem.addActionListener(this);
	362	+ }
257	363
258	364	oe.menuBar.add(menu = new Menu("Object"));
259	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +374,29 @@
268	374	shadowYItem.addActionListener(this);
269	375	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
271	380	linkerItem = menu.add(new MenuItem("Linker"));
272	381	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	382	attributeItem = menu.add(new MenuItem("Attribute"));
276	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
277	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	387	pointflowItem.addActionListener(this);
	388	+ }
279	389	menu.add("-");
280	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	391	resetTransformItem.addActionListener(this);
282	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	393	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
286	400
287	401	oe.menuBar.add(menu = new Menu("Geometry"));
288	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +407,11 @@
293	407	genNormalsCADItem.addActionListener(this);
294	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
296	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
298	415	stripifyItem = menu.add(new MenuItem("Stripify"));
299	416	stripifyItem.addActionListener(this);
300	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +433,34 @@
316	433	reduce34MeshItem.addActionListener(this);
317	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	435	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
323	444
324	445	oe.menuBar.add(menu = new Menu("Attributes"));
325	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
327	452	menu.add("-");
328	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	454	liveleavesItem.addActionListener(this);
330	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
332	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	460	supportleavesItem.addActionListener(this);
334	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	462	unsupportleavesItem.addActionListener(this);
	463	+ }
336	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	465	hideleavesItem.addActionListener(this);
338	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,29 +504,22 @@
376	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	505	sortbynameItem.addActionListener(this);
378	506	menu.add("-");
	507	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	508	+ shareGeometriesItem.addActionListener(this);
	509	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	510	+ mergeGeometriesItem.addActionListener(this);
	511	+ if (Globals.ADVANCED)
	512	+ {
	513	+ // Pretty much the same as duplicate and clone.
379	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	515	extractGeometriesItem.addActionListener(this);
381	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	517	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);
	518	+ }
387	519
388	520	oe.menuBar.add(menu = new Menu("Insert"));
389	521	buildCreateMenu(menu);
390	522
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	523	oe.menuBar.add(menu = new Menu("Tools"));
403	524	buildToolsMenu(menu);
404	525	}
..	..	@@ -433,153 +554,98 @@
433	554	oe.radioPanel.add(dummyButton);
434	555	oe.buttonGroup.add(dummyButton);
435	556	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	557	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	558
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	559	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	560	+ liveCB.setToolTipText("Enable animation");
441	561	liveCB.addItemListener(this);
442	562
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	564	+ oneStepButton.setToolTipText("Animate one step forward");
	565	+ oneStepButton.addActionListener(this);
	566	+
	567	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	568	+ fastCB.setToolTipText("Fast mode");
461	569	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	570	+
	571	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	572	+ trackCB.setToolTipText("Enable tracking");
503	573	trackCB.addItemListener(this);
504	574
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	576	+ screenfitButton.setToolTipText("Screen fit");
507	577	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	578	+
509	579	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	580	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	581
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	582	+ if (Globals.ADVANCED)
	583	+ {
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ snapobjectButton.addActionListener(this);
	586	+ snapobjectButton.setToolTipText("Snap Object");
	587	+ }
	588	+
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ flashSelectionButton.setToolTipText("Show selection");
522	591	flashSelectionButton.addActionListener(this);
523	592
524		- oe.toolbarPanel.add(new cButton(" ", false));
	593	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	594
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ twoButton.setToolTipText("Show center view only");
532	597	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	599	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	600	+ fourButton.setToolTipText("Show left panel only");
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ sixButton.setToolTipText("2-column layout left");
536	603	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ threeButton.setToolTipText("2-column layout right");
538	606	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ sevenButton.setToolTipText("3-column layout");
540	609	sevenButton.addActionListener(this);
541	610	//
542	611
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ rootButton.setToolTipText("Edit selection in new tab");
544	614	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ closeButton.setToolTipText("Close tab");
547	618	closeButton.addActionListener(this);
548	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	620	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	621
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	622	+ cGridBag commandsPanel = new cGridBag();
	623	+
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	625	+ editButton.setToolTipText("Edit selection");
554	626	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	627
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ uneditButton.setToolTipText("Unedit selection");
560	630	uneditButton.addActionListener(this);
561	631
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	632	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	633	+ allParamsButton.setToolTipText("Edit all params");
574	634	allParamsButton.addActionListener(this);
575	635
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ clearPanelButton.setToolTipText("Clear edit panel");
	638	+ clearPanelButton.addActionListener(this);
	639	+
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ unselectButton.setToolTipText("Unselect");
581	642	unselectButton.addActionListener(this);
582	643
	644	+ commandsPanel.preferredHeight = 1;
	645	+
	646	+ oe.treePanel.add(commandsPanel);
	647	+ oe.treePanel.Return();
	648	+
583	649	// oe.aConstraints.gridx += 1;
584	650	// oe.aConstraints.weighty = 0;
585	651	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +657,37 @@
591	657	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	658	// gcButton.addActionListener(this);
593	659
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	660	+ cGridBag jSPPanel = new cGridBag();
	661	+
	662	+ JScrollPane jSP;
605	663	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	664	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	665	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	666	+
	667	+ oe.treePanel.add(jSPPanel);
	668	+ oe.treePanel.Return();
612	669
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	670	+ cGridBag copyOptionsPanel = new cGridBag();
	671	+
	672	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	673	+ colorCB.setToolTipText("Copy color when dropped");
617	674	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	675	+
	676	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	677	+ materialCB.setToolTipText("Copy material when dropped");
620	678	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	679	+
	680	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	681	+ textureCB.setToolTipText("Copy texture when dropped");
623	682	textureCB.addItemListener(this);
624	683
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	684	+ copyOptionsPanel.preferredHeight = 1;
	685	+ oe.treePanel.add(copyOptionsPanel);
	686	+ oe.treePanel.Return();
627	687
	688	+// mainPanel.setDividerLocation(0.5); //1.0);
	689	+// mainPanel.setResizeWeight(0.5);
	690	+
628	691	//jList.addListSelectionListener(this);
629	692	oe.jTree.addTreeSelectionListener(this);
630	693	//jTree.setRootVisible(false);
..	..	@@ -646,6 +709,78 @@
646	709	radio.layout = sevenButton;
647	710	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	711	}
	712	+
	713	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	714	+ {
	715	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	716	+ boxCB.setToolTipText("Display bounding boxes");
	717	+ boxCB.addItemListener(this);
	718	+
	719	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	720	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	721	+ zoomBoxCB.addItemListener(this);
	722	+
	723	+ if (true) // Globals.ADVANCED)
	724	+ {
	725	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	726	+ supportCB.setToolTipText("Enable rigging");
	727	+ supportCB.addItemListener(this);
	728	+
	729	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	730	+ // localCB.addItemListener(this);
	731	+
	732	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	733	+ crowdCB.setToolTipText("Used for crowds");
	734	+ crowdCB.addItemListener(this);
	735	+
	736	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	737	+ smoothCB.setToolTipText("Snapping delay");
	738	+ smoothCB.addItemListener(this);
	739	+
	740	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	741	+ slowCB.setToolTipText("Smooth interpolation");
	742	+ slowCB.addItemListener(this);
	743	+
	744	+// constraints.gridy += 1;
	745	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	746	+// speakerMocapCB.addItemListener(this);
	747	+
	748	+ if (false)
	749	+ {
	750	+ // handled in scripts
	751	+ //constraints.gridy += 1;
	752	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	753	+ speakerCameraCB.addItemListener(this);
	754	+
	755	+ //constraints.gridy += 1;
	756	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	757	+ speakerFocusCB.addItemListener(this);
	758	+
	759	+ //constraints.gridy += 1;
	760	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	761	+ smoothfocusCB.addItemListener(this);
	762	+ }
	763	+
	764	+//constraints.gridx += 1;
	765	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	766	+// debugCB.addItemListener(this);
	767	+
	768	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	769	+ oeilCB.addItemListener(this);
	770	+
	771	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	772	+ lookAtCB.setToolTipText("Look-at target");
	773	+ lookAtCB.addItemListener(this);
	774	+
	775	+ }
	776	+
	777	+ cGridBag fill = new cGridBag();
	778	+
	779	+ fill.preferredHeight = 200;
	780	+
	781	+ panel.add(fill);
	782	+
	783	+ }
649	784
650	785	void EditObject(Object3D obj)
651	786	{
..	..	@@ -658,6 +793,7 @@
658	793	buttonGroup.add(radioButton);
659	794	radioButton.doClick();
660	795	}
	796	+
661	797	void SetupViews(ObjEditor oe)
662	798	{
663	799	oe.SetupViews();
..	..	@@ -676,6 +812,7 @@
676	812	JCheckBox fastCB;
677	813	JCheckBox slowCB;
678	814	JCheckBox boxCB;
	815	+ JCheckBox zoomBoxCB;
679	816	JCheckBox trackCB;
680	817	JCheckBox smoothfocusCB;
681	818	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +892,10 @@
755	892	Recompile();
756	893	cameraView.repaint();
757	894	// refreshContents();
	895	+ }
	896	+ else if(e.getSource() == zoomBoxCB)
	897	+ {
	898	+ cameraView.ToggleZoomBoxMode();
758	899	}
759	900	else if(e.getSource() == smoothfocusCB)
760	901	{
..	..	@@ -869,7 +1010,9 @@
869	1010	// objEditor.DropFile((java.io.File[]) object, true);
870	1011	// return;
871	1012	// }
872		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1016	{
874	1017	// file(s)
875	1018	String[] names = string.split("\n");
..	..	@@ -896,7 +1039,7 @@
896	1039
897	1040	flashIt = false;
898	1041	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1044
902	1045	if (group.selection.size() == 1)
..	..	@@ -923,11 +1066,11 @@
923	1066	{
924	1067	loadClipboard(true);
925	1068	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	1069	+ pasteInto(false, false);
927	1070	} else {
928	1071	loadClipboard(false);
929	1072	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1073	+ pasteInto(false, false); // true); // ???
931	1074	}
932	1075	}
933	1076	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1192,33 @@
1049	1192	kleinItem.addActionListener(this);
1050	1193	particleItem = menu.add(new MenuItem("Particle system"));
1051	1194	particleItem.addActionListener(this);
	1195	+ if (Globals.ADVANCED)
	1196	+ {
1052	1197	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1198	ragdollItem.addActionListener(this);
1054	1199	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1200	ragdoll2Item.addActionListener(this);
	1201	+ }
1056	1202	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1203	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1204	meshItem.addActionListener(this);
1059	1205	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1206	// meshGroupItem.addActionListener(this);
	1207	+ if (Globals.ADVANCED)
	1208	+ {
1061	1209	springItem = menu.add(new MenuItem("Spring"));
1062	1210	springItem.addActionListener(this);
1063	1211	flagItem = menu.add(new MenuItem("Flag"));
1064	1212	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1213	blobItem = menu.add(new MenuItem("Blob"));
1070	1214	blobItem.addActionListener(this);
1071	1215	latheItem = menu.add(new MenuItem("Lathe"));
1072	1216	latheItem.addActionListener(this);
	1217	+ }
	1218	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1219	+ bezierItem.addActionListener(this);
	1220	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1221	+ overlayItem.addActionListener(this);
1073	1222	lightItem = menu.add(new MenuItem("Light"));
1074	1223	lightItem.addActionListener(this);
1075	1224	menu.add("-");
..	..	@@ -1079,34 +1228,39 @@
1079	1228	loopItem.addActionListener(this);
1080	1229	doubleItem = menu.add(new MenuItem("Fork"));
1081	1230	doubleItem.addActionListener(this);
	1231	+ if (Globals.ADVANCED)
	1232	+ {
1082	1233	tripleItem = menu.add(new MenuItem("Trident"));
1083	1234	tripleItem.addActionListener(this);
	1235	+ }
1084	1236	}
1085	1237
1086	1238	void buildToolsMenu(Menu menu)
1087	1239	{
1088	1240	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1241	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1242	+ animationItem.setState(Globals.ANIMATION);
1091	1243
1092	1244	menu.add("-");
1093	1245	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1246	parseverticesItem.addActionListener(this);
1095	1247	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1248	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1250	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1252	reduceMorphItem.addActionListener(this);
1103	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1254	reduce34MorphItem.addActionListener(this);
1105		-
	1255	+ menu.add("-");
1106	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1257	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1258
	1259	+ if (Globals.ADVANCED)
	1260	+ {
	1261	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1262	+ mirrorItem.addActionListener(this);
	1263	+ menu.add("-");
1110	1264	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1265	memoryItem.addActionListener(this);
1112	1266	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1129,6 +1283,7 @@
1129	1283	menu.add("-");
1130	1284	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1285	editScriptItem.addActionListener(this);
	1286	+ }
1132	1287	}
1133	1288
1134	1289	void ScreenFit()
..	..	@@ -1457,9 +1612,9 @@
1457	1612
1458	1613	void Overwrite(int mask)
1459	1614	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1616	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1463	1618
1464	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1620	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1637,7 @@
1482	1637	//
1483	1638	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1639	{
	1640	+ Object source = event.getSource();
1485	1641	/*
1486	1642	if (event.getSource() == nameField)
1487	1643	{
..	..	@@ -1493,11 +1649,11 @@
1493	1649	}
1494	1650	else
1495	1651	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1652	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1653	{
1498	1654	ScreenFit();
1499	1655	} else
1500		- if (event.getSource() == switchItem)
	1656	+ if (source == switchItem)
1501	1657	{
1502	1658	cVector v1 = new cVector();
1503	1659	cVector v2 = new cVector();
..	..	@@ -1506,11 +1662,11 @@
1506	1662	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1663	objEditor.cameraView.repaint();
1508	1664	} else
1509		- if (event.getSource() == rectoidItem)
	1665	+ if (source == rectoidItem)
1510	1666	{
1511	1667	makeSomething(new Box());
1512	1668	} else
1513		- if (event.getSource() == particleItem)
	1669	+ if (source == particleItem)
1514	1670	{
1515	1671	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1672	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1687,9 @@
1531	1687	applyExample(particleGeom, "SMOKE");
1532	1688	makeSomething(particleGeom);
1533	1689	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1690	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1691	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1692	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1693
1538	1694	ragdoll.toParent = LA.newMatrix();
1539	1695	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1707,7 @@
1551	1707	} else
1552	1708	/*
1553	1709	*/
1554		- if (event.getSource() == heightFieldItem)
	1710	+ if (source == heightFieldItem)
1555	1711	{
1556	1712	Object3D obj = new Object3D();
1557	1713
..	..	@@ -1589,31 +1745,31 @@
1589	1745
1590	1746	makeSomething(obj);
1591	1747	} else
1592		- if (event.getSource() == gridItem)
	1748	+ if (source == gridItem)
1593	1749	{
1594	1750	makeSomething(new Grid());
1595	1751	} else
1596		- if (event.getSource() == ellipsoidItem)
	1752	+ if (source == ellipsoidItem)
1597	1753	{
1598	1754	makeSomething(new Sphere());
1599	1755	} else
1600		- if (event.getSource() == coneItem)
	1756	+ if (source == coneItem)
1601	1757	{
1602	1758	makeSomething(new Cone());
1603	1759	} else
1604		- if (event.getSource() == torusItem)
	1760	+ if (source == torusItem)
1605	1761	{
1606	1762	makeSomething(new Torus());
1607	1763	} else
1608		- if (event.getSource() == superItem)
	1764	+ if (source == superItem)
1609	1765	{
1610	1766	makeSomething(new Superellipsoid());
1611	1767	} else
1612		- if (event.getSource() == kleinItem)
	1768	+ if (source == kleinItem)
1613	1769	{
1614	1770	makeSomething(new Klein());
1615	1771	} else
1616		- if (event.getSource() == blobItem)
	1772	+ if (source == blobItem)
1617	1773	{
1618	1774	Blob blob = new Blob();
1619	1775	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1777,15 @@
1621	1777	//blob.retile();
1622	1778	makeSomething(blob);
1623	1779	} else
1624		- if (event.getSource() == latheItem)
	1780	+ if (source == latheItem)
1625	1781	{
1626	1782	makeSomething(new Lathe());
1627	1783	} else
1628		- if (event.getSource() == bezierItem)
	1784	+ if (source == bezierItem)
1629	1785	{
1630	1786	makeSomething(new BezierSurface());
1631	1787	} else
1632		- if (event.getSource() == checkerItem)
	1788	+ if (source == overlayItem)
1633	1789	{
1634	1790	/*
1635	1791	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1800,7 @@
1644	1800	*/
1645	1801	makeSomething(new Checker());
1646	1802	} else
1647		- if (event.getSource() == meshItem)
	1803	+ if (source == meshItem)
1648	1804	{
1649	1805	Object3D itemtomake = new Object3D();
1650	1806	Object3D child;
..	..	@@ -1665,35 +1821,35 @@
1665	1821	makeSomething(child);
1666	1822	}
1667	1823	} else
1668		- if (event.getSource() == springItem)
	1824	+ if (source == springItem)
1669	1825	{
1670	1826	cSpring s = new cSpring();
1671	1827	s.setup();
1672	1828	makeSomething(s);
1673	1829	} else
1674		- if (event.getSource() == flagItem)
	1830	+ if (source == flagItem)
1675	1831	{
1676	1832	cSpring s = new cFlag();
1677	1833	s.setup();
1678	1834	makeSomething(s);
1679	1835	} else
1680		- if (event.getSource() == lightItem)
	1836	+ if (source == lightItem)
1681	1837	{
1682	1838	makeSomething(new Light());
1683	1839	} else
1684		- if (event.getSource() == csgItem)
	1840	+ if (source == csgItem)
1685	1841	{
1686	1842	group(new CSG());
1687	1843	} else
1688		- if (event.getSource() == templateItem)
	1844	+ if (source == templateItem)
1689	1845	{
1690	1846	group(new cTemplate());
1691	1847	} else
1692		- if (event.getSource() == attributeItem)
	1848	+ if (source == attributeItem)
1693	1849	{
1694	1850	makeSomething(new Attribute());
1695	1851	} else
1696		- if (event.getSource() == pointflowItem)
	1852	+ if (source == pointflowItem)
1697	1853	{
1698	1854	makeSomething(new PointFlow());
1699	1855	} else
..	..	@@ -1705,7 +1861,7 @@
1705	1861	} else
1706	1862	*/
1707	1863
1708		- if (event.getSource() == superLoopItem)
	1864	+ if (source == superLoopItem)
1709	1865	{
1710	1866	Composite g = new cGroup();
1711	1867	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1883,7 @@
1727	1883
1728	1884	group(g);
1729	1885	} else
1730		- if (event.getSource() == loopItem)
	1886	+ if (source == loopItem)
1731	1887	{
1732	1888	Composite csg = new GroupLeaf();
1733	1889	csg.count = 5;
..	..	@@ -1736,7 +1892,7 @@
1736	1892	csg.addChild(child);
1737	1893	child.addChild(csg);
1738	1894	} else
1739		- if (event.getSource() == doubleItem)
	1895	+ if (source == doubleItem)
1740	1896	{
1741	1897	Composite csg = new GroupLeaf();
1742	1898	csg.count = 5;
..	..	@@ -1748,7 +1904,7 @@
1748	1904	csg.addChild(child);
1749	1905	child.addChild(csg);
1750	1906	} else
1751		- if (event.getSource() == tripleItem)
	1907	+ if (source == tripleItem)
1752	1908	{
1753	1909	Composite csg = new GroupLeaf();
1754	1910	csg.count = 4;
..	..	@@ -1763,71 +1919,59 @@
1763	1919	csg.addChild(child);
1764	1920	child.addChild(csg);
1765	1921	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	1922	+ if (source == computeAOItem)
1784	1923	{
1785	1924	Globals.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1925	+ Globals.theRenderer.repaint();
1787	1926	} else
1788		- if (event.getSource() == recompileItem)
	1927	+ if (source == recompileItem)
1789	1928	{
1790	1929	Recompile();
1791	1930	refreshContents();
1792	1931	} else
1793		- if (event.getSource() == editScriptItem)
	1932	+ if (source == editScriptItem)
1794	1933	{
1795	1934	OpenDialog();
1796	1935	refreshContents();
1797	1936	} else
1798		- if (event.getSource() == invariantsItem)
	1937	+ if (source == invariantsItem)
1799	1938	{
1800	1939	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1802	1941	} else
1803		- if (event.getSource() == memoryItem)
	1942	+ if (source == memoryItem)
1804	1943	{
1805	1944	//System.out.println("Invariants:");
1806	1945	PrintMemory();
1807	1946	} else
1808		- if (event.getSource() == pathItem)
	1947	+ if (source == pathItem)
1809	1948	{
1810	1949	PrintPath();
1811	1950	} else
1812		- if (event.getSource() == analyzeItem)
	1951	+ if (source == analyzeItem)
1813	1952	{
1814	1953	AnalyzeObject();
1815	1954	} else
1816		- if (event.getSource() == dumpItem)
	1955	+ if (source == dumpItem)
1817	1956	{
1818	1957	DumpObject();
1819	1958	} else
1820		- if (event.getSource() == screenfitButton)
	1959	+ if (source == oneStepButton)
	1960	+ {
	1961	+ Globals.ONESTEP = true;
	1962	+ cameraView.repaint();
	1963	+ } else
	1964	+ if (source == screenfitButton)
1821	1965	{
1822	1966	//Reload(lastConverter, lastFilename, true);
1823	1967	ScreenFit();
1824	1968	} else
1825		- if (event.getSource() == screenfitpointButton)
	1969	+ if (source == screenfitpointButton)
1826	1970	{
1827	1971	//Reload(lastConverter, lastFilename, true);
1828	1972	ScreenFitPoint();
1829	1973	} else
1830		- if (event.getSource() == snapobjectButton)
	1974	+ if (source == snapobjectButton)
1831	1975	{
1832	1976	//Reload(lastConverter, lastFilename, true);
1833	1977	SnapObject();
..	..	@@ -1838,13 +1982,13 @@
1838	1982	// Recompile();
1839	1983	// refreshContents();
1840	1984	// } else
1841		- if (event.getSource() == gcButton)
	1985	+ if (source == gcButton)
1842	1986	{
1843	1987	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1988	System.gc();
1845	1989	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	1990	} else
1847		- if (event.getSource() == editLeafItem)
	1991	+ if (source == editLeafItem)
1848	1992	{
1849	1993	Object3D obj;
1850	1994	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2002,74 @@
1858	2002	}
1859	2003	refreshContents(true);
1860	2004	} else
1861		- if (event.getSource() == openWindowItem)
	2005	+ if (source == openWindowItem)
1862	2006	{
1863	2007	EditSelection(true);
1864	2008	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2009	+ if (source == cutItem \|\| source == clearButton)
1866	2010	{
1867	2011	loadClipboard(true);
1868	2012	} else
1869		- if (event.getSource() == duplicateItem)
	2013	+ if (source == undoItem)
1870	2014	{
1871		- Object3D keep = GrafreeD.clipboard;
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
	2021	+ if (source == duplicateItem)
	2022	+ {
	2023	+ Object3D keep = Grafreed.clipboard;
1872	2024	loadClipboard(false);
1873	2025	paste(false);
1874		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1875	2027	} else
1876		- if (event.getSource() == cloneItem)
	2028	+ if (source == cloneItem)
1877	2029	{
1878	2030	CloneSelection(false);
1879	2031	} else
1880		- if (event.getSource() == cloneSupportItem)
	2032	+ if (source == cloneSupportItem)
1881	2033	{
1882	2034	CloneSelection(true);
1883	2035	} else
1884		- if (event.getSource() == copyItem)
	2036	+ if (source == copyItem)
1885	2037	{
1886	2038	loadClipboard(false);
1887	2039	} else
1888		- if (event.getSource() == pasteItem)
	2040	+ if (source == pasteItem)
1889	2041	{
1890	2042	paste(false);
1891	2043	} else
1892		- if (event.getSource() == pasteLinkItem)
	2044	+ if (source == pasteIntoItem)
1893	2045	{
1894		- pasteInto(false);
	2046	+ pasteInto(true, false);
1895	2047	} else
1896		- if (event.getSource() == pasteCloneItem)
	2048	+ if (source == pasteLinkItem)
1897	2049	{
1898		- pasteInto(true);
	2050	+ pasteInto(false, false);
1899	2051	} else
1900		- if (event.getSource() == pasteExpandItem)
	2052	+ if (source == pasteCloneItem)
	2053	+ {
	2054	+ pasteInto(true, true);
	2055	+ } else
	2056	+ if (source == pasteExpandItem)
1901	2057	{
1902	2058	paste(true);
1903	2059	} else
1904		- if (event.getSource() == synchronizeItem)
	2060	+ if (source == synchronizeItem)
1905	2061	{
1906	2062	Overwrite(Object3D.TRANSFORM);
1907	2063	} else
1908		- if (event.getSource() == overwriteNameItem)
	2064	+ if (source == overwriteNameItem)
1909	2065	{
1910	2066	Overwrite(Object3D.NAME);
1911	2067	} else
1912		- if (event.getSource() == overwriteUVItem)
	2068	+ if (source == overwriteUVItem)
1913	2069	{
1914	2070	Overwrite(Object3D.UV);
1915	2071	} else
1916		- if (event.getSource() == overwriteMatItem)
	2072	+ if (source == overwriteMatItem)
1917	2073	{
1918	2074	/* july 2015
1919	2075	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2089,7 @@
1933	2089
1934	2090	Overwrite(dropAttributes);
1935	2091	}
1936		- if (event.getSource() == overwriteGeoItem)
	2092	+ if (source == overwriteGeoItem)
1937	2093	{
1938	2094	Overwrite(Object3D.GEOMETRY);
1939	2095	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2106,7 @@
1950	2106	// refreshContents();
1951	2107	// }
1952	2108	} else
1953		- if (event.getSource() == generateMeshItem)
	2109	+ if (source == generateMeshItem)
1954	2110	{
1955	2111	//if (group.selection.size() == 1)
1956	2112	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2117,7 @@
1961	2117	ResetModel();
1962	2118	refreshContents();
1963	2119	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2120	+ if (source == extractGeometriesItem)
1965	2121	{
1966	2122	boolean one = false;
1967	2123
..	..	@@ -1988,7 +2144,7 @@
1988	2144	ResetModel();
1989	2145	refreshContents();
1990	2146	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2147	+ if (source == cloneGeometriesItem)
1992	2148	{
1993	2149	boolean one = false;
1994	2150
..	..	@@ -2014,7 +2170,7 @@
2014	2170	ResetModel();
2015	2171	refreshContents();
2016	2172	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2173	+ if (source == shareGeometriesItem)
2018	2174	{
2019	2175	boolean one = false;
2020	2176
..	..	@@ -2044,7 +2200,7 @@
2044	2200	refreshContents();
2045	2201	}
2046	2202	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2203	+ if (source == mergeGeometriesItem)
2048	2204	{
2049	2205	boolean one = false;
2050	2206
..	..	@@ -2074,7 +2230,7 @@
2074	2230	ResetModel();
2075	2231	refreshContents();
2076	2232	} else
2077		- if (event.getSource() == linkverticesItem)
	2233	+ if (source == linkverticesItem)
2078	2234	{
2079	2235	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2236	// {
..	..	@@ -2087,48 +2243,48 @@
2087	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2244	// refreshContents();
2089	2245	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2247	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2093	2249
2094	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2251	content = ((cGroup)content).get(0);
2096	2252
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2253	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2254	for (int i=0; i<group.selection.size(); i++)
2099	2255	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2256	+ boolean random = CameraPane.SWITCH;
	2257	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2258	group.selection.get(i).linkVerticesThis(content);
2103	2259	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2105	2261	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2262	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2263	refreshContents();
2108	2264	}
2109	2265	} else
2110		- if (event.getSource() == resetsupportItem)
	2266	+ if (source == resetsupportItem)
2111	2267	{
2112	2268	for (int i=0; i<group.selection.size(); i++)
2113	2269	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2270	+ boolean random = CameraPane.SWITCH;
	2271	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2272	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2273	+ CameraPane.SWITCH = random;
2118	2274	}
2119	2275
2120	2276	refreshContents();
2121	2277	} else
2122		- if (event.getSource() == relinkverticesItem)
	2278	+ if (source == relinkverticesItem)
2123	2279	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2280	+ boolean random = CameraPane.SWITCH;
	2281	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2282	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2283	+ CameraPane.SWITCH = random;
2128	2284
2129	2285	refreshContents();
2130	2286	} else
2131		- if (event.getSource() == resetreferencesItem)
	2287	+ if (source == resetreferencesItem)
2132	2288	{
2133	2289	for (int i=0; i<group.selection.size(); i++)
2134	2290	{
..	..	@@ -2137,11 +2293,11 @@
2137	2293
2138	2294	refreshContents();
2139	2295	} else
2140		- if (event.getSource() == setMasterItem)
	2296	+ if (source == setMasterItem)
2141	2297	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2299	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2145	2301
2146	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2303	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2306,13 @@
2150	2306	refreshContents();
2151	2307	}
2152	2308	} else
2153		- if (event.getSource() == poseMeshItem)
	2309	+ if (source == poseMeshItem)
2154	2310	{
2155	2311	if (group.selection.size() == 1)
2156	2312	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2158	2314	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2160	2316
2161	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2318	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2325,19 @@
2169	2325	}
2170	2326
2171	2327	} else
2172		- if (event.getSource() == revertMeshItem)
	2328	+ if (source == revertMeshItem)
2173	2329	{
2174	2330	RevertMeshes();
2175	2331	} else
2176		- if (event.getSource() == resetMeshItem)
	2332	+ if (source == resetAllItem)
2177	2333	{
2178	2334	ResetAll();
2179	2335	} else
2180		- if (event.getSource() == stepAllItem)
	2336	+ if (source == stepAllItem)
2181	2337	{
2182	2338	StepAll();
2183	2339	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2340	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2341	{
2186	2342	//int indices[] = jList.getSelectedIndices();
2187	2343	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2345,46 @@
2189	2345
2190	2346	ClearSelection(false);
2191	2347	} else
2192		- if (event.getSource() == clearAllItem)
	2348	+ if (source == clearAllItem)
2193	2349	{
2194	2350	ClearSelection(true);
2195	2351	} else
2196		- if (event.getSource() == grabItem)
	2352	+ if (source == grabItem)
2197	2353	{
2198	2354	group(new cGroup(), true);
2199	2355	} else
2200		- if (event.getSource() == hideItem)
	2356	+ if (source == hideItem)
2201	2357	{
2202	2358	group(new HiddenObject());
2203	2359	} else
2204		- if (event.getSource() == frontItem)
	2360	+ if (source == frontItem)
2205	2361	{
2206	2362	front();
2207	2363	} else
2208		- if (event.getSource() == backItem)
	2364	+ if (source == backItem)
2209	2365	{
2210	2366	back();
2211	2367	} else
2212		- if (event.getSource() == cameraItem)
	2368	+ if (source == cameraItem)
2213	2369	{
2214	2370	makeSomething(new Camera());
2215	2371	} else
2216		- if (event.getSource() == compositeItem)
	2372	+ if (source == compositeItem)
2217	2373	{
2218	2374	group(new Composite());
2219	2375	} else
2220		- if (event.getSource() == randomItem)
	2376	+ if (source == randomItem)
2221	2377	{
2222	2378	RandomNode random = new RandomNode();
2223	2379	group(random);
2224	2380	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2381	+ random.name = random.get(0).name + "Switch";
2226	2382	} else
2227		- if (event.getSource() == physicsItem)
	2383	+ if (source == physicsItem)
2228	2384	{
2229	2385	group(new PhysicsNode());
2230	2386	} else
2231		- if (event.getSource() == frameselectorItem)
	2387	+ if (source == frameselectorItem)
2232	2388	{
2233	2389	for (int i=0; i<group.selection.size(); i++)
2234	2390	{
..	..	@@ -2240,7 +2396,7 @@
2240	2396	ResetModel();
2241	2397	refreshContents();
2242	2398	} else
2243		- if (event.getSource() == switchGeoItem)
	2399	+ if (source == switchGeoItem)
2244	2400	{
2245	2401	for (int i=0; i<group.selection.size(); i++)
2246	2402	{
..	..	@@ -2252,7 +2408,7 @@
2252	2408	ResetModel();
2253	2409	refreshContents();
2254	2410	} else
2255		- if (event.getSource() == switchTransfoItem)
	2411	+ if (source == switchTransfoItem)
2256	2412	{
2257	2413	for (int i=0; i<group.selection.size(); i++)
2258	2414	{
..	..	@@ -2264,7 +2420,7 @@
2264	2420	ResetModel();
2265	2421	refreshContents();
2266	2422	} else
2267		- if (event.getSource() == morphItem)
	2423	+ if (source == morphItem)
2268	2424	{
2269	2425	for (int i=0; i<group.selection.size(); i++)
2270	2426	{
..	..	@@ -2276,7 +2432,7 @@
2276	2432	ResetModel();
2277	2433	refreshContents();
2278	2434	} else
2279		- if (event.getSource() == scriptNodeItem)
	2435	+ if (source == scriptNodeItem)
2280	2436	{
2281	2437	boolean atleastone = false;
2282	2438
..	..	@@ -2315,31 +2471,31 @@
2315	2471	}
2316	2472	}
2317	2473	} else
2318		- if (event.getSource() == linkerItem)
	2474	+ if (source == linkerItem)
2319	2475	{
2320	2476	group(new cLinker());
2321	2477	} else
2322		- if (event.getSource() == textureItem)
	2478	+ if (source == textureItem)
2323	2479	{
2324	2480	group(new TextureNode());
2325	2481	} else
2326		- if (event.getSource() == billboardItem)
	2482	+ if (source == billboardItem)
2327	2483	{
2328	2484	group(new BillboardNode());
2329	2485	} else
2330		- if (event.getSource() == shadowXItem)
	2486	+ if (source == shadowXItem)
2331	2487	{
2332	2488	CastShadow(0);
2333	2489	} else
2334		- if (event.getSource() == shadowYItem)
	2490	+ if (source == shadowYItem)
2335	2491	{
2336	2492	CastShadow(1);
2337	2493	} else
2338		- if (event.getSource() == shadowZItem)
	2494	+ if (source == shadowZItem)
2339	2495	{
2340	2496	CastShadow(2);
2341	2497	} else
2342		- if (event.getSource() == ungroupItem)
	2498	+ if (source == ungroupItem)
2343	2499	{
2344	2500	//ungroup();
2345	2501	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2507,187 @@
2351	2507
2352	2508	refreshContents();
2353	2509	} else
2354		- if (event.getSource() == genUVItem)
	2510	+ if (source == genUVItem)
2355	2511	{
2356	2512	GenUV();
2357	2513	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2514	+ if (source == genNormalsCADItem)
2359	2515	{
2360	2516	GenNormals(true);
2361	2517	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2518	+ if (source == genNormalsMESHItem)
2363	2519	{
2364	2520	GenNormals(true); // TODO
2365	2521	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2522	+ if (source == genNormalsORGANItem)
2367	2523	{
2368	2524	GenNormals(false);
2369	2525	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2526	+ if (source == genNormalsMINEItem)
2371	2527	{
2372	2528	GenNormalsMINE();
2373	2529	} else
2374		- if (event.getSource() == stripifyItem)
	2530	+ if (source == stripifyItem)
2375	2531	{
2376	2532	Stripify();
2377	2533	} else
2378		- if (event.getSource() == unstripifyItem)
	2534	+ if (source == unstripifyItem)
2379	2535	{
2380	2536	Unstripify();
2381	2537	} else
2382		- if (event.getSource() == trimItem)
	2538	+ if (source == trimItem)
2383	2539	{
2384	2540	Trim();
2385	2541	} else
2386		- if (event.getSource() == untrimItem)
	2542	+ if (source == untrimItem)
2387	2543	{
2388	2544	Untrim();
2389	2545	} else
2390		- if (event.getSource() == clearColorsItem)
	2546	+ if (source == clearColorsItem)
2391	2547	{
2392	2548	ClearColors();
2393	2549	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2550	+ if (source == clearMaterialsItem)
2395	2551	{
2396	2552	ClearMaterials();
2397	2553	} else
2398		- if (event.getSource() == liveleavesItem)
	2554	+ if (source == liveleavesItem)
2399	2555	{
2400	2556	LiveLeaves(true);
2401	2557	} else
2402		- if (event.getSource() == unliveleavesItem)
	2558	+ if (source == unliveleavesItem)
2403	2559	{
2404	2560	LiveLeaves(false);
2405	2561	} else
2406		- if (event.getSource() == supportleavesItem)
	2562	+ if (source == supportleavesItem)
2407	2563	{
2408	2564	SupportLeaves(true);
2409	2565	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2566	+ if (source == unsupportleavesItem)
2411	2567	{
2412	2568	SupportLeaves(false);
2413	2569	} else
2414		- if (event.getSource() == hideleavesItem)
	2570	+ if (source == hideleavesItem)
2415	2571	{
2416	2572	HideLeaves(true);
2417	2573	} else
2418		- if (event.getSource() == showleavesItem)
	2574	+ if (source == showleavesItem)
2419	2575	{
2420	2576	HideLeaves(false);
2421	2577	} else
2422		- if (event.getSource() == markleavesItem)
	2578	+ if (source == markleavesItem)
2423	2579	{
2424	2580	MarkLeaves(true);
2425	2581	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2582	+ if (source == unmarkleavesItem)
2427	2583	{
2428	2584	MarkLeaves(false);
2429	2585	} else
2430		- if (event.getSource() == flipVItem)
	2586	+ if (source == flipVItem)
2431	2587	{
2432	2588	FlipV(true);
2433	2589	} else
2434		- if (event.getSource() == unflipVItem)
	2590	+ if (source == unflipVItem)
2435	2591	{
2436	2592	FlipV(false);
2437	2593	} else
2438		- if (event.getSource() == lowTexturesItem)
	2594	+ if (source == lowTexturesItem)
2439	2595	{
2440	2596	SetTexRes(0);
2441	2597	} else
2442		- if (event.getSource() == normalTexturesItem)
	2598	+ if (source == normalTexturesItem)
2443	2599	{
2444	2600	SetTexRes(1);
2445	2601	} else
2446		- if (event.getSource() == highTexturesItem)
	2602	+ if (source == highTexturesItem)
2447	2603	{
2448	2604	SetTexRes(2);
2449	2605	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2606	+ if (source == veryhighTexturesItem)
2451	2607	{
2452	2608	SetTexRes(3);
2453	2609	} else
2454		- if (event.getSource() == maxTexturesItem)
	2610	+ if (source == maxTexturesItem)
2455	2611	{
2456	2612	SetTexRes(4);
2457	2613	} else
2458		- if (event.getSource() == panoTexturesItem)
	2614	+ if (source == panoTexturesItem)
2459	2615	{
2460	2616	SetTexRes(5);
2461	2617	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2618	+ if (source == reverseNormalsItem)
2463	2619	{
2464	2620	ReverseNormals();
2465	2621	} else
2466		- if (event.getSource() == parseverticesItem)
	2622	+ if (source == parseverticesItem)
2467	2623	{
2468	2624	ParseVertices();
2469	2625	} else
2470		- if (event.getSource() == textureFieldItem)
	2626	+ if (source == textureFieldItem)
2471	2627	{
2472	2628	TextureVertices();
2473	2629	} else
2474		- if (event.getSource() == alignItem)
	2630	+ if (source == alignItem)
2475	2631	{
2476	2632	Align();
2477	2633	} else
2478		- if (event.getSource() == mirrorItem)
	2634	+ if (source == mirrorItem)
2479	2635	{
2480	2636	MirrorPoses();
2481	2637	} else
2482		- if (event.getSource() == reduceMorphItem)
	2638	+ if (source == reduceMorphItem)
2483	2639	{
2484	2640	MeshReduction(false);
2485	2641	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2642	+ if (source == reduce34MorphItem)
2487	2643	{
2488	2644	MeshReduction(true);
2489	2645	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2646	+ if (source == reverseTrianglesItem)
2491	2647	{
2492	2648	ReverseTriangles();
2493	2649	} else
2494		- if (event.getSource() == reduceMeshItem)
	2650	+ if (source == reduceMeshItem)
2495	2651	{
2496	2652	ReduceMesh(false);
2497	2653	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2654	+ if (source == reduce34MeshItem)
2499	2655	{
2500	2656	ReduceMesh(true);
2501	2657	} else
2502		- if (event.getSource() == increaseMeshItem)
	2658	+ if (source == increaseMeshItem)
2503	2659	{
2504	2660	IncreaseMesh();
2505	2661	} else
2506		- if (event.getSource() == clipMeshItem)
	2662	+ if (source == clipMeshItem)
2507	2663	{
2508	2664	ClipMesh();
2509	2665	} else
2510		- if (event.getSource() == smoothMeshItem)
	2666	+ if (source == smoothMeshItem)
2511	2667	{
2512	2668	SmoothMesh();
2513	2669	} else
2514		- if (event.getSource() == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2515	2671	{
2516	2672	TransformGeometry();
2517	2673	} else
2518		- if (event.getSource() == resetTransformItem)
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
	2677	+ } else
	2678	+ if (source == resetTransformItem)
2519	2679	{
2520	2680	ResetTransform();
2521	2681	} else
2522		- if (event.getSource() == resetCentroidItem)
	2682	+ if (source == resetCentroidItem)
2523	2683	{
2524		- ResetCentroid();
	2684	+ ResetCentroid(true);
2525	2685	} else
2526		- if (event.getSource() == resetParentItem)
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
	2689	+ } else
	2690	+ if (source == resetParentItem)
2527	2691	{
2528	2692	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2693	{
..	..	@@ -2533,7 +2697,7 @@
2533	2697
2534	2698	refreshContents();
2535	2699	} else
2536		- if (event.getSource() == repairParentItem)
	2700	+ if (source == repairParentItem)
2537	2701	{
2538	2702	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2703	{
..	..	@@ -2547,7 +2711,7 @@
2547	2711
2548	2712	refreshContents();
2549	2713	} else
2550		- if (event.getSource() == repairShadowItem)
	2714	+ if (source == repairShadowItem)
2551	2715	{
2552	2716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2717	{
..	..	@@ -2561,7 +2725,7 @@
2561	2725
2562	2726	refreshContents();
2563	2727	} else
2564		- if (event.getSource() == sortbysizeItem)
	2728	+ if (source == sortbysizeItem)
2565	2729	{
2566	2730	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2731	{
..	..	@@ -2573,7 +2737,7 @@
2573	2737	ResetModel();
2574	2738	refreshContents();
2575	2739	} else
2576		- if (event.getSource() == sortbynameItem)
	2740	+ if (source == sortbynameItem)
2577	2741	{
2578	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2743	{
..	..	@@ -2585,7 +2749,7 @@
2585	2749	ResetModel();
2586	2750	refreshContents();
2587	2751	} else
2588		- if (event.getSource() == attachPigmentItem)
	2752	+ if (source == attachPigmentItem)
2589	2753	{
2590	2754	String texture = GetFile("Attach pigment");
2591	2755	Object3D obj;
..	..	@@ -2597,7 +2761,7 @@
2597	2761
2598	2762	refreshContents();
2599	2763	} else
2600		- if (event.getSource() == detachPigmentItem)
	2764	+ if (source == detachPigmentItem)
2601	2765	{
2602	2766	Object3D obj;
2603	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2772,7 @@
2608	2772
2609	2773	refreshContents();
2610	2774	} else
2611		- if (event.getSource() == attachBumpItem)
	2775	+ if (source == attachBumpItem)
2612	2776	{
2613	2777	String texture = GetFile("Attach bump");
2614	2778	Object3D obj;
..	..	@@ -2620,7 +2784,7 @@
2620	2784
2621	2785	refreshContents();
2622	2786	} else
2623		- if (event.getSource() == detachBumpItem)
	2787	+ if (source == detachBumpItem)
2624	2788	{
2625	2789	Object3D obj;
2626	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2795,7 @@
2631	2795
2632	2796	refreshContents();
2633	2797	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2798	+ if (source == pigmentBumpItem)
2635	2799	{
2636	2800	Object3D obj;
2637	2801	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2806,195 @@
2642	2806
2643	2807	refreshContents();
2644	2808	} else
2645		- if (event.getSource() == flashSelectionButton)
	2809	+ if (source == flashSelectionButton)
2646	2810	{
2647	2811	CameraPane.flash = true;
2648	2812	refreshContents();
2649	2813	} else
2650		- if (event.getSource() == oneButton)
	2814	+ if (source == oneButton)
2651	2815	{
2652	2816	} else
2653		- if (event.getSource() == twoButton)
	2817	+ if (source == twoButton)
2654	2818	{
2655	2819	radio.layout = twoButton;
2656	2820	// bug
2657	2821	//gridPanel.setDividerLocation(1.0);
2658	2822	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2823	+// bigThree.remove(scenePanel);
	2824	+// bigThree.remove(centralPanel);
	2825	+// bigThree.remove(XYZPanel);
	2826	+// aWindowConstraints.gridx = 0;
	2827	+// aWindowConstraints.gridy = 0;
	2828	+// aWindowConstraints.gridwidth = 1;
	2829	+// // aConstraints.gridheight = 3;
	2830	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2831	+// aWindowConstraints.weightx = 0;
	2832	+// aWindowConstraints.weighty = 1;
	2833	+// //bigThree.add(jtp, aWindowConstraints);
	2834	+// aWindowConstraints.weightx = 1;
	2835	+// aWindowConstraints.gridwidth = 3;
	2836	+// // aConstraints.gridheight = 3;
	2837	+// aWindowConstraints.gridx = 1;
	2838	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2839	+// bigThree.add(centralPanel, aWindowConstraints);
	2840	+// aWindowConstraints.weightx = 0;
	2841	+// aWindowConstraints.gridx = 4;
	2842	+// aWindowConstraints.gridwidth = 1;
	2843	+// // aConstraints.gridheight = 3;
	2844	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2845	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2846	+// scenePanel.setVisible(false);
	2847	+// centralPanel.setVisible(true);
	2848	+// XYZPanel.setVisible(false);
	2849	+ bigThree.ClearUI();
	2850	+ bigThree.add(centralPanel);
	2851	+ bigThree.FlushUI();
2683	2852	} else
2684		- if (event.getSource() == threeButton)
	2853	+ if (source == threeButton)
2685	2854	{
2686	2855	radio.layout = threeButton;
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		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2856	+
	2857	+// bigThree.remove(scenePanel);
	2858	+// bigThree.remove(centralPanel);
	2859	+// bigThree.remove(XYZPanel);
	2860	+// aWindowConstraints.gridx = 0;
	2861	+// aWindowConstraints.gridy = 0;
	2862	+// aWindowConstraints.gridwidth = 1;
	2863	+// // aConstraints.gridheight = 3;
	2864	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.weighty = 1;
	2867	+// //bigThree.add(jtp, aWindowConstraints);
	2868	+// aWindowConstraints.weightx = 1;
	2869	+// aWindowConstraints.gridwidth = 3;
	2870	+// // aConstraints.gridheight = 3;
	2871	+// aWindowConstraints.gridx = 1;
	2872	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2873	+// bigThree.add(centralPanel, aWindowConstraints);
	2874	+// aWindowConstraints.weightx = 0;
	2875	+// aWindowConstraints.gridx = 4;
	2876	+// aWindowConstraints.gridwidth = 1;
	2877	+// // aConstraints.gridheight = 3;
	2878	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2879	+// bigThree.add(XYZPanel, aWindowConstraints);
	2880	+// bigThree.validate();
	2881	+// scenePanel.setVisible(false);
	2882	+// centralPanel.setVisible(true);
	2883	+// XYZPanel.setVisible(true);
	2884	+ bigThree.ClearUI();
	2885	+ bigThree.add(centralPanel);
	2886	+ bigThree.add(XYZPanel);
	2887	+ bigThree.FlushUI();
2711	2888	} else
2712		- if (event.getSource() == fourButton)
	2889	+ if (source == fourButton)
2713	2890	{
2714	2891	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, 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(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	2892	+
	2893	+// bigThree.remove(scenePanel);
	2894	+// bigThree.remove(centralPanel);
	2895	+// bigThree.remove(XYZPanel);
	2896	+// aWindowConstraints.gridx = 0;
	2897	+// aWindowConstraints.gridy = 0;
	2898	+// aWindowConstraints.gridwidth = 1;
	2899	+// // aWindowConstraints.gridheight = 3;
	2900	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2901	+// aWindowConstraints.weightx = 1;
	2902	+// aWindowConstraints.weighty = 1;
	2903	+// bigThree.add(scenePanel, aWindowConstraints);
	2904	+// aWindowConstraints.weightx = 1;
	2905	+// aWindowConstraints.gridwidth = 3;
	2906	+// // aConstraints.gridheight = 3;
	2907	+// aWindowConstraints.gridx = 1;
	2908	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2909	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2910	+// aWindowConstraints.weightx = 0;
	2911	+// aWindowConstraints.gridx = 4;
	2912	+// aWindowConstraints.gridwidth = 1;
	2913	+// // aWindowConstraints.gridheight = 3;
	2914	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2915	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2916	+// bigThree.validate();
	2917	+// scenePanel.setVisible(true);
	2918	+// centralPanel.setVisible(false);
	2919	+// XYZPanel.setVisible(false);
	2920	+ bigThree.ClearUI();
	2921	+ bigThree.add(scenePanel);
	2922	+ bigThree.FlushUI();
2739	2923	} else
2740		- if (event.getSource() == sixButton)
	2924	+ if (source == sixButton)
2741	2925	{
2742	2926	radio.layout = sixButton;
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		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, 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, aConstraints);
2766		- bigThree.revalidate();
	2927	+
	2928	+// bigThree.remove(scenePanel);
	2929	+// bigThree.remove(centralPanel);
	2930	+// bigThree.remove(XYZPanel);
	2931	+// aWindowConstraints.gridx = 0;
	2932	+// aWindowConstraints.gridy = 0;
	2933	+// aWindowConstraints.gridwidth = 1;
	2934	+// // aConstraints.gridheight = 3;
	2935	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2936	+// aWindowConstraints.weightx = 0;
	2937	+// aWindowConstraints.weighty = 1;
	2938	+// bigThree.add(scenePanel, aWindowConstraints);
	2939	+// aWindowConstraints.weightx = 1;
	2940	+// aWindowConstraints.gridwidth = 3;
	2941	+// // aWindowConstraints.gridheight = 3;
	2942	+// aWindowConstraints.gridx = 1;
	2943	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2944	+// bigThree.add(centralPanel, aWindowConstraints);
	2945	+// aWindowConstraints.weightx = 0;
	2946	+// aWindowConstraints.gridx = 4;
	2947	+// aWindowConstraints.gridwidth = 1;
	2948	+// // aWindowConstraints.gridheight = 3;
	2949	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2950	+// //bigThree.add(XYZPanel, aConstraints);
	2951	+// bigThree.validate();
	2952	+// scenePanel.setVisible(true);
	2953	+// centralPanel.setVisible(true);
	2954	+// XYZPanel.setVisible(false);
	2955	+ bigThree.ClearUI();
	2956	+ bigThree.add(scenePanel);
	2957	+ bigThree.add(centralPanel);
	2958	+ bigThree.FlushUI();
2767	2959	} else
2768		- if (event.getSource() == sevenButton)
	2960	+ if (source == sevenButton)
2769	2961	{
2770	2962	radio.layout = sevenButton;
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		- // aWindowConstraints.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		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	2963	+
	2964	+// bigThree.remove(scenePanel);
	2965	+// bigThree.remove(centralPanel);
	2966	+// bigThree.remove(XYZPanel);
	2967	+// aWindowConstraints.gridx = 0;
	2968	+// aWindowConstraints.gridy = 0;
	2969	+// aWindowConstraints.gridwidth = 1;
	2970	+// // aWindowConstraints.gridheight = 3;
	2971	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2972	+// aWindowConstraints.weightx = 0;
	2973	+// aWindowConstraints.weighty = 1;
	2974	+// bigThree.add(scenePanel, aWindowConstraints);
	2975	+// aWindowConstraints.weightx = 1;
	2976	+// aWindowConstraints.gridwidth = 3;
	2977	+// // aWindowConstraints.gridheight = 3;
	2978	+// aWindowConstraints.gridx = 1;
	2979	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2980	+// bigThree.add(centralPanel, aWindowConstraints);
	2981	+// aWindowConstraints.weightx = 0;
	2982	+// aWindowConstraints.gridx = 4;
	2983	+// aWindowConstraints.gridwidth = 1;
	2984	+// // aConstraints.gridheight = 3;
	2985	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2986	+// bigThree.add(XYZPanel, aWindowConstraints);
	2987	+// bigThree.validate();
	2988	+// scenePanel.setVisible(true);
	2989	+// centralPanel.setVisible(true);
	2990	+// XYZPanel.setVisible(true);
	2991	+ bigThree.ClearUI();
	2992	+ bigThree.add(scenePanel);
	2993	+ bigThree.add(centralPanel);
	2994	+ bigThree.add(XYZPanel);
	2995	+ bigThree.FlushUI();
2795	2996	} else
2796		- if (event.getSource() == rootButton)
	2997	+ if (source == rootButton)
2797	2998	{
2798	2999	Object3D obj;
2799	3000	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +3006,7 @@
2805	3006
2806	3007	refreshContents(true);
2807	3008	} else
2808		- if (event.getSource() == closeButton)
	3009	+ if (source == closeButton)
2809	3010	{
2810	3011	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3012	cRadio ab;
..	..	@@ -2826,11 +3027,11 @@
2826	3027	}
2827	3028	refreshContents(true);
2828	3029	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3030	+ if (source == editItem \|\| source == editButton)
2830	3031	{
2831	3032	EditSelection(false);
2832	3033	} else
2833		- if (event.getSource() == uneditButton)
	3034	+ if (source == uneditButton)
2834	3035	{
2835	3036	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3037	{
..	..	@@ -2840,14 +3041,14 @@
2840	3041	child.CloseUI();
2841	3042	listUI.remove(child);
2842	3043
2843		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2844	3045	}
2845		- objEditor.ctrlPanel.revalidate();
	3046	+ objEditor.ctrlPanel.FlushUI();
2846	3047	//objEditor.jTree.clearSelection();
2847	3048	//objEditor.ResetSliders();
2848	3049	refreshContents(true);
2849	3050	} else
2850		- if (event.getSource() == clearPanelButton)
	3051	+ if (source == clearPanelButton)
2851	3052	{
2852	3053	assert(copy == group);
2853	3054	//copy.ClearUI();
..	..	@@ -2858,7 +3059,7 @@
2858	3059	listUI.clear();
2859	3060	refreshContents(true);
2860	3061	} else
2861		- if (event.getSource() == allParamsButton)
	3062	+ if (source == allParamsButton)
2862	3063	{
2863	3064	assert(copy == group);
2864	3065
..	..	@@ -2879,19 +3080,19 @@
2879	3080
2880	3081	refreshContents(true);
2881	3082	} else
2882		- if (event.getSource() == unselectButton)
	3083	+ if (source == unselectButton)
2883	3084	{
2884	3085	objEditor.jTree.clearSelection();
2885	3086	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3087	objEditor.ResetSliders();
2887	3088	refreshContents(true);
2888	3089	} else
2889		- if(event.getSource() instanceof cRadio)
	3090	+ if(source instanceof cRadio)
2890	3091	{
2891	3092	group.parent = keepparent;
2892	3093	group.attributes = 0;
2893	3094	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3095	+ /cRadio/ radio = (cRadio)source;
2895	3096	Object3D obj = radio.GetObject();
2896	3097	System.out.println("Edit " + obj);
2897	3098	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3112,7 @@
2911	3112	}
2912	3113
2913	3114	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3115	+ //Globals.theRenderer.object = group;
2915	3116	if(!useclient)
2916	3117	{
2917	3118	cameraView.renderCamera = radio.camera;
..	..	@@ -2926,7 +3127,9 @@
2926	3127	frontView.object = group;
2927	3128	sideView.object = group;
2928	3129	}
2929		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
2930	3133	/*
2931	3134	currentLayout = radio.layout;
2932	3135	if (currentLayout == null)
..	..	@@ -2939,7 +3142,20 @@
2939	3142	//group.attributes = -1;
2940	3143	ResetModel();
2941	3144	refreshContents(true);
2942		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
2943	3159	else
2944	3160	{
2945	3161	//return super.action(event, arg);
..	..	@@ -3000,6 +3216,28 @@
3000	3216	refreshContents();
3001	3217	}
3002	3218
	3219	+ void TransformChildren()
	3220	+ {
	3221	+ Object3D obj;
	3222	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3223	+ {
	3224	+ obj = (Object3D)e.nextElement();
	3225	+ obj.KeepTextureMatrices();
	3226	+ obj.TransformChildren();
	3227	+ obj.RestoreTextureMatrices();
	3228	+
	3229	+// if (obj.parent == null)
	3230	+// {
	3231	+// System.out.println("NULL PARENT!");
	3232	+// new Exception().printStackTrace();
	3233	+// }
	3234	+// else
	3235	+// TouchTransform(obj);
	3236	+// //obj.parent.Touch();
	3237	+ }
	3238	+
	3239	+ refreshContents();
	3240	+ }
3003	3241
3004	3242	void ResetTransform()
3005	3243	{
..	..	@@ -3112,7 +3350,7 @@
3112	3350	refreshContents();
3113	3351	}
3114	3352
3115		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3116	3354	{
3117	3355	Object3D obj;
3118	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +3365,16 @@
3127	3365	LA.matIdentity(Object3D.mat);
3128	3366	obj.getBounds(minima, maxima, false);
3129	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3133	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3136	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3198,9 +3440,9 @@
3198	3440	obj = (Object3D)e.nextElement();
3199	3441
3200	3442	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3202	3444	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3204	3446
3205	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	3448	}
..	..	@@ -3414,8 +3656,8 @@
3414	3656
3415	3657	void ParseVertices()
3416	3658	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3419	3661
3420	3662	for (int i=0; i<group.selection.size(); i++)
3421	3663	{
..	..	@@ -3440,7 +3682,7 @@
3440	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	3684
3443		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3444	3686
3445	3687	buffer.add(g);
3446	3688	}
..	..	@@ -3455,7 +3697,7 @@
3455	3697	makeSomething(buffer, i==group.selection.size()-1);
3456	3698	}
3457	3699
3458		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3459	3701
3460	3702	refreshContents();
3461	3703	}
..	..	@@ -3473,7 +3715,16 @@
3473	3715	String pigment = Object3D.GetPigment(tex);
3474	3716	//String bump = Object3D.GetBump(tex);
3475	3717
3476		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3477	3728
3478	3729	double s = v.s;
3479	3730
..	..	@@ -3561,11 +3812,11 @@
3561	3812
3562	3813	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	3814
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	3815	+ boolean random = CameraPane.SWITCH;
	3816	+ CameraPane.SWITCH = false; // parse all random nodes
3566	3817	lowres.linkVerticesThis(null);
3567	3818	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	3819	+ CameraPane.SWITCH = random;
3569	3820
3570	3821	System.err.flush();
3571	3822
..	..	@@ -3605,7 +3856,7 @@
3605	3856	return;
3606	3857
3607	3858	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3609	3860
3610	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	3862
..	..	@@ -3774,7 +4025,7 @@
3774	4025	group.selection.RelinkToSupport(); // july 2014
3775	4026	System.out.println("DONE.");
3776	4027	refreshContents();
3777		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4028	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3778	4029	}
3779	4030
3780	4031	void ReduceMesh(boolean reduction34)
..	..	@@ -3799,9 +4050,9 @@
3799	4050
3800	4051	void ClipMesh()
3801	4052	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4054	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3805	4056
3806	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4058	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4061,7 @@
3810	4061	// {
3811	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4063	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4065	}
3815	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4067	System.out.println("DONE.");
..	..	@@ -3945,7 +4196,7 @@
3945	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4197
3947	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
3949	4200	{
3950	4201	// if (!(elem instanceof Composite))
3951	4202	// newWindow = false;
..	..	@@ -4050,25 +4301,28 @@
4050	4301	System.err.println("info : " + child.GetPath());
4051	4302	}
4052	4303	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	4304	+// else
	4305	+// {
	4306	+// objEditor.SetMaterial(group); // .GetMaterial());
	4307	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4308	+// System.err.println("info : " + group.GetPath());
	4309	+// }
4059	4310
4060	4311	objEditor.SetText(); // jan 2014
4061	4312
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	4314	CameraPane.flash = true;
4064	4315
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	4317	// a camera
4067	4318	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4070		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4071		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
	4324	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4325	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	4326	}
4073	4327
4074	4328	refreshContents();
..	..	@@ -4150,12 +4404,12 @@
4150	4404	{
4151	4405	if (group.selection.isEmpty())
4152	4406	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4154	4408	Composite tGroup = null;
4155	4409	if (group.selection.size() > 0) // 1)
4156	4410	{
4157	4411	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4159	4413	}
4160	4414
4161	4415	if (cut)
..	..	@@ -4195,16 +4449,16 @@
4195	4449	//System.out.println("cut " + child);
4196	4450	//System.out.println("parent = " + child.parent);
4197	4451	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4199	4453	tGroup.add/Child/(tmp);
4200	4454	else
4201		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4202	4456	}
4203	4457	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4205	4459	tGroup.add/Child/(child);
4206	4460	else
4207		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4208	4462	}
4209	4463
4210	4464	//ResetModel();
..	..	@@ -4236,21 +4490,21 @@
4236	4490	//System.out.println("cut " + elem);
4237	4491	//System.out.println("parent = " + elem.parent);
4238	4492	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4240	4494	tGroup.add/Child/(tmp);
4241	4495	else
4242		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4243	4497	}
4244	4498	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4246	4500	tGroup.add/Child/(child);
4247	4501	else
4248		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4249	4503	}
4250	4504
4251	4505	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4254	4508	if (cut)
4255	4509	{
4256	4510	ResetModel();
..	..	@@ -4264,7 +4518,7 @@
4264	4518	// return;
4265	4519	boolean first = true;
4266	4520
4267		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4268	4522	{
4269	4523	Composite temp;
4270	4524
..	..	@@ -4275,7 +4529,7 @@
4275	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	4530	*/
4277	4531	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4532	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	4533	{
4280	4534	Object3D child = (Object3D)e.nextElement();
4281	4535
..	..	@@ -4309,21 +4563,21 @@
4309	4563	//Object3D cb = Applet3D.clipboard;
4310	4564	//temp.addChild(cb);
4311	4565	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4566	+ assert(Grafreed.clipboard.parent == null);
	4567	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4568	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4569	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4570	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	4571	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	4574	}
4321	4575
4322	4576	ResetModel();
4323	4577	refreshContents();
4324	4578	}
4325	4579
4326		- void pasteInto(boolean copyit)
	4580	+ void pasteInto(boolean copyit, boolean clone)
4327	4581	{
4328	4582	// if (GrafreeD.clipboard == null)
4329	4583	// return;
..	..	@@ -4352,15 +4606,22 @@
4352	4606	if (copyit)
4353	4607	{
4354	4608	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	4609	+ if (clone)
	4610	+ {
	4611	+ CloneClipboard(false); // sept 2014
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ paste(false);
	4616	+ }
4356	4617	}
4357	4618	else
4358	4619	{
4359	4620	boolean first = true;
4360	4621
4361		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4362	4623	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4364	4625	Object3D copy;
4365	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	4627	{
..	..	@@ -4370,7 +4631,7 @@
4370	4631	}
4371	4632	} else
4372	4633	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	4635	}
4375	4636	}
4376	4637	}
..	..	@@ -4775,21 +5036,6 @@
4775	5036	}
4776	5037	*/
4777	5038
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	5039	/*
4794	5040	public void Callback(Object obj)
4795	5041	{
..	..	@@ -4813,26 +5059,9 @@
4813	5059	}
4814	5060	*/
4815	5061
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	5062	String GetFile(String dialogName)
4834	5063	{
4835		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4836	5065	{
4837	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5067	browser.show();
..	..	@@ -4896,10 +5125,12 @@
4896	5125	cButton flashSelectionButton;
4897	5126	cButton editButton;
4898	5127	cButton uneditButton;
	5128	+ JCheckBox allParamsButton;
4899	5129	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5130	cButton unselectButton;
4902	5131
	5132	+ cButton oneStepButton;
	5133	+
4903	5134	cButton screenfitButton;
4904	5135	cButton screenfitpointButton;
4905	5136	cButton snapobjectButton;
..	..	@@ -4930,6 +5161,8 @@
4930	5161	private MenuItem lookFromItem;
4931	5162	private MenuItem switchItem;
4932	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
4933	5166	private MenuItem duplicateItem;
4934	5167	private MenuItem cloneItem;
4935	5168	private MenuItem cloneSupportItem;
..	..	@@ -4943,7 +5176,7 @@
4943	5176	private MenuItem linkverticesItem;
4944	5177	private MenuItem relinkverticesItem;
4945	5178	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
4947	5180	private MenuItem stepAllItem;
4948	5181	private MenuItem revertMeshItem;
4949	5182	private MenuItem poseMeshItem;
..	..	@@ -4954,6 +5187,7 @@
4954	5187	private MenuItem mergeGeometriesItem;
4955	5188	private MenuItem copyItem;
4956	5189	private MenuItem pasteItem;
	5190	+ private MenuItem pasteIntoItem;
4957	5191	private MenuItem pasteLinkItem;
4958	5192	private MenuItem pasteCloneItem;
4959	5193	private MenuItem pasteExpandItem;
..	..	@@ -5003,8 +5237,10 @@
5003	5237	private MenuItem panoTexturesItem;
5004	5238
5005	5239	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
5007	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
5008	5244	private MenuItem hideItem;
5009	5245	private MenuItem grabItem;
5010	5246	private MenuItem backItem;
..	..	@@ -5051,7 +5287,7 @@
5051	5287	private MenuItem blobItem;
5052	5288	private MenuItem latheItem;
5053	5289	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	5290	+ private MenuItem overlayItem;
5055	5291	private MenuItem meshItem;
5056	5292	// private MenuItem meshGroupItem;
5057	5293	private MenuItem springItem;
..	..	@@ -5073,11 +5309,6 @@
5073	5309	private MenuItem doubleItem;
5074	5310	private MenuItem tripleItem;
5075	5311
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	5312	private MenuItem computeAOItem;
5082	5313	private MenuItem recompileItem;
5083	5314	private MenuItem editScriptItem;
..	..	@@ -5087,4 +5318,8 @@
5087	5318	private MenuItem analyzeItem;
5088	5319	private MenuItem dumpItem;
5089	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5090	5325	}