~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,130 @@
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	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//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		-
	286	+ }
	287	+
192	288	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);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +305,26 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
222	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	326	setMasterItem.addActionListener(this);
	327	+ }
224	328
225	329	oe.menuBar.add(menu = new Menu("Group"));
226	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +335,38 @@
231	335	frontItem.addActionListener(this);
232	336	compositeItem = menu.add(new MenuItem("Composite"));
233	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
234	342	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
236	344	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	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	346	switchGeoItem.addActionListener(this);
243	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	348	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
247	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	360	scriptNodeItem.addActionListener(this);
249	361	cameraItem = menu.add(new MenuItem("Camera"));
250	362	cameraItem.addActionListener(this);
	363	+ }
251	364
252	365	oe.menuBar.add(menu = new Menu("Object"));
253	366	textureItem = menu.add(new MenuItem("Texture"));
254	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
255	370	csgItem = menu.add(new MenuItem("CSG"));
256	371	csgItem.addActionListener(this);
257	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +375,29 @@
260	375	shadowYItem.addActionListener(this);
261	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
263	381	linkerItem = menu.add(new MenuItem("Linker"));
264	382	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	383	attributeItem = menu.add(new MenuItem("Attribute"));
268	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
269	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	388	pointflowItem.addActionListener(this);
	389	+ }
271	390	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	392	resetTransformItem.addActionListener(this);
276	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	394	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
280	401
281	402	oe.menuBar.add(menu = new Menu("Geometry"));
282	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +406,13 @@
285	406	genNormalsORGANItem.addActionListener(this);
286	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
288	416	stripifyItem = menu.add(new MenuItem("Stripify"));
289	417	stripifyItem.addActionListener(this);
290	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
313	445
314	446	oe.menuBar.add(menu = new Menu("Attributes"));
315	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
317	453	menu.add("-");
318	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	455	liveleavesItem.addActionListener(this);
320	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
322	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	461	supportleavesItem.addActionListener(this);
324	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	463	unsupportleavesItem.addActionListener(this);
	464	+ }
326	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	466	hideleavesItem.addActionListener(this);
328	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -366,29 +505,22 @@
366	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	506	sortbynameItem.addActionListener(this);
368	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
369	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	516	extractGeometriesItem.addActionListener(this);
371	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	518	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	519	+ }
377	520
378	521	oe.menuBar.add(menu = new Menu("Insert"));
379	522	buildCreateMenu(menu);
380	523
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	524	oe.menuBar.add(menu = new Menu("Tools"));
393	525	buildToolsMenu(menu);
394	526	}
..	..	@@ -423,150 +555,110 @@
423	555	oe.radioPanel.add(dummyButton);
424	556	oe.buttonGroup.add(dummyButton);
425	557	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	559
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
431	574	liveCB.addItemListener(this);
432	575
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
451	582	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	585	+ trackCB.setToolTipText("Enable tracking");
493	586	trackCB.addItemListener(this);
494	587
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ screenfitButton.setToolTipText("Screen fit");
497	590	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	591	+
499	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	593	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	594
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ flashSelectionButton.setToolTipText("Show selection");
512	604	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	605
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	607	+
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ twoButton.setToolTipText("Show center view only");
519	610	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	612	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	613	+ fourButton.setToolTipText("Show left panel only");
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ sixButton.setToolTipText("2-column layout left");
523	616	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ threeButton.setToolTipText("2-column layout right");
525	619	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ sevenButton.setToolTipText("3-column layout");
527	622	sevenButton.addActionListener(this);
528	623	//
529	624
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
531	627	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ closeButton.setToolTipText("Close tab");
534	631	closeButton.addActionListener(this);
535	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	633	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	634
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
541	639	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	640
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
547	643	uneditButton.addActionListener(this);
548	644
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
561	647	allParamsButton.addActionListener(this);
562	648
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
568	655	unselectButton.addActionListener(this);
569	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
570	662	// oe.aConstraints.gridx += 1;
571	663	// oe.aConstraints.weighty = 0;
572	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +670,37 @@
578	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	671	// gcButton.addActionListener(this);
580	672
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
592	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	678	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
599	682
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
604	687	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
607	691	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
610	695	textureCB.addItemListener(this);
611	696
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
614	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
615	704	//jList.addListSelectionListener(this);
616	705	oe.jTree.addTreeSelectionListener(this);
617	706	//jTree.setRootVisible(false);
..	..	@@ -633,18 +722,91 @@
633	722	radio.layout = sevenButton;
634	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	724	}
	725	+
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	727	+ {
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
	757	+// constraints.gridy += 1;
	758	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	759	+// speakerMocapCB.addItemListener(this);
	760	+
	761	+ if (false)
	762	+ {
	763	+ // handled in scripts
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	766	+ speakerCameraCB.addItemListener(this);
	767	+
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	770	+ speakerFocusCB.addItemListener(this);
	771	+
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	774	+ smoothfocusCB.addItemListener(this);
	775	+ }
	776	+
	777	+//constraints.gridx += 1;
	778	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	779	+// debugCB.addItemListener(this);
	780	+
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	782	+ oeilCB.addItemListener(this);
	783	+
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	785	+ lookAtCB.setToolTipText("Look-at target");
	786	+ lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
	795	+
	796	+ }
636	797
637	798	void EditObject(Object3D obj)
638	799	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	800	+ cRadio radioButton = new cRadio(obj.name);
	801	+ radioButton.SetObject(obj);
	802	+ radioButton.layout = sevenButton;
	803	+ radioButton.SetCamera(cameraView.renderCamera, false);
	804	+ radioButton.addActionListener(this);
	805	+ radioPanel.add(radioButton);
	806	+ buttonGroup.add(radioButton);
	807	+ radioButton.doClick();
647	808	}
	809	+
648	810	void SetupViews(ObjEditor oe)
649	811	{
650	812	oe.SetupViews();
..	..	@@ -663,6 +825,7 @@
663	825	JCheckBox fastCB;
664	826	JCheckBox slowCB;
665	827	JCheckBox boxCB;
	828	+ JCheckBox zoomBoxCB;
666	829	JCheckBox trackCB;
667	830	JCheckBox smoothfocusCB;
668	831	// JCheckBox speakerMocapCB;
..	..	@@ -705,10 +868,10 @@
705	868	dropAttributes \|= Object3D.TEXTURE;
706	869	else
707	870	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	871	+ } else if(e.getSource() == liveCB)
710	872	{
711	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
712	875	}
713	876	else if(e.getSource() == supportCB)
714	877	{
..	..	@@ -743,6 +906,10 @@
743	906	Recompile();
744	907	cameraView.repaint();
745	908	// refreshContents();
	909	+ }
	910	+ else if(e.getSource() == zoomBoxCB)
	911	+ {
	912	+ cameraView.ToggleZoomBoxMode();
746	913	}
747	914	else if(e.getSource() == smoothfocusCB)
748	915	{
..	..	@@ -857,7 +1024,9 @@
857	1024	// objEditor.DropFile((java.io.File[]) object, true);
858	1025	// return;
859	1026	// }
860		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1030	{
862	1031	// file(s)
863	1032	String[] names = string.split("\n");
..	..	@@ -884,7 +1053,7 @@
884	1053
885	1054	flashIt = false;
886	1055	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1058
890	1059	if (group.selection.size() == 1)
..	..	@@ -911,11 +1080,11 @@
911	1080	{
912	1081	loadClipboard(true);
913	1082	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1083	+ pasteInto(false, false);
915	1084	} else {
916	1085	loadClipboard(false);
917	1086	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1087	+ pasteInto(false, false); // true); // ???
919	1088	}
920	1089	}
921	1090	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1202,37 @@
1033	1202	torusItem.addActionListener(this);
1034	1203	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1204	superItem.addActionListener(this);
	1205	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1206	+ kleinItem.addActionListener(this);
1036	1207	particleItem = menu.add(new MenuItem("Particle system"));
1037	1208	particleItem.addActionListener(this);
	1209	+ if (Globals.ADVANCED)
	1210	+ {
1038	1211	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1212	ragdollItem.addActionListener(this);
1040	1213	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1214	ragdoll2Item.addActionListener(this);
	1215	+ }
1042	1216	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1217	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1218	meshItem.addActionListener(this);
1045	1219	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1220	// meshGroupItem.addActionListener(this);
	1221	+ if (Globals.ADVANCED)
	1222	+ {
1047	1223	springItem = menu.add(new MenuItem("Spring"));
1048	1224	springItem.addActionListener(this);
1049	1225	flagItem = menu.add(new MenuItem("Flag"));
1050	1226	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1227	blobItem = menu.add(new MenuItem("Blob"));
1056	1228	blobItem.addActionListener(this);
1057	1229	latheItem = menu.add(new MenuItem("Lathe"));
1058	1230	latheItem.addActionListener(this);
	1231	+ }
	1232	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1233	+ bezierItem.addActionListener(this);
	1234	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1235	+ overlayItem.addActionListener(this);
1059	1236	lightItem = menu.add(new MenuItem("Light"));
1060	1237	lightItem.addActionListener(this);
1061	1238	menu.add("-");
..	..	@@ -1065,39 +1242,44 @@
1065	1242	loopItem.addActionListener(this);
1066	1243	doubleItem = menu.add(new MenuItem("Fork"));
1067	1244	doubleItem.addActionListener(this);
	1245	+ if (Globals.ADVANCED)
	1246	+ {
1068	1247	tripleItem = menu.add(new MenuItem("Trident"));
1069	1248	tripleItem.addActionListener(this);
	1249	+ }
1070	1250	}
1071	1251
1072	1252	void buildToolsMenu(Menu menu)
1073	1253	{
1074	1254	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1255	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1256	+ animationItem.setState(Globals.ANIMATION);
1077	1257
1078	1258	menu.add("-");
1079	1259	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1260	parseverticesItem.addActionListener(this);
1081	1261	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1262	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1263	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1264	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1265	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1266	reduceMorphItem.addActionListener(this);
1089	1267	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1268	reduce34MorphItem.addActionListener(this);
1091		-
	1269	+ menu.add("-");
1092	1270	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1271	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1272
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1276	+ mirrorItem.addActionListener(this);
	1277	+ menu.add("-");
1096	1278	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1279	memoryItem.addActionListener(this);
1098	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1281	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1283	dumpItem.addActionListener(this);
1102	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1285	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1288,8 @@
1106	1288	resetParentItem.addActionListener(this);
1107	1289	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1290	repairParentItem.addActionListener(this);
	1291	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1292	+ repairShadowItem.addActionListener(this);
1109	1293	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1294	invariantsItem.addActionListener(this);
1111	1295	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1297,7 @@
1113	1297	menu.add("-");
1114	1298	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1299	editScriptItem.addActionListener(this);
	1300	+ }
