~nbriere/GrafreeD.git - Noware Git Repository

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