~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);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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,48 +305,68 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
222	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	326	setMasterItem.addActionListener(this);
	327	+ }
224	328
225	329	oe.menuBar.add(menu = new Menu("Group"));
226	330	grabItem = menu.add(new MenuItem("Grab"));
227	331	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	332	backItem = menu.add(new MenuItem("Back"));
231	333	backItem.addActionListener(this);
	334	+ frontItem = menu.add(new MenuItem("Front"));
	335	+ frontItem.addActionListener(this);
232	336	compositeItem = menu.add(new MenuItem("Composite"));
233	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
234	342	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
236	344	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	346	switchGeoItem.addActionListener(this);
243	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	348	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
247	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	360	scriptNodeItem.addActionListener(this);
249	361	cameraItem = menu.add(new MenuItem("Camera"));
250	362	cameraItem.addActionListener(this);
	363	+ }
251	364
252	365	oe.menuBar.add(menu = new Menu("Object"));
253	366	textureItem = menu.add(new MenuItem("Texture"));
254	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
255	370	csgItem = menu.add(new MenuItem("CSG"));
256	371	csgItem.addActionListener(this);
257	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +375,29 @@
260	375	shadowYItem.addActionListener(this);
261	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
263	381	linkerItem = menu.add(new MenuItem("Linker"));
264	382	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	383	attributeItem = menu.add(new MenuItem("Attribute"));
268	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
269	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	388	pointflowItem.addActionListener(this);
	389	+ }
271	390	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	392	resetTransformItem.addActionListener(this);
276	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	394	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
280	401
281	402	oe.menuBar.add(menu = new Menu("Geometry"));
282	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +406,13 @@
285	406	genNormalsORGANItem.addActionListener(this);
286	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
288	416	stripifyItem = menu.add(new MenuItem("Stripify"));
289	417	stripifyItem.addActionListener(this);
290	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
313	445
314	446	oe.menuBar.add(menu = new Menu("Attributes"));
315	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
317	453	menu.add("-");
318	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	455	liveleavesItem.addActionListener(this);
320	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
322	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	461	supportleavesItem.addActionListener(this);
324	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	463	unsupportleavesItem.addActionListener(this);
	464	+ }
326	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	466	hideleavesItem.addActionListener(this);
328	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +470,14 @@
331	470	markleavesItem.addActionListener(this);
332	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
334	481	menu.add("-");
335	482	flipVItem = menu.add(new MenuItem("Flip V"));
336	483	flipVItem.addActionListener(this);
..	..	@@ -366,29 +513,22 @@
366	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	514	sortbynameItem.addActionListener(this);
368	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
369	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	524	extractGeometriesItem.addActionListener(this);
371	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	526	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	527	+ }
377	528
378	529	oe.menuBar.add(menu = new Menu("Insert"));
379	530	buildCreateMenu(menu);
380	531
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	532	oe.menuBar.add(menu = new Menu("Tools"));
393	533	buildToolsMenu(menu);
394	534	}
..	..	@@ -423,150 +563,110 @@
423	563	oe.radioPanel.add(dummyButton);
424	564	oe.buttonGroup.add(dummyButton);
425	565	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	566	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	567
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	581	+ liveCB.setToolTipText("Enable animation");
431	582	liveCB.addItemListener(this);
432	583
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ oneStepButton.setToolTipText("Animate one step forward");
	586	+ oneStepButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	589	+ fastCB.setToolTipText("Fast mode");
451	590	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	591	+
	592	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	593	+ trackCB.setToolTipText("Enable tracking");
493	594	trackCB.addItemListener(this);
494	595
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ screenfitButton.setToolTipText("Screen fit");
497	598	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	599	+
499	600	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	601	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	602
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	603	+ if (Globals.ADVANCED)
	604	+ {
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ snapobjectButton.addActionListener(this);
	607	+ snapobjectButton.setToolTipText("Snap Object");
	608	+ }
	609	+
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ flashSelectionButton.setToolTipText("Show selection");
512	612	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	613
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	615	+
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ twoButton.setToolTipText("Show center view only");
519	618	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	620	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	621	+ fourButton.setToolTipText("Show left panel only");
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ sixButton.setToolTipText("2-column layout left");
523	624	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ threeButton.setToolTipText("2-column layout right");
525	627	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ sevenButton.setToolTipText("3-column layout");
527	630	sevenButton.addActionListener(this);
528	631	//
529	632
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ rootButton.setToolTipText("Edit selection in new tab");
531	635	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	636	+
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ closeButton.setToolTipText("Close tab");
534	639	closeButton.addActionListener(this);
535	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	641	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	642
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	643	+ cGridBag commandsPanel = new cGridBag();
	644	+
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ editButton.setToolTipText("Edit selection");
541	647	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	648
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ uneditButton.setToolTipText("Unedit selection");
547	651	uneditButton.addActionListener(this);
548	652
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	653	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	654	+ allParamsButton.setToolTipText("Edit all params");
561	655	allParamsButton.addActionListener(this);
562	656
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ clearPanelButton.setToolTipText("Clear edit panel");
	659	+ clearPanelButton.addActionListener(this);
	660	+
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ unselectButton.setToolTipText("Unselect");
568	663	unselectButton.addActionListener(this);
569	664
	665	+ commandsPanel.preferredHeight = 1;
	666	+
	667	+ oe.treePanel.add(commandsPanel);
	668	+ oe.treePanel.Return();
	669	+
570	670	// oe.aConstraints.gridx += 1;
571	671	// oe.aConstraints.weighty = 0;
572	672	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +678,37 @@
578	678	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	679	// gcButton.addActionListener(this);
580	680
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	681	+ cGridBag jSPPanel = new cGridBag();
	682	+
	683	+ JScrollPane jSP;
592	684	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	685	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	686	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	687	+
	688	+ oe.treePanel.add(jSPPanel);
	689	+ oe.treePanel.Return();
599	690
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	691	+ cGridBag copyOptionsPanel = new cGridBag();
	692	+
	693	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	694	+ colorCB.setToolTipText("Copy color when dropped");
604	695	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	696	+
	697	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	698	+ materialCB.setToolTipText("Copy material when dropped");
607	699	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	700	+
	701	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	702	+ textureCB.setToolTipText("Copy texture when dropped");
610	703	textureCB.addItemListener(this);
611	704
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	705	+ copyOptionsPanel.preferredHeight = 1;
	706	+ oe.treePanel.add(copyOptionsPanel);
	707	+ oe.treePanel.Return();
614	708
	709	+// mainPanel.setDividerLocation(0.5); //1.0);
	710	+// mainPanel.setResizeWeight(0.5);
	711	+
615	712	//jList.addListSelectionListener(this);
616	713	oe.jTree.addTreeSelectionListener(this);
617	714	//jTree.setRootVisible(false);
..	..	@@ -633,18 +730,91 @@
633	730	radio.layout = sevenButton;
634	731	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	732	}
	733	+
	734	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	735	+ {
	736	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	737	+ boxCB.setToolTipText("Display bounding boxes");
	738	+ boxCB.addItemListener(this);
	739	+
	740	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	741	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	742	+ zoomBoxCB.addItemListener(this);
	743	+
	744	+ if (true) // Globals.ADVANCED)
	745	+ {
	746	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	747	+ supportCB.setToolTipText("Enable rigging");
	748	+ supportCB.addItemListener(this);
	749	+
	750	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	751	+ // localCB.addItemListener(this);
	752	+
	753	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	754	+ crowdCB.setToolTipText("Used for crowds");
	755	+ crowdCB.addItemListener(this);
	756	+
	757	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	758	+ smoothCB.setToolTipText("Snapping delay");
	759	+ smoothCB.addItemListener(this);
	760	+
	761	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	762	+ slowCB.setToolTipText("Smooth interpolation");
	763	+ slowCB.addItemListener(this);
	764	+
	765	+// constraints.gridy += 1;
	766	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	767	+// speakerMocapCB.addItemListener(this);
	768	+
	769	+ if (false)
	770	+ {
	771	+ // handled in scripts
	772	+ //constraints.gridy += 1;
	773	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	774	+ speakerCameraCB.addItemListener(this);
	775	+
	776	+ //constraints.gridy += 1;
	777	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	778	+ speakerFocusCB.addItemListener(this);
	779	+
	780	+ //constraints.gridy += 1;
	781	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	782	+ smoothfocusCB.addItemListener(this);
	783	+ }
	784	+
	785	+//constraints.gridx += 1;
	786	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	787	+// debugCB.addItemListener(this);
	788	+
	789	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	790	+ oeilCB.addItemListener(this);
	791	+
	792	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	793	+ lookAtCB.setToolTipText("Look-at target");
	794	+ lookAtCB.addItemListener(this);
	795	+
	796	+ }
	797	+
	798	+ cGridBag fill = new cGridBag();
	799	+
	800	+ fill.preferredHeight = 200;
	801	+
	802	+ panel.add(fill);
	803	+
	804	+ }
636	805
637	806	void EditObject(Object3D obj)
638	807	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	808	+ cRadio radioButton = new cRadio(obj.name);
	809	+ radioButton.SetObject(obj);
	810	+ radioButton.layout = sevenButton;
	811	+ radioButton.SetCamera(cameraView.renderCamera, false);
	812	+ radioButton.addActionListener(this);
	813	+ radioPanel.add(radioButton);
	814	+ buttonGroup.add(radioButton);
	815	+ radioButton.doClick();
647	816	}
	817	+
