~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,17 +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);
	319	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	320	+ relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
222	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	325	setMasterItem.addActionListener(this);
	326	+ }
224	327
225	328	oe.menuBar.add(menu = new Menu("Group"));
226	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +334,38 @@
231	334	frontItem.addActionListener(this);
232	335	compositeItem = menu.add(new MenuItem("Composite"));
233	336	compositeItem.addActionListener(this);
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	338	+ hideItem.addActionListener(this);
	339	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	340	+ ungroupItem.addActionListener(this);
234	341	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
236	343	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	345	switchGeoItem.addActionListener(this);
243	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	347	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	359	scriptNodeItem.addActionListener(this);
249	360	cameraItem = menu.add(new MenuItem("Camera"));
250	361	cameraItem.addActionListener(this);
	362	+ }
251	363
252	364	oe.menuBar.add(menu = new Menu("Object"));
253	365	textureItem = menu.add(new MenuItem("Texture"));
254	366	textureItem.addActionListener(this);
	367	+ billboardItem = menu.add(new MenuItem("Billboard"));
	368	+ billboardItem.addActionListener(this);
255	369	csgItem = menu.add(new MenuItem("CSG"));
256	370	csgItem.addActionListener(this);
257	371	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +374,29 @@
260	374	shadowYItem.addActionListener(this);
261	375	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
263	380	linkerItem = menu.add(new MenuItem("Linker"));
264	381	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	382	attributeItem = menu.add(new MenuItem("Attribute"));
268	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
269	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	387	pointflowItem.addActionListener(this);
	388	+ }
271	389	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	391	resetTransformItem.addActionListener(this);
276	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	393	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	400
281	401	oe.menuBar.add(menu = new Menu("Geometry"));
282	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +407,11 @@
287	407	genNormalsCADItem.addActionListener(this);
288	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
290	415	stripifyItem = menu.add(new MenuItem("Stripify"));
291	416	stripifyItem.addActionListener(this);
292	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +433,34 @@
308	433	reduce34MeshItem.addActionListener(this);
309	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	435	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
315	444
316	445	oe.menuBar.add(menu = new Menu("Attributes"));
317	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	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);
319	452	menu.add("-");
320	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	454	liveleavesItem.addActionListener(this);
322	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
324	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	460	supportleavesItem.addActionListener(this);
326	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	462	unsupportleavesItem.addActionListener(this);
	463	+ }
328	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	465	hideleavesItem.addActionListener(this);
330	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -368,29 +504,22 @@
368	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	505	sortbynameItem.addActionListener(this);
370	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.
371	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	515	extractGeometriesItem.addActionListener(this);
373	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	517	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	518	+ }
379	519
380	520	oe.menuBar.add(menu = new Menu("Insert"));
381	521	buildCreateMenu(menu);
382	522
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	523	oe.menuBar.add(menu = new Menu("Tools"));
395	524	buildToolsMenu(menu);
396	525	}
..	..	@@ -425,150 +554,98 @@
425	554	oe.radioPanel.add(dummyButton);
426	555	oe.buttonGroup.add(dummyButton);
427	556	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	557	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	558
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	559	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	560	+ liveCB.setToolTipText("Enable animation");
433	561	liveCB.addItemListener(this);
434	562
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	564	+ oneStepButton.setToolTipText("Animate one step forward");
	565	+ oneStepButton.addActionListener(this);
	566	+
	567	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	568	+ fastCB.setToolTipText("Fast mode");
453	569	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	570	+
	571	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	572	+ trackCB.setToolTipText("Enable tracking");
495	573	trackCB.addItemListener(this);
496	574
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	576	+ screenfitButton.setToolTipText("Screen fit");
499	577	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	578	+
501	579	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	580	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	581
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	582	+ if (Globals.ADVANCED)
	583	+ {
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ snapobjectButton.addActionListener(this);
	586	+ snapobjectButton.setToolTipText("Snap Object");
	587	+ }
	588	+
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ flashSelectionButton.setToolTipText("Show selection");
514	591	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	592
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	594	+
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ twoButton.setToolTipText("Show center view only");
521	597	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	599	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	600	+ fourButton.setToolTipText("Show left panel only");
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ sixButton.setToolTipText("2-column layout left");
525	603	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ threeButton.setToolTipText("2-column layout right");
527	606	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ sevenButton.setToolTipText("3-column layout");
529	609	sevenButton.addActionListener(this);
530	610	//
531	611
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ rootButton.setToolTipText("Edit selection in new tab");
533	614	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ closeButton.setToolTipText("Close tab");
536	618	closeButton.addActionListener(this);
537	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	620	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	621
541		- oe.aConstraints.gridx = 1; //
542		- 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");
543	626	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	627
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ uneditButton.setToolTipText("Unedit selection");
549	630	uneditButton.addActionListener(this);
550	631
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- 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");
563	634	allParamsButton.addActionListener(this);
564	635
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- 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");
570	642	unselectButton.addActionListener(this);
571	643
	644	+ commandsPanel.preferredHeight = 1;
	645	+
	646	+ oe.treePanel.add(commandsPanel);
	647	+ oe.treePanel.Return();
	648	+
572	649	// oe.aConstraints.gridx += 1;
573	650	// oe.aConstraints.weighty = 0;
574	651	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +657,37 @@
580	657	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	658	// gcButton.addActionListener(this);
582	659
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	660	+ cGridBag jSPPanel = new cGridBag();
	661	+
	662	+ JScrollPane jSP;
594	663	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- 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);
596	665	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	666	+
	667	+ oe.treePanel.add(jSPPanel);
	668	+ oe.treePanel.Return();
601	669
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- 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");
606	674	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- 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");
609	678	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- 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");
612	682	textureCB.addItemListener(this);
613	683
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	684	+ copyOptionsPanel.preferredHeight = 1;
	685	+ oe.treePanel.add(copyOptionsPanel);
	686	+ oe.treePanel.Return();
616	687
	688	+// mainPanel.setDividerLocation(0.5); //1.0);
	689	+// mainPanel.setResizeWeight(0.5);
	690	+
617	691	//jList.addListSelectionListener(this);
618	692	oe.jTree.addTreeSelectionListener(this);
619	693	//jTree.setRootVisible(false);
..	..	@@ -635,18 +709,91 @@
635	709	radio.layout = sevenButton;
636	710	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	711	}
	712	+
	713	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	714	+ {
	715	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	716	+ boxCB.setToolTipText("Display bounding boxes");
	717	+ boxCB.addItemListener(this);
	718	+
	719	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	720	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	721	+ zoomBoxCB.addItemListener(this);
	722	+
	723	+ if (true) // Globals.ADVANCED)
	724	+ {
	725	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	726	+ supportCB.setToolTipText("Enable rigging");
	727	+ supportCB.addItemListener(this);
	728	+
	729	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	730	+ // localCB.addItemListener(this);
	731	+
	732	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	733	+ crowdCB.setToolTipText("Used for crowds");
	734	+ crowdCB.addItemListener(this);
	735	+
	736	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	737	+ smoothCB.setToolTipText("Snapping delay");
	738	+ smoothCB.addItemListener(this);
	739	+
	740	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	741	+ slowCB.setToolTipText("Smooth interpolation");
	742	+ slowCB.addItemListener(this);
	743	+
	744	+// constraints.gridy += 1;
	745	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	746	+// speakerMocapCB.addItemListener(this);
	747	+
	748	+ if (false)
	749	+ {
	750	+ // handled in scripts
	751	+ //constraints.gridy += 1;
	752	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	753	+ speakerCameraCB.addItemListener(this);
	754	+
	755	+ //constraints.gridy += 1;
	756	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	757	+ speakerFocusCB.addItemListener(this);
	758	+
	759	+ //constraints.gridy += 1;
	760	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	761	+ smoothfocusCB.addItemListener(this);
	762	+ }
	763	+
	764	+//constraints.gridx += 1;
	765	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	766	+// debugCB.addItemListener(this);
	767	+
	768	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	769	+ oeilCB.addItemListener(this);
	770	+
	771	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	772	+ lookAtCB.setToolTipText("Look-at target");
	773	+ lookAtCB.addItemListener(this);
	774	+
	775	+ }
	776	+
	777	+ cGridBag fill = new cGridBag();
	778	+
	779	+ fill.preferredHeight = 200;
	780	+
	781	+ panel.add(fill);
	782	+
	783	+ }
