~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,124 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	158	+ duplicateItem.addActionListener(this);
	159	+ cloneItem = menu.add(new MenuItem("Clone"));
	160	+ cloneItem.addActionListener(this);
	161	+ if (Globals.ADVANCED)
	162	+ {
	163	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	164	+ cloneSupportItem.addActionListener(this);
	165	+ }
	166	+ menu.add("-");
	167	+ cutItem = menu.add(new MenuItem("Cut"));
	168	+ cutItem.addActionListener(this);
	169	+ copyItem = menu.add(new MenuItem("Copy"));
	170	+ copyItem.addActionListener(this);
	171	+ pasteItem = menu.add(new MenuItem("Paste"));
	172	+ pasteItem.addActionListener(this);
	173	+ menu.add("-");
	174	+
	175	+ menu.add("-");
	176	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	177	+ pasteIntoItem.addActionListener(this);
	178	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	179	+ pasteLinkItem.addActionListener(this);
	180	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	181	+ pasteCloneItem.addActionListener(this);
	182	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	183	+// pasteExpandItem.addActionListener(this);
	184	+ menu.add("-");
	185	+ clearItem = menu.add(new MenuItem("Clear"));
	186	+ clearItem.addActionListener(this);
	187	+
	188	+ if (Globals.ADVANCED)
	189	+ {
	190	+ // Deletes the cameras...
	191	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	192	+ clearAllItem.addActionListener(this);
	193	+ }
	194	+
	195	+ menuBar.add(cameraMenu = new Menu("View"));
	196	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	197	+ //zBufferItem.addActionListener(this);
	198	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	199	+ //normalLensItem.addActionListener(this);
	200	+ cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
	201	+ revertCameraItem.addActionListener(this);
	202	+
	203	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	204	+ toggleFullScreenItem.addItemListener(this);
	205	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	206	+ cameraMenu.add("-");
	207	+
	208	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	209	+ toggleTextureItem.addItemListener(this);
	210	+ toggleTextureItem.setState(CameraPane.textureon);
	211	+
	212	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	213	+ toggleSwitchItem.addItemListener(this);
	214	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	215	+
	216	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	217	+ toggleHandleItem.addItemListener(this);
	218	+ toggleHandleItem.setState(CameraPane.HANDLES);
	219	+
	220	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	221	+ togglePaintItem.addItemListener(this);
	222	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	223	+
	224	+ if (Globals.ADVANCED)
	225	+ {
	226	+ cameraMenu.add("-");
	227	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	228	+ toggleLiveItem.addItemListener(this);
	229	+ toggleLiveItem.setState(Globals.isLIVE());
	230	+
	231	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	232	+ stepItem.addActionListener(this);
	233	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	234	+ // toggleDLItem.addItemListener(this);
	235	+ // toggleDLItem.setState(false);
	236	+
	237	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	238	+ toggleRenderItem.addItemListener(this);
	239	+ toggleRenderItem.setState(!CameraPane.frozen);
	240	+
	241	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	242	+ toggleDebugItem.addItemListener(this);
	243	+ toggleDebugItem.setState(CameraPane.DEBUG);
	244	+
	245	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	246	+ toggleFrustumItem.addItemListener(this);
	247	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	248	+
	249	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	250	+ toggleFootContactItem.addItemListener(this);
	251	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	252	+
	253	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	254	+ toggleTimelineItem.addItemListener(this);
	255	+ }
	256	+
	257	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	258	+// toggleRootItem.addItemListener(this);
	259	+// toggleRootItem.setState(false);
	260	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	261	+// animationItem.addItemListener(this);
	262	+// animationItem.setState(CameraPane.ANIMATION);
	263	+ cameraMenu.add("-");
	264	+ cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	265	+ editCameraItem.addActionListener(this);
	266	+
	267	+ if (Globals.ADVANCED)
	268	+ {
152	269	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	270	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	271	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +277,17 @@
160	277	lookAtItem.addActionListener(this);
161	278	//lookFromItem.addActinoListener(this);
162	279	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	280	+ }
	281	+
192	282	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	283	+ if (Globals.ADVANCED)
	284	+ {
197	285	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	286	revertMeshItem.addActionListener(this);
199	287	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	288	resetreferencesItem.addActionListener(this);
201	289	menu.add("-");
	290	+ }
202	291	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	292	overwriteGeoItem.addActionListener(this);
204	293	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +299,26 @@
210	299	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	300	overwriteUVItem.addActionListener(this);
212	301	menu.add("-");
	302	+ if (Globals.ADVANCED)
	303	+ {
213	304	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	305	generateMeshItem.addActionListener(this);
215	306	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	307	poseMeshItem.addActionListener(this);
217	308	menu.add("-");
	309	+ }
218	310	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	311	resetsupportItem.addActionListener(this);
220	312	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	313	linkverticesItem.addActionListener(this);
	314	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	315	+ relinkverticesItem.addActionListener(this);
	316	+
	317	+ if (Globals.ADVANCED)
	318	+ {
222	319	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	320	setMasterItem.addActionListener(this);
	321	+ }
224	322
225	323	oe.menuBar.add(menu = new Menu("Group"));
226	324	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +329,38 @@
231	329	frontItem.addActionListener(this);
232	330	compositeItem = menu.add(new MenuItem("Composite"));
233	331	compositeItem.addActionListener(this);
	332	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	333	+ hideItem.addActionListener(this);
	334	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	335	+ ungroupItem.addActionListener(this);
234	336	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	337	+ randomItem = menu.add(new MenuItem("Switch node"));
236	338	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	339	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	340	switchGeoItem.addActionListener(this);
243	341	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	342	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	343	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	344	morphItem.addActionListener(this);
	345	+
	346	+ if (Globals.ADVANCED)
	347	+ {
	348	+ menu.add("-");
	349	+ physicsItem = menu.add(new MenuItem("Physics"));
	350	+ physicsItem.addActionListener(this);
	351	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	352	+ frameselectorItem.addActionListener(this);
247	353	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	354	scriptNodeItem.addActionListener(this);
249	355	cameraItem = menu.add(new MenuItem("Camera"));
250	356	cameraItem.addActionListener(this);
	357	+ }
251	358
252	359	oe.menuBar.add(menu = new Menu("Object"));
253	360	textureItem = menu.add(new MenuItem("Texture"));
254	361	textureItem.addActionListener(this);
	362	+ billboardItem = menu.add(new MenuItem("Billboard"));
	363	+ billboardItem.addActionListener(this);
255	364	csgItem = menu.add(new MenuItem("CSG"));
256	365	csgItem.addActionListener(this);
257	366	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +369,29 @@
260	369	shadowYItem.addActionListener(this);
261	370	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	371	shadowZItem.addActionListener(this);
	372	+ if (Globals.ADVANCED)
	373	+ {
	374	+ menu.add("-");
263	375	linkerItem = menu.add(new MenuItem("Linker"));
264	376	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	377	attributeItem = menu.add(new MenuItem("Attribute"));
268	378	attributeItem.addActionListener(this);
	379	+ templateItem = menu.add(new MenuItem("Template"));
	380	+ templateItem.addActionListener(this);
269	381	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	382	pointflowItem.addActionListener(this);
	383	+ }
271	384	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	385	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	386	resetTransformItem.addActionListener(this);
276	387	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	388	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	389	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	390	+ resetCentroidXZItem.addActionListener(this);
	391	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	392	+ transformGeometryItem.addActionListener(this);
	393	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	394	+ transformChildrenItem.addActionListener(this);
280	395
281	396	oe.menuBar.add(menu = new Menu("Geometry"));
282	397	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +402,11 @@
287	402	genNormalsCADItem.addActionListener(this);
288	403	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	404	genNormalsMESHItem.addActionListener(this);
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	408	+ genNormalsMINEItem.addActionListener(this);
	409	+ }
290	410	stripifyItem = menu.add(new MenuItem("Stripify"));
291	411	stripifyItem.addActionListener(this);
292	412	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +428,34 @@
308	428	reduce34MeshItem.addActionListener(this);
309	429	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	430	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	431	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	432	clipMeshItem.addActionListener(this);
	433	+
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	437	+ smoothMeshItem.addActionListener(this);
	438	+ }
315	439
316	440	oe.menuBar.add(menu = new Menu("Attributes"));
317	441	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	442	clearMaterialsItem.addActionListener(this);
	443	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	444	+ resetAllItem.addActionListener(this);
	445	+ stepAllItem = menu.add(new MenuItem("Step All"));
	446	+ stepAllItem.addActionListener(this);
319	447	menu.add("-");
320	448	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	449	liveleavesItem.addActionListener(this);
322	450	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	451	unliveleavesItem.addActionListener(this);
	452	+ if (Globals.ADVANCED)
	453	+ {
324	454	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	455	supportleavesItem.addActionListener(this);
326	456	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	457	unsupportleavesItem.addActionListener(this);
	458	+ }
328	459	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	460	hideleavesItem.addActionListener(this);
330	461	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -368,29 +499,22 @@
368	499	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	500	sortbynameItem.addActionListener(this);
370	501	menu.add("-");
	502	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	503	+ shareGeometriesItem.addActionListener(this);
	504	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	505	+ mergeGeometriesItem.addActionListener(this);
	506	+ if (Globals.ADVANCED)
	507	+ {
	508	+ // Pretty much the same as duplicate and clone.
371	509	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	510	extractGeometriesItem.addActionListener(this);
373	511	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	512	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);
	513	+ }
379	514
380	515	oe.menuBar.add(menu = new Menu("Insert"));
381	516	buildCreateMenu(menu);
382	517
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	518	oe.menuBar.add(menu = new Menu("Tools"));
395	519	buildToolsMenu(menu);
396	520	}
..	..	@@ -425,150 +549,98 @@
425	549	oe.radioPanel.add(dummyButton);
426	550	oe.buttonGroup.add(dummyButton);
427	551	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	552	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	553
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	554	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	555	+ liveCB.setToolTipText("Enable animation");
433	556	liveCB.addItemListener(this);
434	557
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);
	558	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	559	+ oneStepButton.setToolTipText("Animate one step forward");
	560	+ oneStepButton.addActionListener(this);
	561	+
	562	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	563	+ fastCB.setToolTipText("Fast mode");
453	564	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);
	565	+
	566	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	567	+ trackCB.setToolTipText("Enable tracking");
495	568	trackCB.addItemListener(this);
496	569
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	570	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	571	+ screenfitButton.setToolTipText("Screen fit");
499	572	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	573	+
501	574	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	575	// 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	576
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);
	577	+ if (Globals.ADVANCED)
	578	+ {
	579	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ snapobjectButton.addActionListener(this);
	581	+ snapobjectButton.setToolTipText("Snap Object");
	582	+ }
	583	+
	584	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ flashSelectionButton.setToolTipText("Show selection");