648	818	void SetupViews(ObjEditor oe)
649	819	{
650	820	oe.SetupViews();
..	..	@@ -663,6 +833,7 @@
663	833	JCheckBox fastCB;
664	834	JCheckBox slowCB;
665	835	JCheckBox boxCB;
	836	+ JCheckBox zoomBoxCB;
666	837	JCheckBox trackCB;
667	838	JCheckBox smoothfocusCB;
668	839	// JCheckBox speakerMocapCB;
..	..	@@ -705,10 +876,10 @@
705	876	dropAttributes \|= Object3D.TEXTURE;
706	877	else
707	878	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	879	+ } else if(e.getSource() == liveCB)
710	880	{
711	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
712	883	}
713	884	else if(e.getSource() == supportCB)
714	885	{
..	..	@@ -743,6 +914,10 @@
743	914	Recompile();
744	915	cameraView.repaint();
745	916	// refreshContents();
	917	+ }
	918	+ else if(e.getSource() == zoomBoxCB)
	919	+ {
	920	+ cameraView.ToggleZoomBoxMode();
746	921	}
747	922	else if(e.getSource() == smoothfocusCB)
748	923	{
..	..	@@ -857,7 +1032,9 @@
857	1032	// objEditor.DropFile((java.io.File[]) object, true);
858	1033	// return;
859	1034	// }
860		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1038	{
862	1039	// file(s)
863	1040	String[] names = string.split("\n");
..	..	@@ -884,7 +1061,7 @@
884	1061
885	1062	flashIt = false;
886	1063	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1066
890	1067	if (group.selection.size() == 1)
..	..	@@ -911,11 +1088,11 @@
911	1088	{
912	1089	loadClipboard(true);
913	1090	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1091	+ pasteInto(false, false);
915	1092	} else {
916	1093	loadClipboard(false);
917	1094	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1095	+ pasteInto(false, false); // true); // ???
919	1096	}
920	1097	}
921	1098	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1210,37 @@
1033	1210	torusItem.addActionListener(this);
1034	1211	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1212	superItem.addActionListener(this);
	1213	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1214	+ kleinItem.addActionListener(this);
1036	1215	particleItem = menu.add(new MenuItem("Particle system"));
1037	1216	particleItem.addActionListener(this);
	1217	+ if (Globals.ADVANCED)
	1218	+ {
1038	1219	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1220	ragdollItem.addActionListener(this);
1040	1221	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1222	ragdoll2Item.addActionListener(this);
	1223	+ }
1042	1224	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1225	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1226	meshItem.addActionListener(this);
1045	1227	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1228	// meshGroupItem.addActionListener(this);
	1229	+ if (Globals.ADVANCED)
	1230	+ {
1047	1231	springItem = menu.add(new MenuItem("Spring"));
1048	1232	springItem.addActionListener(this);
1049	1233	flagItem = menu.add(new MenuItem("Flag"));
1050	1234	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1235	blobItem = menu.add(new MenuItem("Blob"));
1056	1236	blobItem.addActionListener(this);
1057	1237	latheItem = menu.add(new MenuItem("Lathe"));
1058	1238	latheItem.addActionListener(this);
	1239	+ }
	1240	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1241	+ bezierItem.addActionListener(this);
	1242	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1243	+ overlayItem.addActionListener(this);
1059	1244	lightItem = menu.add(new MenuItem("Light"));
1060	1245	lightItem.addActionListener(this);
1061	1246	menu.add("-");
..	..	@@ -1065,39 +1250,44 @@
1065	1250	loopItem.addActionListener(this);
1066	1251	doubleItem = menu.add(new MenuItem("Fork"));
1067	1252	doubleItem.addActionListener(this);
	1253	+ if (Globals.ADVANCED)
	1254	+ {
1068	1255	tripleItem = menu.add(new MenuItem("Trident"));
1069	1256	tripleItem.addActionListener(this);
	1257	+ }
1070	1258	}
1071	1259
1072	1260	void buildToolsMenu(Menu menu)
1073	1261	{
1074	1262	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1263	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1264	+ animationItem.setState(Globals.ANIMATION);
1077	1265
1078	1266	menu.add("-");
1079	1267	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1268	parseverticesItem.addActionListener(this);
1081	1269	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1270	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1272	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1274	reduceMorphItem.addActionListener(this);
1089	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1276	reduce34MorphItem.addActionListener(this);
1091		-
	1277	+ menu.add("-");
1092	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1279	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1280
	1281	+ if (Globals.ADVANCED)
	1282	+ {
	1283	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1284	+ mirrorItem.addActionListener(this);
	1285	+ menu.add("-");
1096	1286	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1287	memoryItem.addActionListener(this);
1098	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1289	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1291	dumpItem.addActionListener(this);
1102	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1293	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1296,8 @@
1106	1296	resetParentItem.addActionListener(this);
1107	1297	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1298	repairParentItem.addActionListener(this);
	1299	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1300	+ repairShadowItem.addActionListener(this);
1109	1301	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1302	invariantsItem.addActionListener(this);
1111	1303	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1305,7 @@
1113	1305	menu.add("-");
1114	1306	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1307	editScriptItem.addActionListener(this);
	1308	+ }
1116	1309	}
1117	1310
1118	1311	void ScreenFit()
..	..	@@ -1441,9 +1634,9 @@
1441	1634
1442	1635	void Overwrite(int mask)
1443	1636	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1638	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1447	1640
1448	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1642	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1659,7 @@
1466	1659	//
1467	1660	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1661	{
	1662	+ Object source = event.getSource();
1469	1663	/*
1470	1664	if (event.getSource() == nameField)
1471	1665	{
..	..	@@ -1477,11 +1671,11 @@
1477	1671	}
1478	1672	else
1479	1673	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1674	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1675	{
1482	1676	ScreenFit();
1483	1677	} else
1484		- if (event.getSource() == switchItem)
	1678	+ if (source == switchItem)
1485	1679	{
1486	1680	cVector v1 = new cVector();
1487	1681	cVector v2 = new cVector();
..	..	@@ -1490,11 +1684,11 @@
1490	1684	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1685	objEditor.cameraView.repaint();
1492	1686	} else
1493		- if (event.getSource() == rectoidItem)
	1687	+ if (source == rectoidItem)
1494	1688	{
1495	1689	makeSomething(new Box());
1496	1690	} else
1497		- if (event.getSource() == particleItem)
	1691	+ if (source == particleItem)
1498	1692	{
1499	1693	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1694	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1709,9 @@
1515	1709	applyExample(particleGeom, "SMOKE");
1516	1710	makeSomething(particleGeom);
1517	1711	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1712	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1713	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1714	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1715
1522	1716	ragdoll.toParent = LA.newMatrix();
1523	1717	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1729,7 @@
1535	1729	} else
1536	1730	/*
1537	1731	*/
1538		- if (event.getSource() == heightFieldItem)
	1732	+ if (source == heightFieldItem)
1539	1733	{
1540	1734	Object3D obj = new Object3D();
1541	1735
..	..	@@ -1573,27 +1767,31 @@
1573	1767
1574	1768	makeSomething(obj);
1575	1769	} else
1576		- if (event.getSource() == gridItem)
	1770	+ if (source == gridItem)
1577	1771	{
1578	1772	makeSomething(new Grid());
1579	1773	} else
1580		- if (event.getSource() == ellipsoidItem)
	1774	+ if (source == ellipsoidItem)
1581	1775	{
1582	1776	makeSomething(new Sphere());
1583	1777	} else
1584		- if (event.getSource() == coneItem)
	1778	+ if (source == coneItem)
1585	1779	{
1586	1780	makeSomething(new Cone());
1587	1781	} else
1588		- if (event.getSource() == torusItem)
	1782	+ if (source == torusItem)
1589	1783	{
1590	1784	makeSomething(new Torus());
1591	1785	} else
1592		- if (event.getSource() == superItem)
	1786	+ if (source == superItem)
1593	1787	{
1594	1788	makeSomething(new Superellipsoid());
1595	1789	} else
1596		- if (event.getSource() == blobItem)
	1790	+ if (source == kleinItem)
	1791	+ {
	1792	+ makeSomething(new Klein());
	1793	+ } else
	1794	+ if (source == blobItem)
1597	1795	{
1598	1796	Blob blob = new Blob();
1599	1797	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1799,15 @@
1601	1799	//blob.retile();
1602	1800	makeSomething(blob);
1603	1801	} else
1604		- if (event.getSource() == latheItem)
	1802	+ if (source == latheItem)
1605	1803	{
1606	1804	makeSomething(new Lathe());
1607	1805	} else
1608		- if (event.getSource() == bezierItem)
	1806	+ if (source == bezierItem)
1609	1807	{
1610	1808	makeSomething(new BezierSurface());
1611	1809	} else
1612		- if (event.getSource() == checkerItem)
	1810	+ if (source == overlayItem)
1613	1811	{
1614	1812	/*
1615	1813	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1822,7 @@
1624	1822	*/
1625	1823	makeSomething(new Checker());
1626	1824	} else
1627		- if (event.getSource() == meshItem)
	1825	+ if (source == meshItem)
1628	1826	{
1629	1827	Object3D itemtomake = new Object3D();
1630	1828	Object3D child;
..	..	@@ -1645,35 +1843,35 @@
1645	1843	makeSomething(child);
1646	1844	}
1647	1845	} else
1648		- if (event.getSource() == springItem)
	1846	+ if (source == springItem)
1649	1847	{
1650	1848	cSpring s = new cSpring();
1651	1849	s.setup();
1652	1850	makeSomething(s);
1653	1851	} else
1654		- if (event.getSource() == flagItem)
	1852	+ if (source == flagItem)
1655	1853	{
1656	1854	cSpring s = new cFlag();
1657	1855	s.setup();
1658	1856	makeSomething(s);
1659	1857	} else
1660		- if (event.getSource() == lightItem)
	1858	+ if (source == lightItem)
1661	1859	{
1662	1860	makeSomething(new Light());
1663	1861	} else
1664		- if (event.getSource() == csgItem)
	1862	+ if (source == csgItem)