638	784
639	785	void EditObject(Object3D obj)
640	786	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	787	+ cRadio radioButton = new cRadio(obj.name);
	788	+ radioButton.SetObject(obj);
	789	+ radioButton.layout = sevenButton;
	790	+ radioButton.SetCamera(cameraView.renderCamera, false);
	791	+ radioButton.addActionListener(this);
	792	+ radioPanel.add(radioButton);
	793	+ buttonGroup.add(radioButton);
	794	+ radioButton.doClick();
649	795	}
	796	+
650	797	void SetupViews(ObjEditor oe)
651	798	{
652	799	oe.SetupViews();
..	..	@@ -665,6 +812,7 @@
665	812	JCheckBox fastCB;
666	813	JCheckBox slowCB;
667	814	JCheckBox boxCB;
	815	+ JCheckBox zoomBoxCB;
668	816	JCheckBox trackCB;
669	817	JCheckBox smoothfocusCB;
670	818	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +855,7 @@
707	855	dropAttributes \|= Object3D.TEXTURE;
708	856	else
709	857	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	858	+ } else if(e.getSource() == liveCB)
712	859	{
713	860	cameraView.ToggleLive();
714	861	}
..	..	@@ -745,6 +892,10 @@
745	892	Recompile();
746	893	cameraView.repaint();
747	894	// refreshContents();
	895	+ }
	896	+ else if(e.getSource() == zoomBoxCB)
	897	+ {
	898	+ cameraView.ToggleZoomBoxMode();
748	899	}
749	900	else if(e.getSource() == smoothfocusCB)
750	901	{
..	..	@@ -859,7 +1010,9 @@
859	1010	// objEditor.DropFile((java.io.File[]) object, true);
860	1011	// return;
861	1012	// }
862		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1016	{
864	1017	// file(s)
865	1018	String[] names = string.split("\n");
..	..	@@ -886,7 +1039,7 @@
886	1039
887	1040	flashIt = false;
888	1041	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1044
892	1045	if (group.selection.size() == 1)
..	..	@@ -913,11 +1066,11 @@
913	1066	{
914	1067	loadClipboard(true);
915	1068	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	1069	+ pasteInto(false, false);
917	1070	} else {
918	1071	loadClipboard(false);
919	1072	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1073	+ pasteInto(false, false); // true); // ???
921	1074	}
922	1075	}
923	1076	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1188,37 @@
1035	1188	torusItem.addActionListener(this);
1036	1189	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1190	superItem.addActionListener(this);
	1191	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1192	+ kleinItem.addActionListener(this);
1038	1193	particleItem = menu.add(new MenuItem("Particle system"));
1039	1194	particleItem.addActionListener(this);
	1195	+ if (Globals.ADVANCED)
	1196	+ {
1040	1197	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1198	ragdollItem.addActionListener(this);
1042	1199	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1200	ragdoll2Item.addActionListener(this);
	1201	+ }
1044	1202	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1203	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1204	meshItem.addActionListener(this);
1047	1205	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1206	// meshGroupItem.addActionListener(this);
	1207	+ if (Globals.ADVANCED)
	1208	+ {
1049	1209	springItem = menu.add(new MenuItem("Spring"));
1050	1210	springItem.addActionListener(this);
1051	1211	flagItem = menu.add(new MenuItem("Flag"));
1052	1212	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1213	blobItem = menu.add(new MenuItem("Blob"));
1058	1214	blobItem.addActionListener(this);
1059	1215	latheItem = menu.add(new MenuItem("Lathe"));
1060	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);
1061	1222	lightItem = menu.add(new MenuItem("Light"));
1062	1223	lightItem.addActionListener(this);
1063	1224	menu.add("-");
..	..	@@ -1067,34 +1228,39 @@
1067	1228	loopItem.addActionListener(this);
1068	1229	doubleItem = menu.add(new MenuItem("Fork"));
1069	1230	doubleItem.addActionListener(this);
	1231	+ if (Globals.ADVANCED)
	1232	+ {
1070	1233	tripleItem = menu.add(new MenuItem("Trident"));
1071	1234	tripleItem.addActionListener(this);
	1235	+ }
1072	1236	}
1073	1237
1074	1238	void buildToolsMenu(Menu menu)
1075	1239	{
1076	1240	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1241	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1242	+ animationItem.setState(Globals.ANIMATION);
1079	1243
1080	1244	menu.add("-");
1081	1245	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1246	parseverticesItem.addActionListener(this);
1083	1247	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1248	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1250	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1252	reduceMorphItem.addActionListener(this);
1091	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1254	reduce34MorphItem.addActionListener(this);
1093		-
	1255	+ menu.add("-");
1094	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1257	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1258
	1259	+ if (Globals.ADVANCED)
	1260	+ {
	1261	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1262	+ mirrorItem.addActionListener(this);
	1263	+ menu.add("-");
1098	1264	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1265	memoryItem.addActionListener(this);
1100	1266	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1108,6 +1274,8 @@
1108	1274	resetParentItem.addActionListener(this);
1109	1275	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1276	repairParentItem.addActionListener(this);
	1277	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1278	+ repairShadowItem.addActionListener(this);
1111	1279	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1280	invariantsItem.addActionListener(this);
1113	1281	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1283,7 @@
1115	1283	menu.add("-");
1116	1284	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1285	editScriptItem.addActionListener(this);
	1286	+ }
1118	1287	}
1119	1288
1120	1289	void ScreenFit()
..	..	@@ -1443,9 +1612,9 @@
1443	1612
1444	1613	void Overwrite(int mask)
1445	1614	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1616	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1449	1618
1450	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1620	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1637,7 @@
1468	1637	//
1469	1638	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1639	{
	1640	+ Object source = event.getSource();
1471	1641	/*
1472	1642	if (event.getSource() == nameField)
1473	1643	{
..	..	@@ -1479,11 +1649,11 @@
1479	1649	}
1480	1650	else
1481	1651	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1652	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1653	{
1484	1654	ScreenFit();
1485	1655	} else
1486		- if (event.getSource() == switchItem)
	1656	+ if (source == switchItem)
1487	1657	{
1488	1658	cVector v1 = new cVector();
1489	1659	cVector v2 = new cVector();
..	..	@@ -1492,11 +1662,11 @@
1492	1662	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1663	objEditor.cameraView.repaint();
1494	1664	} else
1495		- if (event.getSource() == rectoidItem)
	1665	+ if (source == rectoidItem)
1496	1666	{
1497	1667	makeSomething(new Box());
1498	1668	} else
1499		- if (event.getSource() == particleItem)
	1669	+ if (source == particleItem)
1500	1670	{
1501	1671	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1672	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1687,9 @@
1517	1687	applyExample(particleGeom, "SMOKE");
1518	1688	makeSomething(particleGeom);
1519	1689	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1690	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1691	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1692	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1693
1524	1694	ragdoll.toParent = LA.newMatrix();
1525	1695	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1707,7 @@
1537	1707	} else
1538	1708	/*
1539	1709	*/
1540		- if (event.getSource() == heightFieldItem)
	1710	+ if (source == heightFieldItem)
1541	1711	{
1542	1712	Object3D obj = new Object3D();
1543	1713
..	..	@@ -1575,27 +1745,31 @@
1575	1745
1576	1746	makeSomething(obj);
1577	1747	} else
1578		- if (event.getSource() == gridItem)
	1748	+ if (source == gridItem)
1579	1749	{
1580	1750	makeSomething(new Grid());
1581	1751	} else
1582		- if (event.getSource() == ellipsoidItem)
	1752	+ if (source == ellipsoidItem)
1583	1753	{
1584	1754	makeSomething(new Sphere());
1585	1755	} else
1586		- if (event.getSource() == coneItem)
	1756	+ if (source == coneItem)
1587	1757	{
1588	1758	makeSomething(new Cone());
1589	1759	} else
1590		- if (event.getSource() == torusItem)
	1760	+ if (source == torusItem)
1591	1761	{
1592	1762	makeSomething(new Torus());
1593	1763	} else
1594		- if (event.getSource() == superItem)
	1764	+ if (source == superItem)
1595	1765	{
1596	1766	makeSomething(new Superellipsoid());
1597	1767	} else
1598		- if (event.getSource() == blobItem)
	1768	+ if (source == kleinItem)
	1769	+ {
	1770	+ makeSomething(new Klein());
	1771	+ } else
	1772	+ if (source == blobItem)
1599	1773	{
1600	1774	Blob blob = new Blob();
1601	1775	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1777,15 @@
1603	1777	//blob.retile();
1604	1778	makeSomething(blob);
1605	1779	} else
1606		- if (event.getSource() == latheItem)
	1780	+ if (source == latheItem)
1607	1781	{
1608	1782	makeSomething(new Lathe());
1609	1783	} else
1610		- if (event.getSource() == bezierItem)
	1784	+ if (source == bezierItem)
1611	1785	{
1612	1786	makeSomething(new BezierSurface());
1613	1787	} else
1614		- if (event.getSource() == checkerItem)
	1788	+ if (source == overlayItem)
1615	1789	{
1616	1790	/*
1617	1791	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1800,7 @@
1626	1800	*/
1627	1801	makeSomething(new Checker());
1628	1802	} else
1629		- if (event.getSource() == meshItem)
	1803	+ if (source == meshItem)
1630	1804	{
1631	1805	Object3D itemtomake = new Object3D();
1632	1806	Object3D child;
..	..	@@ -1647,35 +1821,35 @@
1647	1821	makeSomething(child);
1648	1822	}
1649	1823	} else
1650		- if (event.getSource() == springItem)
	1824	+ if (source == springItem)