514	586	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	587
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	589	+
	590	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ twoButton.setToolTipText("Show center view only");
521	592	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	594	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	595	+ fourButton.setToolTipText("Show left panel only");
	596	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ sixButton.setToolTipText("2-column layout left");
525	598	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	599	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ threeButton.setToolTipText("2-column layout right");
527	601	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ sevenButton.setToolTipText("3-column layout");
529	604	sevenButton.addActionListener(this);
530	605	//
531	606
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ rootButton.setToolTipText("Edit selection in new tab");
533	609	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	610	+
	611	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ closeButton.setToolTipText("Close tab");
536	613	closeButton.addActionListener(this);
537	614	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	615	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	616
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	617	+ cGridBag commandsPanel = new cGridBag();
	618	+
	619	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ editButton.setToolTipText("Edit selection");
543	621	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	622
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	623	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ uneditButton.setToolTipText("Unedit selection");
549	625	uneditButton.addActionListener(this);
550	626
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);
	627	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	628	+ allParamsButton.setToolTipText("Edit all params");
563	629	allParamsButton.addActionListener(this);
564	630
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);
	631	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ clearPanelButton.setToolTipText("Clear edit panel");
	633	+ clearPanelButton.addActionListener(this);
	634	+
	635	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ unselectButton.setToolTipText("Unselect");
570	637	unselectButton.addActionListener(this);
571	638
	639	+ commandsPanel.preferredHeight = 1;
	640	+
	641	+ oe.treePanel.add(commandsPanel);
	642	+ oe.treePanel.Return();
	643	+
572	644	// oe.aConstraints.gridx += 1;
573	645	// oe.aConstraints.weighty = 0;
574	646	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +652,37 @@
580	652	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	653	// gcButton.addActionListener(this);
582	654
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;
	655	+ cGridBag jSPPanel = new cGridBag();
	656	+
	657	+ JScrollPane jSP;
594	658	//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);
	659	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	660	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	661	+
	662	+ oe.treePanel.add(jSPPanel);
	663	+ oe.treePanel.Return();
601	664
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);
	665	+ cGridBag copyOptionsPanel = new cGridBag();
	666	+
	667	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	668	+ colorCB.setToolTipText("Copy color when dropped");
606	669	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	670	+
	671	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	672	+ materialCB.setToolTipText("Copy material when dropped");
609	673	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	674	+
	675	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	676	+ textureCB.setToolTipText("Copy texture when dropped");
612	677	textureCB.addItemListener(this);
613	678
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	679	+ copyOptionsPanel.preferredHeight = 1;
	680	+ oe.treePanel.add(copyOptionsPanel);
	681	+ oe.treePanel.Return();
616	682
	683	+// mainPanel.setDividerLocation(0.5); //1.0);
	684	+// mainPanel.setResizeWeight(0.5);
	685	+
617	686	//jList.addListSelectionListener(this);
618	687	oe.jTree.addTreeSelectionListener(this);
619	688	//jTree.setRootVisible(false);
..	..	@@ -635,18 +704,91 @@
635	704	radio.layout = sevenButton;
636	705	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	706	}
	707	+
	708	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	709	+ {
	710	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	711	+ boxCB.setToolTipText("Display bounding boxes");
	712	+ boxCB.addItemListener(this);
	713	+
	714	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	715	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	716	+ zoomBoxCB.addItemListener(this);
	717	+
	718	+ if (true) // Globals.ADVANCED)
	719	+ {
	720	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	721	+ supportCB.setToolTipText("Enable rigging");
	722	+ supportCB.addItemListener(this);
	723	+
	724	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	725	+ // localCB.addItemListener(this);
	726	+
	727	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	728	+ crowdCB.setToolTipText("Used for crowds");
	729	+ crowdCB.addItemListener(this);
	730	+
	731	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	732	+ smoothCB.setToolTipText("Snapping delay");
	733	+ smoothCB.addItemListener(this);
	734	+
	735	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	736	+ slowCB.setToolTipText("Smooth interpolation");
	737	+ slowCB.addItemListener(this);
	738	+
	739	+// constraints.gridy += 1;
	740	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	741	+// speakerMocapCB.addItemListener(this);
	742	+
	743	+ if (false)
	744	+ {
	745	+ // handled in scripts
	746	+ //constraints.gridy += 1;
	747	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	748	+ speakerCameraCB.addItemListener(this);
	749	+
	750	+ //constraints.gridy += 1;
	751	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	752	+ speakerFocusCB.addItemListener(this);
	753	+
	754	+ //constraints.gridy += 1;
	755	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	756	+ smoothfocusCB.addItemListener(this);
	757	+ }
	758	+
	759	+//constraints.gridx += 1;
	760	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	761	+// debugCB.addItemListener(this);
	762	+
	763	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	764	+ oeilCB.addItemListener(this);
	765	+
	766	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	767	+ lookAtCB.setToolTipText("Look-at target");
	768	+ lookAtCB.addItemListener(this);
	769	+
	770	+ }
	771	+
	772	+ cGridBag fill = new cGridBag();
	773	+
	774	+ fill.preferredHeight = 200;
	775	+
	776	+ panel.add(fill);
	777	+
	778	+ }
638	779
639	780	void EditObject(Object3D obj)
640	781	{
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();
	782	+ cRadio radioButton = new cRadio(obj.name);
	783	+ radioButton.SetObject(obj);
	784	+ radioButton.layout = sevenButton;
	785	+ radioButton.SetCamera(cameraView.renderCamera, false);
	786	+ radioButton.addActionListener(this);
	787	+ radioPanel.add(radioButton);
	788	+ buttonGroup.add(radioButton);
	789	+ radioButton.doClick();
649	790	}
	791	+
650	792	void SetupViews(ObjEditor oe)
651	793	{
652	794	oe.SetupViews();
..	..	@@ -665,6 +807,7 @@
665	807	JCheckBox fastCB;
666	808	JCheckBox slowCB;
667	809	JCheckBox boxCB;
	810	+ JCheckBox zoomBoxCB;
668	811	JCheckBox trackCB;
669	812	JCheckBox smoothfocusCB;
670	813	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +850,7 @@
707	850	dropAttributes \|= Object3D.TEXTURE;
708	851	else
709	852	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	853	+ } else if(e.getSource() == liveCB)
712	854	{
713	855	cameraView.ToggleLive();
714	856	}
..	..	@@ -745,6 +887,10 @@
745	887	Recompile();
746	888	cameraView.repaint();
747	889	// refreshContents();
	890	+ }
	891	+ else if(e.getSource() == zoomBoxCB)
	892	+ {
	893	+ cameraView.ToggleZoomBoxMode();
748	894	}
749	895	else if(e.getSource() == smoothfocusCB)
750	896	{
..	..	@@ -859,7 +1005,9 @@
859	1005	// objEditor.DropFile((java.io.File[]) object, true);
860	1006	// return;
861	1007	// }
862		- if (string.charAt(0) == '/')
	1008	+
	1009	+ // File path for Mac and Windows
	1010	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1011	{
864	1012	// file(s)
865	1013	String[] names = string.split("\n");
..	..	@@ -886,7 +1034,7 @@
886	1034
887	1035	flashIt = false;
888	1036	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1037	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1038	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1039
892	1040	if (group.selection.size() == 1)
..	..	@@ -913,11 +1061,11 @@
913	1061	{
914	1062	loadClipboard(true);
915	1063	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	1064	+ pasteInto(false, false);
917	1065	} else {
918	1066	loadClipboard(false);
919	1067	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1068	+ pasteInto(false, false); // true); // ???
921	1069	}
922	1070	}
923	1071	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1183,37 @@
1035	1183	torusItem.addActionListener(this);
1036	1184	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1185	superItem.addActionListener(this);
	1186	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1187	+ kleinItem.addActionListener(this);
1038	1188	particleItem = menu.add(new MenuItem("Particle system"));
1039	1189	particleItem.addActionListener(this);
	1190	+ if (Globals.ADVANCED)
	1191	+ {
1040	1192	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1193	ragdollItem.addActionListener(this);
1042	1194	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1195	ragdoll2Item.addActionListener(this);
	1196	+ }
1044	1197	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1198	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1199	meshItem.addActionListener(this);
1047	1200	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1201	// meshGroupItem.addActionListener(this);
	1202	+ if (Globals.ADVANCED)
	1203	+ {
1049	1204	springItem = menu.add(new MenuItem("Spring"));
1050	1205	springItem.addActionListener(this);
1051	1206	flagItem = menu.add(new MenuItem("Flag"));
1052	1207	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	1208	blobItem = menu.add(new MenuItem("Blob"));
1058	1209	blobItem.addActionListener(this);
1059	1210	latheItem = menu.add(new MenuItem("Lathe"));
1060	1211	latheItem.addActionListener(this);
	1212	+ }
	1213	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1214	+ bezierItem.addActionListener(this);
	1215	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1216	+ overlayItem.addActionListener(this);
1061	1217	lightItem = menu.add(new MenuItem("Light"));
1062	1218	lightItem.addActionListener(this);
1063	1219	menu.add("-");
..	..	@@ -1067,34 +1223,39 @@
1067	1223	loopItem.addActionListener(this);
1068	1224	doubleItem = menu.add(new MenuItem("Fork"));
1069	1225	doubleItem.addActionListener(this);
	1226	+ if (Globals.ADVANCED)
	1227	+ {
1070	1228	tripleItem = menu.add(new MenuItem("Trident"));
1071	1229	tripleItem.addActionListener(this);
	1230	+ }
1072	1231	}
1073	1232
1074	1233	void buildToolsMenu(Menu menu)
1075	1234	{
1076	1235	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1236	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1237	+ animationItem.setState(Globals.ANIMATION);
1079	1238
1080	1239	menu.add("-");
1081	1240	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1241	parseverticesItem.addActionListener(this);
1083	1242	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1243	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1244	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1245	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1246	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1247	reduceMorphItem.addActionListener(this);
1091	1248	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1249	reduce34MorphItem.addActionListener(this);
1093		-
	1250	+ menu.add("-");
1094	1251	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1252	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1253
	1254	+ if (Globals.ADVANCED)
	1255	+ {
	1256	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1257	+ mirrorItem.addActionListener(this);
	1258	+ menu.add("-");
1098	1259	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1260	memoryItem.addActionListener(this);
1100	1261	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1108,6 +1269,8 @@
1108	1269	resetParentItem.addActionListener(this);
1109	1270	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1271	repairParentItem.addActionListener(this);
	1272	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1273	+ repairShadowItem.addActionListener(this);
1111	1274	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1275	invariantsItem.addActionListener(this);
1113	1276	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1278,7 @@
1115	1278	menu.add("-");
1116	1279	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1280	editScriptItem.addActionListener(this);
	1281	+ }
1118	1282	}
1119	1283
1120	1284	void ScreenFit()
..	..	@@ -1443,9 +1607,9 @@
1443	1607
1444	1608	void Overwrite(int mask)
1445	1609	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1610	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1611	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1612	+ Object3D content = Grafreed.clipboard.get(0);
1449	1613
1450	1614	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1615	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1632,7 @@
1468	1632	//
1469	1633	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1634	{
	1635	+ Object source = event.getSource();
1471	1636	/*
1472	1637	if (event.getSource() == nameField)
1473	1638	{
..	..	@@ -1479,11 +1644,11 @@
1479	1644	}
1480	1645	else
1481	1646	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1647	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1648	{
1484	1649	ScreenFit();
1485	1650	} else
1486		- if (event.getSource() == switchItem)
	1651	+ if (source == switchItem)
1487	1652	{
1488	1653	cVector v1 = new cVector();
1489	1654	cVector v2 = new cVector();
..	..	@@ -1492,11 +1657,11 @@
1492	1657	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1658	objEditor.cameraView.repaint();
1494	1659	} else
1495		- if (event.getSource() == rectoidItem)
	1660	+ if (source == rectoidItem)
1496	1661	{
1497	1662	makeSomething(new Box());
1498	1663	} else
1499		- if (event.getSource() == particleItem)
	1664	+ if (source == particleItem)
1500	1665	{
1501	1666	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1667	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1682,9 @@
1517	1682	applyExample(particleGeom, "SMOKE");
1518	1683	makeSomething(particleGeom);
1519	1684	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1685	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1686	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1687	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1688
1524	1689	ragdoll.toParent = LA.newMatrix();
1525	1690	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1702,7 @@
1537	1702	} else
1538	1703	/*
1539	1704	*/
1540		- if (event.getSource() == heightFieldItem)
	1705	+ if (source == heightFieldItem)
1541	1706	{
1542	1707	Object3D obj = new Object3D();
1543	1708
..	..	@@ -1575,27 +1740,31 @@
1575	1740
1576	1741	makeSomething(obj);
1577	1742	} else
1578		- if (event.getSource() == gridItem)
	1743	+ if (source == gridItem)
1579	1744	{
1580	1745	makeSomething(new Grid());
1581	1746	} else
1582		- if (event.getSource() == ellipsoidItem)
	1747	+ if (source == ellipsoidItem)
1583	1748	{
1584	1749	makeSomething(new Sphere());
1585	1750	} else
1586		- if (event.getSource() == coneItem)
	1751	+ if (source == coneItem)
1587	1752	{
1588	1753	makeSomething(new Cone());
1589	1754	} else
1590		- if (event.getSource() == torusItem)
	1755	+ if (source == torusItem)
1591	1756	{
1592	1757	makeSomething(new Torus());
1593	1758	} else
1594		- if (event.getSource() == superItem)
	1759	+ if (source == superItem)
1595	1760	{
1596	1761	makeSomething(new Superellipsoid());
1597	1762	} else
1598		- if (event.getSource() == blobItem)
	1763	+ if (source == kleinItem)
	1764	+ {
	1765	+ makeSomething(new Klein());
	1766	+ } else
	1767	+ if (source == blobItem)
1599	1768	{
1600	1769	Blob blob = new Blob();
1601	1770	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1772,15 @@
1603	1772	//blob.retile();
1604	1773	makeSomething(blob);
1605	1774	} else
1606		- if (event.getSource() == latheItem)
	1775	+ if (source == latheItem)
1607	1776	{
1608	1777	makeSomething(new Lathe());
1609	1778	} else
1610		- if (event.getSource() == bezierItem)
	1779	+ if (source == bezierItem)
1611	1780	{
1612	1781	makeSomething(new BezierSurface());
1613	1782	} else
1614		- if (event.getSource() == checkerItem)
	1783	+ if (source == overlayItem)
1615	1784	{
1616	1785	/*
1617	1786	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1795,7 @@
1626	1795	*/
1627	1796	makeSomething(new Checker());
1628	1797	} else
1629		- if (event.getSource() == meshItem)
	1798	+ if (source == meshItem)
1630	1799	{
1631	1800	Object3D itemtomake = new Object3D();
1632	1801	Object3D child;
..	..	@@ -1647,35 +1816,35 @@
1647	1816	makeSomething(child);
1648	1817	}
1649	1818	} else
1650		- if (event.getSource() == springItem)
	1819	+ if (source == springItem)