1665	1863	{
1666	1864	group(new CSG());
1667	1865	} else
1668		- if (event.getSource() == templateItem)
	1866	+ if (source == templateItem)
1669	1867	{
1670	1868	group(new cTemplate());
1671	1869	} else
1672		- if (event.getSource() == attributeItem)
	1870	+ if (source == attributeItem)
1673	1871	{
1674	1872	makeSomething(new Attribute());
1675	1873	} else
1676		- if (event.getSource() == pointflowItem)
	1874	+ if (source == pointflowItem)
1677	1875	{
1678	1876	makeSomething(new PointFlow());
1679	1877	} else
..	..	@@ -1685,7 +1883,7 @@
1685	1883	} else
1686	1884	*/
1687	1885
1688		- if (event.getSource() == superLoopItem)
	1886	+ if (source == superLoopItem)
1689	1887	{
1690	1888	Composite g = new cGroup();
1691	1889	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1905,7 @@
1707	1905
1708	1906	group(g);
1709	1907	} else
1710		- if (event.getSource() == loopItem)
	1908	+ if (source == loopItem)
1711	1909	{
1712	1910	Composite csg = new GroupLeaf();
1713	1911	csg.count = 5;
..	..	@@ -1716,7 +1914,7 @@
1716	1914	csg.addChild(child);
1717	1915	child.addChild(csg);
1718	1916	} else
1719		- if (event.getSource() == doubleItem)
	1917	+ if (source == doubleItem)
1720	1918	{
1721	1919	Composite csg = new GroupLeaf();
1722	1920	csg.count = 5;
..	..	@@ -1728,7 +1926,7 @@
1728	1926	csg.addChild(child);
1729	1927	child.addChild(csg);
1730	1928	} else
1731		- if (event.getSource() == tripleItem)
	1929	+ if (source == tripleItem)
