~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,19 +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);
222	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
224	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	326	setMasterItem.addActionListener(this);
	327	+ }
226	328
227	329	oe.menuBar.add(menu = new Menu("Group"));
228	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +335,32 @@
233	335	frontItem.addActionListener(this);
234	336	compositeItem = menu.add(new MenuItem("Composite"));
235	337	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	339	hideItem.addActionListener(this);
238	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	341	ungroupItem.addActionListener(this);
240	342	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
242	344	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	346	switchGeoItem.addActionListener(this);
249	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	348	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	360	scriptNodeItem.addActionListener(this);
255	361	cameraItem = menu.add(new MenuItem("Camera"));
256	362	cameraItem.addActionListener(this);
	363	+ }
257	364
258	365	oe.menuBar.add(menu = new Menu("Object"));
259	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +375,29 @@
268	375	shadowYItem.addActionListener(this);
269	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
271	381	linkerItem = menu.add(new MenuItem("Linker"));
272	382	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	383	attributeItem = menu.add(new MenuItem("Attribute"));
276	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
277	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	388	pointflowItem.addActionListener(this);
	389	+ }
279	390	menu.add("-");
280	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	392	resetTransformItem.addActionListener(this);
282	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	394	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.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);
286	401
287	402	oe.menuBar.add(menu = new Menu("Geometry"));
288	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +408,11 @@
293	408	genNormalsCADItem.addActionListener(this);
294	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
296	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
298	416	stripifyItem = menu.add(new MenuItem("Stripify"));
299	417	stripifyItem.addActionListener(this);
300	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +434,34 @@
316	434	reduce34MeshItem.addActionListener(this);
317	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	436	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
323	445
324	446	oe.menuBar.add(menu = new Menu("Attributes"));
325	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	453	menu.add("-");
328	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	455	liveleavesItem.addActionListener(this);
330	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
332	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	461	supportleavesItem.addActionListener(this);
334	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	463	unsupportleavesItem.addActionListener(this);
	464	+ }
336	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	466	hideleavesItem.addActionListener(this);
338	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,29 +505,22 @@
376	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	506	sortbynameItem.addActionListener(this);
378	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.
379	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	516	extractGeometriesItem.addActionListener(this);
381	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	518	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	519	+ }
387	520
388	521	oe.menuBar.add(menu = new Menu("Insert"));
389	522	buildCreateMenu(menu);
390	523
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	524	oe.menuBar.add(menu = new Menu("Tools"));
403	525	buildToolsMenu(menu);
404	526	}
..	..	@@ -433,176 +555,110 @@
433	555	oe.radioPanel.add(dummyButton);
434	556	oe.buttonGroup.add(dummyButton);
435	557	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	559
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	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");
442	574	liveCB.addItemListener(this);
443	575
444		- oe.aConstraints.gridx += 1;
445		- 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);
446	581	fastCB.setToolTipText("Fast mode");
447	582	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
515	585	trackCB.setToolTipText("Enable tracking");
516	586	trackCB.addItemListener(this);
517	587
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	589	screenfitButton.setToolTipText("Screen fit");
521	590	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	591	+
523	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	593	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	594
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- 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);
537	603	flashSelectionButton.setToolTipText("Show selection");
538	604	flashSelectionButton.addActionListener(this);
539	605
540		- oe.toolbarPanel.add(new cButton(" ", false));
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	607
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	609	twoButton.setToolTipText("Show center view only");
549	610	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	612	fourButton.addActionListener(this);
552	613	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	615	sixButton.setToolTipText("2-column layout left");
555	616	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	618	threeButton.setToolTipText("2-column layout right");
558	619	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	621	sevenButton.setToolTipText("3-column layout");
561	622	sevenButton.addActionListener(this);
562	623	//
563	624
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
566	627	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	630	closeButton.setToolTipText("Close tab");
570	631	closeButton.addActionListener(this);
571	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	633	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574	634
575		- oe.aConstraints.gridx = 1; //
576		- 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");
577	639	editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	640
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
583	643	uneditButton.addActionListener(this);
584	644
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- 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");
597	647	allParamsButton.addActionListener(this);
598	648
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- 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");
604	655	unselectButton.addActionListener(this);
605	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
606	662	// oe.aConstraints.gridx += 1;
607	663	// oe.aConstraints.weighty = 0;
608	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +670,37 @@
614	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	671	// gcButton.addActionListener(this);
616	672
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
628	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- 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);
630	678	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
635	682
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- 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");
640	687	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- 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");
643	691	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- 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");
646	695	textureCB.addItemListener(this);
647	696
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
650	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
651	704	//jList.addListSelectionListener(this);
652	705	oe.jTree.addTreeSelectionListener(this);
653	706	//jTree.setRootVisible(false);
..	..	@@ -669,6 +722,78 @@
669	722	radio.layout = sevenButton;
670	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	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	+ }
672	797
673	798	void EditObject(Object3D obj)
674	799	{
..	..	@@ -681,6 +806,7 @@
681	806	buttonGroup.add(radioButton);
682	807	radioButton.doClick();
683	808	}
	809	+
684	810	void SetupViews(ObjEditor oe)
685	811	{
686	812	oe.SetupViews();
..	..	@@ -745,6 +871,7 @@
745	871	} else if(e.getSource() == liveCB)
746	872	{
747	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
748	875	}
749	876	else if(e.getSource() == supportCB)
750	877	{
..	..	@@ -897,7 +1024,9 @@
897	1024	// objEditor.DropFile((java.io.File[]) object, true);
898	1025	// return;
899	1026	// }
900		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1030	{
902	1031	// file(s)
903	1032	String[] names = string.split("\n");
..	..	@@ -924,7 +1053,7 @@
924	1053
925	1054	flashIt = false;
926	1055	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1058
930	1059	if (group.selection.size() == 1)
..	..	@@ -951,11 +1080,11 @@
951	1080	{
952	1081	loadClipboard(true);
953	1082	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
	1083	+ pasteInto(false, false);
955	1084	} else {
956	1085	loadClipboard(false);
957	1086	objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
	1087	+ pasteInto(false, false); // true); // ???
959	1088	}
960	1089	}
961	1090	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1077,27 +1206,33 @@
1077	1206	kleinItem.addActionListener(this);
1078	1207	particleItem = menu.add(new MenuItem("Particle system"));
1079	1208	particleItem.addActionListener(this);
	1209	+ if (Globals.ADVANCED)
	1210	+ {
1080	1211	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1212	ragdollItem.addActionListener(this);
1082	1213	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1214	ragdoll2Item.addActionListener(this);
	1215	+ }
1084	1216	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1217	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1218	meshItem.addActionListener(this);
1087	1219	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1220	// meshGroupItem.addActionListener(this);
	1221	+ if (Globals.ADVANCED)
	1222	+ {
1089	1223	springItem = menu.add(new MenuItem("Spring"));
1090	1224	springItem.addActionListener(this);
1091	1225	flagItem = menu.add(new MenuItem("Flag"));
1092	1226	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1227	blobItem = menu.add(new MenuItem("Blob"));
1098	1228	blobItem.addActionListener(this);
1099	1229	latheItem = menu.add(new MenuItem("Lathe"));
1100	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);
1101	1236	lightItem = menu.add(new MenuItem("Light"));
1102	1237	lightItem.addActionListener(this);
1103	1238	menu.add("-");
..	..	@@ -1107,39 +1242,44 @@
1107	1242	loopItem.addActionListener(this);
1108	1243	doubleItem = menu.add(new MenuItem("Fork"));
1109	1244	doubleItem.addActionListener(this);
	1245	+ if (Globals.ADVANCED)
	1246	+ {
1110	1247	tripleItem = menu.add(new MenuItem("Trident"));
1111	1248	tripleItem.addActionListener(this);
	1249	+ }
1112	1250	}
1113	1251
1114	1252	void buildToolsMenu(Menu menu)
1115	1253	{
1116	1254	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1255	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1256	+ animationItem.setState(Globals.ANIMATION);
1119	1257
1120	1258	menu.add("-");
1121	1259	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1260	parseverticesItem.addActionListener(this);
1123	1261	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1262	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1263	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1264	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1265	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1266	reduceMorphItem.addActionListener(this);
1131	1267	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1268	reduce34MorphItem.addActionListener(this);
1133		-
	1269	+ menu.add("-");
1134	1270	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1271	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1272
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1276	+ mirrorItem.addActionListener(this);
	1277	+ menu.add("-");
1138	1278	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1279	memoryItem.addActionListener(this);
1140	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1281	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1283	dumpItem.addActionListener(this);
1144	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1285	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1297,7 @@
1157	1297	menu.add("-");
1158	1298	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1299	editScriptItem.addActionListener(this);
	1300	+ }