1651	1820	{
1652	1821	cSpring s = new cSpring();
1653	1822	s.setup();
1654	1823	makeSomething(s);
1655	1824	} else
1656		- if (event.getSource() == flagItem)
	1825	+ if (source == flagItem)
1657	1826	{
1658	1827	cSpring s = new cFlag();
1659	1828	s.setup();
1660	1829	makeSomething(s);
1661	1830	} else
1662		- if (event.getSource() == lightItem)
	1831	+ if (source == lightItem)
1663	1832	{
1664	1833	makeSomething(new Light());
1665	1834	} else
1666		- if (event.getSource() == csgItem)
	1835	+ if (source == csgItem)
1667	1836	{
1668	1837	group(new CSG());
1669	1838	} else
1670		- if (event.getSource() == templateItem)
	1839	+ if (source == templateItem)
1671	1840	{
1672	1841	group(new cTemplate());
1673	1842	} else
1674		- if (event.getSource() == attributeItem)
	1843	+ if (source == attributeItem)
1675	1844	{
1676	1845	makeSomething(new Attribute());
1677	1846	} else
1678		- if (event.getSource() == pointflowItem)
	1847	+ if (source == pointflowItem)
1679	1848	{
1680	1849	makeSomething(new PointFlow());
1681	1850	} else
..	..	@@ -1687,7 +1856,7 @@
1687	1856	} else
1688	1857	*/
1689	1858
1690		- if (event.getSource() == superLoopItem)
	1859	+ if (source == superLoopItem)
1691	1860	{
1692	1861	Composite g = new cGroup();
1693	1862	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1878,7 @@
1709	1878
1710	1879	group(g);
1711	1880	} else
1712		- if (event.getSource() == loopItem)
	1881	+ if (source == loopItem)
1713	1882	{
1714	1883	Composite csg = new GroupLeaf();
1715	1884	csg.count = 5;
..	..	@@ -1718,7 +1887,7 @@
1718	1887	csg.addChild(child);
1719	1888	child.addChild(csg);
1720	1889	} else
1721		- if (event.getSource() == doubleItem)
	1890	+ if (source == doubleItem)
1722	1891	{
1723	1892	Composite csg = new GroupLeaf();
1724	1893	csg.count = 5;
..	..	@@ -1730,7 +1899,7 @@
1730	1899	csg.addChild(child);
1731	1900	child.addChild(csg);
1732	1901	} else
1733		- if (event.getSource() == tripleItem)
	1902	+ if (source == tripleItem)
1734	1903	{
1735	1904	Composite csg = new GroupLeaf();
1736	1905	csg.count = 4;
..	..	@@ -1745,71 +1914,59 @@
1745	1914	csg.addChild(child);
1746	1915	child.addChild(csg);
1747	1916	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	1917	+ if (source == computeAOItem)
1750	1918	{
1751		- ImportGFD();
	1919	+ Globals.drawMode = CameraPane.OCCLUSION;
	1920	+ Globals.theRenderer.repaint();
1752	1921	} 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)
	1922	+ if (source == recompileItem)
1771	1923	{
1772	1924	Recompile();
1773	1925	refreshContents();
1774	1926	} else
1775		- if (event.getSource() == editScriptItem)
	1927	+ if (source == editScriptItem)
1776	1928	{
1777	1929	OpenDialog();
1778	1930	refreshContents();
1779	1931	} else
1780		- if (event.getSource() == invariantsItem)
	1932	+ if (source == invariantsItem)
1781	1933	{
1782	1934	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1935	+ Grafreed.grafreeD.universe.invariants();
1784	1936	} else
1785		- if (event.getSource() == memoryItem)
	1937	+ if (source == memoryItem)
1786	1938	{
1787	1939	//System.out.println("Invariants:");
1788	1940	PrintMemory();
1789	1941	} else
1790		- if (event.getSource() == pathItem)
	1942	+ if (source == pathItem)
1791	1943	{
1792	1944	PrintPath();
1793	1945	} else
1794		- if (event.getSource() == analyzeItem)
	1946	+ if (source == analyzeItem)
1795	1947	{
1796	1948	AnalyzeObject();
1797	1949	} else
1798		- if (event.getSource() == dumpItem)
	1950	+ if (source == dumpItem)
1799	1951	{
1800	1952	DumpObject();
1801	1953	} else
1802		- if (event.getSource() == screenfitButton)
	1954	+ if (source == oneStepButton)
	1955	+ {
	1956	+ Globals.ONESTEP = true;
	1957	+ cameraView.repaint();
	1958	+ } else
	1959	+ if (source == screenfitButton)
1803	1960	{
1804	1961	//Reload(lastConverter, lastFilename, true);
1805	1962	ScreenFit();
1806	1963	} else
1807		- if (event.getSource() == screenfitpointButton)
	1964	+ if (source == screenfitpointButton)
1808	1965	{
1809	1966	//Reload(lastConverter, lastFilename, true);
1810	1967	ScreenFitPoint();
1811	1968	} else
1812		- if (event.getSource() == snapobjectButton)
	1969	+ if (source == snapobjectButton)
1813	1970	{
1814	1971	//Reload(lastConverter, lastFilename, true);
1815	1972	SnapObject();
..	..	@@ -1820,13 +1977,13 @@
1820	1977	// Recompile();
1821	1978	// refreshContents();
1822	1979	// } else
1823		- if (event.getSource() == gcButton)
	1980	+ if (source == gcButton)
1824	1981	{
1825	1982	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1983	System.gc();
1827	1984	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1985	} else
1829		- if (event.getSource() == editLeafItem)
	1986	+ if (source == editLeafItem)
1830	1987	{
1831	1988	Object3D obj;
1832	1989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1997,66 @@
1840	1997	}
1841	1998	refreshContents(true);
1842	1999	} else
1843		- if (event.getSource() == openWindowItem)
	2000	+ if (source == openWindowItem)
