~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,124 @@
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	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	158	+ duplicateItem.addActionListener(this);
	159	+ cloneItem = menu.add(new MenuItem("Clone"));
	160	+ cloneItem.addActionListener(this);
	161	+ if (Globals.ADVANCED)
	162	+ {
	163	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	164	+ cloneSupportItem.addActionListener(this);
	165	+ }
	166	+ menu.add("-");
	167	+ cutItem = menu.add(new MenuItem("Cut"));
	168	+ cutItem.addActionListener(this);
	169	+ copyItem = menu.add(new MenuItem("Copy"));
	170	+ copyItem.addActionListener(this);
	171	+ pasteItem = menu.add(new MenuItem("Paste"));
	172	+ pasteItem.addActionListener(this);
	173	+ menu.add("-");
	174	+
	175	+ menu.add("-");
	176	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	177	+ pasteIntoItem.addActionListener(this);
	178	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	179	+ pasteLinkItem.addActionListener(this);
	180	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	181	+ pasteCloneItem.addActionListener(this);
	182	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	183	+// pasteExpandItem.addActionListener(this);
	184	+ menu.add("-");
	185	+ clearItem = menu.add(new MenuItem("Clear"));
	186	+ clearItem.addActionListener(this);
	187	+
	188	+ if (Globals.ADVANCED)
	189	+ {
	190	+ // Deletes the cameras...
	191	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	192	+ clearAllItem.addActionListener(this);
	193	+ }
	194	+
	195	+ menuBar.add(cameraMenu = new Menu("View"));
	196	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	197	+ //zBufferItem.addActionListener(this);
	198	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	199	+ //normalLensItem.addActionListener(this);
	200	+ cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
	201	+ revertCameraItem.addActionListener(this);
	202	+
	203	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	204	+ toggleFullScreenItem.addItemListener(this);
	205	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	206	+ cameraMenu.add("-");
	207	+
	208	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	209	+ toggleTextureItem.addItemListener(this);
	210	+ toggleTextureItem.setState(CameraPane.textureon);
	211	+
	212	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	213	+ toggleSwitchItem.addItemListener(this);
	214	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	215	+
	216	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	217	+ toggleHandleItem.addItemListener(this);
	218	+ toggleHandleItem.setState(CameraPane.HANDLES);
	219	+
	220	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	221	+ togglePaintItem.addItemListener(this);
	222	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	223	+
	224	+ if (Globals.ADVANCED)
	225	+ {
	226	+ cameraMenu.add("-");
	227	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	228	+ toggleLiveItem.addItemListener(this);
	229	+ toggleLiveItem.setState(Globals.isLIVE());
	230	+
	231	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	232	+ stepItem.addActionListener(this);
	233	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	234	+ // toggleDLItem.addItemListener(this);
	235	+ // toggleDLItem.setState(false);
	236	+
	237	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	238	+ toggleRenderItem.addItemListener(this);
	239	+ toggleRenderItem.setState(!CameraPane.frozen);
	240	+
	241	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	242	+ toggleDebugItem.addItemListener(this);
	243	+ toggleDebugItem.setState(CameraPane.DEBUG);
	244	+
	245	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	246	+ toggleFrustumItem.addItemListener(this);
	247	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	248	+
	249	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	250	+ toggleFootContactItem.addItemListener(this);
	251	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	252	+
	253	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	254	+ toggleTimelineItem.addItemListener(this);
	255	+ }
	256	+
	257	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	258	+// toggleRootItem.addItemListener(this);
	259	+// toggleRootItem.setState(false);
	260	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	261	+// animationItem.addItemListener(this);
	262	+// animationItem.setState(CameraPane.ANIMATION);
	263	+ cameraMenu.add("-");
	264	+ cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	265	+ editCameraItem.addActionListener(this);
	266	+
	267	+ if (Globals.ADVANCED)
	268	+ {
152	269	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	270	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	271	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +277,17 @@
160	277	lookAtItem.addActionListener(this);
161	278	//lookFromItem.addActinoListener(this);
162	279	//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		-
	280	+ }
	281	+
192	282	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);
	283	+ if (Globals.ADVANCED)
	284	+ {
197	285	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	286	revertMeshItem.addActionListener(this);
199	287	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	288	resetreferencesItem.addActionListener(this);
201	289	menu.add("-");
	290	+ }
202	291	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	292	overwriteGeoItem.addActionListener(this);
204	293	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +299,26 @@
210	299	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	300	overwriteUVItem.addActionListener(this);
212	301	menu.add("-");
	302	+ if (Globals.ADVANCED)
	303	+ {
213	304	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	305	generateMeshItem.addActionListener(this);
215	306	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	307	poseMeshItem.addActionListener(this);
217	308	menu.add("-");
	309	+ }
218	310	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	311	resetsupportItem.addActionListener(this);
220	312	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	313	linkverticesItem.addActionListener(this);
222	314	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	315	relinkverticesItem.addActionListener(this);
	316	+
	317	+ if (Globals.ADVANCED)
	318	+ {
224	319	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	320	setMasterItem.addActionListener(this);
	321	+ }
226	322
227	323	oe.menuBar.add(menu = new Menu("Group"));
228	324	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +329,32 @@
233	329	frontItem.addActionListener(this);
234	330	compositeItem = menu.add(new MenuItem("Composite"));
235	331	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	332	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	333	hideItem.addActionListener(this);
238	334	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	335	ungroupItem.addActionListener(this);
240	336	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	337	+ randomItem = menu.add(new MenuItem("Switch node"));
242	338	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	339	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	340	switchGeoItem.addActionListener(this);
249	341	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	342	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	343	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	344	morphItem.addActionListener(this);
	345	+
	346	+ if (Globals.ADVANCED)
	347	+ {
	348	+ menu.add("-");
	349	+ physicsItem = menu.add(new MenuItem("Physics"));
	350	+ physicsItem.addActionListener(this);
	351	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	352	+ frameselectorItem.addActionListener(this);
253	353	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	354	scriptNodeItem.addActionListener(this);
255	355	cameraItem = menu.add(new MenuItem("Camera"));
256	356	cameraItem.addActionListener(this);
	357	+ }
257	358
258	359	oe.menuBar.add(menu = new Menu("Object"));
259	360	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +369,29 @@
268	369	shadowYItem.addActionListener(this);
269	370	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	371	shadowZItem.addActionListener(this);
	372	+ if (Globals.ADVANCED)
	373	+ {
	374	+ menu.add("-");
271	375	linkerItem = menu.add(new MenuItem("Linker"));
272	376	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	377	attributeItem = menu.add(new MenuItem("Attribute"));
276	378	attributeItem.addActionListener(this);
	379	+ templateItem = menu.add(new MenuItem("Template"));
	380	+ templateItem.addActionListener(this);
277	381	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	382	pointflowItem.addActionListener(this);
	383	+ }
279	384	menu.add("-");
280	385	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	386	resetTransformItem.addActionListener(this);
282	387	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	388	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	389	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	390	+ resetCentroidXZItem.addActionListener(this);
	391	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	392	+ transformGeometryItem.addActionListener(this);
	393	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	394	+ transformChildrenItem.addActionListener(this);
286	395
287	396	oe.menuBar.add(menu = new Menu("Geometry"));
288	397	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +402,11 @@
293	402	genNormalsCADItem.addActionListener(this);
294	403	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	404	genNormalsMESHItem.addActionListener(this);
	405	+ if (Globals.ADVANCED)
	406	+ {
296	407	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	408	genNormalsMINEItem.addActionListener(this);
	409	+ }
298	410	stripifyItem = menu.add(new MenuItem("Stripify"));
299	411	stripifyItem.addActionListener(this);
300	412	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +428,34 @@
316	428	reduce34MeshItem.addActionListener(this);
317	429	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	430	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	431	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	432	clipMeshItem.addActionListener(this);
	433	+
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	437	+ smoothMeshItem.addActionListener(this);
	438	+ }
323	439
324	440	oe.menuBar.add(menu = new Menu("Attributes"));
325	441	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	442	clearMaterialsItem.addActionListener(this);
	443	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	444	+ resetAllItem.addActionListener(this);
	445	+ stepAllItem = menu.add(new MenuItem("Step All"));
	446	+ stepAllItem.addActionListener(this);
327	447	menu.add("-");
328	448	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	449	liveleavesItem.addActionListener(this);
330	450	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	451	unliveleavesItem.addActionListener(this);
	452	+ if (Globals.ADVANCED)
	453	+ {
332	454	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	455	supportleavesItem.addActionListener(this);
334	456	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	457	unsupportleavesItem.addActionListener(this);
	458	+ }
336	459	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	460	hideleavesItem.addActionListener(this);
338	461	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,29 +499,22 @@
376	499	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	500	sortbynameItem.addActionListener(this);
378	501	menu.add("-");
	502	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	503	+ shareGeometriesItem.addActionListener(this);
	504	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	505	+ mergeGeometriesItem.addActionListener(this);
	506	+ if (Globals.ADVANCED)
	507	+ {
	508	+ // Pretty much the same as duplicate and clone.
379	509	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	510	extractGeometriesItem.addActionListener(this);
381	511	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	512	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);
	513	+ }
387	514
388	515	oe.menuBar.add(menu = new Menu("Insert"));
389	516	buildCreateMenu(menu);
390	517
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	518	oe.menuBar.add(menu = new Menu("Tools"));
403	519	buildToolsMenu(menu);
404	520	}
..	..	@@ -433,153 +549,98 @@
433	549	oe.radioPanel.add(dummyButton);
434	550	oe.buttonGroup.add(dummyButton);
435	551	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	552	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	553
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	554	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	555	+ liveCB.setToolTipText("Enable animation");
441	556	liveCB.addItemListener(this);
442	557
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);
	558	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	559	+ oneStepButton.setToolTipText("Animate one step forward");
	560	+ oneStepButton.addActionListener(this);
	561	+
	562	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	563	+ fastCB.setToolTipText("Fast mode");