1116	1301	}
1117	1302
1118	1303	void ScreenFit()
..	..	@@ -1441,9 +1626,9 @@
1441	1626
1442	1627	void Overwrite(int mask)
1443	1628	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1630	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1447	1632
1448	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1634	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1651,7 @@
1466	1651	//
1467	1652	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1653	{
	1654	+ Object source = event.getSource();
1469	1655	/*
1470	1656	if (event.getSource() == nameField)
1471	1657	{
..	..	@@ -1477,11 +1663,11 @@
1477	1663	}
1478	1664	else
1479	1665	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1666	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1667	{
1482	1668	ScreenFit();
1483	1669	} else
1484		- if (event.getSource() == switchItem)
	1670	+ if (source == switchItem)
1485	1671	{
1486	1672	cVector v1 = new cVector();
1487	1673	cVector v2 = new cVector();
..	..	@@ -1490,11 +1676,11 @@
1490	1676	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1677	objEditor.cameraView.repaint();
1492	1678	} else
1493		- if (event.getSource() == rectoidItem)
	1679	+ if (source == rectoidItem)
1494	1680	{
1495	1681	makeSomething(new Box());
1496	1682	} else
1497		- if (event.getSource() == particleItem)
	1683	+ if (source == particleItem)
1498	1684	{
1499	1685	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1686	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1701,9 @@
1515	1701	applyExample(particleGeom, "SMOKE");
1516	1702	makeSomething(particleGeom);
1517	1703	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1704	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1705	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1706	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1707
1522	1708	ragdoll.toParent = LA.newMatrix();
1523	1709	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1721,7 @@
1535	1721	} else
1536	1722	/*
1537	1723	*/
1538		- if (event.getSource() == heightFieldItem)
	1724	+ if (source == heightFieldItem)
1539	1725	{
1540	1726	Object3D obj = new Object3D();
1541	1727
..	..	@@ -1573,27 +1759,31 @@
1573	1759
1574	1760	makeSomething(obj);
1575	1761	} else
1576		- if (event.getSource() == gridItem)
	1762	+ if (source == gridItem)
1577	1763	{
1578	1764	makeSomething(new Grid());
1579	1765	} else
1580		- if (event.getSource() == ellipsoidItem)
	1766	+ if (source == ellipsoidItem)
1581	1767	{
1582	1768	makeSomething(new Sphere());
1583	1769	} else
1584		- if (event.getSource() == coneItem)
	1770	+ if (source == coneItem)
1585	1771	{
1586	1772	makeSomething(new Cone());
1587	1773	} else
1588		- if (event.getSource() == torusItem)
	1774	+ if (source == torusItem)
1589	1775	{
1590	1776	makeSomething(new Torus());
1591	1777	} else
1592		- if (event.getSource() == superItem)
	1778	+ if (source == superItem)
1593	1779	{
1594	1780	makeSomething(new Superellipsoid());
1595	1781	} else
1596		- if (event.getSource() == blobItem)
	1782	+ if (source == kleinItem)
	1783	+ {
	1784	+ makeSomething(new Klein());
	1785	+ } else
	1786	+ if (source == blobItem)
1597	1787	{
1598	1788	Blob blob = new Blob();
1599	1789	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1791,15 @@
1601	1791	//blob.retile();
1602	1792	makeSomething(blob);
1603	1793	} else
1604		- if (event.getSource() == latheItem)
	1794	+ if (source == latheItem)
1605	1795	{
1606	1796	makeSomething(new Lathe());
1607	1797	} else
1608		- if (event.getSource() == bezierItem)
	1798	+ if (source == bezierItem)
1609	1799	{
1610	1800	makeSomething(new BezierSurface());
1611	1801	} else
1612		- if (event.getSource() == checkerItem)
	1802	+ if (source == overlayItem)
1613	1803	{
1614	1804	/*
1615	1805	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1814,7 @@
1624	1814	*/
1625	1815	makeSomething(new Checker());
1626	1816	} else
1627		- if (event.getSource() == meshItem)
	1817	+ if (source == meshItem)
1628	1818	{
1629	1819	Object3D itemtomake = new Object3D();
1630	1820	Object3D child;
..	..	@@ -1645,35 +1835,35 @@
1645	1835	makeSomething(child);
1646	1836	}
1647	1837	} else
1648		- if (event.getSource() == springItem)
	1838	+ if (source == springItem)
1649	1839	{
1650	1840	cSpring s = new cSpring();
1651	1841	s.setup();
1652	1842	makeSomething(s);
1653	1843	} else
1654		- if (event.getSource() == flagItem)
	1844	+ if (source == flagItem)
1655	1845	{
1656	1846	cSpring s = new cFlag();
1657	1847	s.setup();
1658	1848	makeSomething(s);
1659	1849	} else
1660		- if (event.getSource() == lightItem)
	1850	+ if (source == lightItem)
1661	1851	{
1662	1852	makeSomething(new Light());
1663	1853	} else
1664		- if (event.getSource() == csgItem)
	1854	+ if (source == csgItem)
1665	1855	{
1666	1856	group(new CSG());
1667	1857	} else
1668		- if (event.getSource() == templateItem)
	1858	+ if (source == templateItem)
1669	1859	{
1670	1860	group(new cTemplate());
1671	1861	} else
1672		- if (event.getSource() == attributeItem)
	1862	+ if (source == attributeItem)
1673	1863	{
1674	1864	makeSomething(new Attribute());
1675	1865	} else
1676		- if (event.getSource() == pointflowItem)
	1866	+ if (source == pointflowItem)
1677	1867	{
1678	1868	makeSomething(new PointFlow());
1679	1869	} else
..	..	@@ -1685,7 +1875,7 @@
1685	1875	} else
1686	1876	*/
1687	1877
1688		- if (event.getSource() == superLoopItem)
	1878	+ if (source == superLoopItem)
1689	1879	{
1690	1880	Composite g = new cGroup();
1691	1881	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1897,7 @@
1707	1897
1708	1898	group(g);
1709	1899	} else
1710		- if (event.getSource() == loopItem)
	1900	+ if (source == loopItem)
1711	1901	{
1712	1902	Composite csg = new GroupLeaf();
1713	1903	csg.count = 5;
..	..	@@ -1716,7 +1906,7 @@
1716	1906	csg.addChild(child);
1717	1907	child.addChild(csg);
1718	1908	} else
1719		- if (event.getSource() == doubleItem)
	1909	+ if (source == doubleItem)
1720	1910	{
1721	1911	Composite csg = new GroupLeaf();
1722	1912	csg.count = 5;
..	..	@@ -1728,7 +1918,7 @@
1728	1918	csg.addChild(child);
1729	1919	child.addChild(csg);
1730	1920	} else
1731		- if (event.getSource() == tripleItem)
	1921	+ if (source == tripleItem)