1160	1301	}
1161	1302
1162	1303	void ScreenFit()
..	..	@@ -1485,9 +1626,9 @@
1485	1626
1486	1627	void Overwrite(int mask)
1487	1628	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1630	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1491	1632
1492	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1634	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1651,7 @@
1510	1651	//
1511	1652	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1653	{
	1654	+ Object source = event.getSource();
1513	1655	/*
1514	1656	if (event.getSource() == nameField)
1515	1657	{
..	..	@@ -1521,11 +1663,11 @@
1521	1663	}
1522	1664	else
1523	1665	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1666	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1667	{
1526	1668	ScreenFit();
1527	1669	} else
1528		- if (event.getSource() == switchItem)
	1670	+ if (source == switchItem)
1529	1671	{
1530	1672	cVector v1 = new cVector();
1531	1673	cVector v2 = new cVector();
..	..	@@ -1534,11 +1676,11 @@
1534	1676	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1677	objEditor.cameraView.repaint();
1536	1678	} else
1537		- if (event.getSource() == rectoidItem)
	1679	+ if (source == rectoidItem)
1538	1680	{
1539	1681	makeSomething(new Box());
1540	1682	} else
1541		- if (event.getSource() == particleItem)
	1683	+ if (source == particleItem)
1542	1684	{
1543	1685	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1686	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1701,9 @@
1559	1701	applyExample(particleGeom, "SMOKE");
1560	1702	makeSomething(particleGeom);
1561	1703	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1704	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1705	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1706	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1707
1566	1708	ragdoll.toParent = LA.newMatrix();
1567	1709	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1721,7 @@
1579	1721	} else
1580	1722	/*
1581	1723	*/
1582		- if (event.getSource() == heightFieldItem)
	1724	+ if (source == heightFieldItem)
1583	1725	{
1584	1726	Object3D obj = new Object3D();
1585	1727
..	..	@@ -1617,31 +1759,31 @@
1617	1759
1618	1760	makeSomething(obj);
1619	1761	} else
1620		- if (event.getSource() == gridItem)
	1762	+ if (source == gridItem)
1621	1763	{
1622	1764	makeSomething(new Grid());
1623	1765	} else
1624		- if (event.getSource() == ellipsoidItem)
	1766	+ if (source == ellipsoidItem)
1625	1767	{
1626	1768	makeSomething(new Sphere());
1627	1769	} else
1628		- if (event.getSource() == coneItem)
	1770	+ if (source == coneItem)
1629	1771	{
1630	1772	makeSomething(new Cone());
1631	1773	} else
1632		- if (event.getSource() == torusItem)
	1774	+ if (source == torusItem)
1633	1775	{
1634	1776	makeSomething(new Torus());
1635	1777	} else
1636		- if (event.getSource() == superItem)
	1778	+ if (source == superItem)
1637	1779	{
1638	1780	makeSomething(new Superellipsoid());
1639	1781	} else
1640		- if (event.getSource() == kleinItem)
	1782	+ if (source == kleinItem)
1641	1783	{
1642	1784	makeSomething(new Klein());
1643	1785	} else
1644		- if (event.getSource() == blobItem)
	1786	+ if (source == blobItem)
1645	1787	{
1646	1788	Blob blob = new Blob();
1647	1789	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1791,15 @@
1649	1791	//blob.retile();
1650	1792	makeSomething(blob);
1651	1793	} else
1652		- if (event.getSource() == latheItem)
	1794	+ if (source == latheItem)
1653	1795	{
1654	1796	makeSomething(new Lathe());
1655	1797	} else
1656		- if (event.getSource() == bezierItem)
	1798	+ if (source == bezierItem)
1657	1799	{
1658	1800	makeSomething(new BezierSurface());
1659	1801	} else
1660		- if (event.getSource() == checkerItem)
	1802	+ if (source == overlayItem)
1661	1803	{
1662	1804	/*
1663	1805	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1814,7 @@
1672	1814	*/
1673	1815	makeSomething(new Checker());
1674	1816	} else
1675		- if (event.getSource() == meshItem)
	1817	+ if (source == meshItem)
1676	1818	{
1677	1819	Object3D itemtomake = new Object3D();
1678	1820	Object3D child;
..	..	@@ -1693,35 +1835,35 @@
1693	1835	makeSomething(child);
1694	1836	}
1695	1837	} else
1696		- if (event.getSource() == springItem)
	1838	+ if (source == springItem)
1697	1839	{
1698	1840	cSpring s = new cSpring();
1699	1841	s.setup();
1700	1842	makeSomething(s);
1701	1843	} else
1702		- if (event.getSource() == flagItem)
	1844	+ if (source == flagItem)
1703	1845	{
1704	1846	cSpring s = new cFlag();
1705	1847	s.setup();
1706	1848	makeSomething(s);
1707	1849	} else
1708		- if (event.getSource() == lightItem)
	1850	+ if (source == lightItem)
1709	1851	{
1710	1852	makeSomething(new Light());
1711	1853	} else
1712		- if (event.getSource() == csgItem)
	1854	+ if (source == csgItem)
1713	1855	{
1714	1856	group(new CSG());
1715	1857	} else
1716		- if (event.getSource() == templateItem)
	1858	+ if (source == templateItem)
1717	1859	{
1718	1860	group(new cTemplate());
1719	1861	} else
1720		- if (event.getSource() == attributeItem)
	1862	+ if (source == attributeItem)
1721	1863	{
1722	1864	makeSomething(new Attribute());
1723	1865	} else
1724		- if (event.getSource() == pointflowItem)
	1866	+ if (source == pointflowItem)
1725	1867	{
1726	1868	makeSomething(new PointFlow());
1727	1869	} else
..	..	@@ -1733,7 +1875,7 @@
1733	1875	} else
1734	1876	*/
1735	1877
1736		- if (event.getSource() == superLoopItem)
	1878	+ if (source == superLoopItem)