1732	1930	{
1733	1931	Composite csg = new GroupLeaf();
1734	1932	csg.count = 4;
..	..	@@ -1743,71 +1941,71 @@
1743	1941	csg.addChild(child);
1744	1942	child.addChild(csg);
1745	1943	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1944	+ if (source == computeAOItem)
1748	1945	{
1749		- ImportGFD();
	1946	+ Globals.drawMode = CameraPane.OCCLUSION;
	1947	+ Globals.theRenderer.repaint();
1750	1948	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	1949	+ if (source == recompileItem)
1769	1950	{
1770	1951	Recompile();
1771	1952	refreshContents();
1772	1953	} else
1773		- if (event.getSource() == editScriptItem)
	1954	+ if (source == editScriptItem)
1774	1955	{
1775	1956	OpenDialog();
1776	1957	refreshContents();
1777	1958	} else
1778		- if (event.getSource() == invariantsItem)
	1959	+ if (source == invariantsItem)
1779	1960	{
1780	1961	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1782	1963	} else
1783		- if (event.getSource() == memoryItem)
	1964	+ if (source == memoryItem)
1784	1965	{
1785	1966	//System.out.println("Invariants:");
1786	1967	PrintMemory();
1787	1968	} else
1788		- if (event.getSource() == pathItem)
	1969	+ if (source == pathItem)
1789	1970	{
1790	1971	PrintPath();
1791	1972	} else
1792		- if (event.getSource() == analyzeItem)
	1973	+ if (source == analyzeItem)
1793	1974	{
1794	1975	AnalyzeObject();
1795	1976	} else
1796		- if (event.getSource() == dumpItem)
	1977	+ if (source == dumpItem)
1797	1978	{
1798	1979	DumpObject();
1799	1980	} else
1800		- if (event.getSource() == screenfitButton)
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
	1992	+ } else
	1993	+ if (source == oneStepButton)
	1994	+ {
	1995	+ Globals.ONESTEP = true;
	1996	+ cameraView.repaint();
	1997	+ } else
	1998	+ if (source == screenfitButton)
1801	1999	{
1802	2000	//Reload(lastConverter, lastFilename, true);
1803	2001	ScreenFit();
1804	2002	} else
1805		- if (event.getSource() == screenfitpointButton)
	2003	+ if (source == screenfitpointButton)
1806	2004	{
1807	2005	//Reload(lastConverter, lastFilename, true);
1808	2006	ScreenFitPoint();
1809	2007	} else
1810		- if (event.getSource() == snapobjectButton)
	2008	+ if (source == snapobjectButton)
1811	2009	{
1812	2010	//Reload(lastConverter, lastFilename, true);
1813	2011	SnapObject();
..	..	@@ -1818,13 +2016,13 @@
1818	2016	// Recompile();
1819	2017	// refreshContents();
1820	2018	// } else
1821		- if (event.getSource() == gcButton)
	2019	+ if (source == gcButton)
1822	2020	{
1823	2021	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2022	System.gc();
1825	2023	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2024	} else
1827		- if (event.getSource() == editLeafItem)
	2025	+ if (source == editLeafItem)
1828	2026	{
1829	2027	Object3D obj;
1830	2028	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2036,78 @@
1838	2036	}
1839	2037	refreshContents(true);
1840	2038	} else
1841		- if (event.getSource() == openWindowItem)
	2039	+ if (source == openWindowItem)
1842	2040	{
1843	2041	EditSelection(true);
1844	2042	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2043	+ if (source == cutItem \|\| source == clearButton)
1846	2044	{
1847	2045	loadClipboard(true);
1848	2046	} else
1849		- if (event.getSource() == duplicateItem)
	2047	+ if (source == undoItem)
1850	2048	{
1851		- Object3D keep = GraphreeD.clipboard;
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
	2055	+ if (source == duplicateItem)
	2056	+ {
	2057	+ Object3D keep = Grafreed.clipboard;
1852	2058	loadClipboard(false);
1853	2059	paste(false);
1854		- GraphreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1855	2061	} else
1856		- if (event.getSource() == cloneItem)
	2062	+ if (source == cloneItem)
1857	2063	{
1858	2064	CloneSelection(false);
1859	2065	} else
1860		- if (event.getSource() == cloneSupportItem)
	2066	+ if (source == cloneSupportItem)
1861	2067	{
1862	2068	CloneSelection(true);
1863	2069	} else
1864		- if (event.getSource() == copyItem)
	2070	+ if (source == copyItem)
1865	2071	{
1866	2072	loadClipboard(false);
1867	2073	} else
1868		- if (event.getSource() == pasteItem)
	2074	+ if (source == pasteItem)
1869	2075	{
1870	2076	paste(false);
1871	2077	} else
1872		- if (event.getSource() == pasteLinkItem)
	2078	+ if (source == pasteIntoItem)
1873	2079	{
1874		- pasteInto(false);
	2080	+ pasteInto(true, false);
1875	2081	} else
1876		- if (event.getSource() == pasteCloneItem)
	2082	+ if (source == pasteLinkItem)
1877	2083	{
1878		- pasteInto(true);
	2084	+ pasteInto(false, false);
1879	2085	} else
1880		- if (event.getSource() == pasteExpandItem)
	2086	+ if (source == pasteCloneItem)
	2087	+ {
	2088	+ pasteInto(true, true);
	2089	+ } else
	2090	+ if (source == pasteExpandItem)
1881	2091	{
1882	2092	paste(true);
1883	2093	} else
1884		- if (event.getSource() == synchronizeItem)
	2094	+ if (source == synchronizeItem)
1885	2095	{
1886	2096	Overwrite(Object3D.TRANSFORM);
1887	2097	} else
1888		- if (event.getSource() == overwriteNameItem)
	2098	+ if (source == overwriteNameItem)
1889	2099	{
1890	2100	Overwrite(Object3D.NAME);
1891	2101	} else
1892		- if (event.getSource() == overwriteUVItem)
	2102	+ if (source == overwriteUVItem)
1893	2103	{
1894	2104	Overwrite(Object3D.UV);
1895	2105	} else
1896		- if (event.getSource() == overwriteMatItem)
	2106	+ if (source == overwriteMatItem)
1897	2107	{
	2108	+ /* july 2015
1898	2109	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2110	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2111	else
1901	2112	{
1902	2113	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2119,16 @@
1908	2119	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2120	}
1910	2121	}
	2122	+ */
	2123	+
	2124	+ Overwrite(dropAttributes);
1911	2125	}
1912		- if (event.getSource() == overwriteGeoItem)
	2126	+ if (source == overwriteGeoItem)
1913	2127	{
1914	2128	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2129	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2130	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2131	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2132	//
1919	2133	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2134	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2140,7 @@
1926	2140	// refreshContents();
1927	2141	// }
1928	2142	} else
1929		- if (event.getSource() == generateMeshItem)
	2143	+ if (source == generateMeshItem)
1930	2144	{
1931	2145	//if (group.selection.size() == 1)
1932	2146	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2151,7 @@
1937	2151	ResetModel();
1938	2152	refreshContents();
1939	2153	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2154	+ if (source == extractGeometriesItem)
1941	2155	{
1942	2156	boolean one = false;
1943	2157
..	..	@@ -1964,7 +2178,7 @@
1964	2178	ResetModel();
1965	2179	refreshContents();
1966	2180	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2181	+ if (source == cloneGeometriesItem)
1968	2182	{
1969	2183	boolean one = false;
1970	2184
..	..	@@ -1990,32 +2204,37 @@
1990	2204	ResetModel();
1991	2205	refreshContents();
1992	2206	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2207	+ if (source == shareGeometriesItem)
1994	2208	{
1995	2209	boolean one = false;
1996	2210
1997	2211	if (group.selection.size() == 1)
1998	2212	one = true;
1999	2213
	2214	+ Object3D merge = null;
	2215	+
2000	2216	Object3D content = new cGroup();
2001	2217
2002	2218	for (int i=0; i<group.selection.size(); i++)
2003	2219	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2220	+ merge = new Merge(group.selection.get(i));
2005	2221
2006	2222	if (one)
2007		- makeSomething(sel, false);
	2223	+ makeSomething(merge, false);
2008	2224	else
2009		- content.addChild(sel);
	2225	+ content.addChild(merge);
2010	2226	}
2011	2227
2012	2228	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2229	+ makeSomething(content, true);
	2230	+ else
	2231	+ {
	2232	+ ResetModel();
	2233	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2234	+ refreshContents();
	2235	+ }
2017	2236	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2237	+ if (source == mergeGeometriesItem)
2019	2238	{
2020	2239	boolean one = false;
2021	2240
..	..	@@ -2045,11 +2264,11 @@
2045	2264	ResetModel();
2046	2265	refreshContents();
2047	2266	} else
2048		- if (event.getSource() == linkverticesItem)
	2267	+ if (source == linkverticesItem)
2049	2268	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2269	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2270	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2271	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2272	//
2054	2273	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2274	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2277,48 @@
2058	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2278	// refreshContents();
2060	2279	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2281	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2064	2283
2065	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2285	content = ((cGroup)content).get(0);
2067	2286
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2287	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2288	for (int i=0; i<group.selection.size(); i++)
2070	2289	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2290	+ boolean random = CameraPane.SWITCH;
	2291	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2292	group.selection.get(i).linkVerticesThis(content);
2074	2293	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2294	+ CameraPane.SWITCH = random;
2076	2295	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2296	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2297	refreshContents();
2079	2298	}
2080	2299	} else
2081		- if (event.getSource() == resetsupportItem)
	2300	+ if (source == resetsupportItem)
2082	2301	{
2083	2302	for (int i=0; i<group.selection.size(); i++)
2084	2303	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2304	+ boolean random = CameraPane.SWITCH;
	2305	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2306	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2307	+ CameraPane.SWITCH = random;
2089	2308	}
2090	2309
2091	2310	refreshContents();
2092	2311	} else
2093		- if (event.getSource() == resetreferencesItem)
	2312	+ if (source == relinkverticesItem)
	2313	+ {
	2314	+ boolean random = CameraPane.SWITCH;
	2315	+ CameraPane.SWITCH = false; // parse all random nodes
	2316	+ group.selection.RelinkToSupport();
	2317	+ CameraPane.SWITCH = random;
	2318	+
	2319	+ refreshContents();
	2320	+ } else
	2321	+ if (source == resetreferencesItem)
2094	2322	{
2095	2323	for (int i=0; i<group.selection.size(); i++)
2096	2324	{
..	..	@@ -2099,11 +2327,11 @@
2099	2327
2100	2328	refreshContents();
2101	2329	} else
2102		- if (event.getSource() == setMasterItem)
	2330	+ if (source == setMasterItem)
2103	2331	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2333	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2107	2335
2108	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2337	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2340,13 @@
2112	2340	refreshContents();
2113	2341	}
2114	2342	} else
2115		- if (event.getSource() == poseMeshItem)
	2343	+ if (source == poseMeshItem)
2116	2344	{
2117	2345	if (group.selection.size() == 1)
2118	2346	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2120	2348	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2122	2350
2123	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2352	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2359,19 @@
2131	2359	}
2132	2360
2133	2361	} else
2134		- if (event.getSource() == revertMeshItem)
	2362	+ if (source == revertMeshItem)
2135	2363	{
2136	2364	RevertMeshes();
2137	2365	} else
2138		- if (event.getSource() == resetMeshItem)
	2366	+ if (source == resetAllItem)
2139	2367	{
2140	2368	ResetAll();
2141	2369	} else
2142		- if (event.getSource() == stepAllItem)
	2370	+ if (source == stepAllItem)
2143	2371	{
2144	2372	StepAll();
2145	2373	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2374	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2375	{
2148	2376	//int indices[] = jList.getSelectedIndices();
2149	2377	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2379,46 @@
2151	2379
2152	2380	ClearSelection(false);
2153	2381	} else
2154		- if (event.getSource() == clearAllItem)
	2382	+ if (source == clearAllItem)
2155	2383	{
2156	2384	ClearSelection(true);
2157	2385	} else
2158		- if (event.getSource() == grabItem)
	2386	+ if (source == grabItem)
2159	2387	{
2160	2388	group(new cGroup(), true);
2161	2389	} else
2162		- if (event.getSource() == frontItem)
	2390	+ if (source == hideItem)
	2391	+ {
	2392	+ group(new HiddenObject());
	2393	+ } else
	2394	+ if (source == frontItem)
2163	2395	{
2164	2396	front();
2165	2397	} else
2166		- if (event.getSource() == backItem)
	2398	+ if (source == backItem)
2167	2399	{
2168	2400	back();
2169	2401	} else
2170		- if (event.getSource() == cameraItem)
	2402	+ if (source == cameraItem)
2171	2403	{
2172	2404	makeSomething(new Camera());
2173	2405	} else
2174		- if (event.getSource() == compositeItem)
	2406	+ if (source == compositeItem)
2175	2407	{
2176	2408	group(new Composite());
2177	2409	} else
2178		- if (event.getSource() == randomItem)
	2410	+ if (source == randomItem)
2179	2411	{
2180	2412	RandomNode random = new RandomNode();
2181	2413	group(random);
2182	2414	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2415	+ random.name = random.get(0).name + "Switch";
2184	2416	} else
2185		- if (event.getSource() == physicsItem)
	2417	+ if (source == physicsItem)
2186	2418	{
2187	2419	group(new PhysicsNode());
2188	2420	} else
2189		- if (event.getSource() == frameselectorItem)
	2421	+ if (source == frameselectorItem)
2190	2422	{
2191	2423	for (int i=0; i<group.selection.size(); i++)
2192	2424	{
..	..	@@ -2198,7 +2430,7 @@
2198	2430	ResetModel();
2199	2431	refreshContents();
2200	2432	} else
2201		- if (event.getSource() == switchGeoItem)
	2433	+ if (source == switchGeoItem)
2202	2434	{
2203	2435	for (int i=0; i<group.selection.size(); i++)
2204	2436	{
..	..	@@ -2210,7 +2442,7 @@
2210	2442	ResetModel();
2211	2443	refreshContents();
2212	2444	} else
2213		- if (event.getSource() == switchTransfoItem)
	2445	+ if (source == switchTransfoItem)
2214	2446	{
2215	2447	for (int i=0; i<group.selection.size(); i++)
2216	2448	{
..	..	@@ -2222,7 +2454,7 @@
2222	2454	ResetModel();
2223	2455	refreshContents();
2224	2456	} else
2225		- if (event.getSource() == morphItem)
	2457	+ if (source == morphItem)
2226	2458	{
2227	2459	for (int i=0; i<group.selection.size(); i++)
2228	2460	{
..	..	@@ -2234,7 +2466,7 @@
2234	2466	ResetModel();
2235	2467	refreshContents();
2236	2468	} else
2237		- if (event.getSource() == scriptNodeItem)
	2469	+ if (source == scriptNodeItem)
2238	2470	{
2239	2471	boolean atleastone = false;
2240	2472
..	..	@@ -2273,195 +2505,239 @@
2273	2505	}
2274	2506	}
2275	2507	} else
2276		- if (event.getSource() == linkerItem)
	2508	+ if (source == linkerItem)
2277	2509	{
2278	2510	group(new cLinker());
2279	2511	} else
2280		- if (event.getSource() == textureItem)
	2512	+ if (source == textureItem)
2281	2513	{
2282	2514	group(new TextureNode());
2283	2515	} else
2284		- if (event.getSource() == shadowXItem)
	2516	+ if (source == billboardItem)
	2517	+ {
	2518	+ group(new BillboardNode());
	2519	+ } else
	2520	+ if (source == shadowXItem)
2285	2521	{
2286	2522	CastShadow(0);
2287	2523	} else
2288		- if (event.getSource() == shadowYItem)
	2524	+ if (source == shadowYItem)
2289	2525	{
2290	2526	CastShadow(1);
2291	2527	} else
2292		- if (event.getSource() == shadowZItem)
	2528	+ if (source == shadowZItem)
2293	2529	{
2294	2530	CastShadow(2);
2295	2531	} else
2296		- if (event.getSource() == ungroupItem)
	2532	+ if (source == ungroupItem)
2297	2533	{
2298		- ungroup();
	2534	+ //ungroup();
	2535	+ for (int i=0; i<group.selection.size(); i++)
	2536	+ {
	2537	+ Ungroup(group.selection.get(i));
	2538	+ }
	2539	+
	2540	+ ClearSelection(false);
	2541	+
	2542	+ refreshContents();
2299	2543	} else
2300		- if (event.getSource() == genUVItem)
	2544	+ if (source == genUVItem)
2301	2545	{
2302	2546	GenUV();
2303	2547	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2548	+ if (source == genNormalsCADItem)
2305	2549	{
2306	2550	GenNormals(true);
2307	2551	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2552	+ if (source == genNormalsMESHItem)
	2553	+ {
	2554	+ GenNormalsMESH();
	2555	+ } else
	2556	+ if (source == genNormalsORGANItem)
2309	2557	{
2310	2558	GenNormals(false);
2311	2559	} else
2312		- if (event.getSource() == stripifyItem)
	2560	+ if (source == genNormalsMINEItem)
	2561	+ {
	2562	+ GenNormalsMINE();
	2563	+ } else
	2564	+ if (source == stripifyItem)
2313	2565	{
2314	2566	Stripify();
2315	2567	} else
2316		- if (event.getSource() == unstripifyItem)
	2568	+ if (source == unstripifyItem)
2317	2569	{
2318	2570	Unstripify();
2319	2571	} else
2320		- if (event.getSource() == trimItem)
	2572	+ if (source == trimItem)
2321	2573	{
2322	2574	Trim();
2323	2575	} else
2324		- if (event.getSource() == untrimItem)
	2576	+ if (source == untrimItem)
2325	2577	{
2326	2578	Untrim();
2327	2579	} else
2328		- if (event.getSource() == clearColorsItem)
	2580	+ if (source == clearColorsItem)
2329	2581	{
2330	2582	ClearColors();
2331	2583	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2584	+ if (source == clearMaterialsItem)
2333	2585	{
2334	2586	ClearMaterials();
2335	2587	} else
2336		- if (event.getSource() == liveleavesItem)
	2588	+ if (source == liveleavesItem)
2337	2589	{
2338	2590	LiveLeaves(true);
2339	2591	} else
2340		- if (event.getSource() == unliveleavesItem)
	2592	+ if (source == unliveleavesItem)
2341	2593	{
2342	2594	LiveLeaves(false);
2343	2595	} else
2344		- if (event.getSource() == supportleavesItem)
	2596	+ if (source == supportleavesItem)
2345	2597	{
2346	2598	SupportLeaves(true);
2347	2599	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2600	+ if (source == unsupportleavesItem)
2349	2601	{
2350	2602	SupportLeaves(false);
2351	2603	} else
2352		- if (event.getSource() == hideleavesItem)
	2604	+ if (source == hideleavesItem)
2353	2605	{
2354	2606	HideLeaves(true);
2355	2607	} else
2356		- if (event.getSource() == showleavesItem)
	2608	+ if (source == showleavesItem)
2357	2609	{
2358	2610	HideLeaves(false);
2359	2611	} else
2360		- if (event.getSource() == markleavesItem)
	2612	+ if (source == markleavesItem)
2361	2613	{
2362	2614	MarkLeaves(true);
2363	2615	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2616	+ if (source == unmarkleavesItem)
2365	2617	{
2366	2618	MarkLeaves(false);
2367	2619	} else
2368		- if (event.getSource() == flipVItem)
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
	2635	+ } else
	2636	+ if (source == flipVItem)
2369	2637	{
2370	2638	FlipV(true);
2371	2639	} else
2372		- if (event.getSource() == unflipVItem)
	2640	+ if (source == unflipVItem)
2373	2641	{
2374	2642	FlipV(false);
2375	2643	} else
2376		- if (event.getSource() == lowTexturesItem)
	2644	+ if (source == lowTexturesItem)
2377	2645	{
2378	2646	SetTexRes(0);
2379	2647	} else
2380		- if (event.getSource() == normalTexturesItem)
	2648	+ if (source == normalTexturesItem)
2381	2649	{
2382	2650	SetTexRes(1);
2383	2651	} else
2384		- if (event.getSource() == highTexturesItem)
	2652	+ if (source == highTexturesItem)
2385	2653	{
2386	2654	SetTexRes(2);
2387	2655	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2656	+ if (source == veryhighTexturesItem)
2389	2657	{
2390	2658	SetTexRes(3);
2391	2659	} else
2392		- if (event.getSource() == maxTexturesItem)
	2660	+ if (source == maxTexturesItem)
2393	2661	{
2394	2662	SetTexRes(4);
2395	2663	} else
2396		- if (event.getSource() == panoTexturesItem)
	2664	+ if (source == panoTexturesItem)
2397	2665	{
2398	2666	SetTexRes(5);
2399	2667	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2668	+ if (source == reverseNormalsItem)
2401	2669	{
2402	2670	ReverseNormals();
2403	2671	} else
2404		- if (event.getSource() == parseverticesItem)
	2672	+ if (source == parseverticesItem)
2405	2673	{
2406	2674	ParseVertices();
2407	2675	} else
2408		- if (event.getSource() == textureFieldItem)
	2676	+ if (source == textureFieldItem)
2409	2677	{
2410	2678	TextureVertices();
2411	2679	} else
2412		- if (event.getSource() == alignItem)
	2680	+ if (source == alignItem)
2413	2681	{
2414	2682	Align();
2415	2683	} else
2416		- if (event.getSource() == mirrorItem)
	2684	+ if (source == mirrorItem)
2417	2685	{
2418	2686	MirrorPoses();
2419	2687	} else
2420		- if (event.getSource() == reduceMorphItem)
	2688	+ if (source == reduceMorphItem)
2421	2689	{
2422	2690	MeshReduction(false);
2423	2691	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2692	+ if (source == reduce34MorphItem)
2425	2693	{
2426	2694	MeshReduction(true);
2427	2695	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2696	+ if (source == reverseTrianglesItem)
2429	2697	{
2430	2698	ReverseTriangles();
2431	2699	} else
2432		- if (event.getSource() == reduceMeshItem)
	2700	+ if (source == reduceMeshItem)
2433	2701	{
2434	2702	ReduceMesh(false);
2435	2703	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2704	+ if (source == reduce34MeshItem)
2437	2705	{
2438	2706	ReduceMesh(true);
2439	2707	} else
2440		- if (event.getSource() == increaseMeshItem)
	2708	+ if (source == increaseMeshItem)
2441	2709	{
2442	2710	IncreaseMesh();
2443	2711	} else
2444		- if (event.getSource() == clipMeshItem)
	2712	+ if (source == clipMeshItem)
2445	2713	{
2446	2714	ClipMesh();
2447	2715	} else
2448		- if (event.getSource() == smoothMeshItem)
	2716	+ if (source == smoothMeshItem)
2449	2717	{
2450	2718	SmoothMesh();
2451	2719	} else
2452		- if (event.getSource() == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2453	2721	{
2454	2722	TransformGeometry();
2455	2723	} else
2456		- if (event.getSource() == resetTransformItem)
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
	2727	+ } else
	2728	+ if (source == resetTransformItem)
2457	2729	{
2458	2730	ResetTransform();
2459	2731	} else
2460		- if (event.getSource() == resetCentroidItem)
	2732	+ if (source == resetCentroidItem)
2461	2733	{
2462		- ResetCentroid();
	2734	+ ResetCentroid(true);
2463	2735	} else
2464		- if (event.getSource() == resetParentItem)
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
	2739	+ } else
	2740	+ if (source == resetParentItem)
2465	2741	{
2466	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2743	{
..	..	@@ -2471,7 +2747,7 @@
2471	2747
2472	2748	refreshContents();
2473	2749	} else
2474		- if (event.getSource() == repairParentItem)
	2750	+ if (source == repairParentItem)
2475	2751	{
2476	2752	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2753	{
..	..	@@ -2485,7 +2761,21 @@
2485	2761
2486	2762	refreshContents();
2487	2763	} else
2488		- if (event.getSource() == sortbysizeItem)
	2764	+ if (source == repairShadowItem)
	2765	+ {
	2766	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2767	+ {
	2768	+ Object3D obj = (Object3D)e.nextElement();
	2769	+ obj.RepairShadow();
	2770	+// for (int i=0; i<obj.size(); i++)
	2771	+// {
	2772	+// obj.get(i).parent = obj;
	2773	+// }
	2774	+ }
	2775	+
	2776	+ refreshContents();
	2777	+ } else
	2778	+ if (source == sortbysizeItem)
2489	2779	{
2490	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2781	{
..	..	@@ -2497,7 +2787,7 @@
2497	2787	ResetModel();
2498	2788	refreshContents();
2499	2789	} else
2500		- if (event.getSource() == sortbynameItem)
	2790	+ if (source == sortbynameItem)
2501	2791	{
2502	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2793	{
..	..	@@ -2509,7 +2799,7 @@
2509	2799	ResetModel();
2510	2800	refreshContents();
2511	2801	} else
2512		- if (event.getSource() == attachPigmentItem)
	2802	+ if (source == attachPigmentItem)
2513	2803	{
2514	2804	String texture = GetFile("Attach pigment");
2515	2805	Object3D obj;
..	..	@@ -2521,7 +2811,7 @@
2521	2811
2522	2812	refreshContents();
2523	2813	} else
2524		- if (event.getSource() == detachPigmentItem)
	2814	+ if (source == detachPigmentItem)
2525	2815	{
2526	2816	Object3D obj;
2527	2817	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2822,7 @@
2532	2822
2533	2823	refreshContents();
2534	2824	} else
2535		- if (event.getSource() == attachBumpItem)
	2825	+ if (source == attachBumpItem)
2536	2826	{
2537	2827	String texture = GetFile("Attach bump");
2538	2828	Object3D obj;
..	..	@@ -2544,7 +2834,7 @@
2544	2834
2545	2835	refreshContents();
2546	2836	} else
2547		- if (event.getSource() == detachBumpItem)
	2837	+ if (source == detachBumpItem)
2548	2838	{
2549	2839	Object3D obj;
2550	2840	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2845,7 @@
2555	2845
2556	2846	refreshContents();
2557	2847	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2848	+ if (source == pigmentBumpItem)
2559	2849	{
2560	2850	Object3D obj;
2561	2851	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2856,195 @@
2566	2856
2567	2857	refreshContents();
2568	2858	} else
2569		- if (event.getSource() == flashSelectionButton)
	2859	+ if (source == flashSelectionButton)
2570	2860	{
2571	2861	CameraPane.flash = true;
2572	2862	refreshContents();
2573	2863	} else
2574		- if (event.getSource() == oneButton)
	2864	+ if (source == oneButton)
2575	2865	{
2576	2866	} else
2577		- if (event.getSource() == twoButton)
	2867	+ if (source == twoButton)
2578	2868	{
2579	2869	radio.layout = twoButton;
2580	2870	// bug
2581	2871	//gridPanel.setDividerLocation(1.0);
2582	2872	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2873	+// bigThree.remove(scenePanel);
	2874	+// bigThree.remove(centralPanel);
	2875	+// bigThree.remove(XYZPanel);
	2876	+// aWindowConstraints.gridx = 0;
	2877	+// aWindowConstraints.gridy = 0;
	2878	+// aWindowConstraints.gridwidth = 1;
	2879	+// // aConstraints.gridheight = 3;
	2880	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2881	+// aWindowConstraints.weightx = 0;
	2882	+// aWindowConstraints.weighty = 1;
	2883	+// //bigThree.add(jtp, aWindowConstraints);
	2884	+// aWindowConstraints.weightx = 1;
	2885	+// aWindowConstraints.gridwidth = 3;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.gridx = 1;
	2888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2889	+// bigThree.add(centralPanel, aWindowConstraints);
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.gridx = 4;
	2892	+// aWindowConstraints.gridwidth = 1;
	2893	+// // aConstraints.gridheight = 3;
	2894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2895	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2896	+// scenePanel.setVisible(false);
	2897	+// centralPanel.setVisible(true);
	2898	+// XYZPanel.setVisible(false);
	2899	+ bigThree.ClearUI();
	2900	+ bigThree.add(centralPanel);
	2901	+ bigThree.FlushUI();
2607	2902	} else
2608		- if (event.getSource() == threeButton)
	2903	+ if (source == threeButton)
2609	2904	{
2610	2905	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	2906	+
	2907	+// bigThree.remove(scenePanel);
	2908	+// bigThree.remove(centralPanel);
	2909	+// bigThree.remove(XYZPanel);
	2910	+// aWindowConstraints.gridx = 0;
	2911	+// aWindowConstraints.gridy = 0;
	2912	+// aWindowConstraints.gridwidth = 1;
	2913	+// // aConstraints.gridheight = 3;
	2914	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2915	+// aWindowConstraints.weightx = 0;
	2916	+// aWindowConstraints.weighty = 1;
	2917	+// //bigThree.add(jtp, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 1;
	2919	+// aWindowConstraints.gridwidth = 3;
	2920	+// // aConstraints.gridheight = 3;
	2921	+// aWindowConstraints.gridx = 1;
	2922	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2923	+// bigThree.add(centralPanel, aWindowConstraints);
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.gridx = 4;
	2926	+// aWindowConstraints.gridwidth = 1;
	2927	+// // aConstraints.gridheight = 3;
	2928	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2929	+// bigThree.add(XYZPanel, aWindowConstraints);
	2930	+// bigThree.validate();
	2931	+// scenePanel.setVisible(false);
	2932	+// centralPanel.setVisible(true);
	2933	+// XYZPanel.setVisible(true);
	2934	+ bigThree.ClearUI();
	2935	+ bigThree.add(centralPanel);
	2936	+ bigThree.add(XYZPanel);
	2937	+ bigThree.FlushUI();
2635	2938	} else
2636		- if (event.getSource() == fourButton)
	2939	+ if (source == fourButton)
2637	2940	{
2638	2941	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2942	+
	2943	+// bigThree.remove(scenePanel);
	2944	+// bigThree.remove(centralPanel);
	2945	+// bigThree.remove(XYZPanel);
	2946	+// aWindowConstraints.gridx = 0;
	2947	+// aWindowConstraints.gridy = 0;
	2948	+// aWindowConstraints.gridwidth = 1;
	2949	+// // aWindowConstraints.gridheight = 3;
	2950	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2951	+// aWindowConstraints.weightx = 1;
	2952	+// aWindowConstraints.weighty = 1;
	2953	+// bigThree.add(scenePanel, aWindowConstraints);
	2954	+// aWindowConstraints.weightx = 1;
	2955	+// aWindowConstraints.gridwidth = 3;
	2956	+// // aConstraints.gridheight = 3;
	2957	+// aWindowConstraints.gridx = 1;
	2958	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2959	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2960	+// aWindowConstraints.weightx = 0;
	2961	+// aWindowConstraints.gridx = 4;
	2962	+// aWindowConstraints.gridwidth = 1;
	2963	+// // aWindowConstraints.gridheight = 3;
	2964	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2965	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2966	+// bigThree.validate();
	2967	+// scenePanel.setVisible(true);
	2968	+// centralPanel.setVisible(false);
	2969	+// XYZPanel.setVisible(false);
	2970	+ bigThree.ClearUI();
	2971	+ bigThree.add(scenePanel);
	2972	+ bigThree.FlushUI();
2663	2973	} else
2664		- if (event.getSource() == sixButton)
	2974	+ if (source == sixButton)
2665	2975	{
2666	2976	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	2977	+
	2978	+// bigThree.remove(scenePanel);
	2979	+// bigThree.remove(centralPanel);
	2980	+// bigThree.remove(XYZPanel);
	2981	+// aWindowConstraints.gridx = 0;
	2982	+// aWindowConstraints.gridy = 0;
	2983	+// aWindowConstraints.gridwidth = 1;
	2984	+// // aConstraints.gridheight = 3;
	2985	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2986	+// aWindowConstraints.weightx = 0;
	2987	+// aWindowConstraints.weighty = 1;
	2988	+// bigThree.add(scenePanel, aWindowConstraints);
	2989	+// aWindowConstraints.weightx = 1;
	2990	+// aWindowConstraints.gridwidth = 3;
	2991	+// // aWindowConstraints.gridheight = 3;
	2992	+// aWindowConstraints.gridx = 1;
	2993	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2994	+// bigThree.add(centralPanel, aWindowConstraints);
	2995	+// aWindowConstraints.weightx = 0;
	2996	+// aWindowConstraints.gridx = 4;
	2997	+// aWindowConstraints.gridwidth = 1;
	2998	+// // aWindowConstraints.gridheight = 3;
	2999	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3000	+// //bigThree.add(XYZPanel, aConstraints);
	3001	+// bigThree.validate();
	3002	+// scenePanel.setVisible(true);
	3003	+// centralPanel.setVisible(true);
	3004	+// XYZPanel.setVisible(false);
	3005	+ bigThree.ClearUI();
	3006	+ bigThree.add(scenePanel);
	3007	+ bigThree.add(centralPanel);
	3008	+ bigThree.FlushUI();
2691	3009	} else
2692		- if (event.getSource() == sevenButton)
	3010	+ if (source == sevenButton)
2693	3011	{
2694	3012	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3013	+
	3014	+// bigThree.remove(scenePanel);
	3015	+// bigThree.remove(centralPanel);
	3016	+// bigThree.remove(XYZPanel);
	3017	+// aWindowConstraints.gridx = 0;
	3018	+// aWindowConstraints.gridy = 0;
	3019	+// aWindowConstraints.gridwidth = 1;
	3020	+// // aWindowConstraints.gridheight = 3;
	3021	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3022	+// aWindowConstraints.weightx = 0;
	3023	+// aWindowConstraints.weighty = 1;
	3024	+// bigThree.add(scenePanel, aWindowConstraints);
	3025	+// aWindowConstraints.weightx = 1;
	3026	+// aWindowConstraints.gridwidth = 3;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.gridx = 1;
	3029	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3030	+// bigThree.add(centralPanel, aWindowConstraints);
	3031	+// aWindowConstraints.weightx = 0;
	3032	+// aWindowConstraints.gridx = 4;
	3033	+// aWindowConstraints.gridwidth = 1;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3036	+// bigThree.add(XYZPanel, aWindowConstraints);
	3037	+// bigThree.validate();
	3038	+// scenePanel.setVisible(true);
	3039	+// centralPanel.setVisible(true);
	3040	+// XYZPanel.setVisible(true);
	3041	+ bigThree.ClearUI();
	3042	+ bigThree.add(scenePanel);
	3043	+ bigThree.add(centralPanel);
	3044	+ bigThree.add(XYZPanel);
	3045	+ bigThree.FlushUI();
2719	3046	} else
2720		- if (event.getSource() == rootButton)
	3047	+ if (source == rootButton)
2721	3048	{
2722	3049	Object3D obj;
2723	3050	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +3056,7 @@
2729	3056
2730	3057	refreshContents(true);
2731	3058	} else
2732		- if (event.getSource() == closeButton)
	3059	+ if (source == closeButton)
2733	3060	{
2734	3061	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3062	cRadio ab;
..	..	@@ -2750,11 +3077,11 @@
2750	3077	}
2751	3078	refreshContents(true);
2752	3079	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3080	+ if (source == editItem \|\| source == editButton)
2754	3081	{
2755	3082	EditSelection(false);
2756	3083	} else
2757		- if (event.getSource() == uneditButton)
	3084	+ if (source == uneditButton)
2758	3085	{
2759	3086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3087	{
..	..	@@ -2764,14 +3091,14 @@
2764	3091	child.CloseUI();
2765	3092	listUI.remove(child);
2766	3093
2767		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2768	3095	}
2769		- objEditor.ctrlPanel.revalidate();
	3096	+ objEditor.ctrlPanel.FlushUI();
2770	3097	//objEditor.jTree.clearSelection();
2771	3098	//objEditor.ResetSliders();
2772	3099	refreshContents(true);
2773	3100	} else
2774		- if (event.getSource() == clearPanelButton)
	3101	+ if (source == clearPanelButton)
2775	3102	{
2776	3103	assert(copy == group);
2777	3104	//copy.ClearUI();
..	..	@@ -2782,7 +3109,7 @@
2782	3109	listUI.clear();
2783	3110	refreshContents(true);
2784	3111	} else
2785		- if (event.getSource() == allParamsButton)
	3112	+ if (source == allParamsButton)
2786	3113	{
2787	3114	assert(copy == group);
2788	3115
..	..	@@ -2803,19 +3130,19 @@
2803	3130
2804	3131	refreshContents(true);
2805	3132	} else
2806		- if (event.getSource() == unselectButton)
	3133	+ if (source == unselectButton)
2807	3134	{
2808	3135	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3136	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3137	objEditor.ResetSliders();
2811	3138	refreshContents(true);
2812	3139	} else
2813		- if(event.getSource() instanceof cRadio)
	3140	+ if(source instanceof cRadio)
2814	3141	{
2815	3142	group.parent = keepparent;
2816	3143	group.attributes = 0;
2817	3144	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3145	+ /cRadio/ radio = (cRadio)source;
2819	3146	Object3D obj = radio.GetObject();
2820	3147	System.out.println("Edit " + obj);
2821	3148	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3162,7 @@
2835	3162	}
2836	3163
2837	3164	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3165	+ //Globals.theRenderer.object = group;
2839	3166	if(!useclient)
2840	3167	{
2841	3168	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3171,16 @@
2844	3171	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3172	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3173	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3174	+ //cameraView.lighttouched = true;
	3175	+ Globals.lighttouched = true;
2848	3176	topView.object = group;
2849	3177	frontView.object = group;
2850	3178	sideView.object = group;
2851	3179	}
	3180	+
	3181	+// fix "+" issue
2852	3182	group.editWindow = this;
	3183	+
2853	3184	/*
2854	3185	currentLayout = radio.layout;
2855	3186	if (currentLayout == null)
..	..	@@ -2862,7 +3193,20 @@
2862	3193	//group.attributes = -1;
2863	3194	ResetModel();
2864	3195	refreshContents(true);
2865		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
2866	3210	else
2867	3211	{
2868	3212	//return super.action(event, arg);
..	..	@@ -2880,7 +3224,7 @@
2880	3224	if (useclient)
2881	3225	{
2882	3226	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3227	+ Globals.lighttouched = true;
2884	3228	//topView.object = client;
2885	3229	//frontView.object = client;
2886	3230	//sideView.object = client;
..	..	@@ -2888,7 +3232,7 @@
2888	3232	else
2889	3233	{
2890	3234	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3235	+ Globals.lighttouched = true;
2892	3236	//topView.object = group;
2893	3237	//frontView.object = group;
2894	3238	//sideView.object = group;
..	..	@@ -2923,6 +3267,28 @@
2923	3267	refreshContents();
2924	3268	}
2925	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
2926	3292
2927	3293	void ResetTransform()
2928	3294	{
..	..	@@ -3035,7 +3401,7 @@
3035	3401	refreshContents();
3036	3402	}
3037	3403
3038		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3039	3405	{
3040	3406	Object3D obj;
3041	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3416,16 @@
3050	3416	LA.matIdentity(Object3D.mat);
3051	3417	obj.getBounds(minima, maxima, false);
3052	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3056	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3059	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3454,8 @@
3084	3454
3085	3455	int size = obj.MemorySize();
3086	3456
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3459	}
3089	3460	}
3090	3461	catch (Exception e)
..	..	@@ -3121,9 +3492,9 @@
3121	3492	obj = (Object3D)e.nextElement();
3122	3493
3123	3494	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3125	3496	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3498
3128	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3500	}
..	..	@@ -3165,6 +3536,20 @@
3165	3536	void GenNormals(boolean crease)
3166	3537	{
3167	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
	3546	+
	3547	+ refreshContents();
	3548	+ }
	3549	+
	3550	+ void GenNormalsMINE()
	3551	+ {
	3552	+ group.selection.GenNormalsMINE();
3168	3553
3169	3554	refreshContents();
3170	3555	}
..	..	@@ -3250,7 +3635,7 @@
3250	3635	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3636	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3637	//
3253		-// g.add(GraphreeD.clipboard);
	3638	+// g.add(GrafreeD.clipboard);
3254	3639	//
3255	3640	// buffer.add(g);
3256	3641	// }
..	..	@@ -3269,8 +3654,8 @@
3269	3654	// nodes = new Object3D();
3270	3655	// vertices = new Vector<Vertex>();
3271	3656	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3657	+// boolean epsequal = GrafreeD.epsequal;
	3658	+// GrafreeD.epsequal = true;
3274	3659	//
3275	3660	// for (int i=0; i<group.selection.size(); i++)
3276	3661	// {
..	..	@@ -3311,7 +3696,7 @@
3311	3696	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3697	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3698	//
3314		-// g.add(GraphreeD.clipboard);
	3699	+// g.add(GrafreeD.clipboard);
3315	3700	//
3316	3701	// buffer.add(g);
3317	3702	// }
..	..	@@ -3319,7 +3704,7 @@
3319	3704	// makeSomething(buffer, i==group.selection.size()-1);
3320	3705	// }
3321	3706	//
3322		-// GraphreeD.epsequal = epsequal;
	3707	+// GrafreeD.epsequal = epsequal;
3323	3708	//
3324	3709	// //buffer = null;
3325	3710	// temprep = null;
..	..	@@ -3330,8 +3715,8 @@
3330	3715
3331	3716	void ParseVertices()
3332	3717	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3335	3720
3336	3721	for (int i=0; i<group.selection.size(); i++)
3337	3722	{
..	..	@@ -3356,7 +3741,7 @@
3356	3741	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3742	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3743
3359		- g.add(GraphreeD.clipboard);
	3744	+ g.add(Grafreed.clipboard);
3360	3745
3361	3746	buffer.add(g);
3362	3747	}
..	..	@@ -3371,7 +3756,7 @@
3371	3756	makeSomething(buffer, i==group.selection.size()-1);
3372	3757	}
3373	3758
3374		- GraphreeD.epsequal = epsequal;
	3759	+ Grafreed.epsequal = epsequal;
3375	3760
3376	3761	refreshContents();
3377	3762	}
..	..	@@ -3389,7 +3774,16 @@
3389	3774	String pigment = Object3D.GetPigment(tex);
3390	3775	//String bump = Object3D.GetBump(tex);
3391	3776
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3393	3787
3394	3788	double s = v.s;
3395	3789
..	..	@@ -3416,7 +3810,7 @@
3416	3810	scale /= 3;
3417	3811
3418	3812	scale /= 0xFF;
3419		- scale /= 4;
	3813	+ // c'est quoi ca? scale /= 4;
3420	3814
3421	3815	//v.AO = scale;
3422	3816
..	..	@@ -3437,12 +3831,26 @@
3437	3831
3438	3832	void Align()
3439	3833	{
	3834	+ if (group.selection.size() == 0)
	3835	+ return;
	3836	+
	3837	+ cVector bbmin = new cVector();
	3838	+ cVector bbmax = new cVector();
	3839	+
	3840	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3841	+
	3842	+ double dx = bbmax.x - bbmin.x;
	3843	+ double dy = bbmax.y - bbmin.y;
	3844	+ double dz = bbmax.z - bbmin.z;
	3845	+
	3846	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3847	+
3440	3848	for (int i=0; i<group.selection.size(); i++)
3441	3849	{
3442	3850	Object3D obj = group.selection.get(i);
3443	3851
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3852	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3853	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3854	}
3447	3855
3448	3856	refreshContents();
..	..	@@ -3455,7 +3863,7 @@
3455	3863	// ref.SaveSupports();
3456	3864	// Object3D par = ref.parent;
3457	3865	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3866	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3867	// ref.parent = par;
3460	3868	// ref.RestoreSupports();
3461	3869
..	..	@@ -3463,11 +3871,11 @@
3463	3871
3464	3872	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3873
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3874	+ boolean random = CameraPane.SWITCH;
	3875	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3876	lowres.linkVerticesThis(null);
3469	3877	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3878	+ CameraPane.SWITCH = random;
3471	3879
3472	3880	System.err.flush();
3473	3881
..	..	@@ -3485,7 +3893,7 @@
3485	3893	// lowres.SaveSupports();
3486	3894	// par = lowres.parent;
3487	3895	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3896	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3897	Object3D newlow = CloneObject(lowres, false);
3490	3898	newlow.name = sn.switchobject.get(i).name;
3491	3899	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3915,7 @@
3507	3915	return;
3508	3916
3509	3917	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3511	3919
3512	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3921
..	..	@@ -3676,7 +4084,7 @@
3676	4084	group.selection.RelinkToSupport(); // july 2014
3677	4085	System.out.println("DONE.");
3678	4086	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4087	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4088	}
3681	4089
3682	4090	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4109,20 @@
3701	4109
3702	4110	void ClipMesh()
3703	4111	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4113	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3707	4115
3708	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4117	content = ((cGroup)content).get(0);
3710	4118
3711	4119	// for (int i=0; i<group.selection.size(); i++)
3712	4120	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4121	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4122	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4124	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4125	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4126	System.out.println("DONE.");
3719	4127	refreshContents();
3720	4128	}
..	..	@@ -3759,6 +4167,18 @@
3759	4167	void MarkLeaves(boolean hide)
3760	4168	{
3761	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3762	4182	refreshContents();
3763	4183	}
3764	4184
..	..	@@ -3847,7 +4267,7 @@
3847	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4268
3849	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
3851	4271	{
3852	4272	// if (!(elem instanceof Composite))
3853	4273	// newWindow = false;
..	..	@@ -3937,7 +4357,6 @@
3937	4357	//case 702: // Event.LIST_DESELECT
3938	4358	group.deselectAll();
3939	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4360	if (tps != null)
3942	4361	{
3943	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,31 +4365,30 @@
3946	4365
3947	4366	//if (child.parent != null)
3948	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
3949	4369	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4370	}
3954	4371	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4372	+// else
	4373	+// {
	4374	+// objEditor.SetMaterial(group); // .GetMaterial());
	4375	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4376	+// System.err.println("info : " + group.GetPath());
	4377	+// }
3961	4378
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4380	CameraPane.flash = true;
3966	4381
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4383	// a camera
3969	4384	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
	4390	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4391	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4392	}
3975	4393
3976	4394	refreshContents();
..	..	@@ -3981,6 +4399,26 @@
3981	4399
3982	4400	freezemodel = false;
3983	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
3984	4422
3985	4423	void linkSomething(Object3D thing)
3986	4424	{
..	..	@@ -4052,16 +4490,18 @@
4052	4490	{
4053	4491	if (group.selection.isEmpty())
4054	4492	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
4056	4495	Composite tGroup = null;
4057	4496	if (group.selection.size() > 0) // 1)
4058	4497	{
4059	4498	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
4061	4500	}
4062	4501
4063	4502	if (cut)
4064	4503	{
	4504	+ Save();
4065	4505	//int indices[] = jList.getSelectedIndices();
4066	4506	//for (int i = indices.length - 1; i >= 0; i--)
4067	4507	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4537,16 @@
4097	4537	//System.out.println("cut " + child);
4098	4538	//System.out.println("parent = " + child.parent);
4099	4539	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
4101	4541	tGroup.add/Child/(tmp);
4102	4542	else
4103		- GraphreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
4104	4544	}
4105	4545	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
4107	4547	tGroup.add/Child/(child);
4108	4548	else
4109		- GraphreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
4110	4550	}
4111	4551
4112	4552	//ResetModel();
..	..	@@ -4138,21 +4578,23 @@
4138	4578	//System.out.println("cut " + elem);
4139	4579	//System.out.println("parent = " + elem.parent);
4140	4580	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
4142	4582	tGroup.add/Child/(tmp);
4143	4583	else
4144		- GraphreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
4145	4585	}
4146	4586	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
4148	4588	tGroup.add/Child/(child);
4149	4589	else
4150		- GraphreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
4151	4591	}
4152	4592
4153	4593	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
4156	4598	if (cut)
4157	4599	{
4158	4600	ResetModel();
..	..	@@ -4162,11 +4604,11 @@
4162	4604
4163	4605	void paste(boolean expand)
4164	4606	{
4165		- // if (GraphreeD.clipboard == null)
	4607	+ // if (GrafreeD.clipboard == null)
4166	4608	// return;
4167	4609	boolean first = true;
4168	4610
4169		- if (GraphreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
4170	4612	{
4171	4613	Composite temp;
4172	4614
..	..	@@ -4177,7 +4619,7 @@
4177	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4620	*/
4179	4621	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4623	{
4182	4624	Object3D child = (Object3D)e.nextElement();
4183	4625
..	..	@@ -4191,7 +4633,7 @@
4191	4633	else
4192	4634	elem = child.deepCopy(); // ?
4193	4635	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4636	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4637	// elem = elem.get(0);
4196	4638	makeSomething(elem, true); // ?? first);
4197	4639	//group.addChild(elem);
..	..	@@ -4211,23 +4653,23 @@
4211	4653	//Object3D cb = Applet3D.clipboard;
4212	4654	//temp.addChild(cb);
4213	4655	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4661	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4664	}
4223	4665
4224	4666	ResetModel();
4225	4667	refreshContents();
4226	4668	}
4227	4669
4228		- void pasteInto(boolean copyit)
	4670	+ void pasteInto(boolean copyit, boolean clone)
4229	4671	{
4230		-// if (GraphreeD.clipboard == null)
	4672	+// if (GrafreeD.clipboard == null)
4231	4673	// return;
4232	4674
4233	4675	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4696,22 @@
4254	4696	if (copyit)
4255	4697	{
4256	4698	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4699	+ if (clone)
	4700	+ {
	4701	+ CloneClipboard(false); // sept 2014
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ paste(false);
	4706	+ }
4258	4707	}
4259	4708	else
4260	4709	{
4261	4710	boolean first = true;
4262	4711
4263		- if (GraphreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4264	4713	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4715	Object3D copy;
4267	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4717	{
..	..	@@ -4272,7 +4721,7 @@
4272	4721	}
4273	4722	} else
4274	4723	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4725	}
4277	4726	}
4278	4727	}
..	..	@@ -4464,6 +4913,26 @@
4464	4913	makeSomething(csg);
4465	4914	}
4466	4915
	4916	+ void Ungroup(Object3D g)
	4917	+ {
	4918	+ if (g instanceof HiddenObject)
	4919	+ {
	4920	+ HiddenObject h = (HiddenObject) g;
	4921	+
	4922	+ for (int i=0; i<h.ActualSize(); i++)
	4923	+ {
	4924	+ objEditor.makeSomething(h.get(i), false);
	4925	+ }
	4926	+ }
	4927	+ else
	4928	+ {
	4929	+ for (int i=0; i<g.Size(); i++)
	4930	+ {
	4931	+ objEditor.makeSomething(g.get(i), false);
	4932	+ }
	4933	+ }
	4934	+ }
	4935	+
4467	4936	void ungroup()
4468	4937	{
4469	4938	/*
..	..	@@ -4657,21 +5126,6 @@
4657	5126	}
4658	5127	*/
4659	5128
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	5129	/*
4676	5130	public void Callback(Object obj)
4677	5131	{
..	..	@@ -4695,26 +5149,9 @@
4695	5149	}
4696	5150	*/
4697	5151
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	5152	String GetFile(String dialogName)
4716	5153	{
4717		- if (GraphreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4718	5155	{
4719	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5157	browser.show();
..	..	@@ -4778,10 +5215,15 @@
4778	5215	cButton flashSelectionButton;
4779	5216	cButton editButton;
4780	5217	cButton uneditButton;
	5218	+ JCheckBox allParamsButton;
4781	5219	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5220	cButton unselectButton;
4784	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
	5225	+ cButton oneStepButton;
	5226	+
4785	5227	cButton screenfitButton;
4786	5228	cButton screenfitpointButton;
4787	5229	cButton snapobjectButton;
..	..	@@ -4812,6 +5254,8 @@
4812	5254	private MenuItem lookFromItem;
4813	5255	private MenuItem switchItem;
4814	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
4815	5259	private MenuItem duplicateItem;
4816	5260	private MenuItem cloneItem;
4817	5261	private MenuItem cloneSupportItem;
..	..	@@ -4823,8 +5267,9 @@
4823	5267	private MenuItem resetsupportItem;
4824	5268	private MenuItem resetreferencesItem;
4825	5269	private MenuItem linkverticesItem;
	5270	+ private MenuItem relinkverticesItem;
4826	5271	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
4828	5273	private MenuItem stepAllItem;
4829	5274	private MenuItem revertMeshItem;
4830	5275	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5280,17 @@
4835	5280	private MenuItem mergeGeometriesItem;
4836	5281	private MenuItem copyItem;
4837	5282	private MenuItem pasteItem;
	5283	+ private MenuItem pasteIntoItem;
4838	5284	private MenuItem pasteLinkItem;
4839	5285	private MenuItem pasteCloneItem;
4840	5286	private MenuItem pasteExpandItem;
4841	5287	private MenuItem clearItem;
4842	5288	private MenuItem clearAllItem;
4843	5289	private MenuItem genUVItem;
	5290	+ private MenuItem genNormalsMESHItem;
4844	5291	private MenuItem genNormalsCADItem;
4845	5292	private MenuItem genNormalsORGANItem;
	5293	+ private MenuItem genNormalsMINEItem;
4846	5294	private MenuItem stripifyItem;
4847	5295	private MenuItem unstripifyItem;
4848	5296	private MenuItem trimItem;
..	..	@@ -4871,6 +5319,10 @@
4871	5319	private MenuItem showleavesItem;
4872	5320	private MenuItem markleavesItem;
4873	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
4874	5326
4875	5327	private MenuItem flipVItem;
4876	5328	private MenuItem unflipVItem;
..	..	@@ -4882,8 +5334,11 @@
4882	5334	private MenuItem panoTexturesItem;
4883	5335
4884	5336	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
4886	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
	5341	+ private MenuItem hideItem;
4887	5342	private MenuItem grabItem;
4888	5343	private MenuItem backItem;
4889	5344	private MenuItem frontItem;
..	..	@@ -4904,6 +5359,7 @@
4904	5359
4905	5360	private MenuItem resetParentItem;
4906	5361	private MenuItem repairParentItem;
	5362	+ private MenuItem repairShadowItem;
4907	5363	private MenuItem sortbysizeItem;
4908	5364	private MenuItem sortbynameItem;
4909	5365
..	..	@@ -4924,10 +5380,11 @@
4924	5380	private MenuItem coneItem;
4925	5381	private MenuItem torusItem;
4926	5382	private MenuItem superItem;
	5383	+ private MenuItem kleinItem;
4927	5384	private MenuItem blobItem;
4928	5385	private MenuItem latheItem;
4929	5386	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5387	+ private MenuItem overlayItem;
4931	5388	private MenuItem meshItem;
4932	5389	// private MenuItem meshGroupItem;
4933	5390	private MenuItem springItem;
..	..	@@ -4936,6 +5393,7 @@
4936	5393	private MenuItem csgItem;
4937	5394	private MenuItem templateItem;
4938	5395	private MenuItem textureItem;
	5396	+ private MenuItem billboardItem;
4939	5397	private MenuItem shadowXItem;
4940	5398	private MenuItem shadowYItem;
4941	5399	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5406,6 @@
4948	5406	private MenuItem doubleItem;
4949	5407	private MenuItem tripleItem;
4950	5408
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5409	private MenuItem computeAOItem;
4957	5410	private MenuItem recompileItem;
4958	5411	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5415,8 @@
4962	5415	private MenuItem analyzeItem;
4963	5416	private MenuItem dumpItem;
4964	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
4965	5422	}