1732	1922	{
1733	1923	Composite csg = new GroupLeaf();
1734	1924	csg.count = 4;
..	..	@@ -1743,71 +1933,71 @@
1743	1933	csg.addChild(child);
1744	1934	child.addChild(csg);
1745	1935	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1936	+ if (source == computeAOItem)
1748	1937	{
1749		- ImportGFD();
	1938	+ Globals.drawMode = CameraPane.OCCLUSION;
	1939	+ Globals.theRenderer.repaint();
1750	1940	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	1941	+ if (source == recompileItem)
1769	1942	{
1770	1943	Recompile();
1771	1944	refreshContents();
1772	1945	} else
1773		- if (event.getSource() == editScriptItem)
	1946	+ if (source == editScriptItem)
1774	1947	{
1775	1948	OpenDialog();
1776	1949	refreshContents();
1777	1950	} else
1778		- if (event.getSource() == invariantsItem)
	1951	+ if (source == invariantsItem)
1779	1952	{
1780	1953	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1782	1955	} else
1783		- if (event.getSource() == memoryItem)
	1956	+ if (source == memoryItem)
1784	1957	{
1785	1958	//System.out.println("Invariants:");
1786	1959	PrintMemory();
1787	1960	} else
1788		- if (event.getSource() == pathItem)
	1961	+ if (source == pathItem)
1789	1962	{
1790	1963	PrintPath();
1791	1964	} else
1792		- if (event.getSource() == analyzeItem)
	1965	+ if (source == analyzeItem)
1793	1966	{
1794	1967	AnalyzeObject();
1795	1968	} else
1796		- if (event.getSource() == dumpItem)
	1969	+ if (source == dumpItem)
1797	1970	{
1798	1971	DumpObject();
1799	1972	} else
1800		- if (event.getSource() == screenfitButton)
	1973	+ if (source == undoButton)
	1974	+ {
	1975	+ Undo();
	1976	+ } else
	1977	+ if (source == redoButton)
	1978	+ {
	1979	+ Redo();
	1980	+ } else
	1981	+ if (source == saveButton)
	1982	+ {
	1983	+ Save();
	1984	+ } else
	1985	+ if (source == oneStepButton)
	1986	+ {
	1987	+ Globals.ONESTEP = true;
	1988	+ cameraView.repaint();
	1989	+ } else
	1990	+ if (source == screenfitButton)
1801	1991	{
1802	1992	//Reload(lastConverter, lastFilename, true);
1803	1993	ScreenFit();
1804	1994	} else
1805		- if (event.getSource() == screenfitpointButton)
	1995	+ if (source == screenfitpointButton)
1806	1996	{
1807	1997	//Reload(lastConverter, lastFilename, true);
1808	1998	ScreenFitPoint();
1809	1999	} else
1810		- if (event.getSource() == snapobjectButton)
	2000	+ if (source == snapobjectButton)
1811	2001	{
1812	2002	//Reload(lastConverter, lastFilename, true);
1813	2003	SnapObject();
..	..	@@ -1818,13 +2008,13 @@
1818	2008	// Recompile();
1819	2009	// refreshContents();
1820	2010	// } else
1821		- if (event.getSource() == gcButton)
	2011	+ if (source == gcButton)
1822	2012	{
1823	2013	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2014	System.gc();
1825	2015	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2016	} else
1827		- if (event.getSource() == editLeafItem)
	2017	+ if (source == editLeafItem)
1828	2018	{
1829	2019	Object3D obj;
1830	2020	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2028,74 @@
1838	2028	}
1839	2029	refreshContents(true);
1840	2030	} else
1841		- if (event.getSource() == openWindowItem)
	2031	+ if (source == openWindowItem)
1842	2032	{
1843	2033	EditSelection(true);
1844	2034	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2035	+ if (source == cutItem \|\| source == clearButton)
1846	2036	{
1847	2037	loadClipboard(true);
1848	2038	} else
1849		- if (event.getSource() == duplicateItem)
	2039	+ if (source == undoItem)
1850	2040	{
1851		- Object3D keep = GrafreeD.clipboard;
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == duplicateItem)
	2048	+ {
	2049	+ Object3D keep = Grafreed.clipboard;
1852	2050	loadClipboard(false);
1853	2051	paste(false);
1854		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1855	2053	} else
1856		- if (event.getSource() == cloneItem)
	2054	+ if (source == cloneItem)
1857	2055	{
1858	2056	CloneSelection(false);
1859	2057	} else
1860		- if (event.getSource() == cloneSupportItem)
	2058	+ if (source == cloneSupportItem)
1861	2059	{
1862	2060	CloneSelection(true);
1863	2061	} else
1864		- if (event.getSource() == copyItem)
	2062	+ if (source == copyItem)
1865	2063	{
1866	2064	loadClipboard(false);
1867	2065	} else
1868		- if (event.getSource() == pasteItem)
	2066	+ if (source == pasteItem)
1869	2067	{
1870	2068	paste(false);
1871	2069	} else
1872		- if (event.getSource() == pasteLinkItem)
	2070	+ if (source == pasteIntoItem)
1873	2071	{
1874		- pasteInto(false);
	2072	+ pasteInto(true, false);
1875	2073	} else
1876		- if (event.getSource() == pasteCloneItem)
	2074	+ if (source == pasteLinkItem)
1877	2075	{
1878		- pasteInto(true);
	2076	+ pasteInto(false, false);
1879	2077	} else
1880		- if (event.getSource() == pasteExpandItem)
	2078	+ if (source == pasteCloneItem)
	2079	+ {
	2080	+ pasteInto(true, true);
	2081	+ } else
	2082	+ if (source == pasteExpandItem)
1881	2083	{
1882	2084	paste(true);
1883	2085	} else
1884		- if (event.getSource() == synchronizeItem)
	2086	+ if (source == synchronizeItem)
1885	2087	{
1886	2088	Overwrite(Object3D.TRANSFORM);
1887	2089	} else
1888		- if (event.getSource() == overwriteNameItem)
	2090	+ if (source == overwriteNameItem)
1889	2091	{
1890	2092	Overwrite(Object3D.NAME);
1891	2093	} else
1892		- if (event.getSource() == overwriteUVItem)
	2094	+ if (source == overwriteUVItem)
1893	2095	{
1894	2096	Overwrite(Object3D.UV);
1895	2097	} else
1896		- if (event.getSource() == overwriteMatItem)
	2098	+ if (source == overwriteMatItem)
1897	2099	{
1898	2100	/* july 2015
1899	2101	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2115,7 @@
1913	2115
1914	2116	Overwrite(dropAttributes);
1915	2117	}
1916		- if (event.getSource() == overwriteGeoItem)
	2118	+ if (source == overwriteGeoItem)
1917	2119	{
1918	2120	Overwrite(Object3D.GEOMETRY);
1919	2121	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2132,7 @@
1930	2132	// refreshContents();
1931	2133	// }
1932	2134	} else
1933		- if (event.getSource() == generateMeshItem)
	2135	+ if (source == generateMeshItem)
1934	2136	{
1935	2137	//if (group.selection.size() == 1)
1936	2138	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2143,7 @@
1941	2143	ResetModel();
1942	2144	refreshContents();
1943	2145	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2146	+ if (source == extractGeometriesItem)
1945	2147	{
1946	2148	boolean one = false;
1947	2149
..	..	@@ -1968,7 +2170,7 @@
1968	2170	ResetModel();
1969	2171	refreshContents();
1970	2172	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2173	+ if (source == cloneGeometriesItem)
1972	2174	{
1973	2175	boolean one = false;
1974	2176
..	..	@@ -1994,32 +2196,37 @@
1994	2196	ResetModel();
1995	2197	refreshContents();
1996	2198	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2199	+ if (source == shareGeometriesItem)
1998	2200	{
1999	2201	boolean one = false;
2000	2202
2001	2203	if (group.selection.size() == 1)
2002	2204	one = true;
2003	2205
	2206	+ Object3D merge = null;
	2207	+
2004	2208	Object3D content = new cGroup();
2005	2209
2006	2210	for (int i=0; i<group.selection.size(); i++)
2007	2211	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2212	+ merge = new Merge(group.selection.get(i));
2009	2213
2010	2214	if (one)
2011		- makeSomething(sel, false);
	2215	+ makeSomething(merge, false);
2012	2216	else
2013		- content.addChild(sel);
	2217	+ content.addChild(merge);
2014	2218	}
2015	2219
2016	2220	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2221	+ makeSomething(content, true);
	2222	+ else
	2223	+ {
	2224	+ ResetModel();
	2225	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2226	+ refreshContents();
	2227	+ }
2021	2228	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2229	+ if (source == mergeGeometriesItem)
2023	2230	{
2024	2231	boolean one = false;
2025	2232
..	..	@@ -2049,7 +2256,7 @@
2049	2256	ResetModel();
2050	2257	refreshContents();
2051	2258	} else
2052		- if (event.getSource() == linkverticesItem)
	2259	+ if (source == linkverticesItem)
2053	2260	{
2054	2261	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2262	// {
..	..	@@ -2062,39 +2269,48 @@
2062	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2063	2270	// refreshContents();
2064	2271	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	2273	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2068	2275
2069	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2277	content = ((cGroup)content).get(0);
2071	2278
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2279	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2280	for (int i=0; i<group.selection.size(); i++)
2074	2281	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2282	+ boolean random = CameraPane.SWITCH;
	2283	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2284	group.selection.get(i).linkVerticesThis(content);
2078	2285	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2286	+ CameraPane.SWITCH = random;
2080	2287	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2288	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2289	refreshContents();
2083	2290	}
2084	2291	} else
2085		- if (event.getSource() == resetsupportItem)
	2292	+ if (source == resetsupportItem)
2086	2293	{
2087	2294	for (int i=0; i<group.selection.size(); i++)
2088	2295	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2296	+ boolean random = CameraPane.SWITCH;
	2297	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2298	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2299	+ CameraPane.SWITCH = random;
2093	2300	}
2094	2301
2095	2302	refreshContents();
2096	2303	} else
2097		- if (event.getSource() == resetreferencesItem)
	2304	+ if (source == relinkverticesItem)
	2305	+ {
	2306	+ boolean random = CameraPane.SWITCH;
	2307	+ CameraPane.SWITCH = false; // parse all random nodes
	2308	+ group.selection.RelinkToSupport();
	2309	+ CameraPane.SWITCH = random;
	2310	+
	2311	+ refreshContents();
	2312	+ } else
	2313	+ if (source == resetreferencesItem)
2098	2314	{
2099	2315	for (int i=0; i<group.selection.size(); i++)
2100	2316	{
..	..	@@ -2103,11 +2319,11 @@
2103	2319
2104	2320	refreshContents();
2105	2321	} else
2106		- if (event.getSource() == setMasterItem)
	2322	+ if (source == setMasterItem)
2107	2323	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	2325	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2111	2327
2112	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	2329	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +2332,13 @@
2116	2332	refreshContents();
2117	2333	}
2118	2334	} else
2119		- if (event.getSource() == poseMeshItem)
	2335	+ if (source == poseMeshItem)
2120	2336	{
2121	2337	if (group.selection.size() == 1)
2122	2338	{
2123		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2124	2340	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2126	2342
2127	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	2344	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +2351,19 @@
2135	2351	}
2136	2352
2137	2353	} else
2138		- if (event.getSource() == revertMeshItem)
	2354	+ if (source == revertMeshItem)
2139	2355	{
2140	2356	RevertMeshes();
2141	2357	} else
2142		- if (event.getSource() == resetMeshItem)
	2358	+ if (source == resetAllItem)
2143	2359	{
2144	2360	ResetAll();
2145	2361	} else
2146		- if (event.getSource() == stepAllItem)
	2362	+ if (source == stepAllItem)
2147	2363	{
2148	2364	StepAll();
2149	2365	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2366	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2367	{
2152	2368	//int indices[] = jList.getSelectedIndices();
2153	2369	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2371,46 @@
2155	2371
2156	2372	ClearSelection(false);
2157	2373	} else
2158		- if (event.getSource() == clearAllItem)
	2374	+ if (source == clearAllItem)
2159	2375	{
2160	2376	ClearSelection(true);
2161	2377	} else
2162		- if (event.getSource() == grabItem)
	2378	+ if (source == grabItem)
2163	2379	{
2164	2380	group(new cGroup(), true);
2165	2381	} else
2166		- if (event.getSource() == frontItem)
	2382	+ if (source == hideItem)
	2383	+ {
	2384	+ group(new HiddenObject());
	2385	+ } else
	2386	+ if (source == frontItem)
2167	2387	{
2168	2388	front();
2169	2389	} else
2170		- if (event.getSource() == backItem)
	2390	+ if (source == backItem)
2171	2391	{
2172	2392	back();
2173	2393	} else
2174		- if (event.getSource() == cameraItem)
	2394	+ if (source == cameraItem)
2175	2395	{
2176	2396	makeSomething(new Camera());
2177	2397	} else
2178		- if (event.getSource() == compositeItem)
	2398	+ if (source == compositeItem)
2179	2399	{
2180	2400	group(new Composite());
2181	2401	} else
2182		- if (event.getSource() == randomItem)
	2402	+ if (source == randomItem)
2183	2403	{
2184	2404	RandomNode random = new RandomNode();
2185	2405	group(random);
2186	2406	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2407	+ random.name = random.get(0).name + "Switch";
2188	2408	} else
2189		- if (event.getSource() == physicsItem)
	2409	+ if (source == physicsItem)
2190	2410	{
2191	2411	group(new PhysicsNode());
2192	2412	} else
2193		- if (event.getSource() == frameselectorItem)
	2413	+ if (source == frameselectorItem)
2194	2414	{
2195	2415	for (int i=0; i<group.selection.size(); i++)
2196	2416	{
..	..	@@ -2202,7 +2422,7 @@
2202	2422	ResetModel();
2203	2423	refreshContents();
2204	2424	} else
2205		- if (event.getSource() == switchGeoItem)
	2425	+ if (source == switchGeoItem)
2206	2426	{
2207	2427	for (int i=0; i<group.selection.size(); i++)
2208	2428	{
..	..	@@ -2214,7 +2434,7 @@
2214	2434	ResetModel();
2215	2435	refreshContents();
2216	2436	} else
2217		- if (event.getSource() == switchTransfoItem)
	2437	+ if (source == switchTransfoItem)
2218	2438	{
2219	2439	for (int i=0; i<group.selection.size(); i++)
2220	2440	{
..	..	@@ -2226,7 +2446,7 @@
2226	2446	ResetModel();
2227	2447	refreshContents();
2228	2448	} else
2229		- if (event.getSource() == morphItem)
	2449	+ if (source == morphItem)
2230	2450	{
2231	2451	for (int i=0; i<group.selection.size(); i++)
2232	2452	{
..	..	@@ -2238,7 +2458,7 @@
2238	2458	ResetModel();
2239	2459	refreshContents();
2240	2460	} else
2241		- if (event.getSource() == scriptNodeItem)
	2461	+ if (source == scriptNodeItem)
2242	2462	{
2243	2463	boolean atleastone = false;
2244	2464
..	..	@@ -2277,195 +2497,223 @@
2277	2497	}
2278	2498	}
2279	2499	} else
2280		- if (event.getSource() == linkerItem)
	2500	+ if (source == linkerItem)
2281	2501	{
2282	2502	group(new cLinker());
2283	2503	} else
2284		- if (event.getSource() == textureItem)
	2504	+ if (source == textureItem)
2285	2505	{
2286	2506	group(new TextureNode());
2287	2507	} else
2288		- if (event.getSource() == shadowXItem)
	2508	+ if (source == billboardItem)
	2509	+ {
	2510	+ group(new BillboardNode());
	2511	+ } else
	2512	+ if (source == shadowXItem)
2289	2513	{
2290	2514	CastShadow(0);
2291	2515	} else
2292		- if (event.getSource() == shadowYItem)
	2516	+ if (source == shadowYItem)
2293	2517	{
2294	2518	CastShadow(1);
2295	2519	} else
2296		- if (event.getSource() == shadowZItem)
	2520	+ if (source == shadowZItem)
2297	2521	{
2298	2522	CastShadow(2);
2299	2523	} else
2300		- if (event.getSource() == ungroupItem)
	2524	+ if (source == ungroupItem)
2301	2525	{
2302		- ungroup();
	2526	+ //ungroup();
	2527	+ for (int i=0; i<group.selection.size(); i++)
	2528	+ {
	2529	+ Ungroup(group.selection.get(i));
	2530	+ }
	2531	+
	2532	+ ClearSelection(false);
	2533	+
	2534	+ refreshContents();
2303	2535	} else
2304		- if (event.getSource() == genUVItem)
	2536	+ if (source == genUVItem)
2305	2537	{
2306	2538	GenUV();
2307	2539	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2540	+ if (source == genNormalsCADItem)
2309	2541	{
2310	2542	GenNormals(true);
2311	2543	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2544	+ if (source == genNormalsMESHItem)
	2545	+ {
	2546	+ GenNormalsMESH();
	2547	+ } else
	2548	+ if (source == genNormalsORGANItem)
2313	2549	{
2314	2550	GenNormals(false);
2315	2551	} else
2316		- if (event.getSource() == stripifyItem)
	2552	+ if (source == genNormalsMINEItem)
	2553	+ {
	2554	+ GenNormalsMINE();
	2555	+ } else
	2556	+ if (source == stripifyItem)
2317	2557	{
2318	2558	Stripify();
2319	2559	} else
2320		- if (event.getSource() == unstripifyItem)
	2560	+ if (source == unstripifyItem)
2321	2561	{
2322	2562	Unstripify();
2323	2563	} else
2324		- if (event.getSource() == trimItem)
	2564	+ if (source == trimItem)
2325	2565	{
2326	2566	Trim();
2327	2567	} else
2328		- if (event.getSource() == untrimItem)
	2568	+ if (source == untrimItem)
2329	2569	{
2330	2570	Untrim();
2331	2571	} else
2332		- if (event.getSource() == clearColorsItem)
	2572	+ if (source == clearColorsItem)
2333	2573	{
2334	2574	ClearColors();
2335	2575	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2576	+ if (source == clearMaterialsItem)
2337	2577	{
2338	2578	ClearMaterials();
2339	2579	} else
2340		- if (event.getSource() == liveleavesItem)
	2580	+ if (source == liveleavesItem)
2341	2581	{
2342	2582	LiveLeaves(true);
2343	2583	} else
2344		- if (event.getSource() == unliveleavesItem)
	2584	+ if (source == unliveleavesItem)
2345	2585	{
2346	2586	LiveLeaves(false);
2347	2587	} else
2348		- if (event.getSource() == supportleavesItem)
	2588	+ if (source == supportleavesItem)
2349	2589	{
2350	2590	SupportLeaves(true);
2351	2591	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2592	+ if (source == unsupportleavesItem)
2353	2593	{
2354	2594	SupportLeaves(false);
2355	2595	} else
2356		- if (event.getSource() == hideleavesItem)
	2596	+ if (source == hideleavesItem)
2357	2597	{
2358	2598	HideLeaves(true);
2359	2599	} else
2360		- if (event.getSource() == showleavesItem)
	2600	+ if (source == showleavesItem)
2361	2601	{
2362	2602	HideLeaves(false);
2363	2603	} else
2364		- if (event.getSource() == markleavesItem)
	2604	+ if (source == markleavesItem)
2365	2605	{
2366	2606	MarkLeaves(true);
2367	2607	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2608	+ if (source == unmarkleavesItem)
2369	2609	{
2370	2610	MarkLeaves(false);
2371	2611	} else
2372		- if (event.getSource() == flipVItem)
	2612	+ if (source == flipVItem)
2373	2613	{
2374	2614	FlipV(true);
2375	2615	} else
2376		- if (event.getSource() == unflipVItem)
	2616	+ if (source == unflipVItem)
2377	2617	{
2378	2618	FlipV(false);
2379	2619	} else
2380		- if (event.getSource() == lowTexturesItem)
	2620	+ if (source == lowTexturesItem)
2381	2621	{
2382	2622	SetTexRes(0);
2383	2623	} else
2384		- if (event.getSource() == normalTexturesItem)
	2624	+ if (source == normalTexturesItem)
2385	2625	{
2386	2626	SetTexRes(1);
2387	2627	} else
2388		- if (event.getSource() == highTexturesItem)
	2628	+ if (source == highTexturesItem)
2389	2629	{
2390	2630	SetTexRes(2);
2391	2631	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2632	+ if (source == veryhighTexturesItem)
2393	2633	{
2394	2634	SetTexRes(3);
2395	2635	} else
2396		- if (event.getSource() == maxTexturesItem)
	2636	+ if (source == maxTexturesItem)
2397	2637	{
2398	2638	SetTexRes(4);
2399	2639	} else
2400		- if (event.getSource() == panoTexturesItem)
	2640	+ if (source == panoTexturesItem)
2401	2641	{
2402	2642	SetTexRes(5);
2403	2643	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2644	+ if (source == reverseNormalsItem)
2405	2645	{
2406	2646	ReverseNormals();
2407	2647	} else
2408		- if (event.getSource() == parseverticesItem)
	2648	+ if (source == parseverticesItem)
2409	2649	{
2410	2650	ParseVertices();
2411	2651	} else
2412		- if (event.getSource() == textureFieldItem)
	2652	+ if (source == textureFieldItem)
2413	2653	{
2414	2654	TextureVertices();
2415	2655	} else
2416		- if (event.getSource() == alignItem)
	2656	+ if (source == alignItem)
2417	2657	{
2418	2658	Align();
2419	2659	} else
2420		- if (event.getSource() == mirrorItem)
	2660	+ if (source == mirrorItem)
2421	2661	{
2422	2662	MirrorPoses();
2423	2663	} else
2424		- if (event.getSource() == reduceMorphItem)
	2664	+ if (source == reduceMorphItem)
2425	2665	{
2426	2666	MeshReduction(false);
2427	2667	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2668	+ if (source == reduce34MorphItem)
2429	2669	{
2430	2670	MeshReduction(true);
2431	2671	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2672	+ if (source == reverseTrianglesItem)
2433	2673	{
2434	2674	ReverseTriangles();
2435	2675	} else
2436		- if (event.getSource() == reduceMeshItem)
	2676	+ if (source == reduceMeshItem)
2437	2677	{
2438	2678	ReduceMesh(false);
2439	2679	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2680	+ if (source == reduce34MeshItem)
2441	2681	{
2442	2682	ReduceMesh(true);
2443	2683	} else
2444		- if (event.getSource() == increaseMeshItem)
	2684	+ if (source == increaseMeshItem)
2445	2685	{
2446	2686	IncreaseMesh();
2447	2687	} else
2448		- if (event.getSource() == clipMeshItem)
	2688	+ if (source == clipMeshItem)
2449	2689	{
2450	2690	ClipMesh();
2451	2691	} else
2452		- if (event.getSource() == smoothMeshItem)
	2692	+ if (source == smoothMeshItem)
2453	2693	{
2454	2694	SmoothMesh();
2455	2695	} else
2456		- if (event.getSource() == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2457	2697	{
2458	2698	TransformGeometry();
2459	2699	} else
2460		- if (event.getSource() == resetTransformItem)
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
	2703	+ } else
	2704	+ if (source == resetTransformItem)
2461	2705	{
2462	2706	ResetTransform();
2463	2707	} else
2464		- if (event.getSource() == resetCentroidItem)
	2708	+ if (source == resetCentroidItem)
2465	2709	{
2466		- ResetCentroid();
	2710	+ ResetCentroid(true);
2467	2711	} else
2468		- if (event.getSource() == resetParentItem)
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
	2715	+ } else
	2716	+ if (source == resetParentItem)
2469	2717	{
2470	2718	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2719	{
..	..	@@ -2475,7 +2723,7 @@
2475	2723
2476	2724	refreshContents();
2477	2725	} else
2478		- if (event.getSource() == repairParentItem)
	2726	+ if (source == repairParentItem)
2479	2727	{
2480	2728	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2729	{
..	..	@@ -2489,7 +2737,21 @@
2489	2737
2490	2738	refreshContents();
2491	2739	} else
2492		- if (event.getSource() == sortbysizeItem)
	2740	+ if (source == repairShadowItem)
	2741	+ {
	2742	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2743	+ {
	2744	+ Object3D obj = (Object3D)e.nextElement();
	2745	+ obj.RepairShadow();
	2746	+// for (int i=0; i<obj.size(); i++)
	2747	+// {
	2748	+// obj.get(i).parent = obj;
	2749	+// }
	2750	+ }
	2751	+
	2752	+ refreshContents();
	2753	+ } else
	2754	+ if (source == sortbysizeItem)
2493	2755	{
2494	2756	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2757	{
..	..	@@ -2501,7 +2763,7 @@
2501	2763	ResetModel();
2502	2764	refreshContents();
2503	2765	} else
2504		- if (event.getSource() == sortbynameItem)
	2766	+ if (source == sortbynameItem)
2505	2767	{
2506	2768	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2769	{
..	..	@@ -2513,7 +2775,7 @@
2513	2775	ResetModel();
2514	2776	refreshContents();
2515	2777	} else
2516		- if (event.getSource() == attachPigmentItem)
	2778	+ if (source == attachPigmentItem)
2517	2779	{
2518	2780	String texture = GetFile("Attach pigment");
2519	2781	Object3D obj;
..	..	@@ -2525,7 +2787,7 @@
2525	2787
2526	2788	refreshContents();
2527	2789	} else
2528		- if (event.getSource() == detachPigmentItem)
	2790	+ if (source == detachPigmentItem)
2529	2791	{
2530	2792	Object3D obj;
2531	2793	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2798,7 @@
2536	2798
2537	2799	refreshContents();
2538	2800	} else
2539		- if (event.getSource() == attachBumpItem)
	2801	+ if (source == attachBumpItem)
2540	2802	{
2541	2803	String texture = GetFile("Attach bump");
2542	2804	Object3D obj;
..	..	@@ -2548,7 +2810,7 @@
2548	2810
2549	2811	refreshContents();
2550	2812	} else
2551		- if (event.getSource() == detachBumpItem)
	2813	+ if (source == detachBumpItem)
2552	2814	{
2553	2815	Object3D obj;
2554	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2821,7 @@
2559	2821
2560	2822	refreshContents();
2561	2823	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2824	+ if (source == pigmentBumpItem)
2563	2825	{
2564	2826	Object3D obj;
2565	2827	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2832,195 @@
2570	2832
2571	2833	refreshContents();
2572	2834	} else
2573		- if (event.getSource() == flashSelectionButton)
	2835	+ if (source == flashSelectionButton)
2574	2836	{
2575	2837	CameraPane.flash = true;
2576	2838	refreshContents();
2577	2839	} else
2578		- if (event.getSource() == oneButton)
	2840	+ if (source == oneButton)
2579	2841	{
2580	2842	} else
2581		- if (event.getSource() == twoButton)
	2843	+ if (source == twoButton)
2582	2844	{
2583	2845	radio.layout = twoButton;
2584	2846	// bug
2585	2847	//gridPanel.setDividerLocation(1.0);
2586	2848	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	2849	+// bigThree.remove(scenePanel);
	2850	+// bigThree.remove(centralPanel);
	2851	+// bigThree.remove(XYZPanel);
	2852	+// aWindowConstraints.gridx = 0;
	2853	+// aWindowConstraints.gridy = 0;
	2854	+// aWindowConstraints.gridwidth = 1;
	2855	+// // aConstraints.gridheight = 3;
	2856	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2857	+// aWindowConstraints.weightx = 0;
	2858	+// aWindowConstraints.weighty = 1;
	2859	+// //bigThree.add(jtp, aWindowConstraints);
	2860	+// aWindowConstraints.weightx = 1;
	2861	+// aWindowConstraints.gridwidth = 3;
	2862	+// // aConstraints.gridheight = 3;
	2863	+// aWindowConstraints.gridx = 1;
	2864	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2865	+// bigThree.add(centralPanel, aWindowConstraints);
	2866	+// aWindowConstraints.weightx = 0;
	2867	+// aWindowConstraints.gridx = 4;
	2868	+// aWindowConstraints.gridwidth = 1;
	2869	+// // aConstraints.gridheight = 3;
	2870	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2871	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2872	+// scenePanel.setVisible(false);
	2873	+// centralPanel.setVisible(true);
	2874	+// XYZPanel.setVisible(false);
	2875	+ bigThree.ClearUI();
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2611	2878	} else
2612		- if (event.getSource() == threeButton)
	2879	+ if (source == threeButton)
2613	2880	{
2614	2881	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// //bigThree.add(jtp, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(false);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(centralPanel);
	2912	+ bigThree.add(XYZPanel);
	2913	+ bigThree.FlushUI();
2639	2914	} else
2640		- if (event.getSource() == fourButton)
	2915	+ if (source == fourButton)
2641	2916	{
2642	2917	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	2918	+
	2919	+// bigThree.remove(scenePanel);
	2920	+// bigThree.remove(centralPanel);
	2921	+// bigThree.remove(XYZPanel);
	2922	+// aWindowConstraints.gridx = 0;
	2923	+// aWindowConstraints.gridy = 0;
	2924	+// aWindowConstraints.gridwidth = 1;
	2925	+// // aWindowConstraints.gridheight = 3;
	2926	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2927	+// aWindowConstraints.weightx = 1;
	2928	+// aWindowConstraints.weighty = 1;
	2929	+// bigThree.add(scenePanel, aWindowConstraints);
	2930	+// aWindowConstraints.weightx = 1;
	2931	+// aWindowConstraints.gridwidth = 3;
	2932	+// // aConstraints.gridheight = 3;
	2933	+// aWindowConstraints.gridx = 1;
	2934	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2935	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2936	+// aWindowConstraints.weightx = 0;
	2937	+// aWindowConstraints.gridx = 4;
	2938	+// aWindowConstraints.gridwidth = 1;
	2939	+// // aWindowConstraints.gridheight = 3;
	2940	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2941	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2942	+// bigThree.validate();
	2943	+// scenePanel.setVisible(true);
	2944	+// centralPanel.setVisible(false);
	2945	+// XYZPanel.setVisible(false);
	2946	+ bigThree.ClearUI();
	2947	+ bigThree.add(scenePanel);
	2948	+ bigThree.FlushUI();
2667	2949	} else
2668		- if (event.getSource() == sixButton)
	2950	+ if (source == sixButton)
2669	2951	{
2670	2952	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	2953	+
	2954	+// bigThree.remove(scenePanel);
	2955	+// bigThree.remove(centralPanel);
	2956	+// bigThree.remove(XYZPanel);
	2957	+// aWindowConstraints.gridx = 0;
	2958	+// aWindowConstraints.gridy = 0;
	2959	+// aWindowConstraints.gridwidth = 1;
	2960	+// // aConstraints.gridheight = 3;
	2961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2962	+// aWindowConstraints.weightx = 0;
	2963	+// aWindowConstraints.weighty = 1;
	2964	+// bigThree.add(scenePanel, aWindowConstraints);
	2965	+// aWindowConstraints.weightx = 1;
	2966	+// aWindowConstraints.gridwidth = 3;
	2967	+// // aWindowConstraints.gridheight = 3;
	2968	+// aWindowConstraints.gridx = 1;
	2969	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2970	+// bigThree.add(centralPanel, aWindowConstraints);
	2971	+// aWindowConstraints.weightx = 0;
	2972	+// aWindowConstraints.gridx = 4;
	2973	+// aWindowConstraints.gridwidth = 1;
	2974	+// // aWindowConstraints.gridheight = 3;
	2975	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2976	+// //bigThree.add(XYZPanel, aConstraints);
	2977	+// bigThree.validate();
	2978	+// scenePanel.setVisible(true);
	2979	+// centralPanel.setVisible(true);
	2980	+// XYZPanel.setVisible(false);
	2981	+ bigThree.ClearUI();
	2982	+ bigThree.add(scenePanel);
	2983	+ bigThree.add(centralPanel);
	2984	+ bigThree.FlushUI();
2695	2985	} else
2696		- if (event.getSource() == sevenButton)
	2986	+ if (source == sevenButton)
2697	2987	{
2698	2988	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	2989	+
	2990	+// bigThree.remove(scenePanel);
	2991	+// bigThree.remove(centralPanel);
	2992	+// bigThree.remove(XYZPanel);
	2993	+// aWindowConstraints.gridx = 0;
	2994	+// aWindowConstraints.gridy = 0;
	2995	+// aWindowConstraints.gridwidth = 1;
	2996	+// // aWindowConstraints.gridheight = 3;
	2997	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2998	+// aWindowConstraints.weightx = 0;
	2999	+// aWindowConstraints.weighty = 1;
	3000	+// bigThree.add(scenePanel, aWindowConstraints);
	3001	+// aWindowConstraints.weightx = 1;
	3002	+// aWindowConstraints.gridwidth = 3;
	3003	+// // aWindowConstraints.gridheight = 3;
	3004	+// aWindowConstraints.gridx = 1;
	3005	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3006	+// bigThree.add(centralPanel, aWindowConstraints);
	3007	+// aWindowConstraints.weightx = 0;
	3008	+// aWindowConstraints.gridx = 4;
	3009	+// aWindowConstraints.gridwidth = 1;
	3010	+// // aConstraints.gridheight = 3;
	3011	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3012	+// bigThree.add(XYZPanel, aWindowConstraints);
	3013	+// bigThree.validate();
	3014	+// scenePanel.setVisible(true);
	3015	+// centralPanel.setVisible(true);
	3016	+// XYZPanel.setVisible(true);
	3017	+ bigThree.ClearUI();
	3018	+ bigThree.add(scenePanel);
	3019	+ bigThree.add(centralPanel);
	3020	+ bigThree.add(XYZPanel);
	3021	+ bigThree.FlushUI();
2723	3022	} else
2724		- if (event.getSource() == rootButton)
	3023	+ if (source == rootButton)
2725	3024	{
2726	3025	Object3D obj;
2727	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +3032,7 @@
2733	3032
2734	3033	refreshContents(true);
2735	3034	} else
2736		- if (event.getSource() == closeButton)
	3035	+ if (source == closeButton)
2737	3036	{
2738	3037	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3038	cRadio ab;
..	..	@@ -2754,11 +3053,11 @@
2754	3053	}
2755	3054	refreshContents(true);
2756	3055	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3056	+ if (source == editItem \|\| source == editButton)
2758	3057	{
2759	3058	EditSelection(false);
2760	3059	} else
2761		- if (event.getSource() == uneditButton)
	3060	+ if (source == uneditButton)
2762	3061	{
2763	3062	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	3063	{
..	..	@@ -2768,14 +3067,14 @@
2768	3067	child.CloseUI();
2769	3068	listUI.remove(child);
2770	3069
2771		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2772	3071	}
2773		- objEditor.ctrlPanel.revalidate();
	3072	+ objEditor.ctrlPanel.FlushUI();
2774	3073	//objEditor.jTree.clearSelection();
2775	3074	//objEditor.ResetSliders();
2776	3075	refreshContents(true);
2777	3076	} else
2778		- if (event.getSource() == clearPanelButton)
	3077	+ if (source == clearPanelButton)
2779	3078	{
2780	3079	assert(copy == group);
2781	3080	//copy.ClearUI();
..	..	@@ -2786,7 +3085,7 @@
2786	3085	listUI.clear();
2787	3086	refreshContents(true);
2788	3087	} else
2789		- if (event.getSource() == allParamsButton)
	3088	+ if (source == allParamsButton)
2790	3089	{
2791	3090	assert(copy == group);
2792	3091
..	..	@@ -2807,19 +3106,19 @@
2807	3106
2808	3107	refreshContents(true);
2809	3108	} else
2810		- if (event.getSource() == unselectButton)
	3109	+ if (source == unselectButton)
2811	3110	{
2812	3111	objEditor.jTree.clearSelection();
2813	3112	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3113	objEditor.ResetSliders();
2815	3114	refreshContents(true);
2816	3115	} else
2817		- if(event.getSource() instanceof cRadio)
	3116	+ if(source instanceof cRadio)
2818	3117	{
2819	3118	group.parent = keepparent;
2820	3119	group.attributes = 0;
2821	3120	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3121	+ /cRadio/ radio = (cRadio)source;
2823	3122	Object3D obj = radio.GetObject();
2824	3123	System.out.println("Edit " + obj);
2825	3124	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3138,7 @@
2839	3138	}
2840	3139
2841	3140	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3141	+ //Globals.theRenderer.object = group;
2843	3142	if(!useclient)
2844	3143	{
2845	3144	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,12 +3147,16 @@
2848	3147	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3148	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3149	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3150	+ //cameraView.lighttouched = true;
	3151	+ Globals.lighttouched = true;
2852	3152	topView.object = group;
2853	3153	frontView.object = group;
2854	3154	sideView.object = group;
2855	3155	}
	3156	+
	3157	+// fix "+" issue
2856	3158	group.editWindow = this;
	3159	+
2857	3160	/*
2858	3161	currentLayout = radio.layout;
2859	3162	if (currentLayout == null)
..	..	@@ -2866,7 +3169,20 @@
2866	3169	//group.attributes = -1;
2867	3170	ResetModel();
2868	3171	refreshContents(true);
2869		- }
	3172	+ } else if (event.getSource() == editCameraItem)
	3173	+ {
	3174	+ cameraView.ProtectCamera();
	3175	+ cameraView.repaint();
	3176	+ return;
	3177	+ } else if (event.getSource() == revertCameraItem)
	3178	+ {
	3179	+ cameraView.RevertCamera();
	3180	+ cameraView.repaint();
	3181	+ return;
	3182	+ // } else if (event.getSource() == textureButton)
	3183	+ // {
	3184	+ // return; // true;
	3185	+ }
2870	3186	else
2871	3187	{
2872	3188	//return super.action(event, arg);
..	..	@@ -2884,7 +3200,7 @@
2884	3200	if (useclient)
2885	3201	{
2886	3202	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3203	+ Globals.lighttouched = true;
2888	3204	//topView.object = client;
2889	3205	//frontView.object = client;
2890	3206	//sideView.object = client;
..	..	@@ -2892,7 +3208,7 @@
2892	3208	else
2893	3209	{
2894	3210	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3211	+ Globals.lighttouched = true;
2896	3212	//topView.object = group;
2897	3213	//frontView.object = group;
2898	3214	//sideView.object = group;
..	..	@@ -2927,6 +3243,28 @@
2927	3243	refreshContents();
2928	3244	}
2929	3245
	3246	+ void TransformChildren()
	3247	+ {
	3248	+ Object3D obj;
	3249	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3250	+ {
	3251	+ obj = (Object3D)e.nextElement();
	3252	+ obj.KeepTextureMatrices();
	3253	+ obj.TransformChildren();
	3254	+ obj.RestoreTextureMatrices();
	3255	+
	3256	+// if (obj.parent == null)
	3257	+// {
	3258	+// System.out.println("NULL PARENT!");
	3259	+// new Exception().printStackTrace();
	3260	+// }
	3261	+// else
	3262	+// TouchTransform(obj);
	3263	+// //obj.parent.Touch();
	3264	+ }
	3265	+
	3266	+ refreshContents();
	3267	+ }
2930	3268
2931	3269	void ResetTransform()
2932	3270	{
..	..	@@ -3039,7 +3377,7 @@
3039	3377	refreshContents();
3040	3378	}
3041	3379
3042		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3043	3381	{
3044	3382	Object3D obj;
3045	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +3392,16 @@
3054	3392	LA.matIdentity(Object3D.mat);
3055	3393	obj.getBounds(minima, maxima, false);
3056	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3060	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3063	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +3430,8 @@
3088	3430
3089	3431	int size = obj.MemorySize();
3090	3432
3091		- System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3434	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3092	3435	}
3093	3436	}
3094	3437	catch (Exception e)
..	..	@@ -3125,9 +3468,9 @@
3125	3468	obj = (Object3D)e.nextElement();
3126	3469
3127	3470	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3129	3472	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3131	3474
3132	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	3476	}
..	..	@@ -3169,6 +3512,20 @@
3169	3512	void GenNormals(boolean crease)
3170	3513	{
3171	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
	3522	+
	3523	+ refreshContents();
	3524	+ }
	3525	+
	3526	+ void GenNormalsMINE()
	3527	+ {
	3528	+ group.selection.GenNormalsMINE();
3172	3529
3173	3530	refreshContents();
3174	3531	}
..	..	@@ -3334,8 +3691,8 @@
3334	3691
3335	3692	void ParseVertices()
3336	3693	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3339	3696
3340	3697	for (int i=0; i<group.selection.size(); i++)
3341	3698	{
..	..	@@ -3360,7 +3717,7 @@
3360	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	3719
3363		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3364	3721
3365	3722	buffer.add(g);
3366	3723	}
..	..	@@ -3375,7 +3732,7 @@
3375	3732	makeSomething(buffer, i==group.selection.size()-1);
3376	3733	}
3377	3734
3378		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3379	3736
3380	3737	refreshContents();
3381	3738	}
..	..	@@ -3393,7 +3750,16 @@
3393	3750	String pigment = Object3D.GetPigment(tex);
3394	3751	//String bump = Object3D.GetBump(tex);
3395	3752
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3753	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3754	+
	3755	+ try
	3756	+ {
	3757	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3758	+ }
	3759	+ catch (Exception e)
	3760	+ {
	3761	+ System.err.println("FAIL: " + node);
	3762	+ }
3397	3763
3398	3764	double s = v.s;
3399	3765
..	..	@@ -3441,12 +3807,26 @@
3441	3807
3442	3808	void Align()
3443	3809	{
	3810	+ if (group.selection.size() == 0)
	3811	+ return;
	3812	+
	3813	+ cVector bbmin = new cVector();
	3814	+ cVector bbmax = new cVector();
	3815	+
	3816	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3817	+
	3818	+ double dx = bbmax.x - bbmin.x;
	3819	+ double dy = bbmax.y - bbmin.y;
	3820	+ double dz = bbmax.z - bbmin.z;
	3821	+
	3822	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3823	+
3444	3824	for (int i=0; i<group.selection.size(); i++)
3445	3825	{
3446	3826	Object3D obj = group.selection.get(i);
3447	3827
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3828	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3829	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3830	}
3451	3831
3452	3832	refreshContents();
..	..	@@ -3467,11 +3847,11 @@
3467	3847
3468	3848	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	3849
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	3850	+ boolean random = CameraPane.SWITCH;
	3851	+ CameraPane.SWITCH = false; // parse all random nodes
3472	3852	lowres.linkVerticesThis(null);
3473	3853	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	3854	+ CameraPane.SWITCH = random;
3475	3855
3476	3856	System.err.flush();
3477	3857
..	..	@@ -3511,7 +3891,7 @@
3511	3891	return;
3512	3892
3513	3893	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3515	3895
3516	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	3897
..	..	@@ -3680,7 +4060,7 @@
3680	4060	group.selection.RelinkToSupport(); // july 2014
3681	4061	System.out.println("DONE.");
3682	4062	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4063	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	4064	}
3685	4065
3686	4066	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +4085,9 @@
3705	4085
3706	4086	void ClipMesh()
3707	4087	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	4089	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3711	4091
3712	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	4093	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +4096,7 @@
3716	4096	// {
3717	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	4098	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	4100	}
3721	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	4102	System.out.println("DONE.");
..	..	@@ -3851,7 +4231,7 @@
3851	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	4232
3853	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
3855	4235	{
3856	4236	// if (!(elem instanceof Composite))
3857	4237	// newWindow = false;
..	..	@@ -3941,7 +4321,6 @@
3941	4321	//case 702: // Event.LIST_DESELECT
3942	4322	group.deselectAll();
3943	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	4324	if (tps != null)
3946	4325	{
3947	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,31 +4329,30 @@
3950	4329
3951	4330	//if (child.parent != null)
3952	4331	//child.parent.addSelectee(child);
	4332	+ objEditor.SetMaterial(child);
3953	4333	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	4334	}
3958	4335	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4336	+// else
	4337	+// {
	4338	+// objEditor.SetMaterial(group); // .GetMaterial());
	4339	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4340	+// System.err.println("info : " + group.GetPath());
	4341	+// }
3965	4342
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3969	4344	CameraPane.flash = true;
3970	4345
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	4347	// a camera
3973	4348	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4350	+ {
	4351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ }
	4354	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4355	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4356	}
3979	4357
3980	4358	refreshContents();
..	..	@@ -3985,6 +4363,26 @@
3985	4363
3986	4364	freezemodel = false;
3987	4365	}
	4366	+
	4367	+ void refreshContents(boolean cp)
	4368	+ {
	4369	+ if (!Globals.MOUSEDRAGGED)
	4370	+ {
	4371	+ objEditor.ClearInfo(); // .GetMaterial());
	4372	+
	4373	+ for (int i=0; i < group.selection.Size(); i++)
	4374	+ {
	4375	+ Object3D child = (Object3D) group.selection.get(i);
	4376	+
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+ }
	4380	+
	4381	+ objEditor.SetText(); // jan 2014
	4382	+ }
	4383	+
	4384	+ super.refreshContents(cp);
	4385	+ }
3988	4386
3989	4387	void linkSomething(Object3D thing)
3990	4388	{
..	..	@@ -4056,16 +4454,18 @@
4056	4454	{
4057	4455	if (group.selection.isEmpty())
4058	4456	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	4457	+
	4458	+ Grafreed.clipboardIsTempGroup = false;
4060	4459	Composite tGroup = null;
4061	4460	if (group.selection.size() > 0) // 1)
4062	4461	{
4063	4462	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	4463	+ Grafreed.clipboardIsTempGroup = true;
4065	4464	}
4066	4465
4067	4466	if (cut)
4068	4467	{
	4468	+ Save();
4069	4469	//int indices[] = jList.getSelectedIndices();
4070	4470	//for (int i = indices.length - 1; i >= 0; i--)
4071	4471	//jList.remove(indices[i]);
..	..	@@ -4101,16 +4501,16 @@
4101	4501	//System.out.println("cut " + child);
4102	4502	//System.out.println("parent = " + child.parent);
4103	4503	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	4504	+ if (Grafreed.clipboardIsTempGroup)
4105	4505	tGroup.add/Child/(tmp);
4106	4506	else
4107		- GrafreeD.clipboard = tmp;
	4507	+ Grafreed.clipboard = tmp;
4108	4508	}
4109	4509	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	4510	+ if (Grafreed.clipboardIsTempGroup)
4111	4511	tGroup.add/Child/(child);
4112	4512	else
4113		- GrafreeD.clipboard = child;
	4513	+ Grafreed.clipboard = child;
4114	4514	}
4115	4515
4116	4516	//ResetModel();
..	..	@@ -4142,21 +4542,23 @@
4142	4542	//System.out.println("cut " + elem);
4143	4543	//System.out.println("parent = " + elem.parent);
4144	4544	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	4545	+ if (Grafreed.clipboardIsTempGroup)
4146	4546	tGroup.add/Child/(tmp);
4147	4547	else
4148		- GrafreeD.clipboard = tmp;
	4548	+ Grafreed.clipboard = tmp;
4149	4549	}
4150	4550	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4152	4552	tGroup.add/Child/(child);
4153	4553	else
4154		- GrafreeD.clipboard = child;
	4554	+ Grafreed.clipboard = child;
4155	4555	}
4156	4556
4157	4557	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	4558	+
	4559	+ if (Grafreed.clipboardIsTempGroup)
	4560	+ Grafreed.clipboard = tGroup;
	4561	+
4160	4562	if (cut)
4161	4563	{
4162	4564	ResetModel();
..	..	@@ -4170,7 +4572,7 @@
4170	4572	// return;
4171	4573	boolean first = true;
4172	4574
4173		- if (GrafreeD.clipboardIsTempGroup)
	4575	+ if (Grafreed.clipboardIsTempGroup)
4174	4576	{
4175	4577	Composite temp;
4176	4578
..	..	@@ -4181,7 +4583,7 @@
4181	4583	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	4584	*/
4183	4585	Object3D elem;
4184		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4586	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4185	4587	{
4186	4588	Object3D child = (Object3D)e.nextElement();
4187	4589
..	..	@@ -4215,21 +4617,21 @@
4215	4617	//Object3D cb = Applet3D.clipboard;
4216	4618	//temp.addChild(cb);
4217	4619	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4620	+ assert(Grafreed.clipboard.parent == null);
	4621	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4622	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4623	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4624	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4223	4625	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	4626	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4627	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	4628	}
4227	4629
4228	4630	ResetModel();
4229	4631	refreshContents();
4230	4632	}
4231	4633
4232		- void pasteInto(boolean copyit)
	4634	+ void pasteInto(boolean copyit, boolean clone)
4233	4635	{
4234	4636	// if (GrafreeD.clipboard == null)
4235	4637	// return;
..	..	@@ -4258,15 +4660,22 @@
4258	4660	if (copyit)
4259	4661	{
4260	4662	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4663	+ if (clone)
	4664	+ {
	4665	+ CloneClipboard(false); // sept 2014
	4666	+ }
	4667	+ else
	4668	+ {
	4669	+ paste(false);
	4670	+ }
4262	4671	}
4263	4672	else
4264	4673	{
4265	4674	boolean first = true;
4266	4675
4267		- if (GrafreeD.clipboardIsTempGroup)
	4676	+ if (Grafreed.clipboardIsTempGroup)
4268	4677	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	4678	+ Composite temp = (Composite)Grafreed.clipboard;
4270	4679	Object3D copy;
4271	4680	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	4681	{
..	..	@@ -4276,7 +4685,7 @@
4276	4685	}
4277	4686	} else
4278	4687	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	4688	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	4689	}
4281	4690	}
4282	4691	}
..	..	@@ -4468,6 +4877,26 @@
4468	4877	makeSomething(csg);
4469	4878	}
4470	4879
	4880	+ void Ungroup(Object3D g)
	4881	+ {
	4882	+ if (g instanceof HiddenObject)
	4883	+ {
	4884	+ HiddenObject h = (HiddenObject) g;
	4885	+
	4886	+ for (int i=0; i<h.ActualSize(); i++)
	4887	+ {
	4888	+ objEditor.makeSomething(h.get(i), false);
	4889	+ }
	4890	+ }
	4891	+ else
	4892	+ {
	4893	+ for (int i=0; i<g.Size(); i++)
	4894	+ {
	4895	+ objEditor.makeSomething(g.get(i), false);
	4896	+ }
	4897	+ }
	4898	+ }
	4899	+