1651	1825	{
1652	1826	cSpring s = new cSpring();
1653	1827	s.setup();
1654	1828	makeSomething(s);
1655	1829	} else
1656		- if (event.getSource() == flagItem)
	1830	+ if (source == flagItem)
1657	1831	{
1658	1832	cSpring s = new cFlag();
1659	1833	s.setup();
1660	1834	makeSomething(s);
1661	1835	} else
1662		- if (event.getSource() == lightItem)
	1836	+ if (source == lightItem)
1663	1837	{
1664	1838	makeSomething(new Light());
1665	1839	} else
1666		- if (event.getSource() == csgItem)
	1840	+ if (source == csgItem)
1667	1841	{
1668	1842	group(new CSG());
1669	1843	} else
1670		- if (event.getSource() == templateItem)
	1844	+ if (source == templateItem)
1671	1845	{
1672	1846	group(new cTemplate());
1673	1847	} else
1674		- if (event.getSource() == attributeItem)
	1848	+ if (source == attributeItem)
1675	1849	{
1676	1850	makeSomething(new Attribute());
1677	1851	} else
1678		- if (event.getSource() == pointflowItem)
	1852	+ if (source == pointflowItem)
1679	1853	{
1680	1854	makeSomething(new PointFlow());
1681	1855	} else
..	..	@@ -1687,7 +1861,7 @@
1687	1861	} else
1688	1862	*/
1689	1863
1690		- if (event.getSource() == superLoopItem)
	1864	+ if (source == superLoopItem)
1691	1865	{
1692	1866	Composite g = new cGroup();
1693	1867	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1883,7 @@
1709	1883
1710	1884	group(g);
1711	1885	} else
1712		- if (event.getSource() == loopItem)
	1886	+ if (source == loopItem)
1713	1887	{
1714	1888	Composite csg = new GroupLeaf();
1715	1889	csg.count = 5;
..	..	@@ -1718,7 +1892,7 @@
1718	1892	csg.addChild(child);
1719	1893	child.addChild(csg);
1720	1894	} else
1721		- if (event.getSource() == doubleItem)
	1895	+ if (source == doubleItem)
1722	1896	{
1723	1897	Composite csg = new GroupLeaf();
1724	1898	csg.count = 5;
..	..	@@ -1730,7 +1904,7 @@
1730	1904	csg.addChild(child);
1731	1905	child.addChild(csg);
1732	1906	} else
1733		- if (event.getSource() == tripleItem)
	1907	+ if (source == tripleItem)