1737	1879	{
1738	1880	Composite g = new cGroup();
1739	1881	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1897,7 @@
1755	1897
1756	1898	group(g);
1757	1899	} else
1758		- if (event.getSource() == loopItem)
	1900	+ if (source == loopItem)
1759	1901	{
1760	1902	Composite csg = new GroupLeaf();
1761	1903	csg.count = 5;
..	..	@@ -1764,7 +1906,7 @@
1764	1906	csg.addChild(child);
1765	1907	child.addChild(csg);
1766	1908	} else
1767		- if (event.getSource() == doubleItem)
	1909	+ if (source == doubleItem)
1768	1910	{
1769	1911	Composite csg = new GroupLeaf();
1770	1912	csg.count = 5;
..	..	@@ -1776,7 +1918,7 @@
1776	1918	csg.addChild(child);
1777	1919	child.addChild(csg);
1778	1920	} else
1779		- if (event.getSource() == tripleItem)
	1921	+ if (source == tripleItem)
1780	1922	{
1781	1923	Composite csg = new GroupLeaf();
1782	1924	csg.count = 4;
..	..	@@ -1791,71 +1933,71 @@
1791	1933	csg.addChild(child);
1792	1934	child.addChild(csg);
1793	1935	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	1936	+ if (source == computeAOItem)
1812	1937	{
1813	1938	Globals.drawMode = CameraPane.OCCLUSION;
1814	1939	Globals.theRenderer.repaint();
1815	1940	} else
1816		- if (event.getSource() == recompileItem)
	1941	+ if (source == recompileItem)
1817	1942	{
1818	1943	Recompile();
1819	1944	refreshContents();
1820	1945	} else
1821		- if (event.getSource() == editScriptItem)
	1946	+ if (source == editScriptItem)
1822	1947	{
1823	1948	OpenDialog();
1824	1949	refreshContents();
1825	1950	} else
1826		- if (event.getSource() == invariantsItem)
	1951	+ if (source == invariantsItem)
1827	1952	{
1828	1953	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1830	1955	} else
1831		- if (event.getSource() == memoryItem)
	1956	+ if (source == memoryItem)
1832	1957	{
1833	1958	//System.out.println("Invariants:");
1834	1959	PrintMemory();
1835	1960	} else
1836		- if (event.getSource() == pathItem)
	1961	+ if (source == pathItem)
1837	1962	{
1838	1963	PrintPath();
1839	1964	} else
1840		- if (event.getSource() == analyzeItem)
	1965	+ if (source == analyzeItem)
1841	1966	{
1842	1967	AnalyzeObject();
1843	1968	} else
1844		- if (event.getSource() == dumpItem)
	1969	+ if (source == dumpItem)
1845	1970	{
1846	1971	DumpObject();
1847	1972	} else
1848		- 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)
1849	1991	{
1850	1992	//Reload(lastConverter, lastFilename, true);
1851	1993	ScreenFit();
1852	1994	} else
1853		- if (event.getSource() == screenfitpointButton)
	1995	+ if (source == screenfitpointButton)
1854	1996	{
1855	1997	//Reload(lastConverter, lastFilename, true);
1856	1998	ScreenFitPoint();
1857	1999	} else
1858		- if (event.getSource() == snapobjectButton)
	2000	+ if (source == snapobjectButton)
1859	2001	{
1860	2002	//Reload(lastConverter, lastFilename, true);
1861	2003	SnapObject();
..	..	@@ -1866,13 +2008,13 @@
1866	2008	// Recompile();
1867	2009	// refreshContents();
1868	2010	// } else
1869		- if (event.getSource() == gcButton)
	2011	+ if (source == gcButton)
1870	2012	{
1871	2013	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2014	System.gc();
1873	2015	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2016	} else
1875		- if (event.getSource() == editLeafItem)
	2017	+ if (source == editLeafItem)
1876	2018	{
1877	2019	Object3D obj;
1878	2020	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2028,74 @@
1886	2028	}
1887	2029	refreshContents(true);
1888	2030	} else
1889		- if (event.getSource() == openWindowItem)
	2031	+ if (source == openWindowItem)