4471	4900	void ungroup()
4472	4901	{
4473	4902	/*
..	..	@@ -4661,21 +5090,6 @@
4661	5090	}
4662	5091	*/
4663	5092
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	5093	/*
4680	5094	public void Callback(Object obj)
4681	5095	{
..	..	@@ -4699,26 +5113,9 @@
4699	5113	}
4700	5114	*/
4701	5115
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	5116	String GetFile(String dialogName)
4720	5117	{
4721		- if (GrafreeD.standAlone)
	5118	+ if (Grafreed.standAlone)
4722	5119	{
4723	5120	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	5121	browser.show();
..	..	@@ -4782,10 +5179,15 @@
4782	5179	cButton flashSelectionButton;
4783	5180	cButton editButton;
4784	5181	cButton uneditButton;
	5182	+ JCheckBox allParamsButton;
4785	5183	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5184	cButton unselectButton;
4788	5185
	5186	+ cButton saveButton;
	5187	+ cButton undoButton;
	5188	+ cButton redoButton;
	5189	+ cButton oneStepButton;
	5190	+
4789	5191	cButton screenfitButton;
4790	5192	cButton screenfitpointButton;
4791	5193	cButton snapobjectButton;
..	..	@@ -4816,6 +5218,8 @@
4816	5218	private MenuItem lookFromItem;
4817	5219	private MenuItem switchItem;
4818	5220	private MenuItem cutItem;
	5221	+ private MenuItem undoItem;
	5222	+ private MenuItem redoItem;
4819	5223	private MenuItem duplicateItem;
4820	5224	private MenuItem cloneItem;
4821	5225	private MenuItem cloneSupportItem;
..	..	@@ -4827,8 +5231,9 @@
4827	5231	private MenuItem resetsupportItem;
4828	5232	private MenuItem resetreferencesItem;
4829	5233	private MenuItem linkverticesItem;
	5234	+ private MenuItem relinkverticesItem;
4830	5235	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	5236	+ private MenuItem resetAllItem;
4832	5237	private MenuItem stepAllItem;
4833	5238	private MenuItem revertMeshItem;
4834	5239	private MenuItem poseMeshItem;
..	..	@@ -4839,14 +5244,17 @@
4839	5244	private MenuItem mergeGeometriesItem;
4840	5245	private MenuItem copyItem;
4841	5246	private MenuItem pasteItem;
	5247	+ private MenuItem pasteIntoItem;
4842	5248	private MenuItem pasteLinkItem;
4843	5249	private MenuItem pasteCloneItem;
4844	5250	private MenuItem pasteExpandItem;
4845	5251	private MenuItem clearItem;
4846	5252	private MenuItem clearAllItem;
4847	5253	private MenuItem genUVItem;
	5254	+ private MenuItem genNormalsMESHItem;
4848	5255	private MenuItem genNormalsCADItem;
4849	5256	private MenuItem genNormalsORGANItem;
	5257	+ private MenuItem genNormalsMINEItem;
4850	5258	private MenuItem stripifyItem;
4851	5259	private MenuItem unstripifyItem;
4852	5260	private MenuItem trimItem;
..	..	@@ -4886,8 +5294,11 @@
4886	5294	private MenuItem panoTexturesItem;
4887	5295
4888	5296	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	5297	+ private MenuItem resetCentroidXZItem;
4890	5298	private MenuItem resetTransformItem;
	5299	+ private MenuItem transformGeometryItem;
	5300	+ private MenuItem transformChildrenItem;
	5301	+ private MenuItem hideItem;
4891	5302	private MenuItem grabItem;
4892	5303	private MenuItem backItem;
4893	5304	private MenuItem frontItem;
..	..	@@ -4908,6 +5319,7 @@
4908	5319
4909	5320	private MenuItem resetParentItem;
4910	5321	private MenuItem repairParentItem;
	5322	+ private MenuItem repairShadowItem;
4911	5323	private MenuItem sortbysizeItem;
4912	5324	private MenuItem sortbynameItem;
4913	5325
..	..	@@ -4928,10 +5340,11 @@
4928	5340	private MenuItem coneItem;
4929	5341	private MenuItem torusItem;
4930	5342	private MenuItem superItem;
	5343	+ private MenuItem kleinItem;
4931	5344	private MenuItem blobItem;
4932	5345	private MenuItem latheItem;
4933	5346	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5347	+ private MenuItem overlayItem;
4935	5348	private MenuItem meshItem;
4936	5349	// private MenuItem meshGroupItem;
4937	5350	private MenuItem springItem;
..	..	@@ -4940,6 +5353,7 @@
4940	5353	private MenuItem csgItem;
4941	5354	private MenuItem templateItem;
4942	5355	private MenuItem textureItem;
	5356	+ private MenuItem billboardItem;
4943	5357	private MenuItem shadowXItem;
4944	5358	private MenuItem shadowYItem;
4945	5359	private MenuItem shadowZItem;
..	..	@@ -4952,11 +5366,6 @@
4952	5366	private MenuItem doubleItem;
4953	5367	private MenuItem tripleItem;
4954	5368
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	5369	private MenuItem computeAOItem;
4961	5370	private MenuItem recompileItem;
4962	5371	private MenuItem editScriptItem;
..	..	@@ -4966,4 +5375,8 @@
4966	5375	private MenuItem analyzeItem;
4967	5376	private MenuItem dumpItem;
4968	5377	//boolean freezemodel = false;
	5378	+
	5379	+ Menu cameraMenu;
	5380	+ MenuItem editCameraItem;
	5381	+ MenuItem revertCameraItem;
4969	5382	}