1734	1908	{
1735	1909	Composite csg = new GroupLeaf();
1736	1910	csg.count = 4;
..	..	@@ -1745,71 +1919,59 @@
1745	1919	csg.addChild(child);
1746	1920	child.addChild(csg);
1747	1921	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	1922	+ if (source == computeAOItem)
1750	1923	{
1751		- ImportGFD();
	1924	+ Globals.drawMode = CameraPane.OCCLUSION;
	1925	+ Globals.theRenderer.repaint();
1752	1926	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	1927	+ if (source == recompileItem)
1771	1928	{
1772	1929	Recompile();
1773	1930	refreshContents();
1774	1931	} else
1775		- if (event.getSource() == editScriptItem)
	1932	+ if (source == editScriptItem)
1776	1933	{
1777	1934	OpenDialog();
1778	1935	refreshContents();
1779	1936	} else
1780		- if (event.getSource() == invariantsItem)
	1937	+ if (source == invariantsItem)
1781	1938	{
1782	1939	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1784	1941	} else
1785		- if (event.getSource() == memoryItem)
	1942	+ if (source == memoryItem)
1786	1943	{
1787	1944	//System.out.println("Invariants:");
1788	1945	PrintMemory();
1789	1946	} else
1790		- if (event.getSource() == pathItem)
	1947	+ if (source == pathItem)
1791	1948	{
1792	1949	PrintPath();
1793	1950	} else
1794		- if (event.getSource() == analyzeItem)
	1951	+ if (source == analyzeItem)
1795	1952	{
1796	1953	AnalyzeObject();
1797	1954	} else
1798		- if (event.getSource() == dumpItem)
	1955	+ if (source == dumpItem)
1799	1956	{
1800	1957	DumpObject();
1801	1958	} else
1802		- if (event.getSource() == screenfitButton)
	1959	+ if (source == oneStepButton)
	1960	+ {
	1961	+ Globals.ONESTEP = true;
	1962	+ cameraView.repaint();
	1963	+ } else
	1964	+ if (source == screenfitButton)
1803	1965	{
1804	1966	//Reload(lastConverter, lastFilename, true);
1805	1967	ScreenFit();
1806	1968	} else
1807		- if (event.getSource() == screenfitpointButton)
	1969	+ if (source == screenfitpointButton)
1808	1970	{
1809	1971	//Reload(lastConverter, lastFilename, true);
1810	1972	ScreenFitPoint();
1811	1973	} else
1812		- if (event.getSource() == snapobjectButton)
	1974	+ if (source == snapobjectButton)
1813	1975	{
1814	1976	//Reload(lastConverter, lastFilename, true);
1815	1977	SnapObject();
..	..	@@ -1820,13 +1982,13 @@
1820	1982	// Recompile();
1821	1983	// refreshContents();
1822	1984	// } else
1823		- if (event.getSource() == gcButton)
	1985	+ if (source == gcButton)
1824	1986	{
1825	1987	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1988	System.gc();
1827	1989	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1990	} else
1829		- if (event.getSource() == editLeafItem)
	1991	+ if (source == editLeafItem)
1830	1992	{
1831	1993	Object3D obj;
1832	1994	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2002,74 @@
1840	2002	}
1841	2003	refreshContents(true);
1842	2004	} else
1843		- if (event.getSource() == openWindowItem)
	2005	+ if (source == openWindowItem)
1844	2006	{
1845	2007	EditSelection(true);
1846	2008	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2009	+ if (source == cutItem \|\| source == clearButton)
1848	2010	{
1849	2011	loadClipboard(true);
1850	2012	} else
1851		- if (event.getSource() == duplicateItem)
	2013	+ if (source == undoItem)
1852	2014	{
1853		- 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;
1854	2024	loadClipboard(false);
1855	2025	paste(false);
1856		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1857	2027	} else
1858		- if (event.getSource() == cloneItem)
	2028	+ if (source == cloneItem)
1859	2029	{
1860	2030	CloneSelection(false);
1861	2031	} else
1862		- if (event.getSource() == cloneSupportItem)
	2032	+ if (source == cloneSupportItem)
1863	2033	{
1864	2034	CloneSelection(true);
1865	2035	} else
1866		- if (event.getSource() == copyItem)
	2036	+ if (source == copyItem)
1867	2037	{
1868	2038	loadClipboard(false);
1869	2039	} else
1870		- if (event.getSource() == pasteItem)
	2040	+ if (source == pasteItem)
1871	2041	{
1872	2042	paste(false);
1873	2043	} else
1874		- if (event.getSource() == pasteLinkItem)
	2044	+ if (source == pasteIntoItem)
1875	2045	{
1876		- pasteInto(false);
	2046	+ pasteInto(true, false);
1877	2047	} else
1878		- if (event.getSource() == pasteCloneItem)
	2048	+ if (source == pasteLinkItem)
1879	2049	{
1880		- pasteInto(true);
	2050	+ pasteInto(false, false);
1881	2051	} else
1882		- if (event.getSource() == pasteExpandItem)
	2052	+ if (source == pasteCloneItem)
	2053	+ {
	2054	+ pasteInto(true, true);
	2055	+ } else
	2056	+ if (source == pasteExpandItem)
1883	2057	{
1884	2058	paste(true);
1885	2059	} else
1886		- if (event.getSource() == synchronizeItem)
	2060	+ if (source == synchronizeItem)
1887	2061	{
1888	2062	Overwrite(Object3D.TRANSFORM);
1889	2063	} else
1890		- if (event.getSource() == overwriteNameItem)
	2064	+ if (source == overwriteNameItem)
1891	2065	{
1892	2066	Overwrite(Object3D.NAME);
1893	2067	} else
1894		- if (event.getSource() == overwriteUVItem)
	2068	+ if (source == overwriteUVItem)
1895	2069	{
1896	2070	Overwrite(Object3D.UV);
1897	2071	} else
1898		- if (event.getSource() == overwriteMatItem)
	2072	+ if (source == overwriteMatItem)
1899	2073	{
1900	2074	/* july 2015
1901	2075	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2089,7 @@
1915	2089
1916	2090	Overwrite(dropAttributes);
1917	2091	}
1918		- if (event.getSource() == overwriteGeoItem)
	2092	+ if (source == overwriteGeoItem)
1919	2093	{
1920	2094	Overwrite(Object3D.GEOMETRY);
1921	2095	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2106,7 @@
1932	2106	// refreshContents();
1933	2107	// }
1934	2108	} else
1935		- if (event.getSource() == generateMeshItem)
	2109	+ if (source == generateMeshItem)
1936	2110	{
1937	2111	//if (group.selection.size() == 1)
1938	2112	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2117,7 @@
1943	2117	ResetModel();
1944	2118	refreshContents();
1945	2119	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2120	+ if (source == extractGeometriesItem)
1947	2121	{
1948	2122	boolean one = false;
1949	2123
..	..	@@ -1970,7 +2144,7 @@
1970	2144	ResetModel();
1971	2145	refreshContents();
1972	2146	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2147	+ if (source == cloneGeometriesItem)
1974	2148	{
1975	2149	boolean one = false;
1976	2150
..	..	@@ -1996,32 +2170,37 @@
1996	2170	ResetModel();
1997	2171	refreshContents();
1998	2172	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2173	+ if (source == shareGeometriesItem)
2000	2174	{
2001	2175	boolean one = false;
2002	2176
2003	2177	if (group.selection.size() == 1)
2004	2178	one = true;
2005	2179
	2180	+ Object3D merge = null;
	2181	+
2006	2182	Object3D content = new cGroup();
2007	2183
2008	2184	for (int i=0; i<group.selection.size(); i++)
2009	2185	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2186	+ merge = new Merge(group.selection.get(i));
2011	2187
2012	2188	if (one)
2013		- makeSomething(sel, false);
	2189	+ makeSomething(merge, false);
2014	2190	else
2015		- content.addChild(sel);
	2191	+ content.addChild(merge);
2016	2192	}
2017	2193
2018	2194	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2195	+ makeSomething(content, true);
	2196	+ else
	2197	+ {
	2198	+ ResetModel();
	2199	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2200	+ refreshContents();
	2201	+ }
2023	2202	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2203	+ if (source == mergeGeometriesItem)
2025	2204	{
2026	2205	boolean one = false;
2027	2206
..	..	@@ -2051,7 +2230,7 @@
2051	2230	ResetModel();
2052	2231	refreshContents();
2053	2232	} else
2054		- if (event.getSource() == linkverticesItem)
	2233	+ if (source == linkverticesItem)
2055	2234	{
2056	2235	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2236	// {
..	..	@@ -2064,39 +2243,48 @@
2064	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2244	// refreshContents();
2066	2245	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2247	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2070	2249
2071	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2251	content = ((cGroup)content).get(0);
2073	2252
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2253	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2254	for (int i=0; i<group.selection.size(); i++)
2076	2255	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2256	+ boolean random = CameraPane.SWITCH;
	2257	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2258	group.selection.get(i).linkVerticesThis(content);
2080	2259	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2082	2261	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2262	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2263	refreshContents();
2085	2264	}
2086	2265	} else
2087		- if (event.getSource() == resetsupportItem)
	2266	+ if (source == resetsupportItem)
2088	2267	{
2089	2268	for (int i=0; i<group.selection.size(); i++)
2090	2269	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2270	+ boolean random = CameraPane.SWITCH;
	2271	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2272	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2273	+ CameraPane.SWITCH = random;
2095	2274	}
2096	2275
2097	2276	refreshContents();
2098	2277	} else
2099		- if (event.getSource() == resetreferencesItem)
	2278	+ if (source == relinkverticesItem)
	2279	+ {
	2280	+ boolean random = CameraPane.SWITCH;
	2281	+ CameraPane.SWITCH = false; // parse all random nodes
	2282	+ group.selection.RelinkToSupport();
	2283	+ CameraPane.SWITCH = random;
	2284	+
	2285	+ refreshContents();
	2286	+ } else
	2287	+ if (source == resetreferencesItem)
2100	2288	{
2101	2289	for (int i=0; i<group.selection.size(); i++)
2102	2290	{
..	..	@@ -2105,11 +2293,11 @@
2105	2293
2106	2294	refreshContents();
2107	2295	} else
2108		- if (event.getSource() == setMasterItem)
	2296	+ if (source == setMasterItem)
2109	2297	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2299	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2113	2301
2114	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2303	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2306,13 @@
2118	2306	refreshContents();
2119	2307	}
2120	2308	} else
2121		- if (event.getSource() == poseMeshItem)
	2309	+ if (source == poseMeshItem)
2122	2310	{
2123	2311	if (group.selection.size() == 1)
2124	2312	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2126	2314	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2128	2316
2129	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2318	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2325,19 @@
2137	2325	}
2138	2326
2139	2327	} else
2140		- if (event.getSource() == revertMeshItem)
	2328	+ if (source == revertMeshItem)
2141	2329	{
2142	2330	RevertMeshes();
2143	2331	} else
2144		- if (event.getSource() == resetMeshItem)
	2332	+ if (source == resetAllItem)
2145	2333	{
2146	2334	ResetAll();
2147	2335	} else
2148		- if (event.getSource() == stepAllItem)
	2336	+ if (source == stepAllItem)
2149	2337	{
2150	2338	StepAll();
2151	2339	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2340	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2341	{
2154	2342	//int indices[] = jList.getSelectedIndices();
2155	2343	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2345,46 @@
2157	2345
2158	2346	ClearSelection(false);
2159	2347	} else
2160		- if (event.getSource() == clearAllItem)
	2348	+ if (source == clearAllItem)
2161	2349	{
2162	2350	ClearSelection(true);
2163	2351	} else
2164		- if (event.getSource() == grabItem)
	2352	+ if (source == grabItem)
2165	2353	{
2166	2354	group(new cGroup(), true);
2167	2355	} else
2168		- if (event.getSource() == frontItem)
	2356	+ if (source == hideItem)
	2357	+ {
	2358	+ group(new HiddenObject());
	2359	+ } else
	2360	+ if (source == frontItem)
2169	2361	{
2170	2362	front();
2171	2363	} else
2172		- if (event.getSource() == backItem)
	2364	+ if (source == backItem)
2173	2365	{
2174	2366	back();
2175	2367	} else
2176		- if (event.getSource() == cameraItem)
	2368	+ if (source == cameraItem)
2177	2369	{
2178	2370	makeSomething(new Camera());
2179	2371	} else
2180		- if (event.getSource() == compositeItem)
	2372	+ if (source == compositeItem)
2181	2373	{
2182	2374	group(new Composite());
2183	2375	} else
2184		- if (event.getSource() == randomItem)
	2376	+ if (source == randomItem)
2185	2377	{
2186	2378	RandomNode random = new RandomNode();
2187	2379	group(random);
2188	2380	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2381	+ random.name = random.get(0).name + "Switch";
2190	2382	} else
2191		- if (event.getSource() == physicsItem)
	2383	+ if (source == physicsItem)
2192	2384	{
2193	2385	group(new PhysicsNode());
2194	2386	} else
2195		- if (event.getSource() == frameselectorItem)
	2387	+ if (source == frameselectorItem)
2196	2388	{
2197	2389	for (int i=0; i<group.selection.size(); i++)
2198	2390	{
..	..	@@ -2204,7 +2396,7 @@
2204	2396	ResetModel();
2205	2397	refreshContents();
2206	2398	} else
2207		- if (event.getSource() == switchGeoItem)
	2399	+ if (source == switchGeoItem)
2208	2400	{
2209	2401	for (int i=0; i<group.selection.size(); i++)
2210	2402	{
..	..	@@ -2216,7 +2408,7 @@
2216	2408	ResetModel();
2217	2409	refreshContents();
2218	2410	} else
2219		- if (event.getSource() == switchTransfoItem)
	2411	+ if (source == switchTransfoItem)
2220	2412	{
2221	2413	for (int i=0; i<group.selection.size(); i++)
2222	2414	{
..	..	@@ -2228,7 +2420,7 @@
2228	2420	ResetModel();
2229	2421	refreshContents();
2230	2422	} else
2231		- if (event.getSource() == morphItem)
	2423	+ if (source == morphItem)
2232	2424	{
2233	2425	for (int i=0; i<group.selection.size(); i++)
2234	2426	{
..	..	@@ -2240,7 +2432,7 @@
2240	2432	ResetModel();
2241	2433	refreshContents();
2242	2434	} else
2243		- if (event.getSource() == scriptNodeItem)
	2435	+ if (source == scriptNodeItem)
2244	2436	{
2245	2437	boolean atleastone = false;
2246	2438
..	..	@@ -2279,199 +2471,223 @@
2279	2471	}
2280	2472	}
2281	2473	} else
2282		- if (event.getSource() == linkerItem)
	2474	+ if (source == linkerItem)
2283	2475	{
2284	2476	group(new cLinker());
2285	2477	} else
2286		- if (event.getSource() == textureItem)
	2478	+ if (source == textureItem)
2287	2479	{
2288	2480	group(new TextureNode());
2289	2481	} else
2290		- if (event.getSource() == shadowXItem)
	2482	+ if (source == billboardItem)
	2483	+ {
	2484	+ group(new BillboardNode());
	2485	+ } else
	2486	+ if (source == shadowXItem)
2291	2487	{
2292	2488	CastShadow(0);
2293	2489	} else
2294		- if (event.getSource() == shadowYItem)
	2490	+ if (source == shadowYItem)
2295	2491	{
2296	2492	CastShadow(1);
2297	2493	} else
2298		- if (event.getSource() == shadowZItem)
	2494	+ if (source == shadowZItem)
2299	2495	{
2300	2496	CastShadow(2);
2301	2497	} else
2302		- if (event.getSource() == ungroupItem)
	2498	+ if (source == ungroupItem)
2303	2499	{
2304		- ungroup();
	2500	+ //ungroup();
	2501	+ for (int i=0; i<group.selection.size(); i++)
	2502	+ {
	2503	+ Ungroup(group.selection.get(i));
	2504	+ }
	2505	+
	2506	+ ClearSelection(false);
	2507	+
	2508	+ refreshContents();
2305	2509	} else
2306		- if (event.getSource() == genUVItem)
	2510	+ if (source == genUVItem)
2307	2511	{
2308	2512	GenUV();
2309	2513	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2514	+ if (source == genNormalsCADItem)
2311	2515	{
2312	2516	GenNormals(true);
2313	2517	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2518	+ if (source == genNormalsMESHItem)
2315	2519	{
2316	2520	GenNormals(true); // TODO
2317	2521	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2522	+ if (source == genNormalsORGANItem)
2319	2523	{
2320	2524	GenNormals(false);
2321	2525	} else
2322		- if (event.getSource() == stripifyItem)
	2526	+ if (source == genNormalsMINEItem)
	2527	+ {
	2528	+ GenNormalsMINE();
	2529	+ } else
	2530	+ if (source == stripifyItem)
2323	2531	{
2324	2532	Stripify();
2325	2533	} else
2326		- if (event.getSource() == unstripifyItem)
	2534	+ if (source == unstripifyItem)
2327	2535	{
2328	2536	Unstripify();
2329	2537	} else
2330		- if (event.getSource() == trimItem)
	2538	+ if (source == trimItem)
2331	2539	{
2332	2540	Trim();
2333	2541	} else
2334		- if (event.getSource() == untrimItem)
	2542	+ if (source == untrimItem)
2335	2543	{
2336	2544	Untrim();
2337	2545	} else
2338		- if (event.getSource() == clearColorsItem)
	2546	+ if (source == clearColorsItem)
2339	2547	{
2340	2548	ClearColors();
2341	2549	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2550	+ if (source == clearMaterialsItem)
2343	2551	{
2344	2552	ClearMaterials();
2345	2553	} else
2346		- if (event.getSource() == liveleavesItem)
	2554	+ if (source == liveleavesItem)
2347	2555	{
2348	2556	LiveLeaves(true);
2349	2557	} else
2350		- if (event.getSource() == unliveleavesItem)
	2558	+ if (source == unliveleavesItem)
2351	2559	{
2352	2560	LiveLeaves(false);
2353	2561	} else
2354		- if (event.getSource() == supportleavesItem)
	2562	+ if (source == supportleavesItem)
2355	2563	{
2356	2564	SupportLeaves(true);
2357	2565	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2566	+ if (source == unsupportleavesItem)
2359	2567	{
2360	2568	SupportLeaves(false);
2361	2569	} else
2362		- if (event.getSource() == hideleavesItem)
	2570	+ if (source == hideleavesItem)
2363	2571	{
2364	2572	HideLeaves(true);
2365	2573	} else
2366		- if (event.getSource() == showleavesItem)
	2574	+ if (source == showleavesItem)
2367	2575	{
2368	2576	HideLeaves(false);
2369	2577	} else
2370		- if (event.getSource() == markleavesItem)
	2578	+ if (source == markleavesItem)
2371	2579	{
2372	2580	MarkLeaves(true);
2373	2581	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2582	+ if (source == unmarkleavesItem)
2375	2583	{
2376	2584	MarkLeaves(false);
2377	2585	} else
2378		- if (event.getSource() == flipVItem)
	2586	+ if (source == flipVItem)
2379	2587	{
2380	2588	FlipV(true);
2381	2589	} else
2382		- if (event.getSource() == unflipVItem)
	2590	+ if (source == unflipVItem)
2383	2591	{
2384	2592	FlipV(false);
2385	2593	} else
2386		- if (event.getSource() == lowTexturesItem)
	2594	+ if (source == lowTexturesItem)
2387	2595	{
2388	2596	SetTexRes(0);
2389	2597	} else
2390		- if (event.getSource() == normalTexturesItem)
	2598	+ if (source == normalTexturesItem)
2391	2599	{
2392	2600	SetTexRes(1);
2393	2601	} else
2394		- if (event.getSource() == highTexturesItem)
	2602	+ if (source == highTexturesItem)
2395	2603	{
2396	2604	SetTexRes(2);
2397	2605	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2606	+ if (source == veryhighTexturesItem)
2399	2607	{
2400	2608	SetTexRes(3);
2401	2609	} else
2402		- if (event.getSource() == maxTexturesItem)
	2610	+ if (source == maxTexturesItem)
2403	2611	{
2404	2612	SetTexRes(4);
2405	2613	} else
2406		- if (event.getSource() == panoTexturesItem)
	2614	+ if (source == panoTexturesItem)
2407	2615	{
2408	2616	SetTexRes(5);
2409	2617	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2618	+ if (source == reverseNormalsItem)
2411	2619	{
2412	2620	ReverseNormals();
2413	2621	} else
2414		- if (event.getSource() == parseverticesItem)
	2622	+ if (source == parseverticesItem)
2415	2623	{
2416	2624	ParseVertices();
2417	2625	} else
2418		- if (event.getSource() == textureFieldItem)
	2626	+ if (source == textureFieldItem)
2419	2627	{
2420	2628	TextureVertices();
2421	2629	} else
2422		- if (event.getSource() == alignItem)
	2630	+ if (source == alignItem)
2423	2631	{
2424	2632	Align();
2425	2633	} else
2426		- if (event.getSource() == mirrorItem)
	2634	+ if (source == mirrorItem)
2427	2635	{
2428	2636	MirrorPoses();
2429	2637	} else
2430		- if (event.getSource() == reduceMorphItem)
	2638	+ if (source == reduceMorphItem)
2431	2639	{
2432	2640	MeshReduction(false);
2433	2641	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2642	+ if (source == reduce34MorphItem)
2435	2643	{
2436	2644	MeshReduction(true);
2437	2645	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2646	+ if (source == reverseTrianglesItem)
2439	2647	{
2440	2648	ReverseTriangles();
2441	2649	} else
2442		- if (event.getSource() == reduceMeshItem)
	2650	+ if (source == reduceMeshItem)
2443	2651	{
2444	2652	ReduceMesh(false);
2445	2653	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2654	+ if (source == reduce34MeshItem)
2447	2655	{
2448	2656	ReduceMesh(true);
2449	2657	} else
2450		- if (event.getSource() == increaseMeshItem)
	2658	+ if (source == increaseMeshItem)
2451	2659	{
2452	2660	IncreaseMesh();
2453	2661	} else
2454		- if (event.getSource() == clipMeshItem)
	2662	+ if (source == clipMeshItem)
2455	2663	{
2456	2664	ClipMesh();
2457	2665	} else
2458		- if (event.getSource() == smoothMeshItem)
	2666	+ if (source == smoothMeshItem)
2459	2667	{
2460	2668	SmoothMesh();
2461	2669	} else
2462		- if (event.getSource() == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2463	2671	{
2464	2672	TransformGeometry();
2465	2673	} else
2466		- if (event.getSource() == resetTransformItem)
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
	2677	+ } else
	2678	+ if (source == resetTransformItem)
2467	2679	{
2468	2680	ResetTransform();
2469	2681	} else
2470		- if (event.getSource() == resetCentroidItem)
	2682	+ if (source == resetCentroidItem)
2471	2683	{
2472		- ResetCentroid();
	2684	+ ResetCentroid(true);
2473	2685	} else
2474		- if (event.getSource() == resetParentItem)
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
	2689	+ } else
	2690	+ if (source == resetParentItem)
2475	2691	{
2476	2692	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2693	{
..	..	@@ -2481,7 +2697,7 @@
2481	2697
2482	2698	refreshContents();
2483	2699	} else
2484		- if (event.getSource() == repairParentItem)
	2700	+ if (source == repairParentItem)
2485	2701	{
2486	2702	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2703	{
..	..	@@ -2495,7 +2711,21 @@
2495	2711
2496	2712	refreshContents();
2497	2713	} else
2498		- if (event.getSource() == sortbysizeItem)
	2714	+ if (source == repairShadowItem)
	2715	+ {
	2716	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2717	+ {
	2718	+ Object3D obj = (Object3D)e.nextElement();
	2719	+ obj.RepairShadow();
	2720	+// for (int i=0; i<obj.size(); i++)
	2721	+// {
	2722	+// obj.get(i).parent = obj;
	2723	+// }
	2724	+ }
	2725	+
	2726	+ refreshContents();
	2727	+ } else
	2728	+ if (source == sortbysizeItem)
2499	2729	{
2500	2730	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2731	{
..	..	@@ -2507,7 +2737,7 @@
2507	2737	ResetModel();
2508	2738	refreshContents();
2509	2739	} else
2510		- if (event.getSource() == sortbynameItem)
	2740	+ if (source == sortbynameItem)
2511	2741	{
2512	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2743	{
..	..	@@ -2519,7 +2749,7 @@
2519	2749	ResetModel();
2520	2750	refreshContents();
2521	2751	} else
2522		- if (event.getSource() == attachPigmentItem)
	2752	+ if (source == attachPigmentItem)
2523	2753	{
2524	2754	String texture = GetFile("Attach pigment");
2525	2755	Object3D obj;
..	..	@@ -2531,7 +2761,7 @@
2531	2761
2532	2762	refreshContents();
2533	2763	} else
2534		- if (event.getSource() == detachPigmentItem)
	2764	+ if (source == detachPigmentItem)
2535	2765	{
2536	2766	Object3D obj;
2537	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2772,7 @@
2542	2772
2543	2773	refreshContents();
2544	2774	} else
2545		- if (event.getSource() == attachBumpItem)
	2775	+ if (source == attachBumpItem)
2546	2776	{
2547	2777	String texture = GetFile("Attach bump");
2548	2778	Object3D obj;
..	..	@@ -2554,7 +2784,7 @@
2554	2784
2555	2785	refreshContents();
2556	2786	} else
2557		- if (event.getSource() == detachBumpItem)
	2787	+ if (source == detachBumpItem)
2558	2788	{
2559	2789	Object3D obj;
2560	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2795,7 @@
2565	2795
2566	2796	refreshContents();
2567	2797	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2798	+ if (source == pigmentBumpItem)
2569	2799	{
2570	2800	Object3D obj;
2571	2801	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2806,195 @@
2576	2806
2577	2807	refreshContents();
2578	2808	} else
2579		- if (event.getSource() == flashSelectionButton)
	2809	+ if (source == flashSelectionButton)
2580	2810	{
2581	2811	CameraPane.flash = true;
2582	2812	refreshContents();
2583	2813	} else
2584		- if (event.getSource() == oneButton)
	2814	+ if (source == oneButton)
2585	2815	{
2586	2816	} else
2587		- if (event.getSource() == twoButton)
	2817	+ if (source == twoButton)
2588	2818	{
2589	2819	radio.layout = twoButton;
2590	2820	// bug
2591	2821	//gridPanel.setDividerLocation(1.0);
2592	2822	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- 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();
2617	2852	} else
2618		- if (event.getSource() == threeButton)
	2853	+ if (source == threeButton)
2619	2854	{
2620	2855	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- 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();
2645	2888	} else
2646		- if (event.getSource() == fourButton)
	2889	+ if (source == fourButton)
2647	2890	{
2648	2891	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- 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();
2673	2923	} else
2674		- if (event.getSource() == sixButton)
	2924	+ if (source == sixButton)
2675	2925	{
2676	2926	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- 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();
2701	2959	} else
2702		- if (event.getSource() == sevenButton)
	2960	+ if (source == sevenButton)
2703	2961	{
2704	2962	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- 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();
2729	2996	} else
2730		- if (event.getSource() == rootButton)
	2997	+ if (source == rootButton)
2731	2998	{
2732	2999	Object3D obj;
2733	3000	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +3006,7 @@
2739	3006
2740	3007	refreshContents(true);
2741	3008	} else
2742		- if (event.getSource() == closeButton)
	3009	+ if (source == closeButton)
2743	3010	{
2744	3011	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3012	cRadio ab;
..	..	@@ -2760,11 +3027,11 @@
2760	3027	}
2761	3028	refreshContents(true);
2762	3029	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3030	+ if (source == editItem \|\| source == editButton)
2764	3031	{
2765	3032	EditSelection(false);
2766	3033	} else
2767		- if (event.getSource() == uneditButton)
	3034	+ if (source == uneditButton)
2768	3035	{
2769	3036	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3037	{
..	..	@@ -2774,14 +3041,14 @@
2774	3041	child.CloseUI();
2775	3042	listUI.remove(child);
2776	3043
2777		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2778	3045	}
2779		- objEditor.ctrlPanel.revalidate();
	3046	+ objEditor.ctrlPanel.FlushUI();
2780	3047	//objEditor.jTree.clearSelection();
2781	3048	//objEditor.ResetSliders();
2782	3049	refreshContents(true);
2783	3050	} else
2784		- if (event.getSource() == clearPanelButton)
	3051	+ if (source == clearPanelButton)
2785	3052	{
2786	3053	assert(copy == group);
2787	3054	//copy.ClearUI();
..	..	@@ -2792,7 +3059,7 @@
2792	3059	listUI.clear();
2793	3060	refreshContents(true);
2794	3061	} else
2795		- if (event.getSource() == allParamsButton)
	3062	+ if (source == allParamsButton)
2796	3063	{
2797	3064	assert(copy == group);
2798	3065
..	..	@@ -2813,19 +3080,19 @@
2813	3080
2814	3081	refreshContents(true);
2815	3082	} else
2816		- if (event.getSource() == unselectButton)
	3083	+ if (source == unselectButton)
2817	3084	{
2818	3085	objEditor.jTree.clearSelection();
2819	3086	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3087	objEditor.ResetSliders();
2821	3088	refreshContents(true);
2822	3089	} else
2823		- if(event.getSource() instanceof cRadio)
	3090	+ if(source instanceof cRadio)
2824	3091	{
2825	3092	group.parent = keepparent;
2826	3093	group.attributes = 0;
2827	3094	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3095	+ /cRadio/ radio = (cRadio)source;
2829	3096	Object3D obj = radio.GetObject();
2830	3097	System.out.println("Edit " + obj);
2831	3098	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3112,7 @@
2845	3112	}
2846	3113
2847	3114	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3115	+ //Globals.theRenderer.object = group;
2849	3116	if(!useclient)
2850	3117	{
2851	3118	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,12 +3121,15 @@
2854	3121	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3122	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3123	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3124	+ //cameraView.lighttouched = true;
	3125	+ Globals.lighttouched = true;
2858	3126	topView.object = group;
2859	3127	frontView.object = group;
2860	3128	sideView.object = group;
2861	3129	}
2862		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
2863	3133	/*
2864	3134	currentLayout = radio.layout;
2865	3135	if (currentLayout == null)
..	..	@@ -2872,7 +3142,20 @@
2872	3142	//group.attributes = -1;
2873	3143	ResetModel();
2874	3144	refreshContents(true);
2875		- }
	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	+ }
2876	3159	else
2877	3160	{
2878	3161	//return super.action(event, arg);
..	..	@@ -2890,7 +3173,7 @@
2890	3173	if (useclient)
2891	3174	{
2892	3175	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3176	+ Globals.lighttouched = true;
2894	3177	//topView.object = client;
2895	3178	//frontView.object = client;
2896	3179	//sideView.object = client;
..	..	@@ -2898,7 +3181,7 @@
2898	3181	else
2899	3182	{
2900	3183	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3184	+ Globals.lighttouched = true;
2902	3185	//topView.object = group;
2903	3186	//frontView.object = group;
2904	3187	//sideView.object = group;
..	..	@@ -2933,6 +3216,28 @@
2933	3216	refreshContents();
2934	3217	}
2935	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	+ }
2936	3241
2937	3242	void ResetTransform()
2938	3243	{
..	..	@@ -3045,7 +3350,7 @@
3045	3350	refreshContents();
3046	3351	}
3047	3352
3048		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3049	3354	{
3050	3355	Object3D obj;
3051	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3365,16 @@
3060	3365	LA.matIdentity(Object3D.mat);
3061	3366	obj.getBounds(minima, maxima, false);
3062	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3066	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3069	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3131,9 +3440,9 @@
3131	3440	obj = (Object3D)e.nextElement();
3132	3441
3133	3442	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3135	3444	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3446
3138	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3448	}
..	..	@@ -3175,6 +3484,13 @@
3175	3484	void GenNormals(boolean crease)
3176	3485	{
3177	3486	group.GenNormalsS(crease);
	3487	+
	3488	+ refreshContents();
	3489	+ }
	3490	+
	3491	+ void GenNormalsMINE()
	3492	+ {
	3493	+ group.selection.GenNormalsMINE();
3178	3494
3179	3495	refreshContents();
3180	3496	}
..	..	@@ -3340,8 +3656,8 @@
3340	3656
3341	3657	void ParseVertices()
3342	3658	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3345	3661
3346	3662	for (int i=0; i<group.selection.size(); i++)
3347	3663	{
..	..	@@ -3366,7 +3682,7 @@
3366	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	3684
3369		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3370	3686
3371	3687	buffer.add(g);
3372	3688	}
..	..	@@ -3381,7 +3697,7 @@
3381	3697	makeSomething(buffer, i==group.selection.size()-1);
3382	3698	}
3383	3699
3384		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3385	3701
3386	3702	refreshContents();
3387	3703	}
..	..	@@ -3399,7 +3715,16 @@
3399	3715	String pigment = Object3D.GetPigment(tex);
3400	3716	//String bump = Object3D.GetBump(tex);
3401	3717
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3403	3728
3404	3729	double s = v.s;
3405	3730
..	..	@@ -3447,12 +3772,26 @@
3447	3772
3448	3773	void Align()
3449	3774	{
	3775	+ if (group.selection.size() == 0)
	3776	+ return;
	3777	+
	3778	+ cVector bbmin = new cVector();
	3779	+ cVector bbmax = new cVector();
	3780	+
	3781	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3782	+
	3783	+ double dx = bbmax.x - bbmin.x;
	3784	+ double dy = bbmax.y - bbmin.y;
	3785	+ double dz = bbmax.z - bbmin.z;
	3786	+
	3787	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3788	+
3450	3789	for (int i=0; i<group.selection.size(); i++)
3451	3790	{
3452	3791	Object3D obj = group.selection.get(i);
3453	3792
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3793	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3794	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3795	}
3457	3796
3458	3797	refreshContents();
..	..	@@ -3473,11 +3812,11 @@
3473	3812
3474	3813	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3814
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3815	+ boolean random = CameraPane.SWITCH;
	3816	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3817	lowres.linkVerticesThis(null);
3479	3818	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3819	+ CameraPane.SWITCH = random;
3481	3820
3482	3821	System.err.flush();
3483	3822
..	..	@@ -3517,7 +3856,7 @@
3517	3856	return;
3518	3857
3519	3858	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3521	3860
3522	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	3862
..	..	@@ -3686,7 +4025,7 @@
3686	4025	group.selection.RelinkToSupport(); // july 2014
3687	4026	System.out.println("DONE.");
3688	4027	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4028	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4029	}
3691	4030
3692	4031	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4050,9 @@
3711	4050
3712	4051	void ClipMesh()
3713	4052	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4054	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3717	4056
3718	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4058	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4061,7 @@
3722	4061	// {
3723	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4063	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4065	}
3727	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4067	System.out.println("DONE.");
..	..	@@ -3857,7 +4196,7 @@
3857	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4197
3859	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
3861	4200	{
3862	4201	// if (!(elem instanceof Composite))
3863	4202	// newWindow = false;
..	..	@@ -3962,25 +4301,28 @@
3962	4301	System.err.println("info : " + child.GetPath());
3963	4302	}
3964	4303	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4304	+// else
	4305	+// {
	4306	+// objEditor.SetMaterial(group); // .GetMaterial());
	4307	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4308	+// System.err.println("info : " + group.GetPath());
	4309	+// }
3971	4310
3972	4311	objEditor.SetText(); // jan 2014
3973	4312
3974		- if (flashIt && !CameraPane.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))
3975	4314	CameraPane.flash = true;
3976	4315
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	4317	// a camera
3979	4318	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
	4324	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4325	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4326	}
3985	4327
3986	4328	refreshContents();
..	..	@@ -4062,12 +4404,12 @@
4062	4404	{
4063	4405	if (group.selection.isEmpty())
4064	4406	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4066	4408	Composite tGroup = null;
4067	4409	if (group.selection.size() > 0) // 1)
4068	4410	{
4069	4411	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4071	4413	}
4072	4414
4073	4415	if (cut)
..	..	@@ -4107,16 +4449,16 @@
4107	4449	//System.out.println("cut " + child);
4108	4450	//System.out.println("parent = " + child.parent);
4109	4451	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4111	4453	tGroup.add/Child/(tmp);
4112	4454	else
4113		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4114	4456	}
4115	4457	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4117	4459	tGroup.add/Child/(child);
4118	4460	else
4119		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4120	4462	}
4121	4463
4122	4464	//ResetModel();
..	..	@@ -4148,21 +4490,21 @@
4148	4490	//System.out.println("cut " + elem);
4149	4491	//System.out.println("parent = " + elem.parent);
4150	4492	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4152	4494	tGroup.add/Child/(tmp);
4153	4495	else
4154		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4155	4497	}
4156	4498	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4158	4500	tGroup.add/Child/(child);
4159	4501	else
4160		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4161	4503	}
4162	4504
4163	4505	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4166	4508	if (cut)
4167	4509	{
4168	4510	ResetModel();
..	..	@@ -4176,7 +4518,7 @@
4176	4518	// return;
4177	4519	boolean first = true;
4178	4520
4179		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4180	4522	{
4181	4523	Composite temp;
4182	4524
..	..	@@ -4187,7 +4529,7 @@
4187	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	4530	*/
4189	4531	Object3D elem;
4190		- 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))
4191	4533	{
4192	4534	Object3D child = (Object3D)e.nextElement();
4193	4535
..	..	@@ -4221,21 +4563,21 @@
4221	4563	//Object3D cb = Applet3D.clipboard;
4222	4564	//temp.addChild(cb);
4223	4565	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- 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());
4229	4571	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	4574	}
4233	4575
4234	4576	ResetModel();
4235	4577	refreshContents();
4236	4578	}
4237	4579
4238		- void pasteInto(boolean copyit)
	4580	+ void pasteInto(boolean copyit, boolean clone)