1890	2032	{
1891	2033	EditSelection(true);
1892	2034	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2035	+ if (source == cutItem \|\| source == clearButton)
1894	2036	{
1895	2037	loadClipboard(true);
1896	2038	} else
1897		- if (event.getSource() == duplicateItem)
	2039	+ if (source == undoItem)
1898	2040	{
1899		- 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;
1900	2050	loadClipboard(false);
1901	2051	paste(false);
1902		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1903	2053	} else
1904		- if (event.getSource() == cloneItem)
	2054	+ if (source == cloneItem)
1905	2055	{
1906	2056	CloneSelection(false);
1907	2057	} else
1908		- if (event.getSource() == cloneSupportItem)
	2058	+ if (source == cloneSupportItem)
1909	2059	{
1910	2060	CloneSelection(true);
1911	2061	} else
1912		- if (event.getSource() == copyItem)
	2062	+ if (source == copyItem)
1913	2063	{
1914	2064	loadClipboard(false);
1915	2065	} else
1916		- if (event.getSource() == pasteItem)
	2066	+ if (source == pasteItem)
1917	2067	{
1918	2068	paste(false);
1919	2069	} else
1920		- if (event.getSource() == pasteLinkItem)
	2070	+ if (source == pasteIntoItem)
1921	2071	{
1922		- pasteInto(false);
	2072	+ pasteInto(true, false);
1923	2073	} else
1924		- if (event.getSource() == pasteCloneItem)
	2074	+ if (source == pasteLinkItem)
1925	2075	{
1926		- pasteInto(true);
	2076	+ pasteInto(false, false);
1927	2077	} else
1928		- if (event.getSource() == pasteExpandItem)
	2078	+ if (source == pasteCloneItem)
	2079	+ {
	2080	+ pasteInto(true, true);
	2081	+ } else
	2082	+ if (source == pasteExpandItem)
1929	2083	{
1930	2084	paste(true);
1931	2085	} else
1932		- if (event.getSource() == synchronizeItem)
	2086	+ if (source == synchronizeItem)
1933	2087	{
1934	2088	Overwrite(Object3D.TRANSFORM);
1935	2089	} else
1936		- if (event.getSource() == overwriteNameItem)
	2090	+ if (source == overwriteNameItem)
1937	2091	{
1938	2092	Overwrite(Object3D.NAME);
1939	2093	} else
1940		- if (event.getSource() == overwriteUVItem)
	2094	+ if (source == overwriteUVItem)
1941	2095	{
1942	2096	Overwrite(Object3D.UV);
1943	2097	} else
1944		- if (event.getSource() == overwriteMatItem)
	2098	+ if (source == overwriteMatItem)
1945	2099	{
1946	2100	/* july 2015
1947	2101	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2115,7 @@
1961	2115
1962	2116	Overwrite(dropAttributes);
1963	2117	}
1964		- if (event.getSource() == overwriteGeoItem)
	2118	+ if (source == overwriteGeoItem)
1965	2119	{
1966	2120	Overwrite(Object3D.GEOMETRY);
1967	2121	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2132,7 @@
1978	2132	// refreshContents();
1979	2133	// }
1980	2134	} else
1981		- if (event.getSource() == generateMeshItem)
	2135	+ if (source == generateMeshItem)
1982	2136	{
1983	2137	//if (group.selection.size() == 1)
1984	2138	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2143,7 @@
1989	2143	ResetModel();
1990	2144	refreshContents();
1991	2145	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2146	+ if (source == extractGeometriesItem)
1993	2147	{
1994	2148	boolean one = false;
1995	2149
..	..	@@ -2016,7 +2170,7 @@
2016	2170	ResetModel();
2017	2171	refreshContents();
2018	2172	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2173	+ if (source == cloneGeometriesItem)
2020	2174	{
2021	2175	boolean one = false;
2022	2176
..	..	@@ -2042,7 +2196,7 @@
2042	2196	ResetModel();
2043	2197	refreshContents();
2044	2198	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2199	+ if (source == shareGeometriesItem)
2046	2200	{
2047	2201	boolean one = false;
2048	2202
..	..	@@ -2072,7 +2226,7 @@
2072	2226	refreshContents();
2073	2227	}
2074	2228	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2229	+ if (source == mergeGeometriesItem)
2076	2230	{
2077	2231	boolean one = false;
2078	2232
..	..	@@ -2102,7 +2256,7 @@
2102	2256	ResetModel();
2103	2257	refreshContents();
2104	2258	} else
2105		- if (event.getSource() == linkverticesItem)
	2259	+ if (source == linkverticesItem)
2106	2260	{
2107	2261	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2262	// {
..	..	@@ -2115,9 +2269,9 @@
2115	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2270	// refreshContents();
2117	2271	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2273	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2121	2275
2122	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2277	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2279,38 @@
2125	2279	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2280	for (int i=0; i<group.selection.size(); i++)
2127	2281	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2282	+ boolean random = CameraPane.SWITCH;
	2283	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2284	group.selection.get(i).linkVerticesThis(content);
2131	2285	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2286	+ CameraPane.SWITCH = random;
2133	2287	}
2134	2288	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2289	refreshContents();
2136	2290	}
2137	2291	} else
2138		- if (event.getSource() == resetsupportItem)
	2292	+ if (source == resetsupportItem)
2139	2293	{
2140	2294	for (int i=0; i<group.selection.size(); i++)
2141	2295	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2296	+ boolean random = CameraPane.SWITCH;
	2297	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2298	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2299	+ CameraPane.SWITCH = random;
2146	2300	}
2147	2301
2148	2302	refreshContents();
2149	2303	} else
2150		- if (event.getSource() == relinkverticesItem)
	2304	+ if (source == relinkverticesItem)
2151	2305	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2306	+ boolean random = CameraPane.SWITCH;
	2307	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2308	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2309	+ CameraPane.SWITCH = random;
2156	2310
2157	2311	refreshContents();
2158	2312	} else
2159		- if (event.getSource() == resetreferencesItem)
	2313	+ if (source == resetreferencesItem)
2160	2314	{
2161	2315	for (int i=0; i<group.selection.size(); i++)
2162	2316	{
..	..	@@ -2165,11 +2319,11 @@
2165	2319
2166	2320	refreshContents();
2167	2321	} else
2168		- if (event.getSource() == setMasterItem)
	2322	+ if (source == setMasterItem)
2169	2323	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2325	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2173	2327
2174	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2329	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2332,13 @@
2178	2332	refreshContents();
2179	2333	}
2180	2334	} else
2181		- if (event.getSource() == poseMeshItem)
	2335	+ if (source == poseMeshItem)
2182	2336	{
2183	2337	if (group.selection.size() == 1)
2184	2338	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2186	2340	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2188	2342
2189	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2344	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2351,19 @@
2197	2351	}
2198	2352
2199	2353	} else
2200		- if (event.getSource() == revertMeshItem)
	2354	+ if (source == revertMeshItem)
2201	2355	{
2202	2356	RevertMeshes();
2203	2357	} else
2204		- if (event.getSource() == resetMeshItem)
	2358	+ if (source == resetAllItem)
2205	2359	{
2206	2360	ResetAll();
2207	2361	} else
2208		- if (event.getSource() == stepAllItem)
	2362	+ if (source == stepAllItem)
2209	2363	{
2210	2364	StepAll();
2211	2365	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2366	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2367	{
2214	2368	//int indices[] = jList.getSelectedIndices();
2215	2369	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2371,46 @@
2217	2371
2218	2372	ClearSelection(false);
2219	2373	} else
2220		- if (event.getSource() == clearAllItem)
	2374	+ if (source == clearAllItem)
2221	2375	{
2222	2376	ClearSelection(true);
2223	2377	} else
2224		- if (event.getSource() == grabItem)
	2378	+ if (source == grabItem)
2225	2379	{
2226	2380	group(new cGroup(), true);
2227	2381	} else
2228		- if (event.getSource() == hideItem)
	2382	+ if (source == hideItem)
2229	2383	{
2230	2384	group(new HiddenObject());
2231	2385	} else
2232		- if (event.getSource() == frontItem)
	2386	+ if (source == frontItem)
2233	2387	{
2234	2388	front();
2235	2389	} else
2236		- if (event.getSource() == backItem)
	2390	+ if (source == backItem)
2237	2391	{
2238	2392	back();
2239	2393	} else
2240		- if (event.getSource() == cameraItem)
	2394	+ if (source == cameraItem)
2241	2395	{
2242	2396	makeSomething(new Camera());
2243	2397	} else
2244		- if (event.getSource() == compositeItem)
	2398	+ if (source == compositeItem)
2245	2399	{
2246	2400	group(new Composite());
2247	2401	} else
2248		- if (event.getSource() == randomItem)
	2402	+ if (source == randomItem)
2249	2403	{
2250	2404	RandomNode random = new RandomNode();
2251	2405	group(random);
2252	2406	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2407	+ random.name = random.get(0).name + "Switch";
2254	2408	} else
2255		- if (event.getSource() == physicsItem)
	2409	+ if (source == physicsItem)
2256	2410	{
2257	2411	group(new PhysicsNode());
2258	2412	} else
2259		- if (event.getSource() == frameselectorItem)
	2413	+ if (source == frameselectorItem)
2260	2414	{
2261	2415	for (int i=0; i<group.selection.size(); i++)
2262	2416	{
..	..	@@ -2268,7 +2422,7 @@
2268	2422	ResetModel();
2269	2423	refreshContents();
2270	2424	} else
2271		- if (event.getSource() == switchGeoItem)
	2425	+ if (source == switchGeoItem)
2272	2426	{
2273	2427	for (int i=0; i<group.selection.size(); i++)
2274	2428	{
..	..	@@ -2280,7 +2434,7 @@
2280	2434	ResetModel();
2281	2435	refreshContents();
2282	2436	} else
2283		- if (event.getSource() == switchTransfoItem)
	2437	+ if (source == switchTransfoItem)
2284	2438	{
2285	2439	for (int i=0; i<group.selection.size(); i++)
2286	2440	{
..	..	@@ -2292,7 +2446,7 @@
2292	2446	ResetModel();
2293	2447	refreshContents();
2294	2448	} else
2295		- if (event.getSource() == morphItem)
	2449	+ if (source == morphItem)
2296	2450	{
2297	2451	for (int i=0; i<group.selection.size(); i++)
2298	2452	{
..	..	@@ -2304,7 +2458,7 @@
2304	2458	ResetModel();
2305	2459	refreshContents();
2306	2460	} else
2307		- if (event.getSource() == scriptNodeItem)
	2461	+ if (source == scriptNodeItem)
2308	2462	{
2309	2463	boolean atleastone = false;
2310	2464
..	..	@@ -2343,31 +2497,31 @@
2343	2497	}
2344	2498	}
2345	2499	} else
2346		- if (event.getSource() == linkerItem)
	2500	+ if (source == linkerItem)
2347	2501	{
2348	2502	group(new cLinker());
2349	2503	} else
2350		- if (event.getSource() == textureItem)
	2504	+ if (source == textureItem)
2351	2505	{
2352	2506	group(new TextureNode());
2353	2507	} else
2354		- if (event.getSource() == billboardItem)
	2508	+ if (source == billboardItem)
2355	2509	{
2356	2510	group(new BillboardNode());
2357	2511	} else
2358		- if (event.getSource() == shadowXItem)
	2512	+ if (source == shadowXItem)
2359	2513	{
2360	2514	CastShadow(0);
2361	2515	} else
2362		- if (event.getSource() == shadowYItem)
	2516	+ if (source == shadowYItem)
2363	2517	{
2364	2518	CastShadow(1);
2365	2519	} else
2366		- if (event.getSource() == shadowZItem)
	2520	+ if (source == shadowZItem)
2367	2521	{
2368	2522	CastShadow(2);
2369	2523	} else
2370		- if (event.getSource() == ungroupItem)
	2524	+ if (source == ungroupItem)
2371	2525	{
2372	2526	//ungroup();
2373	2527	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2533,187 @@
2379	2533
2380	2534	refreshContents();
2381	2535	} else
2382		- if (event.getSource() == genUVItem)
	2536	+ if (source == genUVItem)
2383	2537	{
2384	2538	GenUV();
2385	2539	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2540	+ if (source == genNormalsCADItem)
2387	2541	{
2388	2542	GenNormals(true);
2389	2543	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2544	+ if (source == genNormalsMESHItem)
2391	2545	{
2392		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2393	2547	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2548	+ if (source == genNormalsORGANItem)
2395	2549	{
2396	2550	GenNormals(false);
2397	2551	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2552	+ if (source == genNormalsMINEItem)
2399	2553	{
2400	2554	GenNormalsMINE();
2401	2555	} else
2402		- if (event.getSource() == stripifyItem)
	2556	+ if (source == stripifyItem)
2403	2557	{
2404	2558	Stripify();
2405	2559	} else
2406		- if (event.getSource() == unstripifyItem)
	2560	+ if (source == unstripifyItem)
2407	2561	{
2408	2562	Unstripify();
2409	2563	} else
2410		- if (event.getSource() == trimItem)
	2564	+ if (source == trimItem)
2411	2565	{
2412	2566	Trim();
2413	2567	} else
2414		- if (event.getSource() == untrimItem)
	2568	+ if (source == untrimItem)
2415	2569	{
2416	2570	Untrim();
2417	2571	} else
2418		- if (event.getSource() == clearColorsItem)
	2572	+ if (source == clearColorsItem)
2419	2573	{
2420	2574	ClearColors();
2421	2575	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2576	+ if (source == clearMaterialsItem)
2423	2577	{
2424	2578	ClearMaterials();
2425	2579	} else
2426		- if (event.getSource() == liveleavesItem)
	2580	+ if (source == liveleavesItem)
2427	2581	{
2428	2582	LiveLeaves(true);
2429	2583	} else
2430		- if (event.getSource() == unliveleavesItem)
	2584	+ if (source == unliveleavesItem)
2431	2585	{
2432	2586	LiveLeaves(false);
2433	2587	} else
2434		- if (event.getSource() == supportleavesItem)
	2588	+ if (source == supportleavesItem)
2435	2589	{
2436	2590	SupportLeaves(true);
2437	2591	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2592	+ if (source == unsupportleavesItem)
2439	2593	{
2440	2594	SupportLeaves(false);
2441	2595	} else
2442		- if (event.getSource() == hideleavesItem)
	2596	+ if (source == hideleavesItem)
2443	2597	{
2444	2598	HideLeaves(true);
2445	2599	} else
2446		- if (event.getSource() == showleavesItem)
	2600	+ if (source == showleavesItem)
2447	2601	{
2448	2602	HideLeaves(false);
2449	2603	} else
2450		- if (event.getSource() == markleavesItem)
	2604	+ if (source == markleavesItem)
2451	2605	{
2452	2606	MarkLeaves(true);
2453	2607	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2608	+ if (source == unmarkleavesItem)
2455	2609	{
2456	2610	MarkLeaves(false);
2457	2611	} else
2458		- if (event.getSource() == flipVItem)
	2612	+ if (source == flipVItem)
2459	2613	{
2460	2614	FlipV(true);
2461	2615	} else
2462		- if (event.getSource() == unflipVItem)
	2616	+ if (source == unflipVItem)
2463	2617	{
2464	2618	FlipV(false);
2465	2619	} else
2466		- if (event.getSource() == lowTexturesItem)
	2620	+ if (source == lowTexturesItem)
2467	2621	{
2468	2622	SetTexRes(0);
2469	2623	} else
2470		- if (event.getSource() == normalTexturesItem)
	2624	+ if (source == normalTexturesItem)
2471	2625	{
2472	2626	SetTexRes(1);
2473	2627	} else
2474		- if (event.getSource() == highTexturesItem)
	2628	+ if (source == highTexturesItem)
2475	2629	{
2476	2630	SetTexRes(2);
2477	2631	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2632	+ if (source == veryhighTexturesItem)
2479	2633	{
2480	2634	SetTexRes(3);
2481	2635	} else
2482		- if (event.getSource() == maxTexturesItem)
	2636	+ if (source == maxTexturesItem)
2483	2637	{
2484	2638	SetTexRes(4);
2485	2639	} else
2486		- if (event.getSource() == panoTexturesItem)
	2640	+ if (source == panoTexturesItem)
2487	2641	{
2488	2642	SetTexRes(5);
2489	2643	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2644	+ if (source == reverseNormalsItem)
2491	2645	{
2492	2646	ReverseNormals();
2493	2647	} else
2494		- if (event.getSource() == parseverticesItem)
	2648	+ if (source == parseverticesItem)
2495	2649	{
2496	2650	ParseVertices();
2497	2651	} else
2498		- if (event.getSource() == textureFieldItem)
	2652	+ if (source == textureFieldItem)
2499	2653	{
2500	2654	TextureVertices();
2501	2655	} else
2502		- if (event.getSource() == alignItem)
	2656	+ if (source == alignItem)
2503	2657	{
2504	2658	Align();
2505	2659	} else
2506		- if (event.getSource() == mirrorItem)
	2660	+ if (source == mirrorItem)
2507	2661	{
2508	2662	MirrorPoses();
2509	2663	} else
2510		- if (event.getSource() == reduceMorphItem)
	2664	+ if (source == reduceMorphItem)
2511	2665	{
2512	2666	MeshReduction(false);
2513	2667	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2668	+ if (source == reduce34MorphItem)
2515	2669	{
2516	2670	MeshReduction(true);
2517	2671	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2672	+ if (source == reverseTrianglesItem)
2519	2673	{
2520	2674	ReverseTriangles();
2521	2675	} else
2522		- if (event.getSource() == reduceMeshItem)
	2676	+ if (source == reduceMeshItem)
2523	2677	{
2524	2678	ReduceMesh(false);
2525	2679	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2680	+ if (source == reduce34MeshItem)
2527	2681	{
2528	2682	ReduceMesh(true);
2529	2683	} else
2530		- if (event.getSource() == increaseMeshItem)
	2684	+ if (source == increaseMeshItem)
2531	2685	{
2532	2686	IncreaseMesh();
2533	2687	} else
2534		- if (event.getSource() == clipMeshItem)
	2688	+ if (source == clipMeshItem)
2535	2689	{
2536	2690	ClipMesh();
2537	2691	} else
2538		- if (event.getSource() == smoothMeshItem)
	2692	+ if (source == smoothMeshItem)
2539	2693	{
2540	2694	SmoothMesh();
2541	2695	} else
2542		- if (event.getSource() == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2543	2697	{
2544	2698	TransformGeometry();
2545	2699	} else
2546		- if (event.getSource() == resetTransformItem)
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
	2703	+ } else
	2704	+ if (source == resetTransformItem)
2547	2705	{
2548	2706	ResetTransform();
2549	2707	} else
2550		- if (event.getSource() == resetCentroidItem)
	2708	+ if (source == resetCentroidItem)
2551	2709	{
2552		- ResetCentroid();
	2710	+ ResetCentroid(true);
2553	2711	} else
2554		- if (event.getSource() == resetParentItem)
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
	2715	+ } else
	2716	+ if (source == resetParentItem)
2555	2717	{
2556	2718	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2719	{
..	..	@@ -2561,7 +2723,7 @@
2561	2723
2562	2724	refreshContents();
2563	2725	} else
2564		- if (event.getSource() == repairParentItem)
	2726	+ if (source == repairParentItem)
2565	2727	{
2566	2728	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2729	{
..	..	@@ -2575,7 +2737,7 @@
2575	2737
2576	2738	refreshContents();
2577	2739	} else
2578		- if (event.getSource() == repairShadowItem)
	2740	+ if (source == repairShadowItem)
2579	2741	{
2580	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2743	{
..	..	@@ -2589,7 +2751,7 @@
2589	2751
2590	2752	refreshContents();
2591	2753	} else
2592		- if (event.getSource() == sortbysizeItem)
	2754	+ if (source == sortbysizeItem)
2593	2755	{
2594	2756	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2757	{
..	..	@@ -2601,7 +2763,7 @@
2601	2763	ResetModel();
2602	2764	refreshContents();
2603	2765	} else
2604		- if (event.getSource() == sortbynameItem)
	2766	+ if (source == sortbynameItem)
2605	2767	{
2606	2768	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2769	{
..	..	@@ -2613,7 +2775,7 @@
2613	2775	ResetModel();
2614	2776	refreshContents();
2615	2777	} else
2616		- if (event.getSource() == attachPigmentItem)
	2778	+ if (source == attachPigmentItem)
2617	2779	{
2618	2780	String texture = GetFile("Attach pigment");
2619	2781	Object3D obj;
..	..	@@ -2625,7 +2787,7 @@
2625	2787
2626	2788	refreshContents();
2627	2789	} else
2628		- if (event.getSource() == detachPigmentItem)
	2790	+ if (source == detachPigmentItem)
2629	2791	{
2630	2792	Object3D obj;
2631	2793	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2798,7 @@
2636	2798
2637	2799	refreshContents();
2638	2800	} else
2639		- if (event.getSource() == attachBumpItem)
	2801	+ if (source == attachBumpItem)
2640	2802	{
2641	2803	String texture = GetFile("Attach bump");
2642	2804	Object3D obj;
..	..	@@ -2648,7 +2810,7 @@
2648	2810
2649	2811	refreshContents();
2650	2812	} else
2651		- if (event.getSource() == detachBumpItem)
	2813	+ if (source == detachBumpItem)
2652	2814	{
2653	2815	Object3D obj;
2654	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2821,7 @@
2659	2821
2660	2822	refreshContents();
2661	2823	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2824	+ if (source == pigmentBumpItem)
2663	2825	{
2664	2826	Object3D obj;
2665	2827	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2832,195 @@
2670	2832
2671	2833	refreshContents();
2672	2834	} else
2673		- if (event.getSource() == flashSelectionButton)
	2835	+ if (source == flashSelectionButton)
2674	2836	{
2675	2837	CameraPane.flash = true;
2676	2838	refreshContents();
2677	2839	} else
2678		- if (event.getSource() == oneButton)
	2840	+ if (source == oneButton)
2679	2841	{
2680	2842	} else
2681		- if (event.getSource() == twoButton)
	2843	+ if (source == twoButton)
2682	2844	{
2683	2845	radio.layout = twoButton;
2684	2846	// bug
2685	2847	//gridPanel.setDividerLocation(1.0);
2686	2848	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- 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();
2711	2878	} else
2712		- if (event.getSource() == threeButton)
	2879	+ if (source == threeButton)
2713	2880	{
2714	2881	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- 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();
2739	2914	} else
2740		- if (event.getSource() == fourButton)
	2915	+ if (source == fourButton)
2741	2916	{
2742	2917	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- 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();
2767	2949	} else
2768		- if (event.getSource() == sixButton)
	2950	+ if (source == sixButton)
2769	2951	{
2770	2952	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- 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();
2795	2985	} else
2796		- if (event.getSource() == sevenButton)
	2986	+ if (source == sevenButton)
2797	2987	{
2798	2988	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- 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();
2823	3022	} else
2824		- if (event.getSource() == rootButton)
	3023	+ if (source == rootButton)
2825	3024	{
2826	3025	Object3D obj;
2827	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2833,7 +3032,7 @@
2833	3032
2834	3033	refreshContents(true);
2835	3034	} else
2836		- if (event.getSource() == closeButton)
	3035	+ if (source == closeButton)
2837	3036	{
2838	3037	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3038	cRadio ab;
..	..	@@ -2854,11 +3053,11 @@
2854	3053	}
2855	3054	refreshContents(true);
2856	3055	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3056	+ if (source == editItem \|\| source == editButton)
2858	3057	{
2859	3058	EditSelection(false);
2860	3059	} else
2861		- if (event.getSource() == uneditButton)
	3060	+ if (source == uneditButton)
2862	3061	{
2863	3062	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3063	{
..	..	@@ -2868,14 +3067,14 @@
2868	3067	child.CloseUI();
2869	3068	listUI.remove(child);
2870	3069
2871		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2872	3071	}
2873		- objEditor.ctrlPanel.revalidate();
	3072	+ objEditor.ctrlPanel.FlushUI();
2874	3073	//objEditor.jTree.clearSelection();
2875	3074	//objEditor.ResetSliders();
2876	3075	refreshContents(true);
2877	3076	} else
2878		- if (event.getSource() == clearPanelButton)
	3077	+ if (source == clearPanelButton)
2879	3078	{
2880	3079	assert(copy == group);
2881	3080	//copy.ClearUI();
..	..	@@ -2886,7 +3085,7 @@
2886	3085	listUI.clear();
2887	3086	refreshContents(true);
2888	3087	} else
2889		- if (event.getSource() == allParamsButton)
	3088	+ if (source == allParamsButton)
2890	3089	{
2891	3090	assert(copy == group);
2892	3091
..	..	@@ -2907,19 +3106,19 @@
2907	3106
2908	3107	refreshContents(true);
2909	3108	} else
2910		- if (event.getSource() == unselectButton)
	3109	+ if (source == unselectButton)
2911	3110	{
2912	3111	objEditor.jTree.clearSelection();
2913	3112	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3113	objEditor.ResetSliders();
2915	3114	refreshContents(true);
2916	3115	} else
2917		- if(event.getSource() instanceof cRadio)
	3116	+ if(source instanceof cRadio)
2918	3117	{
2919	3118	group.parent = keepparent;
2920	3119	group.attributes = 0;
2921	3120	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3121	+ /cRadio/ radio = (cRadio)source;
2923	3122	Object3D obj = radio.GetObject();
2924	3123	System.out.println("Edit " + obj);
2925	3124	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2954,7 +3153,10 @@
2954	3153	frontView.object = group;
2955	3154	sideView.object = group;
2956	3155	}
	3156	+
	3157	+// fix "+" issue
2957	3158	group.editWindow = this;
	3159	+
2958	3160	/*
2959	3161	currentLayout = radio.layout;
2960	3162	if (currentLayout == null)
..	..	@@ -2967,7 +3169,20 @@
2967	3169	//group.attributes = -1;
2968	3170	ResetModel();
2969	3171	refreshContents(true);
2970		- }
	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	+ }
2971	3186	else
2972	3187	{
2973	3188	//return super.action(event, arg);
..	..	@@ -3028,6 +3243,28 @@
3028	3243	refreshContents();
3029	3244	}
3030	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	+ }
3031	3268
3032	3269	void ResetTransform()
3033	3270	{
..	..	@@ -3140,7 +3377,7 @@
3140	3377	refreshContents();
3141	3378	}
3142	3379
3143		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3144	3381	{
3145	3382	Object3D obj;
3146	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3392,16 @@
3155	3392	LA.matIdentity(Object3D.mat);
3156	3393	obj.getBounds(minima, maxima, false);
3157	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3161	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3164	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3430,8 @@
3189	3430
3190	3431	int size = obj.MemorySize();
3191	3432
3192		- 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)");
3193	3435	}
3194	3436	}
3195	3437	catch (Exception e)
..	..	@@ -3226,9 +3468,9 @@
3226	3468	obj = (Object3D)e.nextElement();
3227	3469
3228	3470	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3230	3472	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3474
3233	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3476	}
..	..	@@ -3270,6 +3512,13 @@
3270	3512	void GenNormals(boolean crease)
3271	3513	{
3272	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3273	3522
3274	3523	refreshContents();
3275	3524	}
..	..	@@ -3442,8 +3691,8 @@
3442	3691
3443	3692	void ParseVertices()
3444	3693	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3447	3696
3448	3697	for (int i=0; i<group.selection.size(); i++)
3449	3698	{
..	..	@@ -3468,7 +3717,7 @@
3468	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3719
3471		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3472	3721
3473	3722	buffer.add(g);
3474	3723	}
..	..	@@ -3483,7 +3732,7 @@
3483	3732	makeSomething(buffer, i==group.selection.size()-1);
3484	3733	}
3485	3734
3486		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3487	3736
3488	3737	refreshContents();
3489	3738	}
..	..	@@ -3501,7 +3750,16 @@
3501	3750	String pigment = Object3D.GetPigment(tex);
3502	3751	//String bump = Object3D.GetBump(tex);
3503	3752
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.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	+ }
3505	3763
3506	3764	double s = v.s;
3507	3765
..	..	@@ -3589,11 +3847,11 @@
3589	3847
3590	3848	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	3849
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	3850	+ boolean random = CameraPane.SWITCH;
	3851	+ CameraPane.SWITCH = false; // parse all random nodes
3594	3852	lowres.linkVerticesThis(null);
3595	3853	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	3854	+ CameraPane.SWITCH = random;
3597	3855
3598	3856	System.err.flush();
3599	3857
..	..	@@ -3633,7 +3891,7 @@
3633	3891	return;
3634	3892
3635	3893	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3637	3895
3638	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	3897
..	..	@@ -3827,9 +4085,9 @@
3827	4085
3828	4086	void ClipMesh()
3829	4087	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4089	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3833	4091
3834	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4093	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4096,7 @@
3838	4096	// {
3839	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4098	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4100	}
3843	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4102	System.out.println("DONE.");
..	..	@@ -3973,7 +4231,7 @@
3973	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4232
3975	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
3977	4235	{
3978	4236	// if (!(elem instanceof Composite))
3979	4237	// newWindow = false;
..	..	@@ -4063,7 +4321,6 @@
4063	4321	//case 702: // Event.LIST_DESELECT
4064	4322	group.deselectAll();
4065	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4324	if (tps != null)
4068	4325	{
4069	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4073,28 +4330,26 @@
4073	4330	//if (child.parent != null)
4074	4331	//child.parent.addSelectee(child);
4075	4332	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4333	}
4080	4334	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4335	+// else
	4336	+// {
	4337	+// objEditor.SetMaterial(group); // .GetMaterial());
	4338	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4339	+// System.err.println("info : " + group.GetPath());
	4340	+// }
4087	4341
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4342	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4343	CameraPane.flash = true;
4092	4344
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4345	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4346	// a camera
4095	4347	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4348	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4349	+ {
	4350	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4351	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4352	+ }
4098	4353	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4354	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4355	}
..	..	@@ -4107,6 +4362,29 @@
4107	4362
4108	4363	freezemodel = false;
4109	4364	}
	4365	+
	4366	+ void refreshContents(boolean cp)
	4367	+ {
	4368	+ if (!Globals.MOUSEDRAGGED)
	4369	+ {
	4370	+ objEditor.ClearInfo(); // .GetMaterial());
	4371	+
	4372	+ for (int i=0; i < group.selection.size(); i++)
	4373	+ {
	4374	+ Object3D child = (Object3D) group.selection.reserve(i);
	4375	+
	4376	+ objEditor.SetMaterial(child);
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+
	4380	+ group.selection.release(i);
	4381	+ }
	4382	+
	4383	+ objEditor.SetText(); // jan 2014
	4384	+ }
	4385	+
	4386	+ super.refreshContents(cp);
	4387	+ }
4110	4388
4111	4389	void linkSomething(Object3D thing)
4112	4390	{
..	..	@@ -4178,16 +4456,18 @@
4178	4456	{
4179	4457	if (group.selection.isEmpty())
4180	4458	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4459	+
	4460	+ Grafreed.clipboardIsTempGroup = false;
4182	4461	Composite tGroup = null;
4183	4462	if (group.selection.size() > 0) // 1)
4184	4463	{
4185	4464	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4465	+ Grafreed.clipboardIsTempGroup = true;
4187	4466	}
4188	4467
4189	4468	if (cut)
4190	4469	{
	4470	+ Save();
4191	4471	//int indices[] = jList.getSelectedIndices();
4192	4472	//for (int i = indices.length - 1; i >= 0; i--)
4193	4473	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4503,16 @@
4223	4503	//System.out.println("cut " + child);
4224	4504	//System.out.println("parent = " + child.parent);
4225	4505	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4506	+ if (Grafreed.clipboardIsTempGroup)
4227	4507	tGroup.add/Child/(tmp);
4228	4508	else
4229		- GrafreeD.clipboard = tmp;
	4509	+ Grafreed.clipboard = tmp;
4230	4510	}
4231	4511	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4512	+ if (Grafreed.clipboardIsTempGroup)
4233	4513	tGroup.add/Child/(child);
4234	4514	else
4235		- GrafreeD.clipboard = child;
	4515	+ Grafreed.clipboard = child;
4236	4516	}
4237	4517
4238	4518	//ResetModel();
..	..	@@ -4264,21 +4544,23 @@
4264	4544	//System.out.println("cut " + elem);
4265	4545	//System.out.println("parent = " + elem.parent);
4266	4546	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4547	+ if (Grafreed.clipboardIsTempGroup)
4268	4548	tGroup.add/Child/(tmp);
4269	4549	else
4270		- GrafreeD.clipboard = tmp;
	4550	+ Grafreed.clipboard = tmp;
4271	4551	}
4272	4552	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4553	+ if (Grafreed.clipboardIsTempGroup)
4274	4554	tGroup.add/Child/(child);
4275	4555	else
4276		- GrafreeD.clipboard = child;
	4556	+ Grafreed.clipboard = child;
4277	4557	}
4278	4558
4279	4559	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4560	+
	4561	+ if (Grafreed.clipboardIsTempGroup)
	4562	+ Grafreed.clipboard = tGroup;
	4563	+
4282	4564	if (cut)
4283	4565	{
4284	4566	ResetModel();
..	..	@@ -4292,7 +4574,7 @@
4292	4574	// return;
4293	4575	boolean first = true;
4294	4576
4295		- if (GrafreeD.clipboardIsTempGroup)
	4577	+ if (Grafreed.clipboardIsTempGroup)
4296	4578	{
4297	4579	Composite temp;
4298	4580
..	..	@@ -4303,7 +4585,7 @@
4303	4585	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4586	*/
4305	4587	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4588	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	4589	{
4308	4590	Object3D child = (Object3D)e.nextElement();
4309	4591
..	..	@@ -4337,21 +4619,21 @@
4337	4619	//Object3D cb = Applet3D.clipboard;
4338	4620	//temp.addChild(cb);
4339	4621	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4622	+ assert(Grafreed.clipboard.parent == null);
	4623	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4624	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4625	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4626	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	4627	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4628	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4629	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4630	}
4349	4631
4350	4632	ResetModel();
4351	4633	refreshContents();
4352	4634	}
4353	4635
4354		- void pasteInto(boolean copyit)
	4636	+ void pasteInto(boolean copyit, boolean clone)
4355	4637	{
4356	4638	// if (GrafreeD.clipboard == null)
4357	4639	// return;
..	..	@@ -4380,15 +4662,22 @@
4380	4662	if (copyit)
4381	4663	{
4382	4664	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4665	+ if (clone)
	4666	+ {
	4667	+ CloneClipboard(false); // sept 2014
	4668	+ }
	4669	+ else
	4670	+ {
	4671	+ paste(false);
	4672	+ }
4384	4673	}
4385	4674	else
4386	4675	{
4387	4676	boolean first = true;
4388	4677
4389		- if (GrafreeD.clipboardIsTempGroup)
	4678	+ if (Grafreed.clipboardIsTempGroup)
4390	4679	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4680	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4681	Object3D copy;
4393	4682	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4683	{
..	..	@@ -4398,7 +4687,7 @@
4398	4687	}
4399	4688	} else
4400	4689	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4690	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4691	}
4403	4692	}
4404	4693	}
..	..	@@ -4803,21 +5092,6 @@
4803	5092	}
4804	5093	*/
4805	5094
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5095	/*
4822	5096	public void Callback(Object obj)
4823	5097	{
..	..	@@ -4841,26 +5115,9 @@
4841	5115	}
4842	5116	*/
4843	5117
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5118	String GetFile(String dialogName)
4862	5119	{
4863		- if (GrafreeD.standAlone)
	5120	+ if (Grafreed.standAlone)
4864	5121	{
4865	5122	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5123	browser.show();
..	..	@@ -4924,10 +5181,15 @@
4924	5181	cButton flashSelectionButton;
4925	5182	cButton editButton;
4926	5183	cButton uneditButton;
	5184	+ JCheckBox allParamsButton;
4927	5185	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5186	cButton unselectButton;
4930	5187
	5188	+ cButton saveButton;
	5189	+ cButton undoButton;
	5190	+ cButton redoButton;
	5191	+ cButton oneStepButton;
	5192	+
4931	5193	cButton screenfitButton;
4932	5194	cButton screenfitpointButton;
4933	5195	cButton snapobjectButton;
..	..	@@ -4958,6 +5220,8 @@
4958	5220	private MenuItem lookFromItem;
4959	5221	private MenuItem switchItem;
4960	5222	private MenuItem cutItem;
	5223	+ private MenuItem undoItem;
	5224	+ private MenuItem redoItem;
4961	5225	private MenuItem duplicateItem;
4962	5226	private MenuItem cloneItem;
4963	5227	private MenuItem cloneSupportItem;
..	..	@@ -4971,7 +5235,7 @@
4971	5235	private MenuItem linkverticesItem;
4972	5236	private MenuItem relinkverticesItem;
4973	5237	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5238	+ private MenuItem resetAllItem;
4975	5239	private MenuItem stepAllItem;
4976	5240	private MenuItem revertMeshItem;
4977	5241	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5246,7 @@
4982	5246	private MenuItem mergeGeometriesItem;
4983	5247	private MenuItem copyItem;
4984	5248	private MenuItem pasteItem;
	5249	+ private MenuItem pasteIntoItem;
4985	5250	private MenuItem pasteLinkItem;
4986	5251	private MenuItem pasteCloneItem;
4987	5252	private MenuItem pasteExpandItem;
..	..	@@ -5031,8 +5296,10 @@
5031	5296	private MenuItem panoTexturesItem;
5032	5297
5033	5298	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5299	+ private MenuItem resetCentroidXZItem;
5035	5300	private MenuItem resetTransformItem;
	5301	+ private MenuItem transformGeometryItem;
	5302	+ private MenuItem transformChildrenItem;
5036	5303	private MenuItem hideItem;
5037	5304	private MenuItem grabItem;
5038	5305	private MenuItem backItem;
..	..	@@ -5079,7 +5346,7 @@
5079	5346	private MenuItem blobItem;
5080	5347	private MenuItem latheItem;
5081	5348	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5349	+ private MenuItem overlayItem;
5083	5350	private MenuItem meshItem;
5084	5351	// private MenuItem meshGroupItem;
5085	5352	private MenuItem springItem;
..	..	@@ -5101,11 +5368,6 @@
5101	5368	private MenuItem doubleItem;
5102	5369	private MenuItem tripleItem;
5103	5370
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5371	private MenuItem computeAOItem;
5110	5372	private MenuItem recompileItem;
5111	5373	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5377,8 @@
5115	5377	private MenuItem analyzeItem;
5116	5378	private MenuItem dumpItem;
5117	5379	//boolean freezemodel = false;
	5380	+
	5381	+ Menu cameraMenu;
	5382	+ MenuItem editCameraItem;
	5383	+ MenuItem revertCameraItem;
5118	5384	}