461	564	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);
	565	+
	566	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	567	+ trackCB.setToolTipText("Enable tracking");
503	568	trackCB.addItemListener(this);
504	569
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	570	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	571	+ screenfitButton.setToolTipText("Screen fit");
507	572	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	573	+
509	574	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	575	// 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	576
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);
	577	+ if (Globals.ADVANCED)
	578	+ {
	579	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ snapobjectButton.addActionListener(this);
	581	+ snapobjectButton.setToolTipText("Snap Object");
	582	+ }
	583	+
	584	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ flashSelectionButton.setToolTipText("Show selection");
522	586	flashSelectionButton.addActionListener(this);
523	587
524		- oe.toolbarPanel.add(new cButton(" ", false));
	588	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	589
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);
	590	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ twoButton.setToolTipText("Show center view only");
532	592	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	594	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	595	+ fourButton.setToolTipText("Show left panel only");
	596	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ sixButton.setToolTipText("2-column layout left");
536	598	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	599	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ threeButton.setToolTipText("2-column layout right");
538	601	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ sevenButton.setToolTipText("3-column layout");
540	604	sevenButton.addActionListener(this);
541	605	//
542	606
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ rootButton.setToolTipText("Edit selection in new tab");
544	609	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	610	+
	611	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ closeButton.setToolTipText("Close tab");
547	613	closeButton.addActionListener(this);
548	614	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	615	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	616
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	617	+ cGridBag commandsPanel = new cGridBag();
	618	+
	619	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ editButton.setToolTipText("Edit selection");
554	621	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	622
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	623	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ uneditButton.setToolTipText("Unedit selection");
560	625	uneditButton.addActionListener(this);
561	626
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);
	627	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	628	+ allParamsButton.setToolTipText("Edit all params");
574	629	allParamsButton.addActionListener(this);
575	630
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);
	631	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ clearPanelButton.setToolTipText("Clear edit panel");
	633	+ clearPanelButton.addActionListener(this);
	634	+
	635	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ unselectButton.setToolTipText("Unselect");
581	637	unselectButton.addActionListener(this);
582	638
	639	+ commandsPanel.preferredHeight = 1;
	640	+
	641	+ oe.treePanel.add(commandsPanel);
	642	+ oe.treePanel.Return();
	643	+
583	644	// oe.aConstraints.gridx += 1;
584	645	// oe.aConstraints.weighty = 0;
585	646	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +652,37 @@
591	652	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	653	// gcButton.addActionListener(this);
593	654
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;
	655	+ cGridBag jSPPanel = new cGridBag();
	656	+
	657	+ JScrollPane jSP;
605	658	//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);
	659	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	660	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	661	+
	662	+ oe.treePanel.add(jSPPanel);
	663	+ oe.treePanel.Return();
612	664
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);
	665	+ cGridBag copyOptionsPanel = new cGridBag();
	666	+
	667	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	668	+ colorCB.setToolTipText("Copy color when dropped");
617	669	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	670	+
	671	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	672	+ materialCB.setToolTipText("Copy material when dropped");
620	673	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	674	+
	675	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	676	+ textureCB.setToolTipText("Copy texture when dropped");
623	677	textureCB.addItemListener(this);
624	678
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	679	+ copyOptionsPanel.preferredHeight = 1;
	680	+ oe.treePanel.add(copyOptionsPanel);
	681	+ oe.treePanel.Return();
627	682
	683	+// mainPanel.setDividerLocation(0.5); //1.0);
	684	+// mainPanel.setResizeWeight(0.5);
	685	+
628	686	//jList.addListSelectionListener(this);
629	687	oe.jTree.addTreeSelectionListener(this);
630	688	//jTree.setRootVisible(false);
..	..	@@ -646,6 +704,78 @@
646	704	radio.layout = sevenButton;
647	705	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	706	}
	707	+
	708	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	709	+ {
	710	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	711	+ boxCB.setToolTipText("Display bounding boxes");
	712	+ boxCB.addItemListener(this);
	713	+
	714	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	715	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	716	+ zoomBoxCB.addItemListener(this);
	717	+
	718	+ if (true) // Globals.ADVANCED)
	719	+ {
	720	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	721	+ supportCB.setToolTipText("Enable rigging");
	722	+ supportCB.addItemListener(this);
	723	+
	724	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	725	+ // localCB.addItemListener(this);
	726	+
	727	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	728	+ crowdCB.setToolTipText("Used for crowds");
	729	+ crowdCB.addItemListener(this);
	730	+
	731	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	732	+ smoothCB.setToolTipText("Snapping delay");
	733	+ smoothCB.addItemListener(this);
	734	+
	735	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	736	+ slowCB.setToolTipText("Smooth interpolation");
	737	+ slowCB.addItemListener(this);
	738	+
	739	+// constraints.gridy += 1;
	740	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	741	+// speakerMocapCB.addItemListener(this);
	742	+
	743	+ if (false)
	744	+ {
	745	+ // handled in scripts
	746	+ //constraints.gridy += 1;
	747	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	748	+ speakerCameraCB.addItemListener(this);
	749	+
	750	+ //constraints.gridy += 1;
	751	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	752	+ speakerFocusCB.addItemListener(this);
	753	+
	754	+ //constraints.gridy += 1;
	755	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	756	+ smoothfocusCB.addItemListener(this);
	757	+ }
	758	+
	759	+//constraints.gridx += 1;
	760	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	761	+// debugCB.addItemListener(this);
	762	+
	763	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	764	+ oeilCB.addItemListener(this);
	765	+
	766	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	767	+ lookAtCB.setToolTipText("Look-at target");
	768	+ lookAtCB.addItemListener(this);
	769	+
	770	+ }
	771	+
	772	+ cGridBag fill = new cGridBag();
	773	+
	774	+ fill.preferredHeight = 200;
	775	+
	776	+ panel.add(fill);
	777	+
	778	+ }
649	779
650	780	void EditObject(Object3D obj)
651	781	{
..	..	@@ -658,6 +788,7 @@
658	788	buttonGroup.add(radioButton);
659	789	radioButton.doClick();
660	790	}
	791	+