4239	4581	{
4240	4582	// if (GrafreeD.clipboard == null)
4241	4583	// return;
..	..	@@ -4264,15 +4606,22 @@
4264	4606	if (copyit)
4265	4607	{
4266	4608	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4609	+ if (clone)
	4610	+ {
	4611	+ CloneClipboard(false); // sept 2014
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ paste(false);
	4616	+ }
4268	4617	}
4269	4618	else
4270	4619	{
4271	4620	boolean first = true;
4272	4621
4273		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4274	4623	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4276	4625	Object3D copy;
4277	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	4627	{
..	..	@@ -4282,7 +4631,7 @@
4282	4631	}
4283	4632	} else
4284	4633	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	4635	}
4287	4636	}
4288	4637	}
..	..	@@ -4474,6 +4823,26 @@
4474	4823	makeSomething(csg);
4475	4824	}
4476	4825
	4826	+ void Ungroup(Object3D g)
	4827	+ {
	4828	+ if (g instanceof HiddenObject)
	4829	+ {
	4830	+ HiddenObject h = (HiddenObject) g;
	4831	+
	4832	+ for (int i=0; i<h.ActualSize(); i++)
	4833	+ {
	4834	+ objEditor.makeSomething(h.get(i), false);
	4835	+ }
	4836	+ }
	4837	+ else
	4838	+ {
	4839	+ for (int i=0; i<g.Size(); i++)
	4840	+ {
	4841	+ objEditor.makeSomething(g.get(i), false);
	4842	+ }
	4843	+ }
	4844	+ }
	4845	+