1844	2001	{
1845	2002	EditSelection(true);
1846	2003	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2004	+ if (source == cutItem \|\| source == clearButton)
1848	2005	{
1849	2006	loadClipboard(true);
1850	2007	} else
1851		- if (event.getSource() == duplicateItem)
	2008	+ if (source == duplicateItem)
1852	2009	{
1853		- Object3D keep = GrafreeD.clipboard;
	2010	+ Object3D keep = Grafreed.clipboard;
1854	2011	loadClipboard(false);
1855	2012	paste(false);
1856		- GrafreeD.clipboard = keep;
	2013	+ Grafreed.clipboard = keep;
1857	2014	} else
1858		- if (event.getSource() == cloneItem)
	2015	+ if (source == cloneItem)
1859	2016	{
1860	2017	CloneSelection(false);
1861	2018	} else
1862		- if (event.getSource() == cloneSupportItem)
	2019	+ if (source == cloneSupportItem)
1863	2020	{
1864	2021	CloneSelection(true);
1865	2022	} else
1866		- if (event.getSource() == copyItem)
	2023	+ if (source == copyItem)
1867	2024	{
1868	2025	loadClipboard(false);
1869	2026	} else
1870		- if (event.getSource() == pasteItem)
	2027	+ if (source == pasteItem)
1871	2028	{
1872	2029	paste(false);
1873	2030	} else
1874		- if (event.getSource() == pasteLinkItem)
	2031	+ if (source == pasteIntoItem)
1875	2032	{
1876		- pasteInto(false);
	2033	+ pasteInto(true, false);
1877	2034	} else
1878		- if (event.getSource() == pasteCloneItem)
	2035	+ if (source == pasteLinkItem)
1879	2036	{
1880		- pasteInto(true);
	2037	+ pasteInto(false, false);
1881	2038	} else
1882		- if (event.getSource() == pasteExpandItem)
	2039	+ if (source == pasteCloneItem)
	2040	+ {
	2041	+ pasteInto(true, true);
	2042	+ } else
	2043	+ if (source == pasteExpandItem)
1883	2044	{
1884	2045	paste(true);
1885	2046	} else
1886		- if (event.getSource() == synchronizeItem)
	2047	+ if (source == synchronizeItem)
1887	2048	{
1888	2049	Overwrite(Object3D.TRANSFORM);
1889	2050	} else
1890		- if (event.getSource() == overwriteNameItem)
	2051	+ if (source == overwriteNameItem)
1891	2052	{
1892	2053	Overwrite(Object3D.NAME);
1893	2054	} else
1894		- if (event.getSource() == overwriteUVItem)
	2055	+ if (source == overwriteUVItem)
1895	2056	{
1896	2057	Overwrite(Object3D.UV);
1897	2058	} else
1898		- if (event.getSource() == overwriteMatItem)
	2059	+ if (source == overwriteMatItem)
1899	2060	{
1900	2061	/* july 2015
1901	2062	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2076,7 @@
1915	2076
1916	2077	Overwrite(dropAttributes);
1917	2078	}
1918		- if (event.getSource() == overwriteGeoItem)
	2079	+ if (source == overwriteGeoItem)
1919	2080	{
1920	2081	Overwrite(Object3D.GEOMETRY);
1921	2082	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2093,7 @@
1932	2093	// refreshContents();
1933	2094	// }
1934	2095	} else
1935		- if (event.getSource() == generateMeshItem)
	2096	+ if (source == generateMeshItem)
1936	2097	{
1937	2098	//if (group.selection.size() == 1)
1938	2099	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2104,7 @@
1943	2104	ResetModel();
1944	2105	refreshContents();
1945	2106	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2107	+ if (source == extractGeometriesItem)
1947	2108	{
1948	2109	boolean one = false;
1949	2110
..	..	@@ -1970,7 +2131,7 @@
1970	2131	ResetModel();
1971	2132	refreshContents();
1972	2133	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2134	+ if (source == cloneGeometriesItem)
1974	2135	{
1975	2136	boolean one = false;
1976	2137
..	..	@@ -1996,32 +2157,37 @@
1996	2157	ResetModel();
1997	2158	refreshContents();
1998	2159	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2160	+ if (source == shareGeometriesItem)
2000	2161	{
2001	2162	boolean one = false;
2002	2163
2003	2164	if (group.selection.size() == 1)
2004	2165	one = true;
2005	2166
	2167	+ Object3D merge = null;
	2168	+
2006	2169	Object3D content = new cGroup();
2007	2170
2008	2171	for (int i=0; i<group.selection.size(); i++)
2009	2172	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2173	+ merge = new Merge(group.selection.get(i));
2011	2174
2012	2175	if (one)
2013		- makeSomething(sel, false);
	2176	+ makeSomething(merge, false);
2014	2177	else
2015		- content.addChild(sel);
	2178	+ content.addChild(merge);
2016	2179	}
2017	2180
2018	2181	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2182	+ makeSomething(content, true);
	2183	+ else
	2184	+ {
	2185	+ ResetModel();
	2186	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2187	+ refreshContents();
	2188	+ }
2023	2189	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2190	+ if (source == mergeGeometriesItem)
2025	2191	{
2026	2192	boolean one = false;
2027	2193
..	..	@@ -2051,7 +2217,7 @@
2051	2217	ResetModel();
2052	2218	refreshContents();
2053	2219	} else
2054		- if (event.getSource() == linkverticesItem)
	2220	+ if (source == linkverticesItem)
2055	2221	{
2056	2222	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2223	// {
..	..	@@ -2064,39 +2230,48 @@
2064	2230	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2231	// refreshContents();
2066	2232	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2233	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2234	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2235	+ Object3D content = Grafreed.clipboard.get(0);
2070	2236
2071	2237	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2238	content = ((cGroup)content).get(0);
2073	2239
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2240	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2241	for (int i=0; i<group.selection.size(); i++)
2076	2242	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2243	+ boolean random = CameraPane.SWITCH;
	2244	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2245	group.selection.get(i).linkVerticesThis(content);
2080	2246	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2247	+ CameraPane.SWITCH = random;
2082	2248	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2249	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2250	refreshContents();
2085	2251	}
2086	2252	} else
2087		- if (event.getSource() == resetsupportItem)
	2253	+ if (source == resetsupportItem)
2088	2254	{
2089	2255	for (int i=0; i<group.selection.size(); i++)
2090	2256	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2257	+ boolean random = CameraPane.SWITCH;
	2258	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2259	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2095	2261	}
2096	2262
2097	2263	refreshContents();
2098	2264	} else
2099		- if (event.getSource() == resetreferencesItem)
	2265	+ if (source == relinkverticesItem)
	2266	+ {
	2267	+ boolean random = CameraPane.SWITCH;
	2268	+ CameraPane.SWITCH = false; // parse all random nodes
	2269	+ group.selection.RelinkToSupport();
	2270	+ CameraPane.SWITCH = random;
	2271	+
	2272	+ refreshContents();
	2273	+ } else
	2274	+ if (source == resetreferencesItem)
2100	2275	{
2101	2276	for (int i=0; i<group.selection.size(); i++)
2102	2277	{
..	..	@@ -2105,11 +2280,11 @@
2105	2280
2106	2281	refreshContents();
2107	2282	} else
2108		- if (event.getSource() == setMasterItem)
	2283	+ if (source == setMasterItem)
2109	2284	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2285	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2286	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2287	+ Object3D content = Grafreed.clipboard.get(0);
2113	2288
2114	2289	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2290	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2293,13 @@
2118	2293	refreshContents();
2119	2294	}
2120	2295	} else
2121		- if (event.getSource() == poseMeshItem)
	2296	+ if (source == poseMeshItem)
2122	2297	{
2123	2298	if (group.selection.size() == 1)
2124	2299	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2300	+ if (Grafreed.clipboard.size() == 1)
2126	2301	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2302	+ Object3D content = Grafreed.clipboard.get(0);
2128	2303
2129	2304	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2305	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2312,19 @@
2137	2312	}
2138	2313
2139	2314	} else
2140		- if (event.getSource() == revertMeshItem)
	2315	+ if (source == revertMeshItem)
2141	2316	{
2142	2317	RevertMeshes();
2143	2318	} else
2144		- if (event.getSource() == resetMeshItem)
	2319	+ if (source == resetAllItem)
2145	2320	{
2146	2321	ResetAll();
2147	2322	} else
2148		- if (event.getSource() == stepAllItem)
	2323	+ if (source == stepAllItem)
2149	2324	{
2150	2325	StepAll();
2151	2326	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2327	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2328	{
2154	2329	//int indices[] = jList.getSelectedIndices();
2155	2330	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2332,46 @@
2157	2332
2158	2333	ClearSelection(false);
2159	2334	} else
2160		- if (event.getSource() == clearAllItem)
	2335	+ if (source == clearAllItem)
2161	2336	{
2162	2337	ClearSelection(true);
2163	2338	} else
2164		- if (event.getSource() == grabItem)
	2339	+ if (source == grabItem)
2165	2340	{
2166	2341	group(new cGroup(), true);
2167	2342	} else
2168		- if (event.getSource() == frontItem)
	2343	+ if (source == hideItem)
	2344	+ {
	2345	+ group(new HiddenObject());
	2346	+ } else
	2347	+ if (source == frontItem)
2169	2348	{
2170	2349	front();
2171	2350	} else
2172		- if (event.getSource() == backItem)
	2351	+ if (source == backItem)
2173	2352	{
2174	2353	back();
2175	2354	} else
2176		- if (event.getSource() == cameraItem)
	2355	+ if (source == cameraItem)
2177	2356	{
2178	2357	makeSomething(new Camera());
2179	2358	} else
2180		- if (event.getSource() == compositeItem)
	2359	+ if (source == compositeItem)
2181	2360	{
2182	2361	group(new Composite());
2183	2362	} else
2184		- if (event.getSource() == randomItem)
	2363	+ if (source == randomItem)
2185	2364	{
2186	2365	RandomNode random = new RandomNode();
2187	2366	group(random);
2188	2367	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2368	+ random.name = random.get(0).name + "Switch";
2190	2369	} else
2191		- if (event.getSource() == physicsItem)
	2370	+ if (source == physicsItem)
2192	2371	{
2193	2372	group(new PhysicsNode());
2194	2373	} else
2195		- if (event.getSource() == frameselectorItem)
	2374	+ if (source == frameselectorItem)
2196	2375	{
2197	2376	for (int i=0; i<group.selection.size(); i++)
2198	2377	{
..	..	@@ -2204,7 +2383,7 @@
2204	2383	ResetModel();
2205	2384	refreshContents();
2206	2385	} else
2207		- if (event.getSource() == switchGeoItem)
	2386	+ if (source == switchGeoItem)
2208	2387	{
2209	2388	for (int i=0; i<group.selection.size(); i++)
2210	2389	{
..	..	@@ -2216,7 +2395,7 @@
2216	2395	ResetModel();
2217	2396	refreshContents();
2218	2397	} else
2219		- if (event.getSource() == switchTransfoItem)
	2398	+ if (source == switchTransfoItem)
2220	2399	{
2221	2400	for (int i=0; i<group.selection.size(); i++)
2222	2401	{
..	..	@@ -2228,7 +2407,7 @@
2228	2407	ResetModel();
2229	2408	refreshContents();
2230	2409	} else
2231		- if (event.getSource() == morphItem)
	2410	+ if (source == morphItem)
2232	2411	{
2233	2412	for (int i=0; i<group.selection.size(); i++)
2234	2413	{
..	..	@@ -2240,7 +2419,7 @@
2240	2419	ResetModel();
2241	2420	refreshContents();
2242	2421	} else
2243		- if (event.getSource() == scriptNodeItem)
	2422	+ if (source == scriptNodeItem)
2244	2423	{
2245	2424	boolean atleastone = false;
2246	2425
..	..	@@ -2279,199 +2458,223 @@
2279	2458	}
2280	2459	}
2281	2460	} else
2282		- if (event.getSource() == linkerItem)
	2461	+ if (source == linkerItem)
2283	2462	{
2284	2463	group(new cLinker());
2285	2464	} else
2286		- if (event.getSource() == textureItem)
	2465	+ if (source == textureItem)
2287	2466	{
2288	2467	group(new TextureNode());
2289	2468	} else
2290		- if (event.getSource() == shadowXItem)
	2469	+ if (source == billboardItem)
	2470	+ {
	2471	+ group(new BillboardNode());
	2472	+ } else
	2473	+ if (source == shadowXItem)
2291	2474	{
2292	2475	CastShadow(0);
2293	2476	} else
2294		- if (event.getSource() == shadowYItem)
	2477	+ if (source == shadowYItem)
2295	2478	{
2296	2479	CastShadow(1);
2297	2480	} else
2298		- if (event.getSource() == shadowZItem)
	2481	+ if (source == shadowZItem)
2299	2482	{
2300	2483	CastShadow(2);
2301	2484	} else
2302		- if (event.getSource() == ungroupItem)
	2485	+ if (source == ungroupItem)
2303	2486	{
2304		- ungroup();
	2487	+ //ungroup();
	2488	+ for (int i=0; i<group.selection.size(); i++)
	2489	+ {
	2490	+ Ungroup(group.selection.get(i));
	2491	+ }
	2492	+
	2493	+ ClearSelection(false);
	2494	+
	2495	+ refreshContents();
2305	2496	} else
2306		- if (event.getSource() == genUVItem)
	2497	+ if (source == genUVItem)
2307	2498	{
2308	2499	GenUV();
2309	2500	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2501	+ if (source == genNormalsCADItem)
2311	2502	{
2312	2503	GenNormals(true);
2313	2504	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2505	+ if (source == genNormalsMESHItem)
2315	2506	{
2316	2507	GenNormals(true); // TODO
2317	2508	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2509	+ if (source == genNormalsORGANItem)
2319	2510	{
2320	2511	GenNormals(false);
2321	2512	} else
2322		- if (event.getSource() == stripifyItem)
	2513	+ if (source == genNormalsMINEItem)
	2514	+ {
	2515	+ GenNormalsMINE();
	2516	+ } else
	2517	+ if (source == stripifyItem)
2323	2518	{
2324	2519	Stripify();
2325	2520	} else
2326		- if (event.getSource() == unstripifyItem)
	2521	+ if (source == unstripifyItem)
2327	2522	{
2328	2523	Unstripify();
2329	2524	} else
2330		- if (event.getSource() == trimItem)
	2525	+ if (source == trimItem)
2331	2526	{
2332	2527	Trim();
2333	2528	} else
2334		- if (event.getSource() == untrimItem)
	2529	+ if (source == untrimItem)
2335	2530	{
2336	2531	Untrim();
2337	2532	} else
2338		- if (event.getSource() == clearColorsItem)
	2533	+ if (source == clearColorsItem)
2339	2534	{
2340	2535	ClearColors();
2341	2536	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2537	+ if (source == clearMaterialsItem)
2343	2538	{
2344	2539	ClearMaterials();
2345	2540	} else
2346		- if (event.getSource() == liveleavesItem)
	2541	+ if (source == liveleavesItem)
2347	2542	{
2348	2543	LiveLeaves(true);
2349	2544	} else
2350		- if (event.getSource() == unliveleavesItem)
	2545	+ if (source == unliveleavesItem)
2351	2546	{
2352	2547	LiveLeaves(false);
2353	2548	} else
2354		- if (event.getSource() == supportleavesItem)
	2549	+ if (source == supportleavesItem)
2355	2550	{
2356	2551	SupportLeaves(true);
2357	2552	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2553	+ if (source == unsupportleavesItem)
2359	2554	{
2360	2555	SupportLeaves(false);
2361	2556	} else
2362		- if (event.getSource() == hideleavesItem)
	2557	+ if (source == hideleavesItem)
2363	2558	{
2364	2559	HideLeaves(true);
2365	2560	} else
2366		- if (event.getSource() == showleavesItem)
	2561	+ if (source == showleavesItem)
2367	2562	{
2368	2563	HideLeaves(false);
2369	2564	} else
2370		- if (event.getSource() == markleavesItem)
	2565	+ if (source == markleavesItem)
2371	2566	{
2372	2567	MarkLeaves(true);
2373	2568	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2569	+ if (source == unmarkleavesItem)
2375	2570	{
2376	2571	MarkLeaves(false);
2377	2572	} else
2378		- if (event.getSource() == flipVItem)
	2573	+ if (source == flipVItem)
2379	2574	{
2380	2575	FlipV(true);
2381	2576	} else
2382		- if (event.getSource() == unflipVItem)
	2577	+ if (source == unflipVItem)
2383	2578	{
2384	2579	FlipV(false);
2385	2580	} else
2386		- if (event.getSource() == lowTexturesItem)
	2581	+ if (source == lowTexturesItem)
2387	2582	{
2388	2583	SetTexRes(0);
2389	2584	} else
2390		- if (event.getSource() == normalTexturesItem)
	2585	+ if (source == normalTexturesItem)
2391	2586	{
2392	2587	SetTexRes(1);
2393	2588	} else
2394		- if (event.getSource() == highTexturesItem)
	2589	+ if (source == highTexturesItem)
2395	2590	{
2396	2591	SetTexRes(2);
2397	2592	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2593	+ if (source == veryhighTexturesItem)
2399	2594	{
2400	2595	SetTexRes(3);
2401	2596	} else
2402		- if (event.getSource() == maxTexturesItem)
	2597	+ if (source == maxTexturesItem)
2403	2598	{
2404	2599	SetTexRes(4);
2405	2600	} else
2406		- if (event.getSource() == panoTexturesItem)
	2601	+ if (source == panoTexturesItem)
2407	2602	{
2408	2603	SetTexRes(5);
2409	2604	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2605	+ if (source == reverseNormalsItem)
2411	2606	{
2412	2607	ReverseNormals();
2413	2608	} else
2414		- if (event.getSource() == parseverticesItem)
	2609	+ if (source == parseverticesItem)
2415	2610	{
2416	2611	ParseVertices();
2417	2612	} else
2418		- if (event.getSource() == textureFieldItem)
	2613	+ if (source == textureFieldItem)
2419	2614	{
2420	2615	TextureVertices();
2421	2616	} else
2422		- if (event.getSource() == alignItem)
	2617	+ if (source == alignItem)
2423	2618	{
2424	2619	Align();
2425	2620	} else
2426		- if (event.getSource() == mirrorItem)
	2621	+ if (source == mirrorItem)
2427	2622	{
2428	2623	MirrorPoses();
2429	2624	} else
2430		- if (event.getSource() == reduceMorphItem)
	2625	+ if (source == reduceMorphItem)
2431	2626	{
2432	2627	MeshReduction(false);
2433	2628	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2629	+ if (source == reduce34MorphItem)
2435	2630	{
2436	2631	MeshReduction(true);
2437	2632	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2633	+ if (source == reverseTrianglesItem)
2439	2634	{
2440	2635	ReverseTriangles();
2441	2636	} else
2442		- if (event.getSource() == reduceMeshItem)
	2637	+ if (source == reduceMeshItem)
2443	2638	{
2444	2639	ReduceMesh(false);
2445	2640	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2641	+ if (source == reduce34MeshItem)
2447	2642	{
2448	2643	ReduceMesh(true);
2449	2644	} else
2450		- if (event.getSource() == increaseMeshItem)
	2645	+ if (source == increaseMeshItem)
2451	2646	{
2452	2647	IncreaseMesh();
2453	2648	} else
2454		- if (event.getSource() == clipMeshItem)
	2649	+ if (source == clipMeshItem)
2455	2650	{
2456	2651	ClipMesh();
2457	2652	} else
2458		- if (event.getSource() == smoothMeshItem)
	2653	+ if (source == smoothMeshItem)
2459	2654	{
2460	2655	SmoothMesh();
2461	2656	} else
2462		- if (event.getSource() == transformgeometryItem)
	2657	+ if (source == transformGeometryItem)
2463	2658	{
2464	2659	TransformGeometry();
2465	2660	} else
2466		- if (event.getSource() == resetTransformItem)
	2661	+ if (source == transformChildrenItem)
	2662	+ {
	2663	+ TransformChildren();
	2664	+ } else
	2665	+ if (source == resetTransformItem)
2467	2666	{
2468	2667	ResetTransform();
2469	2668	} else
2470		- if (event.getSource() == resetCentroidItem)
	2669	+ if (source == resetCentroidItem)
2471	2670	{
2472		- ResetCentroid();
	2671	+ ResetCentroid(true);
2473	2672	} else
2474		- if (event.getSource() == resetParentItem)
	2673	+ if (source == resetCentroidXZItem)
	2674	+ {
	2675	+ ResetCentroid(false);
	2676	+ } else
	2677	+ if (source == resetParentItem)
2475	2678	{
2476	2679	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2680	{
..	..	@@ -2481,7 +2684,7 @@
2481	2684
2482	2685	refreshContents();
2483	2686	} else
2484		- if (event.getSource() == repairParentItem)
	2687	+ if (source == repairParentItem)
2485	2688	{
2486	2689	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2690	{
..	..	@@ -2495,7 +2698,21 @@
2495	2698
2496	2699	refreshContents();
2497	2700	} else
2498		- if (event.getSource() == sortbysizeItem)
	2701	+ if (source == repairShadowItem)
	2702	+ {
	2703	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2704	+ {
	2705	+ Object3D obj = (Object3D)e.nextElement();
	2706	+ obj.RepairShadow();
	2707	+// for (int i=0; i<obj.size(); i++)
	2708	+// {
	2709	+// obj.get(i).parent = obj;
	2710	+// }
	2711	+ }
	2712	+
	2713	+ refreshContents();
	2714	+ } else
	2715	+ if (source == sortbysizeItem)
2499	2716	{
2500	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2718	{
..	..	@@ -2507,7 +2724,7 @@
2507	2724	ResetModel();
2508	2725	refreshContents();
2509	2726	} else
2510		- if (event.getSource() == sortbynameItem)
	2727	+ if (source == sortbynameItem)
2511	2728	{
2512	2729	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2730	{
..	..	@@ -2519,7 +2736,7 @@
2519	2736	ResetModel();
2520	2737	refreshContents();
2521	2738	} else
2522		- if (event.getSource() == attachPigmentItem)
	2739	+ if (source == attachPigmentItem)
2523	2740	{
2524	2741	String texture = GetFile("Attach pigment");
2525	2742	Object3D obj;
..	..	@@ -2531,7 +2748,7 @@
2531	2748
2532	2749	refreshContents();
2533	2750	} else
2534		- if (event.getSource() == detachPigmentItem)
	2751	+ if (source == detachPigmentItem)
2535	2752	{
2536	2753	Object3D obj;
2537	2754	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2759,7 @@
2542	2759
2543	2760	refreshContents();
2544	2761	} else
2545		- if (event.getSource() == attachBumpItem)
	2762	+ if (source == attachBumpItem)
2546	2763	{
2547	2764	String texture = GetFile("Attach bump");
2548	2765	Object3D obj;
..	..	@@ -2554,7 +2771,7 @@
2554	2771
2555	2772	refreshContents();
2556	2773	} else
2557		- if (event.getSource() == detachBumpItem)
	2774	+ if (source == detachBumpItem)
2558	2775	{
2559	2776	Object3D obj;
2560	2777	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2782,7 @@
2565	2782
2566	2783	refreshContents();
2567	2784	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2785	+ if (source == pigmentBumpItem)
2569	2786	{
2570	2787	Object3D obj;
2571	2788	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2793,195 @@
2576	2793
2577	2794	refreshContents();
2578	2795	} else
2579		- if (event.getSource() == flashSelectionButton)
	2796	+ if (source == flashSelectionButton)
2580	2797	{
2581	2798	CameraPane.flash = true;
2582	2799	refreshContents();
2583	2800	} else
2584		- if (event.getSource() == oneButton)
	2801	+ if (source == oneButton)
2585	2802	{
2586	2803	} else
2587		- if (event.getSource() == twoButton)
	2804	+ if (source == twoButton)
2588	2805	{
2589	2806	radio.layout = twoButton;
2590	2807	// bug
2591	2808	//gridPanel.setDividerLocation(1.0);
2592	2809	//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();
	2810	+// bigThree.remove(scenePanel);
	2811	+// bigThree.remove(centralPanel);
	2812	+// bigThree.remove(XYZPanel);
	2813	+// aWindowConstraints.gridx = 0;
	2814	+// aWindowConstraints.gridy = 0;
	2815	+// aWindowConstraints.gridwidth = 1;
	2816	+// // aConstraints.gridheight = 3;
	2817	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2818	+// aWindowConstraints.weightx = 0;
	2819	+// aWindowConstraints.weighty = 1;
	2820	+// //bigThree.add(jtp, aWindowConstraints);
	2821	+// aWindowConstraints.weightx = 1;
	2822	+// aWindowConstraints.gridwidth = 3;
	2823	+// // aConstraints.gridheight = 3;
	2824	+// aWindowConstraints.gridx = 1;
	2825	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2826	+// bigThree.add(centralPanel, aWindowConstraints);
	2827	+// aWindowConstraints.weightx = 0;
	2828	+// aWindowConstraints.gridx = 4;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aConstraints.gridheight = 3;
	2831	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2833	+// scenePanel.setVisible(false);
	2834	+// centralPanel.setVisible(true);
	2835	+// XYZPanel.setVisible(false);
	2836	+ bigThree.ClearUI();
	2837	+ bigThree.add(centralPanel);
	2838	+ bigThree.FlushUI();
2617	2839	} else
2618		- if (event.getSource() == threeButton)
	2840	+ if (source == threeButton)
2619	2841	{
2620	2842	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();
	2843	+
	2844	+// bigThree.remove(scenePanel);
	2845	+// bigThree.remove(centralPanel);
	2846	+// bigThree.remove(XYZPanel);
	2847	+// aWindowConstraints.gridx = 0;
	2848	+// aWindowConstraints.gridy = 0;
	2849	+// aWindowConstraints.gridwidth = 1;
	2850	+// // aConstraints.gridheight = 3;
	2851	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2852	+// aWindowConstraints.weightx = 0;
	2853	+// aWindowConstraints.weighty = 1;
	2854	+// //bigThree.add(jtp, aWindowConstraints);
	2855	+// aWindowConstraints.weightx = 1;
	2856	+// aWindowConstraints.gridwidth = 3;
	2857	+// // aConstraints.gridheight = 3;
	2858	+// aWindowConstraints.gridx = 1;
	2859	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2860	+// bigThree.add(centralPanel, aWindowConstraints);
	2861	+// aWindowConstraints.weightx = 0;
	2862	+// aWindowConstraints.gridx = 4;
	2863	+// aWindowConstraints.gridwidth = 1;
	2864	+// // aConstraints.gridheight = 3;
	2865	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2866	+// bigThree.add(XYZPanel, aWindowConstraints);
	2867	+// bigThree.validate();
	2868	+// scenePanel.setVisible(false);
	2869	+// centralPanel.setVisible(true);
	2870	+// XYZPanel.setVisible(true);
	2871	+ bigThree.ClearUI();
	2872	+ bigThree.add(centralPanel);
	2873	+ bigThree.add(XYZPanel);
	2874	+ bigThree.FlushUI();
2645	2875	} else
2646		- if (event.getSource() == fourButton)
	2876	+ if (source == fourButton)
2647	2877	{
2648	2878	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();
	2879	+
	2880	+// bigThree.remove(scenePanel);
	2881	+// bigThree.remove(centralPanel);
	2882	+// bigThree.remove(XYZPanel);
	2883	+// aWindowConstraints.gridx = 0;
	2884	+// aWindowConstraints.gridy = 0;
	2885	+// aWindowConstraints.gridwidth = 1;
	2886	+// // aWindowConstraints.gridheight = 3;
	2887	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2888	+// aWindowConstraints.weightx = 1;
	2889	+// aWindowConstraints.weighty = 1;
	2890	+// bigThree.add(scenePanel, aWindowConstraints);
	2891	+// aWindowConstraints.weightx = 1;
	2892	+// aWindowConstraints.gridwidth = 3;
	2893	+// // aConstraints.gridheight = 3;
	2894	+// aWindowConstraints.gridx = 1;
	2895	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2896	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2897	+// aWindowConstraints.weightx = 0;
	2898	+// aWindowConstraints.gridx = 4;
	2899	+// aWindowConstraints.gridwidth = 1;
	2900	+// // aWindowConstraints.gridheight = 3;
	2901	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2902	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2903	+// bigThree.validate();
	2904	+// scenePanel.setVisible(true);
	2905	+// centralPanel.setVisible(false);
	2906	+// XYZPanel.setVisible(false);
	2907	+ bigThree.ClearUI();
	2908	+ bigThree.add(scenePanel);
	2909	+ bigThree.FlushUI();
2673	2910	} else
2674		- if (event.getSource() == sixButton)
	2911	+ if (source == sixButton)
2675	2912	{
2676	2913	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();
	2914	+
	2915	+// bigThree.remove(scenePanel);
	2916	+// bigThree.remove(centralPanel);
	2917	+// bigThree.remove(XYZPanel);
	2918	+// aWindowConstraints.gridx = 0;
	2919	+// aWindowConstraints.gridy = 0;
	2920	+// aWindowConstraints.gridwidth = 1;
	2921	+// // aConstraints.gridheight = 3;
	2922	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2923	+// aWindowConstraints.weightx = 0;
	2924	+// aWindowConstraints.weighty = 1;
	2925	+// bigThree.add(scenePanel, aWindowConstraints);
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.gridwidth = 3;
	2928	+// // aWindowConstraints.gridheight = 3;
	2929	+// aWindowConstraints.gridx = 1;
	2930	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2931	+// bigThree.add(centralPanel, aWindowConstraints);
	2932	+// aWindowConstraints.weightx = 0;
	2933	+// aWindowConstraints.gridx = 4;
	2934	+// aWindowConstraints.gridwidth = 1;
	2935	+// // aWindowConstraints.gridheight = 3;
	2936	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2937	+// //bigThree.add(XYZPanel, aConstraints);
	2938	+// bigThree.validate();
	2939	+// scenePanel.setVisible(true);
	2940	+// centralPanel.setVisible(true);
	2941	+// XYZPanel.setVisible(false);
	2942	+ bigThree.ClearUI();
	2943	+ bigThree.add(scenePanel);
	2944	+ bigThree.add(centralPanel);
	2945	+ bigThree.FlushUI();
2701	2946	} else
2702		- if (event.getSource() == sevenButton)
	2947	+ if (source == sevenButton)
2703	2948	{
2704	2949	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();
	2950	+
	2951	+// bigThree.remove(scenePanel);
	2952	+// bigThree.remove(centralPanel);
	2953	+// bigThree.remove(XYZPanel);
	2954	+// aWindowConstraints.gridx = 0;
	2955	+// aWindowConstraints.gridy = 0;
	2956	+// aWindowConstraints.gridwidth = 1;
	2957	+// // aWindowConstraints.gridheight = 3;
	2958	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2959	+// aWindowConstraints.weightx = 0;
	2960	+// aWindowConstraints.weighty = 1;
	2961	+// bigThree.add(scenePanel, aWindowConstraints);
	2962	+// aWindowConstraints.weightx = 1;
	2963	+// aWindowConstraints.gridwidth = 3;
	2964	+// // aWindowConstraints.gridheight = 3;
	2965	+// aWindowConstraints.gridx = 1;
	2966	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2967	+// bigThree.add(centralPanel, aWindowConstraints);
	2968	+// aWindowConstraints.weightx = 0;
	2969	+// aWindowConstraints.gridx = 4;
	2970	+// aWindowConstraints.gridwidth = 1;
	2971	+// // aConstraints.gridheight = 3;
	2972	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2973	+// bigThree.add(XYZPanel, aWindowConstraints);
	2974	+// bigThree.validate();
	2975	+// scenePanel.setVisible(true);
	2976	+// centralPanel.setVisible(true);
	2977	+// XYZPanel.setVisible(true);
	2978	+ bigThree.ClearUI();
	2979	+ bigThree.add(scenePanel);
	2980	+ bigThree.add(centralPanel);
	2981	+ bigThree.add(XYZPanel);
	2982	+ bigThree.FlushUI();
2729	2983	} else
2730		- if (event.getSource() == rootButton)
	2984	+ if (source == rootButton)
2731	2985	{
2732	2986	Object3D obj;
2733	2987	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2993,7 @@
2739	2993
2740	2994	refreshContents(true);
2741	2995	} else
2742		- if (event.getSource() == closeButton)
	2996	+ if (source == closeButton)
2743	2997	{
2744	2998	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2999	cRadio ab;
..	..	@@ -2760,11 +3014,11 @@
2760	3014	}
2761	3015	refreshContents(true);
2762	3016	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3017	+ if (source == editItem \|\| source == editButton)
2764	3018	{
2765	3019	EditSelection(false);
2766	3020	} else
2767		- if (event.getSource() == uneditButton)
	3021	+ if (source == uneditButton)
2768	3022	{
2769	3023	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3024	{
..	..	@@ -2776,12 +3030,12 @@
2776	3030
2777	3031	child.editWindow = null; // ???????????
2778	3032	}
2779		- objEditor.ctrlPanel.revalidate();
	3033	+ objEditor.ctrlPanel.FlushUI();
2780	3034	//objEditor.jTree.clearSelection();
2781	3035	//objEditor.ResetSliders();
2782	3036	refreshContents(true);
2783	3037	} else
2784		- if (event.getSource() == clearPanelButton)
	3038	+ if (source == clearPanelButton)
2785	3039	{
2786	3040	assert(copy == group);
2787	3041	//copy.ClearUI();
..	..	@@ -2792,7 +3046,7 @@
2792	3046	listUI.clear();
2793	3047	refreshContents(true);
2794	3048	} else
2795		- if (event.getSource() == allParamsButton)
	3049	+ if (source == allParamsButton)
2796	3050	{
2797	3051	assert(copy == group);
2798	3052
..	..	@@ -2813,19 +3067,19 @@
2813	3067
2814	3068	refreshContents(true);
2815	3069	} else
2816		- if (event.getSource() == unselectButton)
	3070	+ if (source == unselectButton)
2817	3071	{
2818	3072	objEditor.jTree.clearSelection();
2819	3073	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3074	objEditor.ResetSliders();
2821	3075	refreshContents(true);
2822	3076	} else
2823		- if(event.getSource() instanceof cRadio)
	3077	+ if(source instanceof cRadio)
2824	3078	{
2825	3079	group.parent = keepparent;
2826	3080	group.attributes = 0;
2827	3081	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3082	+ /cRadio/ radio = (cRadio)source;
2829	3083	Object3D obj = radio.GetObject();
2830	3084	System.out.println("Edit " + obj);
2831	3085	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3099,7 @@
2845	3099	}
2846	3100
2847	3101	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3102	+ //Globals.theRenderer.object = group;
2849	3103	if(!useclient)
2850	3104	{
2851	3105	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,12 +3108,15 @@
2854	3108	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3109	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3110	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3111	+ //cameraView.lighttouched = true;
	3112	+ Globals.lighttouched = true;
2858	3113	topView.object = group;
2859	3114	frontView.object = group;
2860	3115	sideView.object = group;
2861	3116	}
2862		- group.editWindow = this;
	3117	+
	3118	+// fix "+" issue group.editWindow = this;
	3119	+
2863	3120	/*
2864	3121	currentLayout = radio.layout;
2865	3122	if (currentLayout == null)
..	..	@@ -2872,7 +3129,20 @@
2872	3129	//group.attributes = -1;
2873	3130	ResetModel();
2874	3131	refreshContents(true);
2875		- }
	3132	+ } else if (event.getSource() == editCameraItem)
	3133	+ {
	3134	+ cameraView.ProtectCamera();
	3135	+ cameraView.repaint();
	3136	+ return;
	3137	+ } else if (event.getSource() == revertCameraItem)
	3138	+ {
	3139	+ cameraView.RevertCamera();
	3140	+ cameraView.repaint();
	3141	+ return;
	3142	+ // } else if (event.getSource() == textureButton)
	3143	+ // {
	3144	+ // return; // true;
	3145	+ }
2876	3146	else
2877	3147	{
2878	3148	//return super.action(event, arg);
..	..	@@ -2890,7 +3160,7 @@
2890	3160	if (useclient)
2891	3161	{
2892	3162	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3163	+ Globals.lighttouched = true;
2894	3164	//topView.object = client;
2895	3165	//frontView.object = client;
2896	3166	//sideView.object = client;
..	..	@@ -2898,7 +3168,7 @@
2898	3168	else
2899	3169	{
2900	3170	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3171	+ Globals.lighttouched = true;
2902	3172	//topView.object = group;
2903	3173	//frontView.object = group;
2904	3174	//sideView.object = group;
..	..	@@ -2933,6 +3203,28 @@
2933	3203	refreshContents();
2934	3204	}
2935	3205
	3206	+ void TransformChildren()
	3207	+ {
	3208	+ Object3D obj;
	3209	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3210	+ {
	3211	+ obj = (Object3D)e.nextElement();
	3212	+ obj.KeepTextureMatrices();
	3213	+ obj.TransformChildren();
	3214	+ obj.RestoreTextureMatrices();
	3215	+
	3216	+// if (obj.parent == null)
	3217	+// {
	3218	+// System.out.println("NULL PARENT!");
	3219	+// new Exception().printStackTrace();
	3220	+// }
	3221	+// else
	3222	+// TouchTransform(obj);
	3223	+// //obj.parent.Touch();
	3224	+ }
	3225	+
	3226	+ refreshContents();
	3227	+ }
2936	3228
2937	3229	void ResetTransform()
2938	3230	{
..	..	@@ -3045,7 +3337,7 @@
3045	3337	refreshContents();
3046	3338	}
3047	3339
3048		- void ResetCentroid()
	3340	+ void ResetCentroid(boolean full)
3049	3341	{
3050	3342	Object3D obj;
3051	3343	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3352,16 @@
3060	3352	LA.matIdentity(Object3D.mat);
3061	3353	obj.getBounds(minima, maxima, false);
3062	3354	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3355	+ if (full)
	3356	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3357	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3358	obj.TransformMesh(Object3D.mat);
	3359	+
3066	3360	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3361	+ if (full)
	3362	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3363	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3364	+
3069	3365	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3366	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3367	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3131,9 +3427,9 @@
3131	3427	obj = (Object3D)e.nextElement();
3132	3428
3133	3429	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3430	+ Grafreed.AnalyzeObject(obj);
3135	3431	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3432	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3433
3138	3434	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3435	}
..	..	@@ -3175,6 +3471,13 @@
3175	3471	void GenNormals(boolean crease)
3176	3472	{
3177	3473	group.GenNormalsS(crease);
	3474	+
	3475	+ refreshContents();
	3476	+ }
	3477	+
	3478	+ void GenNormalsMINE()
	3479	+ {
	3480	+ group.selection.GenNormalsMINE();
3178	3481
3179	3482	refreshContents();
3180	3483	}
..	..	@@ -3340,8 +3643,8 @@
3340	3643
3341	3644	void ParseVertices()
3342	3645	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	3646	+ boolean epsequal = Grafreed.epsequal;
	3647	+ Grafreed.epsequal = true;
3345	3648
3346	3649	for (int i=0; i<group.selection.size(); i++)
3347	3650	{
..	..	@@ -3366,7 +3669,7 @@
3366	3669	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	3670	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	3671
3369		- g.add(GrafreeD.clipboard);
	3672	+ g.add(Grafreed.clipboard);
3370	3673
3371	3674	buffer.add(g);
3372	3675	}
..	..	@@ -3381,7 +3684,7 @@
3381	3684	makeSomething(buffer, i==group.selection.size()-1);
3382	3685	}
3383	3686
3384		- GrafreeD.epsequal = epsequal;
	3687	+ Grafreed.epsequal = epsequal;
3385	3688
3386	3689	refreshContents();
3387	3690	}
..	..	@@ -3399,7 +3702,16 @@
3399	3702	String pigment = Object3D.GetPigment(tex);
3400	3703	//String bump = Object3D.GetBump(tex);
3401	3704
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3705	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3706	+
	3707	+ try
	3708	+ {
	3709	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3710	+ }
	3711	+ catch (Exception e)
	3712	+ {
	3713	+ System.err.println("FAIL: " + node);
	3714	+ }
3403	3715
3404	3716	double s = v.s;
3405	3717
..	..	@@ -3447,12 +3759,26 @@
3447	3759
3448	3760	void Align()
3449	3761	{
	3762	+ if (group.selection.size() == 0)
	3763	+ return;
	3764	+
	3765	+ cVector bbmin = new cVector();
	3766	+ cVector bbmax = new cVector();
	3767	+
	3768	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3769	+
	3770	+ double dx = bbmax.x - bbmin.x;
	3771	+ double dy = bbmax.y - bbmin.y;
	3772	+ double dz = bbmax.z - bbmin.z;
	3773	+
	3774	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3775	+
3450	3776	for (int i=0; i<group.selection.size(); i++)
3451	3777	{
3452	3778	Object3D obj = group.selection.get(i);
3453	3779
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3780	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3781	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3782	}
3457	3783
3458	3784	refreshContents();
..	..	@@ -3473,11 +3799,11 @@
3473	3799
3474	3800	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3801
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3802	+ boolean random = CameraPane.SWITCH;
	3803	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3804	lowres.linkVerticesThis(null);
3479	3805	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3806	+ CameraPane.SWITCH = random;
3481	3807
3482	3808	System.err.flush();
3483	3809
..	..	@@ -3517,7 +3843,7 @@
3517	3843	return;
3518	3844
3519	3845	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	3846	+ Object3D ref = Grafreed.clipboard.get(0);
3521	3847
3522	3848	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	3849
..	..	@@ -3686,7 +4012,7 @@
3686	4012	group.selection.RelinkToSupport(); // july 2014
3687	4013	System.out.println("DONE.");
3688	4014	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4015	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4016	}
3691	4017
3692	4018	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4037,9 @@
3711	4037
3712	4038	void ClipMesh()
3713	4039	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4040	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4041	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4042	+ Object3D content = Grafreed.clipboard.get(0);
3717	4043
3718	4044	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4045	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4048,7 @@
3722	4048	// {
3723	4049	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4050	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4051	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4052	}
3727	4053	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4054	System.out.println("DONE.");
..	..	@@ -3857,7 +4183,7 @@
3857	4183	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4184
3859	4185	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4186	+ if(elem != group \|\| !newWindow)
3861	4187	{
3862	4188	// if (!(elem instanceof Composite))
3863	4189	// newWindow = false;
..	..	@@ -3962,25 +4288,25 @@
3962	4288	System.err.println("info : " + child.GetPath());
3963	4289	}
3964	4290	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4291	+// else
	4292	+// {
	4293	+// objEditor.SetMaterial(group); // .GetMaterial());
	4294	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4295	+// System.err.println("info : " + group.GetPath());
	4296	+// }
3971	4297
3972	4298	objEditor.SetText(); // jan 2014
3973	4299
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4300	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4301	CameraPane.flash = true;
3976	4302
3977	4303	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4304	// a camera
3979	4305	{
3980	4306	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;
	4307	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4308	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4309	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4310	}
3985	4311
3986	4312	refreshContents();
..	..	@@ -4062,12 +4388,12 @@
4062	4388	{
4063	4389	if (group.selection.isEmpty())
4064	4390	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4391	+ Grafreed.clipboardIsTempGroup = false;
4066	4392	Composite tGroup = null;
4067	4393	if (group.selection.size() > 0) // 1)
4068	4394	{
4069	4395	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4396	+ Grafreed.clipboardIsTempGroup = true;
4071	4397	}
4072	4398
4073	4399	if (cut)
..	..	@@ -4107,16 +4433,16 @@
4107	4433	//System.out.println("cut " + child);
4108	4434	//System.out.println("parent = " + child.parent);
4109	4435	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4111	4437	tGroup.add/Child/(tmp);
4112	4438	else
4113		- GrafreeD.clipboard = tmp;
	4439	+ Grafreed.clipboard = tmp;
4114	4440	}
4115	4441	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4442	+ if (Grafreed.clipboardIsTempGroup)
4117	4443	tGroup.add/Child/(child);
4118	4444	else
4119		- GrafreeD.clipboard = child;
	4445	+ Grafreed.clipboard = child;
4120	4446	}
4121	4447
4122	4448	//ResetModel();
..	..	@@ -4148,21 +4474,21 @@
4148	4474	//System.out.println("cut " + elem);
4149	4475	//System.out.println("parent = " + elem.parent);
4150	4476	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4477	+ if (Grafreed.clipboardIsTempGroup)
4152	4478	tGroup.add/Child/(tmp);
4153	4479	else
4154		- GrafreeD.clipboard = tmp;
	4480	+ Grafreed.clipboard = tmp;
4155	4481	}
4156	4482	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4483	+ if (Grafreed.clipboardIsTempGroup)
4158	4484	tGroup.add/Child/(child);
4159	4485	else
4160		- GrafreeD.clipboard = child;
	4486	+ Grafreed.clipboard = child;
4161	4487	}
4162	4488
4163	4489	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4490	+ if (Grafreed.clipboardIsTempGroup)
	4491	+ Grafreed.clipboard = tGroup;
4166	4492	if (cut)
4167	4493	{
4168	4494	ResetModel();
..	..	@@ -4176,7 +4502,7 @@
4176	4502	// return;
4177	4503	boolean first = true;
4178	4504
4179		- if (GrafreeD.clipboardIsTempGroup)
	4505	+ if (Grafreed.clipboardIsTempGroup)
4180	4506	{
4181	4507	Composite temp;
4182	4508
..	..	@@ -4187,7 +4513,7 @@
4187	4513	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	4514	*/
4189	4515	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4516	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	4517	{
4192	4518	Object3D child = (Object3D)e.nextElement();
4193	4519
..	..	@@ -4221,21 +4547,21 @@
4221	4547	//Object3D cb = Applet3D.clipboard;
4222	4548	//temp.addChild(cb);
4223	4549	//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());
	4550	+ assert(Grafreed.clipboard.parent == null);
	4551	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4552	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4553	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4554	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	4555	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	4556	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4557	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	4558	}
4233	4559
4234	4560	ResetModel();
4235	4561	refreshContents();
4236	4562	}
4237	4563
4238		- void pasteInto(boolean copyit)
	4564	+ void pasteInto(boolean copyit, boolean clone)
4239	4565	{
4240	4566	// if (GrafreeD.clipboard == null)
4241	4567	// return;
..	..	@@ -4264,15 +4590,22 @@
4264	4590	if (copyit)
4265	4591	{
4266	4592	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4593	+ if (clone)
	4594	+ {
	4595	+ CloneClipboard(false); // sept 2014
	4596	+ }
	4597	+ else
	4598	+ {
	4599	+ paste(false);
	4600	+ }
4268	4601	}
4269	4602	else
4270	4603	{
4271	4604	boolean first = true;
4272	4605
4273		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4274	4607	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	4608	+ Composite temp = (Composite)Grafreed.clipboard;
4276	4609	Object3D copy;
4277	4610	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	4611	{
..	..	@@ -4282,7 +4615,7 @@
4282	4615	}
4283	4616	} else
4284	4617	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	4618	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	4619	}
4287	4620	}
4288	4621	}
..	..	@@ -4474,6 +4807,26 @@
4474	4807	makeSomething(csg);
4475	4808	}
4476	4809
	4810	+ void Ungroup(Object3D g)
	4811	+ {
	4812	+ if (g instanceof HiddenObject)
	4813	+ {
	4814	+ HiddenObject h = (HiddenObject) g;
	4815	+
	4816	+ for (int i=0; i<h.ActualSize(); i++)
	4817	+ {
	4818	+ objEditor.makeSomething(h.get(i), false);
	4819	+ }
	4820	+ }
	4821	+ else
	4822	+ {
	4823	+ for (int i=0; i<g.Size(); i++)
	4824	+ {
	4825	+ objEditor.makeSomething(g.get(i), false);
	4826	+ }
	4827	+ }
	4828	+ }
	4829	+