661	792	void SetupViews(ObjEditor oe)
662	793	{
663	794	oe.SetupViews();
..	..	@@ -676,6 +807,7 @@
676	807	JCheckBox fastCB;
677	808	JCheckBox slowCB;
678	809	JCheckBox boxCB;
	810	+ JCheckBox zoomBoxCB;
679	811	JCheckBox trackCB;
680	812	JCheckBox smoothfocusCB;
681	813	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +887,10 @@
755	887	Recompile();
756	888	cameraView.repaint();
757	889	// refreshContents();
	890	+ }
	891	+ else if(e.getSource() == zoomBoxCB)
	892	+ {
	893	+ cameraView.ToggleZoomBoxMode();
758	894	}
759	895	else if(e.getSource() == smoothfocusCB)
760	896	{
..	..	@@ -869,7 +1005,9 @@
869	1005	// objEditor.DropFile((java.io.File[]) object, true);
870	1006	// return;
871	1007	// }
872		- if (string.charAt(0) == '/')
	1008	+
	1009	+ // File path for Mac and Windows
	1010	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1011	{
874	1012	// file(s)
875	1013	String[] names = string.split("\n");
..	..	@@ -896,7 +1034,7 @@
896	1034
897	1035	flashIt = false;
898	1036	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1037	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1038	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1039
902	1040	if (group.selection.size() == 1)
..	..	@@ -923,11 +1061,11 @@
923	1061	{
924	1062	loadClipboard(true);
925	1063	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	1064	+ pasteInto(false, false);
927	1065	} else {
928	1066	loadClipboard(false);
929	1067	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1068	+ pasteInto(false, false); // true); // ???
931	1069	}
932	1070	}
933	1071	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1187,33 @@
1049	1187	kleinItem.addActionListener(this);
1050	1188	particleItem = menu.add(new MenuItem("Particle system"));
1051	1189	particleItem.addActionListener(this);
	1190	+ if (Globals.ADVANCED)
	1191	+ {
1052	1192	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1193	ragdollItem.addActionListener(this);
1054	1194	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1195	ragdoll2Item.addActionListener(this);
	1196	+ }
1056	1197	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1198	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1199	meshItem.addActionListener(this);
1059	1200	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1201	// meshGroupItem.addActionListener(this);
	1202	+ if (Globals.ADVANCED)
	1203	+ {
1061	1204	springItem = menu.add(new MenuItem("Spring"));
1062	1205	springItem.addActionListener(this);
1063	1206	flagItem = menu.add(new MenuItem("Flag"));
1064	1207	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	1208	blobItem = menu.add(new MenuItem("Blob"));
1070	1209	blobItem.addActionListener(this);
1071	1210	latheItem = menu.add(new MenuItem("Lathe"));
1072	1211	latheItem.addActionListener(this);
	1212	+ }
	1213	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1214	+ bezierItem.addActionListener(this);
	1215	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1216	+ overlayItem.addActionListener(this);
1073	1217	lightItem = menu.add(new MenuItem("Light"));
1074	1218	lightItem.addActionListener(this);
1075	1219	menu.add("-");
..	..	@@ -1079,34 +1223,39 @@
1079	1223	loopItem.addActionListener(this);
1080	1224	doubleItem = menu.add(new MenuItem("Fork"));
1081	1225	doubleItem.addActionListener(this);
	1226	+ if (Globals.ADVANCED)
	1227	+ {
1082	1228	tripleItem = menu.add(new MenuItem("Trident"));
1083	1229	tripleItem.addActionListener(this);
	1230	+ }
1084	1231	}
1085	1232
1086	1233	void buildToolsMenu(Menu menu)
1087	1234	{
1088	1235	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1236	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1237	+ animationItem.setState(Globals.ANIMATION);
1091	1238
1092	1239	menu.add("-");
1093	1240	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1241	parseverticesItem.addActionListener(this);
1095	1242	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1243	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1244	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1245	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1246	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1247	reduceMorphItem.addActionListener(this);
1103	1248	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1249	reduce34MorphItem.addActionListener(this);
1105		-
	1250	+ menu.add("-");
1106	1251	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1252	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1253
	1254	+ if (Globals.ADVANCED)
	1255	+ {
	1256	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1257	+ mirrorItem.addActionListener(this);
	1258	+ menu.add("-");
1110	1259	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1260	memoryItem.addActionListener(this);
1112	1261	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1129,6 +1278,7 @@
1129	1278	menu.add("-");
1130	1279	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1280	editScriptItem.addActionListener(this);
	1281	+ }
1132	1282	}
1133	1283
1134	1284	void ScreenFit()
..	..	@@ -1457,9 +1607,9 @@
1457	1607
1458	1608	void Overwrite(int mask)
1459	1609	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1610	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1611	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1612	+ Object3D content = Grafreed.clipboard.get(0);
1463	1613
1464	1614	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1615	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1632,7 @@
1482	1632	//
1483	1633	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1634	{
	1635	+ Object source = event.getSource();
1485	1636	/*
1486	1637	if (event.getSource() == nameField)
1487	1638	{
..	..	@@ -1493,11 +1644,11 @@
1493	1644	}
1494	1645	else
1495	1646	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1647	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1648	{
1498	1649	ScreenFit();
1499	1650	} else
1500		- if (event.getSource() == switchItem)
	1651	+ if (source == switchItem)
1501	1652	{
1502	1653	cVector v1 = new cVector();
1503	1654	cVector v2 = new cVector();
..	..	@@ -1506,11 +1657,11 @@
1506	1657	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1658	objEditor.cameraView.repaint();
1508	1659	} else
1509		- if (event.getSource() == rectoidItem)
	1660	+ if (source == rectoidItem)
1510	1661	{
1511	1662	makeSomething(new Box());
1512	1663	} else
1513		- if (event.getSource() == particleItem)
	1664	+ if (source == particleItem)
1514	1665	{
1515	1666	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1667	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1682,9 @@
1531	1682	applyExample(particleGeom, "SMOKE");
1532	1683	makeSomething(particleGeom);
1533	1684	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1685	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1686	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1687	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1688
1538	1689	ragdoll.toParent = LA.newMatrix();
1539	1690	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1702,7 @@
1551	1702	} else
1552	1703	/*
1553	1704	*/
1554		- if (event.getSource() == heightFieldItem)
	1705	+ if (source == heightFieldItem)
1555	1706	{
1556	1707	Object3D obj = new Object3D();
1557	1708
..	..	@@ -1589,31 +1740,31 @@
1589	1740
1590	1741	makeSomething(obj);
1591	1742	} else
1592		- if (event.getSource() == gridItem)
	1743	+ if (source == gridItem)
1593	1744	{
1594	1745	makeSomething(new Grid());
1595	1746	} else
1596		- if (event.getSource() == ellipsoidItem)
	1747	+ if (source == ellipsoidItem)
1597	1748	{
1598	1749	makeSomething(new Sphere());
1599	1750	} else
1600		- if (event.getSource() == coneItem)
	1751	+ if (source == coneItem)
1601	1752	{
1602	1753	makeSomething(new Cone());
1603	1754	} else
1604		- if (event.getSource() == torusItem)
	1755	+ if (source == torusItem)
1605	1756	{
1606	1757	makeSomething(new Torus());
1607	1758	} else
1608		- if (event.getSource() == superItem)
	1759	+ if (source == superItem)
1609	1760	{
1610	1761	makeSomething(new Superellipsoid());
1611	1762	} else
1612		- if (event.getSource() == kleinItem)
	1763	+ if (source == kleinItem)
1613	1764	{
1614	1765	makeSomething(new Klein());
1615	1766	} else
1616		- if (event.getSource() == blobItem)
	1767	+ if (source == blobItem)
1617	1768	{
1618	1769	Blob blob = new Blob();
1619	1770	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1772,15 @@
1621	1772	//blob.retile();
1622	1773	makeSomething(blob);
1623	1774	} else
1624		- if (event.getSource() == latheItem)
	1775	+ if (source == latheItem)
1625	1776	{
1626	1777	makeSomething(new Lathe());
1627	1778	} else
1628		- if (event.getSource() == bezierItem)
	1779	+ if (source == bezierItem)
1629	1780	{
1630	1781	makeSomething(new BezierSurface());
1631	1782	} else
1632		- if (event.getSource() == checkerItem)
	1783	+ if (source == overlayItem)
1633	1784	{
1634	1785	/*
1635	1786	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1795,7 @@
1644	1795	*/
1645	1796	makeSomething(new Checker());
1646	1797	} else
1647		- if (event.getSource() == meshItem)
	1798	+ if (source == meshItem)
1648	1799	{
1649	1800	Object3D itemtomake = new Object3D();
1650	1801	Object3D child;
..	..	@@ -1665,35 +1816,35 @@
1665	1816	makeSomething(child);
1666	1817	}
1667	1818	} else
1668		- if (event.getSource() == springItem)
	1819	+ if (source == springItem)
1669	1820	{
1670	1821	cSpring s = new cSpring();
1671	1822	s.setup();
1672	1823	makeSomething(s);
1673	1824	} else
1674		- if (event.getSource() == flagItem)
	1825	+ if (source == flagItem)
1675	1826	{
1676	1827	cSpring s = new cFlag();
1677	1828	s.setup();
1678	1829	makeSomething(s);
1679	1830	} else
1680		- if (event.getSource() == lightItem)
	1831	+ if (source == lightItem)
1681	1832	{
1682	1833	makeSomething(new Light());
1683	1834	} else
1684		- if (event.getSource() == csgItem)
	1835	+ if (source == csgItem)
1685	1836	{
1686	1837	group(new CSG());
1687	1838	} else
1688		- if (event.getSource() == templateItem)
	1839	+ if (source == templateItem)
1689	1840	{
1690	1841	group(new cTemplate());
1691	1842	} else
1692		- if (event.getSource() == attributeItem)
	1843	+ if (source == attributeItem)
1693	1844	{
1694	1845	makeSomething(new Attribute());
1695	1846	} else
1696		- if (event.getSource() == pointflowItem)
	1847	+ if (source == pointflowItem)
1697	1848	{
1698	1849	makeSomething(new PointFlow());
1699	1850	} else
..	..	@@ -1705,7 +1856,7 @@
1705	1856	} else
1706	1857	*/
1707	1858
1708		- if (event.getSource() == superLoopItem)
	1859	+ if (source == superLoopItem)
1709	1860	{
1710	1861	Composite g = new cGroup();
1711	1862	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1878,7 @@
1727	1878
1728	1879	group(g);
1729	1880	} else
1730		- if (event.getSource() == loopItem)
	1881	+ if (source == loopItem)
1731	1882	{
1732	1883	Composite csg = new GroupLeaf();
1733	1884	csg.count = 5;
..	..	@@ -1736,7 +1887,7 @@
1736	1887	csg.addChild(child);
1737	1888	child.addChild(csg);
1738	1889	} else
1739		- if (event.getSource() == doubleItem)
	1890	+ if (source == doubleItem)
1740	1891	{
1741	1892	Composite csg = new GroupLeaf();
1742	1893	csg.count = 5;
..	..	@@ -1748,7 +1899,7 @@
1748	1899	csg.addChild(child);
1749	1900	child.addChild(csg);
1750	1901	} else
1751		- if (event.getSource() == tripleItem)
	1902	+ if (source == tripleItem)
1752	1903	{
1753	1904	Composite csg = new GroupLeaf();
1754	1905	csg.count = 4;
..	..	@@ -1763,71 +1914,59 @@
1763	1914	csg.addChild(child);
1764	1915	child.addChild(csg);
1765	1916	} 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)
	1917	+ if (source == computeAOItem)
1784	1918	{
1785	1919	Globals.drawMode = CameraPane.OCCLUSION;
1786		- CameraPane.theRenderer.repaint();
	1920	+ Globals.theRenderer.repaint();
1787	1921	} else
1788		- if (event.getSource() == recompileItem)
	1922	+ if (source == recompileItem)
1789	1923	{
1790	1924	Recompile();
1791	1925	refreshContents();
1792	1926	} else
1793		- if (event.getSource() == editScriptItem)
	1927	+ if (source == editScriptItem)
1794	1928	{
1795	1929	OpenDialog();
1796	1930	refreshContents();
1797	1931	} else
1798		- if (event.getSource() == invariantsItem)
	1932	+ if (source == invariantsItem)
1799	1933	{
1800	1934	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	1935	+ Grafreed.grafreeD.universe.invariants();
1802	1936	} else
1803		- if (event.getSource() == memoryItem)
	1937	+ if (source == memoryItem)
1804	1938	{
1805	1939	//System.out.println("Invariants:");
1806	1940	PrintMemory();
1807	1941	} else
1808		- if (event.getSource() == pathItem)
	1942	+ if (source == pathItem)
1809	1943	{
1810	1944	PrintPath();
1811	1945	} else
1812		- if (event.getSource() == analyzeItem)
	1946	+ if (source == analyzeItem)
1813	1947	{
1814	1948	AnalyzeObject();
1815	1949	} else
1816		- if (event.getSource() == dumpItem)
	1950	+ if (source == dumpItem)
1817	1951	{
1818	1952	DumpObject();
1819	1953	} else
1820		- if (event.getSource() == screenfitButton)
	1954	+ if (source == oneStepButton)
	1955	+ {
	1956	+ Globals.ONESTEP = true;
	1957	+ cameraView.repaint();
	1958	+ } else
	1959	+ if (source == screenfitButton)
1821	1960	{
1822	1961	//Reload(lastConverter, lastFilename, true);
1823	1962	ScreenFit();
1824	1963	} else
1825		- if (event.getSource() == screenfitpointButton)
	1964	+ if (source == screenfitpointButton)