4477	4846	void ungroup()
4478	4847	{
4479	4848	/*
..	..	@@ -4667,21 +5036,6 @@
4667	5036	}
4668	5037	*/
4669	5038
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5039	/*
4686	5040	public void Callback(Object obj)
4687	5041	{
..	..	@@ -4705,26 +5059,9 @@
4705	5059	}
4706	5060	*/
4707	5061
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5062	String GetFile(String dialogName)
4726	5063	{
4727		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4728	5065	{
4729	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5067	browser.show();
..	..	@@ -4788,10 +5125,12 @@
4788	5125	cButton flashSelectionButton;
4789	5126	cButton editButton;
4790	5127	cButton uneditButton;
	5128	+ JCheckBox allParamsButton;
4791	5129	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5130	cButton unselectButton;
4794	5131
	5132	+ cButton oneStepButton;
	5133	+
4795	5134	cButton screenfitButton;
4796	5135	cButton screenfitpointButton;
4797	5136	cButton snapobjectButton;
..	..	@@ -4822,6 +5161,8 @@
4822	5161	private MenuItem lookFromItem;
4823	5162	private MenuItem switchItem;
4824	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
4825	5166	private MenuItem duplicateItem;
4826	5167	private MenuItem cloneItem;
4827	5168	private MenuItem cloneSupportItem;
..	..	@@ -4833,8 +5174,9 @@
4833	5174	private MenuItem resetsupportItem;
4834	5175	private MenuItem resetreferencesItem;
4835	5176	private MenuItem linkverticesItem;
	5177	+ private MenuItem relinkverticesItem;
4836	5178	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
4838	5180	private MenuItem stepAllItem;
4839	5181	private MenuItem revertMeshItem;
4840	5182	private MenuItem poseMeshItem;
..	..	@@ -4845,6 +5187,7 @@
4845	5187	private MenuItem mergeGeometriesItem;
4846	5188	private MenuItem copyItem;
4847	5189	private MenuItem pasteItem;
	5190	+ private MenuItem pasteIntoItem;
4848	5191	private MenuItem pasteLinkItem;
4849	5192	private MenuItem pasteCloneItem;
4850	5193	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5197,7 @@
4854	5197	private MenuItem genNormalsMESHItem;
4855	5198	private MenuItem genNormalsCADItem;
4856	5199	private MenuItem genNormalsORGANItem;
	5200	+ private MenuItem genNormalsMINEItem;
4857	5201	private MenuItem stripifyItem;
4858	5202	private MenuItem unstripifyItem;
4859	5203	private MenuItem trimItem;
..	..	@@ -4893,8 +5237,11 @@
4893	5237	private MenuItem panoTexturesItem;
4894	5238
4895	5239	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
4897	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
	5244	+ private MenuItem hideItem;
4898	5245	private MenuItem grabItem;
4899	5246	private MenuItem backItem;
4900	5247	private MenuItem frontItem;
..	..	@@ -4915,6 +5262,7 @@
4915	5262
4916	5263	private MenuItem resetParentItem;
4917	5264	private MenuItem repairParentItem;
	5265	+ private MenuItem repairShadowItem;
4918	5266	private MenuItem sortbysizeItem;
4919	5267	private MenuItem sortbynameItem;
4920	5268
..	..	@@ -4935,10 +5283,11 @@
4935	5283	private MenuItem coneItem;
4936	5284	private MenuItem torusItem;
4937	5285	private MenuItem superItem;
	5286	+ private MenuItem kleinItem;
4938	5287	private MenuItem blobItem;
4939	5288	private MenuItem latheItem;
4940	5289	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5290	+ private MenuItem overlayItem;
4942	5291	private MenuItem meshItem;
4943	5292	// private MenuItem meshGroupItem;
4944	5293	private MenuItem springItem;
..	..	@@ -4947,6 +5296,7 @@
4947	5296	private MenuItem csgItem;
4948	5297	private MenuItem templateItem;
4949	5298	private MenuItem textureItem;
	5299	+ private MenuItem billboardItem;
4950	5300	private MenuItem shadowXItem;
4951	5301	private MenuItem shadowYItem;
4952	5302	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5309,6 @@
4959	5309	private MenuItem doubleItem;
4960	5310	private MenuItem tripleItem;
4961	5311
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5312	private MenuItem computeAOItem;
4968	5313	private MenuItem recompileItem;
4969	5314	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5318,8 @@
4973	5318	private MenuItem analyzeItem;
4974	5319	private MenuItem dumpItem;
4975	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
4976	5325	}