4477	4830	void ungroup()
4478	4831	{
4479	4832	/*
..	..	@@ -4667,21 +5020,6 @@
4667	5020	}
4668	5021	*/
4669	5022
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	5023	/*
4686	5024	public void Callback(Object obj)
4687	5025	{
..	..	@@ -4705,26 +5043,9 @@
4705	5043	}
4706	5044	*/
4707	5045
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	5046	String GetFile(String dialogName)
4726	5047	{
4727		- if (GrafreeD.standAlone)
	5048	+ if (Grafreed.standAlone)
4728	5049	{
4729	5050	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5051	browser.show();
..	..	@@ -4788,10 +5109,12 @@
4788	5109	cButton flashSelectionButton;
4789	5110	cButton editButton;
4790	5111	cButton uneditButton;
	5112	+ JCheckBox allParamsButton;
4791	5113	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5114	cButton unselectButton;
4794	5115
	5116	+ cButton oneStepButton;
	5117	+
4795	5118	cButton screenfitButton;
4796	5119	cButton screenfitpointButton;
4797	5120	cButton snapobjectButton;
..	..	@@ -4833,8 +5156,9 @@
4833	5156	private MenuItem resetsupportItem;
4834	5157	private MenuItem resetreferencesItem;
4835	5158	private MenuItem linkverticesItem;
	5159	+ private MenuItem relinkverticesItem;
4836	5160	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5161	+ private MenuItem resetAllItem;
4838	5162	private MenuItem stepAllItem;
4839	5163	private MenuItem revertMeshItem;
4840	5164	private MenuItem poseMeshItem;
..	..	@@ -4845,6 +5169,7 @@
4845	5169	private MenuItem mergeGeometriesItem;
4846	5170	private MenuItem copyItem;
4847	5171	private MenuItem pasteItem;
	5172	+ private MenuItem pasteIntoItem;
4848	5173	private MenuItem pasteLinkItem;
4849	5174	private MenuItem pasteCloneItem;
4850	5175	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5179,7 @@
4854	5179	private MenuItem genNormalsMESHItem;
4855	5180	private MenuItem genNormalsCADItem;
4856	5181	private MenuItem genNormalsORGANItem;
	5182	+ private MenuItem genNormalsMINEItem;
4857	5183	private MenuItem stripifyItem;
4858	5184	private MenuItem unstripifyItem;
4859	5185	private MenuItem trimItem;
..	..	@@ -4893,8 +5219,11 @@
4893	5219	private MenuItem panoTexturesItem;
4894	5220
4895	5221	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5222	+ private MenuItem resetCentroidXZItem;
4897	5223	private MenuItem resetTransformItem;
	5224	+ private MenuItem transformGeometryItem;
	5225	+ private MenuItem transformChildrenItem;
	5226	+ private MenuItem hideItem;
4898	5227	private MenuItem grabItem;
4899	5228	private MenuItem backItem;
4900	5229	private MenuItem frontItem;
..	..	@@ -4915,6 +5244,7 @@
4915	5244
4916	5245	private MenuItem resetParentItem;
4917	5246	private MenuItem repairParentItem;
	5247	+ private MenuItem repairShadowItem;
4918	5248	private MenuItem sortbysizeItem;
4919	5249	private MenuItem sortbynameItem;
4920	5250
..	..	@@ -4935,10 +5265,11 @@
4935	5265	private MenuItem coneItem;
4936	5266	private MenuItem torusItem;
4937	5267	private MenuItem superItem;
	5268	+ private MenuItem kleinItem;
4938	5269	private MenuItem blobItem;
4939	5270	private MenuItem latheItem;
4940	5271	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5272	+ private MenuItem overlayItem;
4942	5273	private MenuItem meshItem;
4943	5274	// private MenuItem meshGroupItem;
4944	5275	private MenuItem springItem;
..	..	@@ -4947,6 +5278,7 @@
4947	5278	private MenuItem csgItem;
4948	5279	private MenuItem templateItem;
4949	5280	private MenuItem textureItem;
	5281	+ private MenuItem billboardItem;
4950	5282	private MenuItem shadowXItem;
4951	5283	private MenuItem shadowYItem;
4952	5284	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5291,6 @@
4959	5291	private MenuItem doubleItem;
4960	5292	private MenuItem tripleItem;
4961	5293
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5294	private MenuItem computeAOItem;
4968	5295	private MenuItem recompileItem;
4969	5296	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5300,8 @@
4973	5300	private MenuItem analyzeItem;
4974	5301	private MenuItem dumpItem;
4975	5302	//boolean freezemodel = false;
	5303	+
	5304	+ Menu cameraMenu;
	5305	+ MenuItem editCameraItem;
	5306	+ MenuItem revertCameraItem;
4976	5307	}