1826	1965	{
1827	1966	//Reload(lastConverter, lastFilename, true);
1828	1967	ScreenFitPoint();
1829	1968	} else
1830		- if (event.getSource() == snapobjectButton)
	1969	+ if (source == snapobjectButton)
1831	1970	{
1832	1971	//Reload(lastConverter, lastFilename, true);
1833	1972	SnapObject();
..	..	@@ -1838,13 +1977,13 @@
1838	1977	// Recompile();
1839	1978	// refreshContents();
1840	1979	// } else
1841		- if (event.getSource() == gcButton)
	1980	+ if (source == gcButton)
1842	1981	{
1843	1982	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1983	System.gc();
1845	1984	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	1985	} else
1847		- if (event.getSource() == editLeafItem)
	1986	+ if (source == editLeafItem)
1848	1987	{
1849	1988	Object3D obj;
1850	1989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +1997,66 @@
1858	1997	}
1859	1998	refreshContents(true);
1860	1999	} else
1861		- if (event.getSource() == openWindowItem)
	2000	+ if (source == openWindowItem)
1862	2001	{
1863	2002	EditSelection(true);
1864	2003	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2004	+ if (source == cutItem \|\| source == clearButton)
1866	2005	{
1867	2006	loadClipboard(true);
1868	2007	} else
1869		- if (event.getSource() == duplicateItem)
	2008	+ if (source == duplicateItem)
1870	2009	{
1871		- Object3D keep = GrafreeD.clipboard;
	2010	+ Object3D keep = Grafreed.clipboard;
1872	2011	loadClipboard(false);
1873	2012	paste(false);
1874		- GrafreeD.clipboard = keep;
	2013	+ Grafreed.clipboard = keep;
1875	2014	} else
1876		- if (event.getSource() == cloneItem)
	2015	+ if (source == cloneItem)
1877	2016	{
1878	2017	CloneSelection(false);
1879	2018	} else
1880		- if (event.getSource() == cloneSupportItem)
	2019	+ if (source == cloneSupportItem)
1881	2020	{
1882	2021	CloneSelection(true);
1883	2022	} else
1884		- if (event.getSource() == copyItem)
	2023	+ if (source == copyItem)
1885	2024	{
1886	2025	loadClipboard(false);
1887	2026	} else
1888		- if (event.getSource() == pasteItem)
	2027	+ if (source == pasteItem)
1889	2028	{
1890	2029	paste(false);
1891	2030	} else
1892		- if (event.getSource() == pasteLinkItem)
	2031	+ if (source == pasteIntoItem)
1893	2032	{
1894		- pasteInto(false);
	2033	+ pasteInto(true, false);
1895	2034	} else
1896		- if (event.getSource() == pasteCloneItem)
	2035	+ if (source == pasteLinkItem)
1897	2036	{
1898		- pasteInto(true);
	2037	+ pasteInto(false, false);
1899	2038	} else
1900		- if (event.getSource() == pasteExpandItem)
	2039	+ if (source == pasteCloneItem)
	2040	+ {
	2041	+ pasteInto(true, true);
	2042	+ } else
	2043	+ if (source == pasteExpandItem)
1901	2044	{
1902	2045	paste(true);
1903	2046	} else
1904		- if (event.getSource() == synchronizeItem)
	2047	+ if (source == synchronizeItem)
1905	2048	{
1906	2049	Overwrite(Object3D.TRANSFORM);
1907	2050	} else
1908		- if (event.getSource() == overwriteNameItem)
	2051	+ if (source == overwriteNameItem)
1909	2052	{
1910	2053	Overwrite(Object3D.NAME);
1911	2054	} else
1912		- if (event.getSource() == overwriteUVItem)
	2055	+ if (source == overwriteUVItem)
1913	2056	{
1914	2057	Overwrite(Object3D.UV);
1915	2058	} else
1916		- if (event.getSource() == overwriteMatItem)
	2059	+ if (source == overwriteMatItem)
1917	2060	{
1918	2061	/* july 2015
1919	2062	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2076,7 @@
1933	2076
1934	2077	Overwrite(dropAttributes);
1935	2078	}
1936		- if (event.getSource() == overwriteGeoItem)
	2079	+ if (source == overwriteGeoItem)
1937	2080	{
1938	2081	Overwrite(Object3D.GEOMETRY);
1939	2082	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2093,7 @@
1950	2093	// refreshContents();
1951	2094	// }
1952	2095	} else
1953		- if (event.getSource() == generateMeshItem)
	2096	+ if (source == generateMeshItem)
1954	2097	{
1955	2098	//if (group.selection.size() == 1)
1956	2099	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2104,7 @@
1961	2104	ResetModel();
1962	2105	refreshContents();
1963	2106	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2107	+ if (source == extractGeometriesItem)
1965	2108	{
1966	2109	boolean one = false;
1967	2110
..	..	@@ -1988,7 +2131,7 @@
1988	2131	ResetModel();
1989	2132	refreshContents();
1990	2133	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2134	+ if (source == cloneGeometriesItem)
1992	2135	{
1993	2136	boolean one = false;
1994	2137
..	..	@@ -2014,7 +2157,7 @@
2014	2157	ResetModel();
2015	2158	refreshContents();
2016	2159	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2160	+ if (source == shareGeometriesItem)
2018	2161	{
2019	2162	boolean one = false;
2020	2163
..	..	@@ -2044,7 +2187,7 @@
2044	2187	refreshContents();
2045	2188	}
2046	2189	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2190	+ if (source == mergeGeometriesItem)
2048	2191	{
2049	2192	boolean one = false;
2050	2193
..	..	@@ -2074,7 +2217,7 @@
2074	2217	ResetModel();
2075	2218	refreshContents();
2076	2219	} else
2077		- if (event.getSource() == linkverticesItem)
	2220	+ if (source == linkverticesItem)
2078	2221	{
2079	2222	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2223	// {
..	..	@@ -2087,48 +2230,48 @@
2087	2230	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2231	// refreshContents();
2089	2232	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2233	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2234	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2235	+ Object3D content = Grafreed.clipboard.get(0);
2093	2236
2094	2237	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2238	content = ((cGroup)content).get(0);
2096	2239
2097		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2240	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2241	for (int i=0; i<group.selection.size(); i++)
2099	2242	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2243	+ boolean random = CameraPane.SWITCH;
	2244	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2245	group.selection.get(i).linkVerticesThis(content);
2103	2246	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2247	+ CameraPane.SWITCH = random;
2105	2248	}
2106		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2249	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2250	refreshContents();
2108	2251	}
2109	2252	} else
2110		- if (event.getSource() == resetsupportItem)
	2253	+ if (source == resetsupportItem)
2111	2254	{
2112	2255	for (int i=0; i<group.selection.size(); i++)
2113	2256	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2257	+ boolean random = CameraPane.SWITCH;
	2258	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2259	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2118	2261	}
2119	2262
2120	2263	refreshContents();
2121	2264	} else
2122		- if (event.getSource() == relinkverticesItem)
	2265	+ if (source == relinkverticesItem)
2123	2266	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2267	+ boolean random = CameraPane.SWITCH;
	2268	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2269	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2270	+ CameraPane.SWITCH = random;
2128	2271
2129	2272	refreshContents();
2130	2273	} else
2131		- if (event.getSource() == resetreferencesItem)
	2274	+ if (source == resetreferencesItem)
2132	2275	{
2133	2276	for (int i=0; i<group.selection.size(); i++)
2134	2277	{
..	..	@@ -2137,11 +2280,11 @@
2137	2280
2138	2281	refreshContents();
2139	2282	} else
2140		- if (event.getSource() == setMasterItem)
	2283	+ if (source == setMasterItem)
2141	2284	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2285	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2286	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2287	+ Object3D content = Grafreed.clipboard.get(0);
2145	2288
2146	2289	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2290	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2293,13 @@
2150	2293	refreshContents();
2151	2294	}
2152	2295	} else
2153		- if (event.getSource() == poseMeshItem)
	2296	+ if (source == poseMeshItem)
2154	2297	{
2155	2298	if (group.selection.size() == 1)
2156	2299	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2300	+ if (Grafreed.clipboard.size() == 1)
2158	2301	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2302	+ Object3D content = Grafreed.clipboard.get(0);
2160	2303
2161	2304	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2305	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2312,19 @@
2169	2312	}
2170	2313
2171	2314	} else
2172		- if (event.getSource() == revertMeshItem)
	2315	+ if (source == revertMeshItem)
2173	2316	{
2174	2317	RevertMeshes();
2175	2318	} else
2176		- if (event.getSource() == resetMeshItem)
	2319	+ if (source == resetAllItem)
2177	2320	{
2178	2321	ResetAll();
2179	2322	} else
2180		- if (event.getSource() == stepAllItem)
	2323	+ if (source == stepAllItem)
2181	2324	{
2182	2325	StepAll();
2183	2326	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2327	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2328	{
2186	2329	//int indices[] = jList.getSelectedIndices();
2187	2330	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2332,46 @@
2189	2332
2190	2333	ClearSelection(false);
2191	2334	} else
2192		- if (event.getSource() == clearAllItem)
	2335	+ if (source == clearAllItem)
2193	2336	{
2194	2337	ClearSelection(true);
2195	2338	} else
2196		- if (event.getSource() == grabItem)
	2339	+ if (source == grabItem)
2197	2340	{
2198	2341	group(new cGroup(), true);
2199	2342	} else
2200		- if (event.getSource() == hideItem)
	2343	+ if (source == hideItem)
2201	2344	{
2202	2345	group(new HiddenObject());
2203	2346	} else
2204		- if (event.getSource() == frontItem)
	2347	+ if (source == frontItem)
2205	2348	{
2206	2349	front();
2207	2350	} else
2208		- if (event.getSource() == backItem)
	2351	+ if (source == backItem)
2209	2352	{
2210	2353	back();
2211	2354	} else
2212		- if (event.getSource() == cameraItem)
	2355	+ if (source == cameraItem)
2213	2356	{
2214	2357	makeSomething(new Camera());
2215	2358	} else
2216		- if (event.getSource() == compositeItem)
	2359	+ if (source == compositeItem)
2217	2360	{
2218	2361	group(new Composite());
2219	2362	} else
2220		- if (event.getSource() == randomItem)
	2363	+ if (source == randomItem)
2221	2364	{
2222	2365	RandomNode random = new RandomNode();
2223	2366	group(random);
2224	2367	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2368	+ random.name = random.get(0).name + "Switch";
2226	2369	} else
2227		- if (event.getSource() == physicsItem)
	2370	+ if (source == physicsItem)
2228	2371	{
2229	2372	group(new PhysicsNode());
2230	2373	} else
2231		- if (event.getSource() == frameselectorItem)
	2374	+ if (source == frameselectorItem)
2232	2375	{
2233	2376	for (int i=0; i<group.selection.size(); i++)
2234	2377	{
..	..	@@ -2240,7 +2383,7 @@
2240	2383	ResetModel();
2241	2384	refreshContents();
2242	2385	} else
2243		- if (event.getSource() == switchGeoItem)
	2386	+ if (source == switchGeoItem)
2244	2387	{
2245	2388	for (int i=0; i<group.selection.size(); i++)
2246	2389	{
..	..	@@ -2252,7 +2395,7 @@
2252	2395	ResetModel();
2253	2396	refreshContents();
2254	2397	} else
2255		- if (event.getSource() == switchTransfoItem)
	2398	+ if (source == switchTransfoItem)
2256	2399	{
2257	2400	for (int i=0; i<group.selection.size(); i++)
2258	2401	{
..	..	@@ -2264,7 +2407,7 @@
2264	2407	ResetModel();
2265	2408	refreshContents();
2266	2409	} else
2267		- if (event.getSource() == morphItem)
	2410	+ if (source == morphItem)
2268	2411	{
2269	2412	for (int i=0; i<group.selection.size(); i++)
2270	2413	{
..	..	@@ -2276,7 +2419,7 @@
2276	2419	ResetModel();
2277	2420	refreshContents();
2278	2421	} else
2279		- if (event.getSource() == scriptNodeItem)
	2422	+ if (source == scriptNodeItem)
2280	2423	{
2281	2424	boolean atleastone = false;
2282	2425
..	..	@@ -2315,31 +2458,31 @@
2315	2458	}
2316	2459	}
2317	2460	} else
2318		- if (event.getSource() == linkerItem)
	2461	+ if (source == linkerItem)
2319	2462	{
2320	2463	group(new cLinker());
2321	2464	} else
2322		- if (event.getSource() == textureItem)
	2465	+ if (source == textureItem)
2323	2466	{
2324	2467	group(new TextureNode());
2325	2468	} else
2326		- if (event.getSource() == billboardItem)
	2469	+ if (source == billboardItem)
2327	2470	{
2328	2471	group(new BillboardNode());
2329	2472	} else
2330		- if (event.getSource() == shadowXItem)
	2473	+ if (source == shadowXItem)
2331	2474	{
2332	2475	CastShadow(0);
2333	2476	} else
2334		- if (event.getSource() == shadowYItem)
	2477	+ if (source == shadowYItem)
2335	2478	{
2336	2479	CastShadow(1);
2337	2480	} else
2338		- if (event.getSource() == shadowZItem)
	2481	+ if (source == shadowZItem)
2339	2482	{
2340	2483	CastShadow(2);
2341	2484	} else
2342		- if (event.getSource() == ungroupItem)
	2485	+ if (source == ungroupItem)
2343	2486	{
2344	2487	//ungroup();
2345	2488	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2494,187 @@
2351	2494
2352	2495	refreshContents();
2353	2496	} else
2354		- if (event.getSource() == genUVItem)
	2497	+ if (source == genUVItem)
2355	2498	{
2356	2499	GenUV();
2357	2500	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2501	+ if (source == genNormalsCADItem)
2359	2502	{
2360	2503	GenNormals(true);
2361	2504	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2505	+ if (source == genNormalsMESHItem)
2363	2506	{
2364	2507	GenNormals(true); // TODO
2365	2508	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2509	+ if (source == genNormalsORGANItem)
2367	2510	{
2368	2511	GenNormals(false);
2369	2512	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2513	+ if (source == genNormalsMINEItem)
2371	2514	{
2372	2515	GenNormalsMINE();
2373	2516	} else
2374		- if (event.getSource() == stripifyItem)
	2517	+ if (source == stripifyItem)
2375	2518	{
2376	2519	Stripify();
2377	2520	} else
2378		- if (event.getSource() == unstripifyItem)
	2521	+ if (source == unstripifyItem)
2379	2522	{
2380	2523	Unstripify();
2381	2524	} else
2382		- if (event.getSource() == trimItem)
	2525	+ if (source == trimItem)
2383	2526	{
2384	2527	Trim();
2385	2528	} else
2386		- if (event.getSource() == untrimItem)
	2529	+ if (source == untrimItem)
2387	2530	{
2388	2531	Untrim();
2389	2532	} else
2390		- if (event.getSource() == clearColorsItem)
	2533	+ if (source == clearColorsItem)
2391	2534	{
2392	2535	ClearColors();
2393	2536	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2537	+ if (source == clearMaterialsItem)
2395	2538	{
2396	2539	ClearMaterials();
2397	2540	} else
2398		- if (event.getSource() == liveleavesItem)
	2541	+ if (source == liveleavesItem)
2399	2542	{
2400	2543	LiveLeaves(true);
2401	2544	} else
2402		- if (event.getSource() == unliveleavesItem)
	2545	+ if (source == unliveleavesItem)
2403	2546	{
2404	2547	LiveLeaves(false);
2405	2548	} else
2406		- if (event.getSource() == supportleavesItem)
	2549	+ if (source == supportleavesItem)
2407	2550	{
2408	2551	SupportLeaves(true);
2409	2552	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2553	+ if (source == unsupportleavesItem)
2411	2554	{
2412	2555	SupportLeaves(false);
2413	2556	} else
2414		- if (event.getSource() == hideleavesItem)
	2557	+ if (source == hideleavesItem)
2415	2558	{
2416	2559	HideLeaves(true);
2417	2560	} else
2418		- if (event.getSource() == showleavesItem)
	2561	+ if (source == showleavesItem)
2419	2562	{
2420	2563	HideLeaves(false);
2421	2564	} else
2422		- if (event.getSource() == markleavesItem)
	2565	+ if (source == markleavesItem)
2423	2566	{
2424	2567	MarkLeaves(true);
2425	2568	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2569	+ if (source == unmarkleavesItem)
2427	2570	{
2428	2571	MarkLeaves(false);
2429	2572	} else
2430		- if (event.getSource() == flipVItem)
	2573	+ if (source == flipVItem)
2431	2574	{
2432	2575	FlipV(true);
2433	2576	} else
2434		- if (event.getSource() == unflipVItem)
	2577	+ if (source == unflipVItem)
2435	2578	{
2436	2579	FlipV(false);
2437	2580	} else
2438		- if (event.getSource() == lowTexturesItem)
	2581	+ if (source == lowTexturesItem)
2439	2582	{
2440	2583	SetTexRes(0);
2441	2584	} else
2442		- if (event.getSource() == normalTexturesItem)
	2585	+ if (source == normalTexturesItem)
2443	2586	{
2444	2587	SetTexRes(1);
2445	2588	} else
2446		- if (event.getSource() == highTexturesItem)
	2589	+ if (source == highTexturesItem)
2447	2590	{
2448	2591	SetTexRes(2);
2449	2592	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2593	+ if (source == veryhighTexturesItem)
2451	2594	{
2452	2595	SetTexRes(3);
2453	2596	} else
2454		- if (event.getSource() == maxTexturesItem)
	2597	+ if (source == maxTexturesItem)
2455	2598	{
2456	2599	SetTexRes(4);
2457	2600	} else
2458		- if (event.getSource() == panoTexturesItem)
	2601	+ if (source == panoTexturesItem)
2459	2602	{
2460	2603	SetTexRes(5);
2461	2604	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2605	+ if (source == reverseNormalsItem)
2463	2606	{
2464	2607	ReverseNormals();
2465	2608	} else
2466		- if (event.getSource() == parseverticesItem)
	2609	+ if (source == parseverticesItem)
2467	2610	{
2468	2611	ParseVertices();
2469	2612	} else
2470		- if (event.getSource() == textureFieldItem)
	2613	+ if (source == textureFieldItem)
2471	2614	{
2472	2615	TextureVertices();
2473	2616	} else
2474		- if (event.getSource() == alignItem)
	2617	+ if (source == alignItem)
2475	2618	{
2476	2619	Align();
2477	2620	} else
2478		- if (event.getSource() == mirrorItem)
	2621	+ if (source == mirrorItem)
2479	2622	{
2480	2623	MirrorPoses();
2481	2624	} else
2482		- if (event.getSource() == reduceMorphItem)
	2625	+ if (source == reduceMorphItem)
2483	2626	{
2484	2627	MeshReduction(false);
2485	2628	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2629	+ if (source == reduce34MorphItem)
2487	2630	{
2488	2631	MeshReduction(true);
2489	2632	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2633	+ if (source == reverseTrianglesItem)
2491	2634	{
2492	2635	ReverseTriangles();
2493	2636	} else
2494		- if (event.getSource() == reduceMeshItem)
	2637	+ if (source == reduceMeshItem)
2495	2638	{
2496	2639	ReduceMesh(false);
2497	2640	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2641	+ if (source == reduce34MeshItem)
2499	2642	{
2500	2643	ReduceMesh(true);
2501	2644	} else
2502		- if (event.getSource() == increaseMeshItem)
	2645	+ if (source == increaseMeshItem)
2503	2646	{
2504	2647	IncreaseMesh();
2505	2648	} else
2506		- if (event.getSource() == clipMeshItem)
	2649	+ if (source == clipMeshItem)
2507	2650	{
2508	2651	ClipMesh();
2509	2652	} else
2510		- if (event.getSource() == smoothMeshItem)
	2653	+ if (source == smoothMeshItem)
2511	2654	{
2512	2655	SmoothMesh();
2513	2656	} else
2514		- if (event.getSource() == transformgeometryItem)
	2657	+ if (source == transformGeometryItem)
2515	2658	{
2516	2659	TransformGeometry();
2517	2660	} else
2518		- if (event.getSource() == resetTransformItem)
	2661	+ if (source == transformChildrenItem)
	2662	+ {
	2663	+ TransformChildren();
	2664	+ } else
	2665	+ if (source == resetTransformItem)
2519	2666	{
2520	2667	ResetTransform();
2521	2668	} else
2522		- if (event.getSource() == resetCentroidItem)
	2669	+ if (source == resetCentroidItem)
2523	2670	{
2524		- ResetCentroid();
	2671	+ ResetCentroid(true);
2525	2672	} else
2526		- if (event.getSource() == resetParentItem)
	2673	+ if (source == resetCentroidXZItem)
	2674	+ {
	2675	+ ResetCentroid(false);
	2676	+ } else
	2677	+ if (source == resetParentItem)
2527	2678	{
2528	2679	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2680	{
..	..	@@ -2533,7 +2684,7 @@
2533	2684
2534	2685	refreshContents();
2535	2686	} else
2536		- if (event.getSource() == repairParentItem)
	2687	+ if (source == repairParentItem)
2537	2688	{
2538	2689	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2690	{
..	..	@@ -2547,7 +2698,7 @@
2547	2698
2548	2699	refreshContents();
2549	2700	} else
2550		- if (event.getSource() == repairShadowItem)
	2701	+ if (source == repairShadowItem)
2551	2702	{
2552	2703	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2704	{
..	..	@@ -2561,7 +2712,7 @@
2561	2712
2562	2713	refreshContents();
2563	2714	} else
2564		- if (event.getSource() == sortbysizeItem)
	2715	+ if (source == sortbysizeItem)
2565	2716	{
2566	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2718	{
..	..	@@ -2573,7 +2724,7 @@
2573	2724	ResetModel();
2574	2725	refreshContents();
2575	2726	} else
2576		- if (event.getSource() == sortbynameItem)
	2727	+ if (source == sortbynameItem)
2577	2728	{
2578	2729	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2730	{
..	..	@@ -2585,7 +2736,7 @@
2585	2736	ResetModel();
2586	2737	refreshContents();
2587	2738	} else
2588		- if (event.getSource() == attachPigmentItem)
	2739	+ if (source == attachPigmentItem)
2589	2740	{
2590	2741	String texture = GetFile("Attach pigment");
2591	2742	Object3D obj;
..	..	@@ -2597,7 +2748,7 @@
2597	2748
2598	2749	refreshContents();
2599	2750	} else
2600		- if (event.getSource() == detachPigmentItem)
	2751	+ if (source == detachPigmentItem)
2601	2752	{
2602	2753	Object3D obj;
2603	2754	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2759,7 @@
2608	2759
2609	2760	refreshContents();
2610	2761	} else
2611		- if (event.getSource() == attachBumpItem)
	2762	+ if (source == attachBumpItem)
2612	2763	{
2613	2764	String texture = GetFile("Attach bump");
2614	2765	Object3D obj;
..	..	@@ -2620,7 +2771,7 @@
2620	2771
2621	2772	refreshContents();
2622	2773	} else
2623		- if (event.getSource() == detachBumpItem)
	2774	+ if (source == detachBumpItem)
2624	2775	{
2625	2776	Object3D obj;
2626	2777	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2782,7 @@
2631	2782
2632	2783	refreshContents();
2633	2784	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2785	+ if (source == pigmentBumpItem)
2635	2786	{
2636	2787	Object3D obj;
2637	2788	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2793,195 @@
2642	2793
2643	2794	refreshContents();
2644	2795	} else
2645		- if (event.getSource() == flashSelectionButton)
	2796	+ if (source == flashSelectionButton)
2646	2797	{
2647	2798	CameraPane.flash = true;
2648	2799	refreshContents();
2649	2800	} else
2650		- if (event.getSource() == oneButton)
	2801	+ if (source == oneButton)
2651	2802	{
2652	2803	} else
2653		- if (event.getSource() == twoButton)
	2804	+ if (source == twoButton)
2654	2805	{
2655	2806	radio.layout = twoButton;
2656	2807	// bug
2657	2808	//gridPanel.setDividerLocation(1.0);
2658	2809	//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();
	2810	+// bigThree.remove(scenePanel);
	2811	+// bigThree.remove(centralPanel);
	2812	+// bigThree.remove(XYZPanel);
	2813	+// aWindowConstraints.gridx = 0;
	2814	+// aWindowConstraints.gridy = 0;
	2815	+// aWindowConstraints.gridwidth = 1;
	2816	+// // aConstraints.gridheight = 3;
	2817	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2818	+// aWindowConstraints.weightx = 0;
	2819	+// aWindowConstraints.weighty = 1;
	2820	+// //bigThree.add(jtp, aWindowConstraints);
	2821	+// aWindowConstraints.weightx = 1;
	2822	+// aWindowConstraints.gridwidth = 3;
	2823	+// // aConstraints.gridheight = 3;
	2824	+// aWindowConstraints.gridx = 1;
	2825	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2826	+// bigThree.add(centralPanel, aWindowConstraints);
	2827	+// aWindowConstraints.weightx = 0;
	2828	+// aWindowConstraints.gridx = 4;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aConstraints.gridheight = 3;
	2831	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2833	+// scenePanel.setVisible(false);
	2834	+// centralPanel.setVisible(true);
	2835	+// XYZPanel.setVisible(false);
	2836	+ bigThree.ClearUI();
	2837	+ bigThree.add(centralPanel);
	2838	+ bigThree.FlushUI();
2683	2839	} else
2684		- if (event.getSource() == threeButton)
	2840	+ if (source == threeButton)
2685	2841	{
2686	2842	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();
	2843	+
	2844	+// bigThree.remove(scenePanel);
	2845	+// bigThree.remove(centralPanel);
	2846	+// bigThree.remove(XYZPanel);
	2847	+// aWindowConstraints.gridx = 0;
	2848	+// aWindowConstraints.gridy = 0;
	2849	+// aWindowConstraints.gridwidth = 1;
	2850	+// // aConstraints.gridheight = 3;
	2851	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2852	+// aWindowConstraints.weightx = 0;
	2853	+// aWindowConstraints.weighty = 1;
	2854	+// //bigThree.add(jtp, aWindowConstraints);
	2855	+// aWindowConstraints.weightx = 1;
	2856	+// aWindowConstraints.gridwidth = 3;
	2857	+// // aConstraints.gridheight = 3;
	2858	+// aWindowConstraints.gridx = 1;
	2859	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2860	+// bigThree.add(centralPanel, aWindowConstraints);
	2861	+// aWindowConstraints.weightx = 0;
	2862	+// aWindowConstraints.gridx = 4;
	2863	+// aWindowConstraints.gridwidth = 1;
	2864	+// // aConstraints.gridheight = 3;
	2865	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2866	+// bigThree.add(XYZPanel, aWindowConstraints);
	2867	+// bigThree.validate();
	2868	+// scenePanel.setVisible(false);
	2869	+// centralPanel.setVisible(true);
	2870	+// XYZPanel.setVisible(true);
	2871	+ bigThree.ClearUI();
	2872	+ bigThree.add(centralPanel);
	2873	+ bigThree.add(XYZPanel);
	2874	+ bigThree.FlushUI();
2711	2875	} else
2712		- if (event.getSource() == fourButton)
	2876	+ if (source == fourButton)
2713	2877	{
2714	2878	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();
	2879	+
	2880	+// bigThree.remove(scenePanel);
	2881	+// bigThree.remove(centralPanel);
	2882	+// bigThree.remove(XYZPanel);
	2883	+// aWindowConstraints.gridx = 0;
	2884	+// aWindowConstraints.gridy = 0;
	2885	+// aWindowConstraints.gridwidth = 1;
	2886	+// // aWindowConstraints.gridheight = 3;
	2887	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2888	+// aWindowConstraints.weightx = 1;
	2889	+// aWindowConstraints.weighty = 1;
	2890	+// bigThree.add(scenePanel, aWindowConstraints);
	2891	+// aWindowConstraints.weightx = 1;
	2892	+// aWindowConstraints.gridwidth = 3;
	2893	+// // aConstraints.gridheight = 3;
	2894	+// aWindowConstraints.gridx = 1;
	2895	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2896	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2897	+// aWindowConstraints.weightx = 0;
	2898	+// aWindowConstraints.gridx = 4;
	2899	+// aWindowConstraints.gridwidth = 1;
	2900	+// // aWindowConstraints.gridheight = 3;
	2901	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2902	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2903	+// bigThree.validate();
	2904	+// scenePanel.setVisible(true);
	2905	+// centralPanel.setVisible(false);
	2906	+// XYZPanel.setVisible(false);
	2907	+ bigThree.ClearUI();
	2908	+ bigThree.add(scenePanel);
	2909	+ bigThree.FlushUI();
2739	2910	} else
2740		- if (event.getSource() == sixButton)
	2911	+ if (source == sixButton)
2741	2912	{
2742	2913	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();
	2914	+
	2915	+// bigThree.remove(scenePanel);
	2916	+// bigThree.remove(centralPanel);
	2917	+// bigThree.remove(XYZPanel);
	2918	+// aWindowConstraints.gridx = 0;
	2919	+// aWindowConstraints.gridy = 0;
	2920	+// aWindowConstraints.gridwidth = 1;
	2921	+// // aConstraints.gridheight = 3;
	2922	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2923	+// aWindowConstraints.weightx = 0;
	2924	+// aWindowConstraints.weighty = 1;
	2925	+// bigThree.add(scenePanel, aWindowConstraints);
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.gridwidth = 3;
	2928	+// // aWindowConstraints.gridheight = 3;
	2929	+// aWindowConstraints.gridx = 1;
	2930	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2931	+// bigThree.add(centralPanel, aWindowConstraints);
	2932	+// aWindowConstraints.weightx = 0;
	2933	+// aWindowConstraints.gridx = 4;
	2934	+// aWindowConstraints.gridwidth = 1;
	2935	+// // aWindowConstraints.gridheight = 3;
	2936	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2937	+// //bigThree.add(XYZPanel, aConstraints);
	2938	+// bigThree.validate();
	2939	+// scenePanel.setVisible(true);
	2940	+// centralPanel.setVisible(true);
	2941	+// XYZPanel.setVisible(false);
	2942	+ bigThree.ClearUI();
	2943	+ bigThree.add(scenePanel);
	2944	+ bigThree.add(centralPanel);
	2945	+ bigThree.FlushUI();
2767	2946	} else
2768		- if (event.getSource() == sevenButton)
	2947	+ if (source == sevenButton)
2769	2948	{
2770	2949	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();
	2950	+
	2951	+// bigThree.remove(scenePanel);
	2952	+// bigThree.remove(centralPanel);
	2953	+// bigThree.remove(XYZPanel);
	2954	+// aWindowConstraints.gridx = 0;
	2955	+// aWindowConstraints.gridy = 0;
	2956	+// aWindowConstraints.gridwidth = 1;
	2957	+// // aWindowConstraints.gridheight = 3;
	2958	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2959	+// aWindowConstraints.weightx = 0;
	2960	+// aWindowConstraints.weighty = 1;
	2961	+// bigThree.add(scenePanel, aWindowConstraints);
	2962	+// aWindowConstraints.weightx = 1;
	2963	+// aWindowConstraints.gridwidth = 3;
	2964	+// // aWindowConstraints.gridheight = 3;
	2965	+// aWindowConstraints.gridx = 1;
	2966	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2967	+// bigThree.add(centralPanel, aWindowConstraints);
	2968	+// aWindowConstraints.weightx = 0;
	2969	+// aWindowConstraints.gridx = 4;
	2970	+// aWindowConstraints.gridwidth = 1;
	2971	+// // aConstraints.gridheight = 3;
	2972	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2973	+// bigThree.add(XYZPanel, aWindowConstraints);
	2974	+// bigThree.validate();
	2975	+// scenePanel.setVisible(true);
	2976	+// centralPanel.setVisible(true);
	2977	+// XYZPanel.setVisible(true);
	2978	+ bigThree.ClearUI();
	2979	+ bigThree.add(scenePanel);
	2980	+ bigThree.add(centralPanel);
	2981	+ bigThree.add(XYZPanel);
	2982	+ bigThree.FlushUI();
2795	2983	} else
2796		- if (event.getSource() == rootButton)
	2984	+ if (source == rootButton)
2797	2985	{
2798	2986	Object3D obj;
2799	2987	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2805,7 +2993,7 @@
2805	2993
2806	2994	refreshContents(true);
2807	2995	} else
2808		- if (event.getSource() == closeButton)
	2996	+ if (source == closeButton)
2809	2997	{
2810	2998	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	2999	cRadio ab;
..	..	@@ -2826,11 +3014,11 @@
2826	3014	}
2827	3015	refreshContents(true);
2828	3016	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3017	+ if (source == editItem \|\| source == editButton)
2830	3018	{
2831	3019	EditSelection(false);
2832	3020	} else
2833		- if (event.getSource() == uneditButton)
	3021	+ if (source == uneditButton)
2834	3022	{
2835	3023	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3024	{
..	..	@@ -2842,12 +3030,12 @@
2842	3030
2843	3031	child.editWindow = null; // ???????????
2844	3032	}
2845		- objEditor.ctrlPanel.revalidate();
	3033	+ objEditor.ctrlPanel.FlushUI();
2846	3034	//objEditor.jTree.clearSelection();
2847	3035	//objEditor.ResetSliders();
2848	3036	refreshContents(true);
2849	3037	} else
2850		- if (event.getSource() == clearPanelButton)
	3038	+ if (source == clearPanelButton)
2851	3039	{
2852	3040	assert(copy == group);
2853	3041	//copy.ClearUI();
..	..	@@ -2858,7 +3046,7 @@
2858	3046	listUI.clear();
2859	3047	refreshContents(true);
2860	3048	} else
2861		- if (event.getSource() == allParamsButton)
	3049	+ if (source == allParamsButton)
2862	3050	{
2863	3051	assert(copy == group);
2864	3052
..	..	@@ -2879,19 +3067,19 @@
2879	3067
2880	3068	refreshContents(true);
2881	3069	} else
2882		- if (event.getSource() == unselectButton)
	3070	+ if (source == unselectButton)
2883	3071	{
2884	3072	objEditor.jTree.clearSelection();
2885	3073	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3074	objEditor.ResetSliders();
2887	3075	refreshContents(true);
2888	3076	} else
2889		- if(event.getSource() instanceof cRadio)
	3077	+ if(source instanceof cRadio)
2890	3078	{
2891	3079	group.parent = keepparent;
2892	3080	group.attributes = 0;
2893	3081	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3082	+ /cRadio/ radio = (cRadio)source;
2895	3083	Object3D obj = radio.GetObject();
2896	3084	System.out.println("Edit " + obj);
2897	3085	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2911,7 +3099,7 @@
2911	3099	}
2912	3100
2913	3101	copy = group;
2914		- //CameraPane.theRenderer.object = group;
	3102	+ //Globals.theRenderer.object = group;
2915	3103	if(!useclient)
2916	3104	{
2917	3105	cameraView.renderCamera = radio.camera;
..	..	@@ -2926,7 +3114,9 @@
2926	3114	frontView.object = group;
2927	3115	sideView.object = group;
2928	3116	}
2929		- group.editWindow = this;
	3117	+
	3118	+// fix "+" issue group.editWindow = this;
	3119	+
2930	3120	/*
2931	3121	currentLayout = radio.layout;
2932	3122	if (currentLayout == null)
..	..	@@ -2939,7 +3129,20 @@
2939	3129	//group.attributes = -1;
2940	3130	ResetModel();
2941	3131	refreshContents(true);
2942		- }
	3132	+ } else if (event.getSource() == editCameraItem)
	3133	+ {
	3134	+ cameraView.ProtectCamera();
	3135	+ cameraView.repaint();
	3136	+ return;
	3137	+ } else if (event.getSource() == revertCameraItem)
	3138	+ {
	3139	+ cameraView.RevertCamera();
	3140	+ cameraView.repaint();
	3141	+ return;
	3142	+ // } else if (event.getSource() == textureButton)
	3143	+ // {
	3144	+ // return; // true;
	3145	+ }
2943	3146	else
2944	3147	{
2945	3148	//return super.action(event, arg);
..	..	@@ -3000,6 +3203,28 @@
3000	3203	refreshContents();
3001	3204	}
3002	3205
	3206	+ void TransformChildren()
	3207	+ {
	3208	+ Object3D obj;
	3209	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3210	+ {
	3211	+ obj = (Object3D)e.nextElement();
	3212	+ obj.KeepTextureMatrices();
	3213	+ obj.TransformChildren();
	3214	+ obj.RestoreTextureMatrices();
	3215	+
	3216	+// if (obj.parent == null)
	3217	+// {
	3218	+// System.out.println("NULL PARENT!");
	3219	+// new Exception().printStackTrace();
	3220	+// }
	3221	+// else
	3222	+// TouchTransform(obj);
	3223	+// //obj.parent.Touch();
	3224	+ }
	3225	+
	3226	+ refreshContents();
	3227	+ }
3003	3228
3004	3229	void ResetTransform()
3005	3230	{
..	..	@@ -3112,7 +3337,7 @@
3112	3337	refreshContents();
3113	3338	}
3114	3339
3115		- void ResetCentroid()
	3340	+ void ResetCentroid(boolean full)
3116	3341	{
3117	3342	Object3D obj;
3118	3343	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +3352,16 @@
3127	3352	LA.matIdentity(Object3D.mat);
3128	3353	obj.getBounds(minima, maxima, false);
3129	3354	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3355	+ if (full)
	3356	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	3357	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	3358	obj.TransformMesh(Object3D.mat);
	3359	+
3133	3360	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3361	+ if (full)
	3362	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	3363	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3364	+
3136	3365	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	3366	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	3367	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3198,9 +3427,9 @@
3198	3427	obj = (Object3D)e.nextElement();
3199	3428
3200	3429	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	3430	+ Grafreed.AnalyzeObject(obj);
3202	3431	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	3432	+ Grafreed.AnalyzeObject(obj.bRep);
3204	3433
3205	3434	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	3435	}
..	..	@@ -3414,8 +3643,8 @@
3414	3643
3415	3644	void ParseVertices()
3416	3645	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	3646	+ boolean epsequal = Grafreed.epsequal;
	3647	+ Grafreed.epsequal = true;
3419	3648
3420	3649	for (int i=0; i<group.selection.size(); i++)
3421	3650	{
..	..	@@ -3440,7 +3669,7 @@
3440	3669	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	3670	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	3671
3443		- g.add(GrafreeD.clipboard);
	3672	+ g.add(Grafreed.clipboard);
3444	3673
3445	3674	buffer.add(g);
3446	3675	}
..	..	@@ -3455,7 +3684,7 @@
3455	3684	makeSomething(buffer, i==group.selection.size()-1);
3456	3685	}
3457	3686
3458		- GrafreeD.epsequal = epsequal;
	3687	+ Grafreed.epsequal = epsequal;
3459	3688
3460	3689	refreshContents();
3461	3690	}
..	..	@@ -3473,7 +3702,16 @@
3473	3702	String pigment = Object3D.GetPigment(tex);
3474	3703	//String bump = Object3D.GetBump(tex);
3475	3704
3476		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3705	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3706	+
	3707	+ try
	3708	+ {
	3709	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3710	+ }
	3711	+ catch (Exception e)
	3712	+ {
	3713	+ System.err.println("FAIL: " + node);
	3714	+ }
3477	3715
3478	3716	double s = v.s;
3479	3717
..	..	@@ -3561,11 +3799,11 @@
3561	3799
3562	3800	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	3801
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	3802	+ boolean random = CameraPane.SWITCH;
	3803	+ CameraPane.SWITCH = false; // parse all random nodes
3566	3804	lowres.linkVerticesThis(null);
3567	3805	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	3806	+ CameraPane.SWITCH = random;
3569	3807
3570	3808	System.err.flush();
3571	3809
..	..	@@ -3605,7 +3843,7 @@
3605	3843	return;
3606	3844
3607	3845	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	3846	+ Object3D ref = Grafreed.clipboard.get(0);
3609	3847
3610	3848	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	3849
..	..	@@ -3774,7 +4012,7 @@
3774	4012	group.selection.RelinkToSupport(); // july 2014
3775	4013	System.out.println("DONE.");
3776	4014	refreshContents();
3777		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4015	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3778	4016	}
3779	4017
3780	4018	void ReduceMesh(boolean reduction34)
..	..	@@ -3799,9 +4037,9 @@
3799	4037
3800	4038	void ClipMesh()
3801	4039	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4040	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4041	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4042	+ Object3D content = Grafreed.clipboard.get(0);
3805	4043
3806	4044	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4045	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4048,7 @@
3810	4048	// {
3811	4049	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4050	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4051	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4052	}
3815	4053	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4054	System.out.println("DONE.");
..	..	@@ -3945,7 +4183,7 @@
3945	4183	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4184
3947	4185	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4186	+ if(elem != group \|\| !newWindow)
3949	4187	{
3950	4188	// if (!(elem instanceof Composite))
3951	4189	// newWindow = false;
..	..	@@ -4050,12 +4288,12 @@
4050	4288	System.err.println("info : " + child.GetPath());
4051	4289	}
4052	4290	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	4291	+// else
	4292	+// {
	4293	+// objEditor.SetMaterial(group); // .GetMaterial());
	4294	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4295	+// System.err.println("info : " + group.GetPath());
	4296	+// }
4059	4297
4060	4298	objEditor.SetText(); // jan 2014
4061	4299
..	..	@@ -4066,9 +4304,9 @@
4066	4304	// a camera
4067	4305	{
4068	4306	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;
	4307	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4308	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4309	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	4310	}
4073	4311
4074	4312	refreshContents();
..	..	@@ -4150,12 +4388,12 @@
4150	4388	{
4151	4389	if (group.selection.isEmpty())
4152	4390	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	4391	+ Grafreed.clipboardIsTempGroup = false;
4154	4392	Composite tGroup = null;
4155	4393	if (group.selection.size() > 0) // 1)
4156	4394	{
4157	4395	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	4396	+ Grafreed.clipboardIsTempGroup = true;
4159	4397	}
4160	4398
4161	4399	if (cut)
..	..	@@ -4195,16 +4433,16 @@
4195	4433	//System.out.println("cut " + child);
4196	4434	//System.out.println("parent = " + child.parent);
4197	4435	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4199	4437	tGroup.add/Child/(tmp);
4200	4438	else
4201		- GrafreeD.clipboard = tmp;
	4439	+ Grafreed.clipboard = tmp;
4202	4440	}
4203	4441	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	4442	+ if (Grafreed.clipboardIsTempGroup)
4205	4443	tGroup.add/Child/(child);
4206	4444	else
4207		- GrafreeD.clipboard = child;
	4445	+ Grafreed.clipboard = child;
4208	4446	}
4209	4447
4210	4448	//ResetModel();
..	..	@@ -4236,21 +4474,21 @@
4236	4474	//System.out.println("cut " + elem);
4237	4475	//System.out.println("parent = " + elem.parent);
4238	4476	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	4477	+ if (Grafreed.clipboardIsTempGroup)
4240	4478	tGroup.add/Child/(tmp);
4241	4479	else
4242		- GrafreeD.clipboard = tmp;
	4480	+ Grafreed.clipboard = tmp;
4243	4481	}
4244	4482	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	4483	+ if (Grafreed.clipboardIsTempGroup)
4246	4484	tGroup.add/Child/(child);
4247	4485	else
4248		- GrafreeD.clipboard = child;
	4486	+ Grafreed.clipboard = child;
4249	4487	}
4250	4488
4251	4489	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	4490	+ if (Grafreed.clipboardIsTempGroup)
	4491	+ Grafreed.clipboard = tGroup;
4254	4492	if (cut)
4255	4493	{
4256	4494	ResetModel();
..	..	@@ -4264,7 +4502,7 @@
4264	4502	// return;
4265	4503	boolean first = true;
4266	4504
4267		- if (GrafreeD.clipboardIsTempGroup)
	4505	+ if (Grafreed.clipboardIsTempGroup)
4268	4506	{
4269	4507	Composite temp;
4270	4508
..	..	@@ -4275,7 +4513,7 @@
4275	4513	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	4514	*/
4277	4515	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4516	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	4517	{
4280	4518	Object3D child = (Object3D)e.nextElement();
4281	4519
..	..	@@ -4309,21 +4547,21 @@
4309	4547	//Object3D cb = Applet3D.clipboard;
4310	4548	//temp.addChild(cb);
4311	4549	//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());
	4550	+ assert(Grafreed.clipboard.parent == null);
	4551	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4552	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4553	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4554	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	4555	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	4556	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4557	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	4558	}
4321	4559
4322	4560	ResetModel();
4323	4561	refreshContents();
4324	4562	}
4325	4563
4326		- void pasteInto(boolean copyit)
	4564	+ void pasteInto(boolean copyit, boolean clone)
4327	4565	{
4328	4566	// if (GrafreeD.clipboard == null)
4329	4567	// return;
..	..	@@ -4352,15 +4590,22 @@
4352	4590	if (copyit)
4353	4591	{
4354	4592	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	4593	+ if (clone)
	4594	+ {
	4595	+ CloneClipboard(false); // sept 2014
	4596	+ }
	4597	+ else
	4598	+ {
	4599	+ paste(false);
	4600	+ }
4356	4601	}
4357	4602	else
4358	4603	{
4359	4604	boolean first = true;
4360	4605
4361		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4362	4607	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	4608	+ Composite temp = (Composite)Grafreed.clipboard;
4364	4609	Object3D copy;
4365	4610	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	4611	{
..	..	@@ -4370,7 +4615,7 @@
4370	4615	}
4371	4616	} else
4372	4617	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	4618	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	4619	}
4375	4620	}
4376	4621	}
..	..	@@ -4775,21 +5020,6 @@
4775	5020	}
4776	5021	*/
4777	5022
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	5023	/*
4794	5024	public void Callback(Object obj)
4795	5025	{
..	..	@@ -4813,26 +5043,9 @@
4813	5043	}
4814	5044	*/
4815	5045
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	5046	String GetFile(String dialogName)
4834	5047	{
4835		- if (GrafreeD.standAlone)
	5048	+ if (Grafreed.standAlone)
4836	5049	{
4837	5050	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5051	browser.show();
..	..	@@ -4896,10 +5109,12 @@
4896	5109	cButton flashSelectionButton;
4897	5110	cButton editButton;
4898	5111	cButton uneditButton;
	5112	+ JCheckBox allParamsButton;
4899	5113	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5114	cButton unselectButton;
4902	5115
	5116	+ cButton oneStepButton;
	5117	+
4903	5118	cButton screenfitButton;
4904	5119	cButton screenfitpointButton;
4905	5120	cButton snapobjectButton;
..	..	@@ -4943,7 +5158,7 @@
4943	5158	private MenuItem linkverticesItem;
4944	5159	private MenuItem relinkverticesItem;
4945	5160	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	5161	+ private MenuItem resetAllItem;
4947	5162	private MenuItem stepAllItem;
4948	5163	private MenuItem revertMeshItem;
4949	5164	private MenuItem poseMeshItem;
..	..	@@ -4954,6 +5169,7 @@
4954	5169	private MenuItem mergeGeometriesItem;
4955	5170	private MenuItem copyItem;
4956	5171	private MenuItem pasteItem;
	5172	+ private MenuItem pasteIntoItem;
4957	5173	private MenuItem pasteLinkItem;
4958	5174	private MenuItem pasteCloneItem;
4959	5175	private MenuItem pasteExpandItem;
..	..	@@ -5003,8 +5219,10 @@
5003	5219	private MenuItem panoTexturesItem;
5004	5220
5005	5221	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	5222	+ private MenuItem resetCentroidXZItem;
5007	5223	private MenuItem resetTransformItem;
	5224	+ private MenuItem transformGeometryItem;
	5225	+ private MenuItem transformChildrenItem;
5008	5226	private MenuItem hideItem;
5009	5227	private MenuItem grabItem;
5010	5228	private MenuItem backItem;
..	..	@@ -5051,7 +5269,7 @@
5051	5269	private MenuItem blobItem;
5052	5270	private MenuItem latheItem;
5053	5271	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	5272	+ private MenuItem overlayItem;
5055	5273	private MenuItem meshItem;
5056	5274	// private MenuItem meshGroupItem;
5057	5275	private MenuItem springItem;
..	..	@@ -5073,11 +5291,6 @@
5073	5291	private MenuItem doubleItem;
5074	5292	private MenuItem tripleItem;
5075	5293
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	5294	private MenuItem computeAOItem;
5082	5295	private MenuItem recompileItem;
5083	5296	private MenuItem editScriptItem;
..	..	@@ -5087,4 +5300,8 @@
5087	5300	private MenuItem analyzeItem;
5088	5301	private MenuItem dumpItem;
5089	5302	//boolean freezemodel = false;
	5303	+
	5304	+ Menu cameraMenu;
	5305	+ MenuItem editCameraItem;
	5306	+ MenuItem revertCameraItem;
5090	5307	}