~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"));
..	..	@@ -366,29 +505,22 @@
366	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	506	sortbynameItem.addActionListener(this);
368	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
369	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	516	extractGeometriesItem.addActionListener(this);
371	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	518	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	519	+ }
377	520
378	521	oe.menuBar.add(menu = new Menu("Insert"));
379	522	buildCreateMenu(menu);
380	523
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("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	524	oe.menuBar.add(menu = new Menu("Tools"));
393	525	buildToolsMenu(menu);
394	526	}
..	..	@@ -423,150 +555,110 @@
423	555	oe.radioPanel.add(dummyButton);
424	556	oe.buttonGroup.add(dummyButton);
425	557	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	559
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
431	574	liveCB.addItemListener(this);
432	575
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
451	582	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	585	+ trackCB.setToolTipText("Enable tracking");
493	586	trackCB.addItemListener(this);
494	587
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ screenfitButton.setToolTipText("Screen fit");
497	590	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	591	+
499	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	593	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	594
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ flashSelectionButton.setToolTipText("Show selection");
512	604	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	605
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	607	+
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ twoButton.setToolTipText("Show center view only");
519	610	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	612	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	613	+ fourButton.setToolTipText("Show left panel only");
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ sixButton.setToolTipText("2-column layout left");
523	616	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ threeButton.setToolTipText("2-column layout right");
525	619	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ sevenButton.setToolTipText("3-column layout");
527	622	sevenButton.addActionListener(this);
528	623	//
529	624
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
531	627	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ closeButton.setToolTipText("Close tab");
534	631	closeButton.addActionListener(this);
535	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	633	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	634
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
541	639	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	640
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
547	643	uneditButton.addActionListener(this);
548	644
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
561	647	allParamsButton.addActionListener(this);
562	648
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
568	655	unselectButton.addActionListener(this);
569	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
570	662	// oe.aConstraints.gridx += 1;
571	663	// oe.aConstraints.weighty = 0;
572	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +670,37 @@
578	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	671	// gcButton.addActionListener(this);
580	672
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
592	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	678	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
599	682
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
604	687	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
607	691	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
610	695	textureCB.addItemListener(this);
611	696
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
614	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
615	704	//jList.addListSelectionListener(this);
616	705	oe.jTree.addTreeSelectionListener(this);
617	706	//jTree.setRootVisible(false);
..	..	@@ -633,18 +722,91 @@
633	722	radio.layout = sevenButton;
634	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	724	}
	725	+
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	727	+ {
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
	757	+// constraints.gridy += 1;
	758	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	759	+// speakerMocapCB.addItemListener(this);
	760	+
	761	+ if (false)
	762	+ {
	763	+ // handled in scripts
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	766	+ speakerCameraCB.addItemListener(this);
	767	+
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	770	+ speakerFocusCB.addItemListener(this);
	771	+
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	774	+ smoothfocusCB.addItemListener(this);
	775	+ }
	776	+
	777	+//constraints.gridx += 1;
	778	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	779	+// debugCB.addItemListener(this);
	780	+
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	782	+ oeilCB.addItemListener(this);
	783	+
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	785	+ lookAtCB.setToolTipText("Look-at target");
	786	+ lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
	795	+
	796	+ }
636	797
637	798	void EditObject(Object3D obj)
638	799	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	800	+ cRadio radioButton = new cRadio(obj.name);
	801	+ radioButton.SetObject(obj);
	802	+ radioButton.layout = sevenButton;
	803	+ radioButton.SetCamera(cameraView.renderCamera, false);
	804	+ radioButton.addActionListener(this);
	805	+ radioPanel.add(radioButton);
	806	+ buttonGroup.add(radioButton);
	807	+ radioButton.doClick();
647	808	}
	809	+
648	810	void SetupViews(ObjEditor oe)
649	811	{
650	812	oe.SetupViews();
..	..	@@ -663,6 +825,7 @@
663	825	JCheckBox fastCB;
664	826	JCheckBox slowCB;
665	827	JCheckBox boxCB;
	828	+ JCheckBox zoomBoxCB;
666	829	JCheckBox trackCB;
667	830	JCheckBox smoothfocusCB;
668	831	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +868,7 @@
705	868	dropAttributes \|= Object3D.TEXTURE;
706	869	else
707	870	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	871	+ } else if(e.getSource() == liveCB)
710	872	{
711	873	cameraView.ToggleLive();
712	874	}
..	..	@@ -743,6 +905,10 @@
743	905	Recompile();
744	906	cameraView.repaint();
745	907	// refreshContents();
	908	+ }
	909	+ else if(e.getSource() == zoomBoxCB)
	910	+ {
	911	+ cameraView.ToggleZoomBoxMode();
746	912	}
747	913	else if(e.getSource() == smoothfocusCB)
748	914	{
..	..	@@ -857,7 +1023,9 @@
857	1023	// objEditor.DropFile((java.io.File[]) object, true);
858	1024	// return;
859	1025	// }
860		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1029	{
862	1030	// file(s)
863	1031	String[] names = string.split("\n");
..	..	@@ -884,7 +1052,7 @@
884	1052
885	1053	flashIt = false;
886	1054	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1057
890	1058	if (group.selection.size() == 1)
..	..	@@ -911,11 +1079,11 @@
911	1079	{
912	1080	loadClipboard(true);
913	1081	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1082	+ pasteInto(false, false);
915	1083	} else {
916	1084	loadClipboard(false);
917	1085	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1086	+ pasteInto(false, false); // true); // ???
919	1087	}
920	1088	}
921	1089	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1201,37 @@
1033	1201	torusItem.addActionListener(this);
1034	1202	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1203	superItem.addActionListener(this);
	1204	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1205	+ kleinItem.addActionListener(this);
1036	1206	particleItem = menu.add(new MenuItem("Particle system"));
1037	1207	particleItem.addActionListener(this);
	1208	+ if (Globals.ADVANCED)
	1209	+ {
1038	1210	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1211	ragdollItem.addActionListener(this);
1040	1212	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1213	ragdoll2Item.addActionListener(this);
	1214	+ }
1042	1215	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1216	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1217	meshItem.addActionListener(this);
1045	1218	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1219	// meshGroupItem.addActionListener(this);
	1220	+ if (Globals.ADVANCED)
	1221	+ {
1047	1222	springItem = menu.add(new MenuItem("Spring"));
1048	1223	springItem.addActionListener(this);
1049	1224	flagItem = menu.add(new MenuItem("Flag"));
1050	1225	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	1226	blobItem = menu.add(new MenuItem("Blob"));
1056	1227	blobItem.addActionListener(this);
1057	1228	latheItem = menu.add(new MenuItem("Lathe"));
1058	1229	latheItem.addActionListener(this);
	1230	+ }
	1231	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1232	+ bezierItem.addActionListener(this);
	1233	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1234	+ overlayItem.addActionListener(this);
1059	1235	lightItem = menu.add(new MenuItem("Light"));
1060	1236	lightItem.addActionListener(this);
1061	1237	menu.add("-");
..	..	@@ -1065,34 +1241,39 @@
1065	1241	loopItem.addActionListener(this);
1066	1242	doubleItem = menu.add(new MenuItem("Fork"));
1067	1243	doubleItem.addActionListener(this);
	1244	+ if (Globals.ADVANCED)
	1245	+ {
1068	1246	tripleItem = menu.add(new MenuItem("Trident"));
1069	1247	tripleItem.addActionListener(this);
	1248	+ }
1070	1249	}
1071	1250
1072	1251	void buildToolsMenu(Menu menu)
1073	1252	{
1074	1253	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1254	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1255	+ animationItem.setState(Globals.ANIMATION);
1077	1256
1078	1257	menu.add("-");
1079	1258	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1259	parseverticesItem.addActionListener(this);
1081	1260	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1261	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1263	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1265	reduceMorphItem.addActionListener(this);
1089	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1267	reduce34MorphItem.addActionListener(this);
1091		-
	1268	+ menu.add("-");
1092	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1270	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1271
	1272	+ if (Globals.ADVANCED)
	1273	+ {
	1274	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1275	+ mirrorItem.addActionListener(this);
	1276	+ menu.add("-");
1096	1277	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1278	memoryItem.addActionListener(this);
1098	1279	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1287,8 @@
1106	1287	resetParentItem.addActionListener(this);
1107	1288	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1289	repairParentItem.addActionListener(this);
	1290	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1291	+ repairShadowItem.addActionListener(this);
1109	1292	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1293	invariantsItem.addActionListener(this);
1111	1294	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1296,7 @@
1113	1296	menu.add("-");
1114	1297	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1298	editScriptItem.addActionListener(this);
	1299	+ }
1116	1300	}
1117	1301
1118	1302	void ScreenFit()
..	..	@@ -1441,9 +1625,9 @@
1441	1625
1442	1626	void Overwrite(int mask)
1443	1627	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1629	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1447	1631
1448	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1633	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1650,7 @@
1466	1650	//
1467	1651	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1652	{
	1653	+ Object source = event.getSource();
1469	1654	/*
1470	1655	if (event.getSource() == nameField)
1471	1656	{
..	..	@@ -1477,11 +1662,11 @@
1477	1662	}
1478	1663	else
1479	1664	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1665	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1666	{
1482	1667	ScreenFit();
1483	1668	} else
1484		- if (event.getSource() == switchItem)
	1669	+ if (source == switchItem)
1485	1670	{
1486	1671	cVector v1 = new cVector();
1487	1672	cVector v2 = new cVector();
..	..	@@ -1490,11 +1675,11 @@
1490	1675	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1676	objEditor.cameraView.repaint();
1492	1677	} else
1493		- if (event.getSource() == rectoidItem)
	1678	+ if (source == rectoidItem)
1494	1679	{
1495	1680	makeSomething(new Box());
1496	1681	} else
1497		- if (event.getSource() == particleItem)
	1682	+ if (source == particleItem)
1498	1683	{
1499	1684	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1685	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1700,9 @@
1515	1700	applyExample(particleGeom, "SMOKE");
1516	1701	makeSomething(particleGeom);
1517	1702	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1703	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1704	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1705	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1706
1522	1707	ragdoll.toParent = LA.newMatrix();
1523	1708	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1720,7 @@
1535	1720	} else
1536	1721	/*
1537	1722	*/
1538		- if (event.getSource() == heightFieldItem)
	1723	+ if (source == heightFieldItem)
1539	1724	{
1540	1725	Object3D obj = new Object3D();
1541	1726
..	..	@@ -1573,27 +1758,31 @@
1573	1758
1574	1759	makeSomething(obj);
1575	1760	} else
1576		- if (event.getSource() == gridItem)
	1761	+ if (source == gridItem)
1577	1762	{
1578	1763	makeSomething(new Grid());
1579	1764	} else
1580		- if (event.getSource() == ellipsoidItem)
	1765	+ if (source == ellipsoidItem)
1581	1766	{
1582	1767	makeSomething(new Sphere());
1583	1768	} else
1584		- if (event.getSource() == coneItem)
	1769	+ if (source == coneItem)
1585	1770	{
1586	1771	makeSomething(new Cone());
1587	1772	} else
1588		- if (event.getSource() == torusItem)
	1773	+ if (source == torusItem)
1589	1774	{
1590	1775	makeSomething(new Torus());
1591	1776	} else
1592		- if (event.getSource() == superItem)
	1777	+ if (source == superItem)
1593	1778	{
1594	1779	makeSomething(new Superellipsoid());
1595	1780	} else
1596		- if (event.getSource() == blobItem)
	1781	+ if (source == kleinItem)
	1782	+ {
	1783	+ makeSomething(new Klein());
	1784	+ } else
	1785	+ if (source == blobItem)
1597	1786	{
1598	1787	Blob blob = new Blob();
1599	1788	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1790,15 @@
1601	1790	//blob.retile();
1602	1791	makeSomething(blob);
1603	1792	} else
1604		- if (event.getSource() == latheItem)
	1793	+ if (source == latheItem)
1605	1794	{
1606	1795	makeSomething(new Lathe());
1607	1796	} else
1608		- if (event.getSource() == bezierItem)
	1797	+ if (source == bezierItem)
1609	1798	{
1610	1799	makeSomething(new BezierSurface());
1611	1800	} else
1612		- if (event.getSource() == checkerItem)
	1801	+ if (source == overlayItem)
1613	1802	{
1614	1803	/*
1615	1804	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1813,7 @@
1624	1813	*/
1625	1814	makeSomething(new Checker());
1626	1815	} else
1627		- if (event.getSource() == meshItem)
	1816	+ if (source == meshItem)
1628	1817	{
1629	1818	Object3D itemtomake = new Object3D();
1630	1819	Object3D child;
..	..	@@ -1645,35 +1834,35 @@
1645	1834	makeSomething(child);
1646	1835	}
1647	1836	} else
1648		- if (event.getSource() == springItem)
	1837	+ if (source == springItem)
1649	1838	{
1650	1839	cSpring s = new cSpring();
1651	1840	s.setup();
1652	1841	makeSomething(s);
1653	1842	} else
1654		- if (event.getSource() == flagItem)
	1843	+ if (source == flagItem)
1655	1844	{
1656	1845	cSpring s = new cFlag();
1657	1846	s.setup();
1658	1847	makeSomething(s);
1659	1848	} else
1660		- if (event.getSource() == lightItem)
	1849	+ if (source == lightItem)
1661	1850	{
1662	1851	makeSomething(new Light());
1663	1852	} else
1664		- if (event.getSource() == csgItem)
	1853	+ if (source == csgItem)
1665	1854	{
1666	1855	group(new CSG());
1667	1856	} else
1668		- if (event.getSource() == templateItem)
	1857	+ if (source == templateItem)
1669	1858	{
1670	1859	group(new cTemplate());
1671	1860	} else
1672		- if (event.getSource() == attributeItem)
	1861	+ if (source == attributeItem)
1673	1862	{
1674	1863	makeSomething(new Attribute());
1675	1864	} else
1676		- if (event.getSource() == pointflowItem)
	1865	+ if (source == pointflowItem)
1677	1866	{
1678	1867	makeSomething(new PointFlow());
1679	1868	} else
..	..	@@ -1685,7 +1874,7 @@
1685	1874	} else
1686	1875	*/
1687	1876
1688		- if (event.getSource() == superLoopItem)
	1877	+ if (source == superLoopItem)
1689	1878	{
1690	1879	Composite g = new cGroup();
1691	1880	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1896,7 @@
1707	1896
1708	1897	group(g);
1709	1898	} else
1710		- if (event.getSource() == loopItem)
	1899	+ if (source == loopItem)
1711	1900	{
1712	1901	Composite csg = new GroupLeaf();
1713	1902	csg.count = 5;
..	..	@@ -1716,7 +1905,7 @@
1716	1905	csg.addChild(child);
1717	1906	child.addChild(csg);
1718	1907	} else
1719		- if (event.getSource() == doubleItem)
	1908	+ if (source == doubleItem)
1720	1909	{
1721	1910	Composite csg = new GroupLeaf();
1722	1911	csg.count = 5;
..	..	@@ -1728,7 +1917,7 @@
1728	1917	csg.addChild(child);
1729	1918	child.addChild(csg);
1730	1919	} else
1731		- if (event.getSource() == tripleItem)
	1920	+ if (source == tripleItem)
1732	1921	{
1733	1922	Composite csg = new GroupLeaf();
1734	1923	csg.count = 4;
..	..	@@ -1743,71 +1932,71 @@
1743	1932	csg.addChild(child);
1744	1933	child.addChild(csg);
1745	1934	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1935	+ if (source == computeAOItem)
1748	1936	{
1749		- ImportGFD();
	1937	+ Globals.drawMode = CameraPane.OCCLUSION;
	1938	+ Globals.theRenderer.repaint();
1750	1939	} 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)
	1940	+ if (source == recompileItem)
1769	1941	{
1770	1942	Recompile();
1771	1943	refreshContents();
1772	1944	} else
1773		- if (event.getSource() == editScriptItem)
	1945	+ if (source == editScriptItem)
1774	1946	{
1775	1947	OpenDialog();
1776	1948	refreshContents();
1777	1949	} else
1778		- if (event.getSource() == invariantsItem)
	1950	+ if (source == invariantsItem)
1779	1951	{
1780	1952	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1782	1954	} else
1783		- if (event.getSource() == memoryItem)
	1955	+ if (source == memoryItem)
1784	1956	{
1785	1957	//System.out.println("Invariants:");
1786	1958	PrintMemory();
1787	1959	} else
1788		- if (event.getSource() == pathItem)
	1960	+ if (source == pathItem)
1789	1961	{
1790	1962	PrintPath();
1791	1963	} else
1792		- if (event.getSource() == analyzeItem)
	1964	+ if (source == analyzeItem)
1793	1965	{
1794	1966	AnalyzeObject();
1795	1967	} else
1796		- if (event.getSource() == dumpItem)
	1968	+ if (source == dumpItem)
1797	1969	{
1798	1970	DumpObject();
1799	1971	} else
1800		- if (event.getSource() == screenfitButton)
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
	1983	+ } else
	1984	+ if (source == oneStepButton)
	1985	+ {
	1986	+ Globals.ONESTEP = true;
	1987	+ cameraView.repaint();
	1988	+ } else
	1989	+ if (source == screenfitButton)
1801	1990	{
1802	1991	//Reload(lastConverter, lastFilename, true);
1803	1992	ScreenFit();
1804	1993	} else
1805		- if (event.getSource() == screenfitpointButton)
	1994	+ if (source == screenfitpointButton)
1806	1995	{
1807	1996	//Reload(lastConverter, lastFilename, true);
1808	1997	ScreenFitPoint();
1809	1998	} else
1810		- if (event.getSource() == snapobjectButton)
	1999	+ if (source == snapobjectButton)
1811	2000	{
1812	2001	//Reload(lastConverter, lastFilename, true);
1813	2002	SnapObject();
..	..	@@ -1818,13 +2007,13 @@
1818	2007	// Recompile();
1819	2008	// refreshContents();
1820	2009	// } else
1821		- if (event.getSource() == gcButton)
	2010	+ if (source == gcButton)
1822	2011	{
1823	2012	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2013	System.gc();
1825	2014	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2015	} else
1827		- if (event.getSource() == editLeafItem)
	2016	+ if (source == editLeafItem)
1828	2017	{
1829	2018	Object3D obj;
1830	2019	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2027,78 @@
1838	2027	}
1839	2028	refreshContents(true);
1840	2029	} else
1841		- if (event.getSource() == openWindowItem)
	2030	+ if (source == openWindowItem)
1842	2031	{
1843	2032	EditSelection(true);
1844	2033	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2034	+ if (source == cutItem \|\| source == clearButton)
1846	2035	{
1847	2036	loadClipboard(true);
1848	2037	} else
1849		- if (event.getSource() == duplicateItem)
	2038	+ if (source == undoItem)
1850	2039	{
1851		- Object3D keep = GraphreeD.clipboard;
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
	2046	+ if (source == duplicateItem)
	2047	+ {
	2048	+ Object3D keep = Grafreed.clipboard;
1852	2049	loadClipboard(false);
1853	2050	paste(false);
1854		- GraphreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1855	2052	} else
1856		- if (event.getSource() == cloneItem)
	2053	+ if (source == cloneItem)
1857	2054	{
1858	2055	CloneSelection(false);
1859	2056	} else
1860		- if (event.getSource() == cloneSupportItem)
	2057	+ if (source == cloneSupportItem)
1861	2058	{
1862	2059	CloneSelection(true);
1863	2060	} else
1864		- if (event.getSource() == copyItem)
	2061	+ if (source == copyItem)
1865	2062	{
1866	2063	loadClipboard(false);
1867	2064	} else
1868		- if (event.getSource() == pasteItem)
	2065	+ if (source == pasteItem)
1869	2066	{
1870	2067	paste(false);
1871	2068	} else
1872		- if (event.getSource() == pasteLinkItem)
	2069	+ if (source == pasteIntoItem)
1873	2070	{
1874		- pasteInto(false);
	2071	+ pasteInto(true, false);
1875	2072	} else
1876		- if (event.getSource() == pasteCloneItem)
	2073	+ if (source == pasteLinkItem)
1877	2074	{
1878		- pasteInto(true);
	2075	+ pasteInto(false, false);
1879	2076	} else
1880		- if (event.getSource() == pasteExpandItem)
	2077	+ if (source == pasteCloneItem)
	2078	+ {
	2079	+ pasteInto(true, true);
	2080	+ } else
	2081	+ if (source == pasteExpandItem)
1881	2082	{
1882	2083	paste(true);
1883	2084	} else
1884		- if (event.getSource() == synchronizeItem)
	2085	+ if (source == synchronizeItem)
1885	2086	{
1886	2087	Overwrite(Object3D.TRANSFORM);
1887	2088	} else
1888		- if (event.getSource() == overwriteNameItem)
	2089	+ if (source == overwriteNameItem)
1889	2090	{
1890	2091	Overwrite(Object3D.NAME);
1891	2092	} else
1892		- if (event.getSource() == overwriteUVItem)
	2093	+ if (source == overwriteUVItem)
1893	2094	{
1894	2095	Overwrite(Object3D.UV);
1895	2096	} else
1896		- if (event.getSource() == overwriteMatItem)
	2097	+ if (source == overwriteMatItem)
1897	2098	{
	2099	+ /* july 2015
1898	2100	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2101	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2102	else
1901	2103	{
1902	2104	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2110,16 @@
1908	2110	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2111	}
1910	2112	}
	2113	+ */
	2114	+
	2115	+ Overwrite(dropAttributes);
1911	2116	}
1912		- if (event.getSource() == overwriteGeoItem)
	2117	+ if (source == overwriteGeoItem)
1913	2118	{
1914	2119	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2120	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2121	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2122	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2123	//
1919	2124	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2125	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2131,7 @@
1926	2131	// refreshContents();
1927	2132	// }
1928	2133	} else
1929		- if (event.getSource() == generateMeshItem)
	2134	+ if (source == generateMeshItem)
1930	2135	{
1931	2136	//if (group.selection.size() == 1)
1932	2137	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2142,7 @@
1937	2142	ResetModel();
1938	2143	refreshContents();
1939	2144	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2145	+ if (source == extractGeometriesItem)
1941	2146	{
1942	2147	boolean one = false;
1943	2148
..	..	@@ -1964,7 +2169,7 @@
1964	2169	ResetModel();
1965	2170	refreshContents();
1966	2171	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2172	+ if (source == cloneGeometriesItem)
1968	2173	{
1969	2174	boolean one = false;
1970	2175
..	..	@@ -1990,32 +2195,37 @@
1990	2195	ResetModel();
1991	2196	refreshContents();
1992	2197	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2198	+ if (source == shareGeometriesItem)
1994	2199	{
1995	2200	boolean one = false;
1996	2201
1997	2202	if (group.selection.size() == 1)
1998	2203	one = true;
1999	2204
	2205	+ Object3D merge = null;
	2206	+
2000	2207	Object3D content = new cGroup();
2001	2208
2002	2209	for (int i=0; i<group.selection.size(); i++)
2003	2210	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2211	+ merge = new Merge(group.selection.get(i));
2005	2212
2006	2213	if (one)
2007		- makeSomething(sel, false);
	2214	+ makeSomething(merge, false);
2008	2215	else
2009		- content.addChild(sel);
	2216	+ content.addChild(merge);
2010	2217	}
2011	2218
2012	2219	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2220	+ makeSomething(content, true);
	2221	+ else
	2222	+ {
	2223	+ ResetModel();
	2224	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2225	+ refreshContents();
	2226	+ }
2017	2227	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2228	+ if (source == mergeGeometriesItem)
2019	2229	{
2020	2230	boolean one = false;
2021	2231
..	..	@@ -2045,11 +2255,11 @@
2045	2255	ResetModel();
2046	2256	refreshContents();
2047	2257	} else
2048		- if (event.getSource() == linkverticesItem)
	2258	+ if (source == linkverticesItem)
2049	2259	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2260	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2261	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2262	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2263	//
2054	2264	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2265	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2268,48 @@
2058	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2269	// refreshContents();
2060	2270	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2272	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2064	2274
2065	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2276	content = ((cGroup)content).get(0);
2067	2277
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2278	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2279	for (int i=0; i<group.selection.size(); i++)
2070	2280	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2281	+ boolean random = CameraPane.SWITCH;
	2282	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2283	group.selection.get(i).linkVerticesThis(content);
2074	2284	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2285	+ CameraPane.SWITCH = random;
2076	2286	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2287	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2288	refreshContents();
2079	2289	}
2080	2290	} else
2081		- if (event.getSource() == resetsupportItem)
	2291	+ if (source == resetsupportItem)
2082	2292	{
2083	2293	for (int i=0; i<group.selection.size(); i++)
2084	2294	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2295	+ boolean random = CameraPane.SWITCH;
	2296	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2297	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2298	+ CameraPane.SWITCH = random;
2089	2299	}
2090	2300
2091	2301	refreshContents();
2092	2302	} else
2093		- if (event.getSource() == resetreferencesItem)
	2303	+ if (source == relinkverticesItem)
	2304	+ {
	2305	+ boolean random = CameraPane.SWITCH;
	2306	+ CameraPane.SWITCH = false; // parse all random nodes
	2307	+ group.selection.RelinkToSupport();
	2308	+ CameraPane.SWITCH = random;
	2309	+
	2310	+ refreshContents();
	2311	+ } else
	2312	+ if (source == resetreferencesItem)
2094	2313	{
2095	2314	for (int i=0; i<group.selection.size(); i++)
2096	2315	{
..	..	@@ -2099,11 +2318,11 @@
2099	2318
2100	2319	refreshContents();
2101	2320	} else
2102		- if (event.getSource() == setMasterItem)
	2321	+ if (source == setMasterItem)
2103	2322	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2324	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2107	2326
2108	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2328	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2331,13 @@
2112	2331	refreshContents();
2113	2332	}
2114	2333	} else
2115		- if (event.getSource() == poseMeshItem)
	2334	+ if (source == poseMeshItem)
2116	2335	{
2117	2336	if (group.selection.size() == 1)
2118	2337	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2120	2339	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2122	2341
2123	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2343	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2350,19 @@
2131	2350	}
2132	2351
2133	2352	} else
2134		- if (event.getSource() == revertMeshItem)
	2353	+ if (source == revertMeshItem)
2135	2354	{
2136	2355	RevertMeshes();
2137	2356	} else
2138		- if (event.getSource() == resetMeshItem)
	2357	+ if (source == resetAllItem)
2139	2358	{
2140	2359	ResetAll();
2141	2360	} else
2142		- if (event.getSource() == stepAllItem)
	2361	+ if (source == stepAllItem)
2143	2362	{
2144	2363	StepAll();
2145	2364	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2365	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2366	{
2148	2367	//int indices[] = jList.getSelectedIndices();
2149	2368	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2370,46 @@
2151	2370
2152	2371	ClearSelection(false);
2153	2372	} else
2154		- if (event.getSource() == clearAllItem)
	2373	+ if (source == clearAllItem)
2155	2374	{
2156	2375	ClearSelection(true);
2157	2376	} else
2158		- if (event.getSource() == grabItem)
	2377	+ if (source == grabItem)
2159	2378	{
2160	2379	group(new cGroup(), true);
2161	2380	} else
2162		- if (event.getSource() == frontItem)
	2381	+ if (source == hideItem)
	2382	+ {
	2383	+ group(new HiddenObject());
	2384	+ } else
	2385	+ if (source == frontItem)
2163	2386	{
2164	2387	front();
2165	2388	} else
2166		- if (event.getSource() == backItem)
	2389	+ if (source == backItem)
2167	2390	{
2168	2391	back();
2169	2392	} else
2170		- if (event.getSource() == cameraItem)
	2393	+ if (source == cameraItem)
2171	2394	{
2172	2395	makeSomething(new Camera());
2173	2396	} else
2174		- if (event.getSource() == compositeItem)
	2397	+ if (source == compositeItem)
2175	2398	{
2176	2399	group(new Composite());
2177	2400	} else
2178		- if (event.getSource() == randomItem)
	2401	+ if (source == randomItem)
2179	2402	{
2180	2403	RandomNode random = new RandomNode();
2181	2404	group(random);
2182	2405	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2406	+ random.name = random.get(0).name + "Switch";
2184	2407	} else
2185		- if (event.getSource() == physicsItem)
	2408	+ if (source == physicsItem)
2186	2409	{
2187	2410	group(new PhysicsNode());
2188	2411	} else
2189		- if (event.getSource() == frameselectorItem)
	2412	+ if (source == frameselectorItem)
2190	2413	{
2191	2414	for (int i=0; i<group.selection.size(); i++)
2192	2415	{
..	..	@@ -2198,7 +2421,7 @@
2198	2421	ResetModel();
2199	2422	refreshContents();
2200	2423	} else
2201		- if (event.getSource() == switchGeoItem)
	2424	+ if (source == switchGeoItem)
2202	2425	{
2203	2426	for (int i=0; i<group.selection.size(); i++)
2204	2427	{
..	..	@@ -2210,7 +2433,7 @@
2210	2433	ResetModel();
2211	2434	refreshContents();
2212	2435	} else
2213		- if (event.getSource() == switchTransfoItem)
	2436	+ if (source == switchTransfoItem)
2214	2437	{
2215	2438	for (int i=0; i<group.selection.size(); i++)
2216	2439	{
..	..	@@ -2222,7 +2445,7 @@
2222	2445	ResetModel();
2223	2446	refreshContents();
2224	2447	} else
2225		- if (event.getSource() == morphItem)
	2448	+ if (source == morphItem)
2226	2449	{
2227	2450	for (int i=0; i<group.selection.size(); i++)
2228	2451	{
..	..	@@ -2234,7 +2457,7 @@
2234	2457	ResetModel();
2235	2458	refreshContents();
2236	2459	} else
2237		- if (event.getSource() == scriptNodeItem)
	2460	+ if (source == scriptNodeItem)
2238	2461	{
2239	2462	boolean atleastone = false;
2240	2463
..	..	@@ -2273,195 +2496,223 @@
2273	2496	}
2274	2497	}
2275	2498	} else
2276		- if (event.getSource() == linkerItem)
	2499	+ if (source == linkerItem)
2277	2500	{
2278	2501	group(new cLinker());
2279	2502	} else
2280		- if (event.getSource() == textureItem)
	2503	+ if (source == textureItem)
2281	2504	{
2282	2505	group(new TextureNode());
2283	2506	} else
2284		- if (event.getSource() == shadowXItem)
	2507	+ if (source == billboardItem)
	2508	+ {
	2509	+ group(new BillboardNode());
	2510	+ } else
	2511	+ if (source == shadowXItem)
2285	2512	{
2286	2513	CastShadow(0);
2287	2514	} else
2288		- if (event.getSource() == shadowYItem)
	2515	+ if (source == shadowYItem)
2289	2516	{
2290	2517	CastShadow(1);
2291	2518	} else
2292		- if (event.getSource() == shadowZItem)
	2519	+ if (source == shadowZItem)
2293	2520	{
2294	2521	CastShadow(2);
2295	2522	} else
2296		- if (event.getSource() == ungroupItem)
	2523	+ if (source == ungroupItem)
2297	2524	{
2298		- ungroup();
	2525	+ //ungroup();
	2526	+ for (int i=0; i<group.selection.size(); i++)
	2527	+ {
	2528	+ Ungroup(group.selection.get(i));
	2529	+ }
	2530	+
	2531	+ ClearSelection(false);
	2532	+
	2533	+ refreshContents();
2299	2534	} else
2300		- if (event.getSource() == genUVItem)
	2535	+ if (source == genUVItem)
2301	2536	{
2302	2537	GenUV();
2303	2538	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2539	+ if (source == genNormalsCADItem)
2305	2540	{
2306	2541	GenNormals(true);
2307	2542	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2543	+ if (source == genNormalsMESHItem)
	2544	+ {
	2545	+ GenNormals(true); // TODO
	2546	+ } else
	2547	+ if (source == genNormalsORGANItem)
2309	2548	{
2310	2549	GenNormals(false);
2311	2550	} else
2312		- if (event.getSource() == stripifyItem)
	2551	+ if (source == genNormalsMINEItem)
	2552	+ {
	2553	+ GenNormalsMINE();
	2554	+ } else
	2555	+ if (source == stripifyItem)
2313	2556	{
2314	2557	Stripify();
2315	2558	} else
2316		- if (event.getSource() == unstripifyItem)
	2559	+ if (source == unstripifyItem)
2317	2560	{
2318	2561	Unstripify();
2319	2562	} else
2320		- if (event.getSource() == trimItem)
	2563	+ if (source == trimItem)
2321	2564	{
2322	2565	Trim();
2323	2566	} else
2324		- if (event.getSource() == untrimItem)
	2567	+ if (source == untrimItem)
2325	2568	{
2326	2569	Untrim();
2327	2570	} else
2328		- if (event.getSource() == clearColorsItem)
	2571	+ if (source == clearColorsItem)
2329	2572	{
2330	2573	ClearColors();
2331	2574	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2575	+ if (source == clearMaterialsItem)
2333	2576	{
2334	2577	ClearMaterials();
2335	2578	} else
2336		- if (event.getSource() == liveleavesItem)
	2579	+ if (source == liveleavesItem)
2337	2580	{
2338	2581	LiveLeaves(true);
2339	2582	} else
2340		- if (event.getSource() == unliveleavesItem)
	2583	+ if (source == unliveleavesItem)
2341	2584	{
2342	2585	LiveLeaves(false);
2343	2586	} else
2344		- if (event.getSource() == supportleavesItem)
	2587	+ if (source == supportleavesItem)
2345	2588	{
2346	2589	SupportLeaves(true);
2347	2590	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2591	+ if (source == unsupportleavesItem)
2349	2592	{
2350	2593	SupportLeaves(false);
2351	2594	} else
2352		- if (event.getSource() == hideleavesItem)
	2595	+ if (source == hideleavesItem)
2353	2596	{
2354	2597	HideLeaves(true);
2355	2598	} else
2356		- if (event.getSource() == showleavesItem)
	2599	+ if (source == showleavesItem)
2357	2600	{
2358	2601	HideLeaves(false);
2359	2602	} else
2360		- if (event.getSource() == markleavesItem)
	2603	+ if (source == markleavesItem)
2361	2604	{
2362	2605	MarkLeaves(true);
2363	2606	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2607	+ if (source == unmarkleavesItem)
2365	2608	{
2366	2609	MarkLeaves(false);
2367	2610	} else
2368		- if (event.getSource() == flipVItem)
	2611	+ if (source == flipVItem)
2369	2612	{
2370	2613	FlipV(true);
2371	2614	} else
2372		- if (event.getSource() == unflipVItem)
	2615	+ if (source == unflipVItem)
2373	2616	{
2374	2617	FlipV(false);
2375	2618	} else
2376		- if (event.getSource() == lowTexturesItem)
	2619	+ if (source == lowTexturesItem)
2377	2620	{
2378	2621	SetTexRes(0);
2379	2622	} else
2380		- if (event.getSource() == normalTexturesItem)
	2623	+ if (source == normalTexturesItem)
2381	2624	{
2382	2625	SetTexRes(1);
2383	2626	} else
2384		- if (event.getSource() == highTexturesItem)
	2627	+ if (source == highTexturesItem)
2385	2628	{
2386	2629	SetTexRes(2);
2387	2630	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2631	+ if (source == veryhighTexturesItem)
2389	2632	{
2390	2633	SetTexRes(3);
2391	2634	} else
2392		- if (event.getSource() == maxTexturesItem)
	2635	+ if (source == maxTexturesItem)
2393	2636	{
2394	2637	SetTexRes(4);
2395	2638	} else
2396		- if (event.getSource() == panoTexturesItem)
	2639	+ if (source == panoTexturesItem)
2397	2640	{
2398	2641	SetTexRes(5);
2399	2642	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2643	+ if (source == reverseNormalsItem)
2401	2644	{
2402	2645	ReverseNormals();
2403	2646	} else
2404		- if (event.getSource() == parseverticesItem)
	2647	+ if (source == parseverticesItem)
2405	2648	{
2406	2649	ParseVertices();
2407	2650	} else
2408		- if (event.getSource() == textureFieldItem)
	2651	+ if (source == textureFieldItem)
2409	2652	{
2410	2653	TextureVertices();
2411	2654	} else
2412		- if (event.getSource() == alignItem)
	2655	+ if (source == alignItem)
2413	2656	{
2414	2657	Align();
2415	2658	} else
2416		- if (event.getSource() == mirrorItem)
	2659	+ if (source == mirrorItem)
2417	2660	{
2418	2661	MirrorPoses();
2419	2662	} else
2420		- if (event.getSource() == reduceMorphItem)
	2663	+ if (source == reduceMorphItem)
2421	2664	{
2422	2665	MeshReduction(false);
2423	2666	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2667	+ if (source == reduce34MorphItem)
2425	2668	{
2426	2669	MeshReduction(true);
2427	2670	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2671	+ if (source == reverseTrianglesItem)
2429	2672	{
2430	2673	ReverseTriangles();
2431	2674	} else
2432		- if (event.getSource() == reduceMeshItem)
	2675	+ if (source == reduceMeshItem)
2433	2676	{
2434	2677	ReduceMesh(false);
2435	2678	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2679	+ if (source == reduce34MeshItem)
2437	2680	{
2438	2681	ReduceMesh(true);
2439	2682	} else
2440		- if (event.getSource() == increaseMeshItem)
	2683	+ if (source == increaseMeshItem)
2441	2684	{
2442	2685	IncreaseMesh();
2443	2686	} else
2444		- if (event.getSource() == clipMeshItem)
	2687	+ if (source == clipMeshItem)
2445	2688	{
2446	2689	ClipMesh();
2447	2690	} else
2448		- if (event.getSource() == smoothMeshItem)
	2691	+ if (source == smoothMeshItem)
2449	2692	{
2450	2693	SmoothMesh();
2451	2694	} else
2452		- if (event.getSource() == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2453	2696	{
2454	2697	TransformGeometry();
2455	2698	} else
2456		- if (event.getSource() == resetTransformItem)
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
	2702	+ } else
	2703	+ if (source == resetTransformItem)
2457	2704	{
2458	2705	ResetTransform();
2459	2706	} else
2460		- if (event.getSource() == resetCentroidItem)
	2707	+ if (source == resetCentroidItem)
2461	2708	{
2462		- ResetCentroid();
	2709	+ ResetCentroid(true);
2463	2710	} else
2464		- if (event.getSource() == resetParentItem)
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
	2714	+ } else
	2715	+ if (source == resetParentItem)
2465	2716	{
2466	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2718	{
..	..	@@ -2471,7 +2722,7 @@
2471	2722
2472	2723	refreshContents();
2473	2724	} else
2474		- if (event.getSource() == repairParentItem)
	2725	+ if (source == repairParentItem)
2475	2726	{
2476	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2728	{
..	..	@@ -2485,7 +2736,21 @@
2485	2736
2486	2737	refreshContents();
2487	2738	} else
2488		- if (event.getSource() == sortbysizeItem)
	2739	+ if (source == repairShadowItem)
	2740	+ {
	2741	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2742	+ {
	2743	+ Object3D obj = (Object3D)e.nextElement();
	2744	+ obj.RepairShadow();
	2745	+// for (int i=0; i<obj.size(); i++)
	2746	+// {
	2747	+// obj.get(i).parent = obj;
	2748	+// }
	2749	+ }
	2750	+
	2751	+ refreshContents();
	2752	+ } else
	2753	+ if (source == sortbysizeItem)
2489	2754	{
2490	2755	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2756	{
..	..	@@ -2497,7 +2762,7 @@
2497	2762	ResetModel();
2498	2763	refreshContents();
2499	2764	} else
2500		- if (event.getSource() == sortbynameItem)
	2765	+ if (source == sortbynameItem)
2501	2766	{
2502	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2768	{
..	..	@@ -2509,7 +2774,7 @@
2509	2774	ResetModel();
2510	2775	refreshContents();
2511	2776	} else
2512		- if (event.getSource() == attachPigmentItem)
	2777	+ if (source == attachPigmentItem)
2513	2778	{
2514	2779	String texture = GetFile("Attach pigment");
2515	2780	Object3D obj;
..	..	@@ -2521,7 +2786,7 @@
2521	2786
2522	2787	refreshContents();
2523	2788	} else
2524		- if (event.getSource() == detachPigmentItem)
	2789	+ if (source == detachPigmentItem)
2525	2790	{
2526	2791	Object3D obj;
2527	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2797,7 @@
2532	2797
2533	2798	refreshContents();
2534	2799	} else
2535		- if (event.getSource() == attachBumpItem)
	2800	+ if (source == attachBumpItem)
2536	2801	{
2537	2802	String texture = GetFile("Attach bump");
2538	2803	Object3D obj;
..	..	@@ -2544,7 +2809,7 @@
2544	2809
2545	2810	refreshContents();
2546	2811	} else
2547		- if (event.getSource() == detachBumpItem)
	2812	+ if (source == detachBumpItem)
2548	2813	{
2549	2814	Object3D obj;
2550	2815	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2820,7 @@
2555	2820
2556	2821	refreshContents();
2557	2822	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2823	+ if (source == pigmentBumpItem)
2559	2824	{
2560	2825	Object3D obj;
2561	2826	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2831,195 @@
2566	2831
2567	2832	refreshContents();
2568	2833	} else
2569		- if (event.getSource() == flashSelectionButton)
	2834	+ if (source == flashSelectionButton)
2570	2835	{
2571	2836	CameraPane.flash = true;
2572	2837	refreshContents();
2573	2838	} else
2574		- if (event.getSource() == oneButton)
	2839	+ if (source == oneButton)
2575	2840	{
2576	2841	} else
2577		- if (event.getSource() == twoButton)
	2842	+ if (source == twoButton)
2578	2843	{
2579	2844	radio.layout = twoButton;
2580	2845	// bug
2581	2846	//gridPanel.setDividerLocation(1.0);
2582	2847	//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();
	2848	+// bigThree.remove(scenePanel);
	2849	+// bigThree.remove(centralPanel);
	2850	+// bigThree.remove(XYZPanel);
	2851	+// aWindowConstraints.gridx = 0;
	2852	+// aWindowConstraints.gridy = 0;
	2853	+// aWindowConstraints.gridwidth = 1;
	2854	+// // aConstraints.gridheight = 3;
	2855	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2856	+// aWindowConstraints.weightx = 0;
	2857	+// aWindowConstraints.weighty = 1;
	2858	+// //bigThree.add(jtp, aWindowConstraints);
	2859	+// aWindowConstraints.weightx = 1;
	2860	+// aWindowConstraints.gridwidth = 3;
	2861	+// // aConstraints.gridheight = 3;
	2862	+// aWindowConstraints.gridx = 1;
	2863	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2864	+// bigThree.add(centralPanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.gridx = 4;
	2867	+// aWindowConstraints.gridwidth = 1;
	2868	+// // aConstraints.gridheight = 3;
	2869	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2870	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2871	+// scenePanel.setVisible(false);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(centralPanel);
	2876	+ bigThree.FlushUI();
2607	2877	} else
2608		- if (event.getSource() == threeButton)
	2878	+ if (source == threeButton)
2609	2879	{
2610	2880	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();
	2881	+
	2882	+// bigThree.remove(scenePanel);
	2883	+// bigThree.remove(centralPanel);
	2884	+// bigThree.remove(XYZPanel);
	2885	+// aWindowConstraints.gridx = 0;
	2886	+// aWindowConstraints.gridy = 0;
	2887	+// aWindowConstraints.gridwidth = 1;
	2888	+// // aConstraints.gridheight = 3;
	2889	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.weighty = 1;
	2892	+// //bigThree.add(jtp, aWindowConstraints);
	2893	+// aWindowConstraints.weightx = 1;
	2894	+// aWindowConstraints.gridwidth = 3;
	2895	+// // aConstraints.gridheight = 3;
	2896	+// aWindowConstraints.gridx = 1;
	2897	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2898	+// bigThree.add(centralPanel, aWindowConstraints);
	2899	+// aWindowConstraints.weightx = 0;
	2900	+// aWindowConstraints.gridx = 4;
	2901	+// aWindowConstraints.gridwidth = 1;
	2902	+// // aConstraints.gridheight = 3;
	2903	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2904	+// bigThree.add(XYZPanel, aWindowConstraints);
	2905	+// bigThree.validate();
	2906	+// scenePanel.setVisible(false);
	2907	+// centralPanel.setVisible(true);
	2908	+// XYZPanel.setVisible(true);
	2909	+ bigThree.ClearUI();
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.add(XYZPanel);
	2912	+ bigThree.FlushUI();
2635	2913	} else
2636		- if (event.getSource() == fourButton)
	2914	+ if (source == fourButton)
2637	2915	{
2638	2916	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();
	2917	+
	2918	+// bigThree.remove(scenePanel);
	2919	+// bigThree.remove(centralPanel);
	2920	+// bigThree.remove(XYZPanel);
	2921	+// aWindowConstraints.gridx = 0;
	2922	+// aWindowConstraints.gridy = 0;
	2923	+// aWindowConstraints.gridwidth = 1;
	2924	+// // aWindowConstraints.gridheight = 3;
	2925	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.weighty = 1;
	2928	+// bigThree.add(scenePanel, aWindowConstraints);
	2929	+// aWindowConstraints.weightx = 1;
	2930	+// aWindowConstraints.gridwidth = 3;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.gridx = 1;
	2933	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2934	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2935	+// aWindowConstraints.weightx = 0;
	2936	+// aWindowConstraints.gridx = 4;
	2937	+// aWindowConstraints.gridwidth = 1;
	2938	+// // aWindowConstraints.gridheight = 3;
	2939	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2940	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2941	+// bigThree.validate();
	2942	+// scenePanel.setVisible(true);
	2943	+// centralPanel.setVisible(false);
	2944	+// XYZPanel.setVisible(false);
	2945	+ bigThree.ClearUI();
	2946	+ bigThree.add(scenePanel);
	2947	+ bigThree.FlushUI();
2663	2948	} else
2664		- if (event.getSource() == sixButton)
	2949	+ if (source == sixButton)
2665	2950	{
2666	2951	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();
	2952	+
	2953	+// bigThree.remove(scenePanel);
	2954	+// bigThree.remove(centralPanel);
	2955	+// bigThree.remove(XYZPanel);
	2956	+// aWindowConstraints.gridx = 0;
	2957	+// aWindowConstraints.gridy = 0;
	2958	+// aWindowConstraints.gridwidth = 1;
	2959	+// // aConstraints.gridheight = 3;
	2960	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2961	+// aWindowConstraints.weightx = 0;
	2962	+// aWindowConstraints.weighty = 1;
	2963	+// bigThree.add(scenePanel, aWindowConstraints);
	2964	+// aWindowConstraints.weightx = 1;
	2965	+// aWindowConstraints.gridwidth = 3;
	2966	+// // aWindowConstraints.gridheight = 3;
	2967	+// aWindowConstraints.gridx = 1;
	2968	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2969	+// bigThree.add(centralPanel, aWindowConstraints);
	2970	+// aWindowConstraints.weightx = 0;
	2971	+// aWindowConstraints.gridx = 4;
	2972	+// aWindowConstraints.gridwidth = 1;
	2973	+// // aWindowConstraints.gridheight = 3;
	2974	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2975	+// //bigThree.add(XYZPanel, aConstraints);
	2976	+// bigThree.validate();
	2977	+// scenePanel.setVisible(true);
	2978	+// centralPanel.setVisible(true);
	2979	+// XYZPanel.setVisible(false);
	2980	+ bigThree.ClearUI();
	2981	+ bigThree.add(scenePanel);
	2982	+ bigThree.add(centralPanel);
	2983	+ bigThree.FlushUI();
2691	2984	} else
2692		- if (event.getSource() == sevenButton)
	2985	+ if (source == sevenButton)
2693	2986	{
2694	2987	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();
	2988	+
	2989	+// bigThree.remove(scenePanel);
	2990	+// bigThree.remove(centralPanel);
	2991	+// bigThree.remove(XYZPanel);
	2992	+// aWindowConstraints.gridx = 0;
	2993	+// aWindowConstraints.gridy = 0;
	2994	+// aWindowConstraints.gridwidth = 1;
	2995	+// // aWindowConstraints.gridheight = 3;
	2996	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2997	+// aWindowConstraints.weightx = 0;
	2998	+// aWindowConstraints.weighty = 1;
	2999	+// bigThree.add(scenePanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 1;
	3001	+// aWindowConstraints.gridwidth = 3;
	3002	+// // aWindowConstraints.gridheight = 3;
	3003	+// aWindowConstraints.gridx = 1;
	3004	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3005	+// bigThree.add(centralPanel, aWindowConstraints);
	3006	+// aWindowConstraints.weightx = 0;
	3007	+// aWindowConstraints.gridx = 4;
	3008	+// aWindowConstraints.gridwidth = 1;
	3009	+// // aConstraints.gridheight = 3;
	3010	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3011	+// bigThree.add(XYZPanel, aWindowConstraints);
	3012	+// bigThree.validate();
	3013	+// scenePanel.setVisible(true);
	3014	+// centralPanel.setVisible(true);
	3015	+// XYZPanel.setVisible(true);
	3016	+ bigThree.ClearUI();
	3017	+ bigThree.add(scenePanel);
	3018	+ bigThree.add(centralPanel);
	3019	+ bigThree.add(XYZPanel);
	3020	+ bigThree.FlushUI();
2719	3021	} else
2720		- if (event.getSource() == rootButton)
	3022	+ if (source == rootButton)
2721	3023	{
2722	3024	Object3D obj;
2723	3025	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +3031,7 @@
2729	3031
2730	3032	refreshContents(true);
2731	3033	} else
2732		- if (event.getSource() == closeButton)
	3034	+ if (source == closeButton)
2733	3035	{
2734	3036	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3037	cRadio ab;
..	..	@@ -2750,11 +3052,11 @@
2750	3052	}
2751	3053	refreshContents(true);
2752	3054	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3055	+ if (source == editItem \|\| source == editButton)
2754	3056	{
2755	3057	EditSelection(false);
2756	3058	} else
2757		- if (event.getSource() == uneditButton)
	3059	+ if (source == uneditButton)
2758	3060	{
2759	3061	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3062	{
..	..	@@ -2764,14 +3066,14 @@
2764	3066	child.CloseUI();
2765	3067	listUI.remove(child);
2766	3068
2767		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2768	3070	}
2769		- objEditor.ctrlPanel.revalidate();
	3071	+ objEditor.ctrlPanel.FlushUI();
2770	3072	//objEditor.jTree.clearSelection();
2771	3073	//objEditor.ResetSliders();
2772	3074	refreshContents(true);
2773	3075	} else
2774		- if (event.getSource() == clearPanelButton)
	3076	+ if (source == clearPanelButton)
2775	3077	{
2776	3078	assert(copy == group);
2777	3079	//copy.ClearUI();
..	..	@@ -2782,7 +3084,7 @@
2782	3084	listUI.clear();
2783	3085	refreshContents(true);
2784	3086	} else
2785		- if (event.getSource() == allParamsButton)
	3087	+ if (source == allParamsButton)
2786	3088	{
2787	3089	assert(copy == group);
2788	3090
..	..	@@ -2803,19 +3105,19 @@
2803	3105
2804	3106	refreshContents(true);
2805	3107	} else
2806		- if (event.getSource() == unselectButton)
	3108	+ if (source == unselectButton)
2807	3109	{
2808	3110	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3111	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3112	objEditor.ResetSliders();
2811	3113	refreshContents(true);
2812	3114	} else
2813		- if(event.getSource() instanceof cRadio)
	3115	+ if(source instanceof cRadio)
2814	3116	{
2815	3117	group.parent = keepparent;
2816	3118	group.attributes = 0;
2817	3119	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3120	+ /cRadio/ radio = (cRadio)source;
2819	3121	Object3D obj = radio.GetObject();
2820	3122	System.out.println("Edit " + obj);
2821	3123	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3137,7 @@
2835	3137	}
2836	3138
2837	3139	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3140	+ //Globals.theRenderer.object = group;
2839	3141	if(!useclient)
2840	3142	{
2841	3143	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3146,16 @@
2844	3146	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3147	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3148	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3149	+ //cameraView.lighttouched = true;
	3150	+ Globals.lighttouched = true;
2848	3151	topView.object = group;
2849	3152	frontView.object = group;
2850	3153	sideView.object = group;
2851	3154	}
	3155	+
	3156	+// fix "+" issue
2852	3157	group.editWindow = this;
	3158	+
2853	3159	/*
2854	3160	currentLayout = radio.layout;
2855	3161	if (currentLayout == null)
..	..	@@ -2862,7 +3168,20 @@
2862	3168	//group.attributes = -1;
2863	3169	ResetModel();
2864	3170	refreshContents(true);
2865		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
2866	3185	else
2867	3186	{
2868	3187	//return super.action(event, arg);
..	..	@@ -2880,7 +3199,7 @@
2880	3199	if (useclient)
2881	3200	{
2882	3201	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3202	+ Globals.lighttouched = true;
2884	3203	//topView.object = client;
2885	3204	//frontView.object = client;
2886	3205	//sideView.object = client;
..	..	@@ -2888,7 +3207,7 @@
2888	3207	else
2889	3208	{
2890	3209	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3210	+ Globals.lighttouched = true;
2892	3211	//topView.object = group;
2893	3212	//frontView.object = group;
2894	3213	//sideView.object = group;
..	..	@@ -2923,6 +3242,28 @@
2923	3242	refreshContents();
2924	3243	}
2925	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
2926	3267
2927	3268	void ResetTransform()
2928	3269	{
..	..	@@ -3035,7 +3376,7 @@
3035	3376	refreshContents();
3036	3377	}
3037	3378
3038		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3039	3380	{
3040	3381	Object3D obj;
3041	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3391,16 @@
3050	3391	LA.matIdentity(Object3D.mat);
3051	3392	obj.getBounds(minima, maxima, false);
3052	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3056	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3059	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3429,8 @@
3084	3429
3085	3430	int size = obj.MemorySize();
3086	3431
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3434	}
3089	3435	}
3090	3436	catch (Exception e)
..	..	@@ -3121,9 +3467,9 @@
3121	3467	obj = (Object3D)e.nextElement();
3122	3468
3123	3469	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3470	+ Grafreed.AnalyzeObject(obj);
3125	3471	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3472	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3473
3128	3474	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3475	}
..	..	@@ -3165,6 +3511,13 @@
3165	3511	void GenNormals(boolean crease)
3166	3512	{
3167	3513	group.GenNormalsS(crease);
	3514	+
	3515	+ refreshContents();
	3516	+ }
	3517	+
	3518	+ void GenNormalsMINE()
	3519	+ {
	3520	+ group.selection.GenNormalsMINE();
3168	3521
3169	3522	refreshContents();
3170	3523	}
..	..	@@ -3250,7 +3603,7 @@
3250	3603	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3604	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3605	//
3253		-// g.add(GraphreeD.clipboard);
	3606	+// g.add(GrafreeD.clipboard);
3254	3607	//
3255	3608	// buffer.add(g);
3256	3609	// }
..	..	@@ -3269,8 +3622,8 @@
3269	3622	// nodes = new Object3D();
3270	3623	// vertices = new Vector<Vertex>();
3271	3624	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3625	+// boolean epsequal = GrafreeD.epsequal;
	3626	+// GrafreeD.epsequal = true;
3274	3627	//
3275	3628	// for (int i=0; i<group.selection.size(); i++)
3276	3629	// {
..	..	@@ -3311,7 +3664,7 @@
3311	3664	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3665	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3666	//
3314		-// g.add(GraphreeD.clipboard);
	3667	+// g.add(GrafreeD.clipboard);
3315	3668	//
3316	3669	// buffer.add(g);
3317	3670	// }
..	..	@@ -3319,7 +3672,7 @@
3319	3672	// makeSomething(buffer, i==group.selection.size()-1);
3320	3673	// }
3321	3674	//
3322		-// GraphreeD.epsequal = epsequal;
	3675	+// GrafreeD.epsequal = epsequal;
3323	3676	//
3324	3677	// //buffer = null;
3325	3678	// temprep = null;
..	..	@@ -3330,8 +3683,8 @@
3330	3683
3331	3684	void ParseVertices()
3332	3685	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3686	+ boolean epsequal = Grafreed.epsequal;
	3687	+ Grafreed.epsequal = true;
3335	3688
3336	3689	for (int i=0; i<group.selection.size(); i++)
3337	3690	{
..	..	@@ -3356,7 +3709,7 @@
3356	3709	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3710	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3711
3359		- g.add(GraphreeD.clipboard);
	3712	+ g.add(Grafreed.clipboard);
3360	3713
3361	3714	buffer.add(g);
3362	3715	}
..	..	@@ -3371,7 +3724,7 @@
3371	3724	makeSomething(buffer, i==group.selection.size()-1);
3372	3725	}
3373	3726
3374		- GraphreeD.epsequal = epsequal;
	3727	+ Grafreed.epsequal = epsequal;
3375	3728
3376	3729	refreshContents();
3377	3730	}
..	..	@@ -3389,7 +3742,16 @@
3389	3742	String pigment = Object3D.GetPigment(tex);
3390	3743	//String bump = Object3D.GetBump(tex);
3391	3744
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3745	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3746	+
	3747	+ try
	3748	+ {
	3749	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3750	+ }
	3751	+ catch (Exception e)
	3752	+ {
	3753	+ System.err.println("FAIL: " + node);
	3754	+ }
3393	3755
3394	3756	double s = v.s;
3395	3757
..	..	@@ -3416,7 +3778,7 @@
3416	3778	scale /= 3;
3417	3779
3418	3780	scale /= 0xFF;
3419		- scale /= 4;
	3781	+ // c'est quoi ca? scale /= 4;
3420	3782
3421	3783	//v.AO = scale;
3422	3784
..	..	@@ -3437,12 +3799,26 @@
3437	3799
3438	3800	void Align()
3439	3801	{
	3802	+ if (group.selection.size() == 0)
	3803	+ return;
	3804	+
	3805	+ cVector bbmin = new cVector();
	3806	+ cVector bbmax = new cVector();
	3807	+
	3808	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3809	+
	3810	+ double dx = bbmax.x - bbmin.x;
	3811	+ double dy = bbmax.y - bbmin.y;
	3812	+ double dz = bbmax.z - bbmin.z;
	3813	+
	3814	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3815	+
3440	3816	for (int i=0; i<group.selection.size(); i++)
3441	3817	{
3442	3818	Object3D obj = group.selection.get(i);
3443	3819
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3820	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3821	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3822	}
3447	3823
3448	3824	refreshContents();
..	..	@@ -3455,7 +3831,7 @@
3455	3831	// ref.SaveSupports();
3456	3832	// Object3D par = ref.parent;
3457	3833	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3834	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3835	// ref.parent = par;
3460	3836	// ref.RestoreSupports();
3461	3837
..	..	@@ -3463,11 +3839,11 @@
3463	3839
3464	3840	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3841
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3842	+ boolean random = CameraPane.SWITCH;
	3843	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3844	lowres.linkVerticesThis(null);
3469	3845	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3846	+ CameraPane.SWITCH = random;
3471	3847
3472	3848	System.err.flush();
3473	3849
..	..	@@ -3485,7 +3861,7 @@
3485	3861	// lowres.SaveSupports();
3486	3862	// par = lowres.parent;
3487	3863	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3864	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3865	Object3D newlow = CloneObject(lowres, false);
3490	3866	newlow.name = sn.switchobject.get(i).name;
3491	3867	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3883,7 @@
3507	3883	return;
3508	3884
3509	3885	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3886	+ Object3D ref = Grafreed.clipboard.get(0);
3511	3887
3512	3888	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3889
..	..	@@ -3676,7 +4052,7 @@
3676	4052	group.selection.RelinkToSupport(); // july 2014
3677	4053	System.out.println("DONE.");
3678	4054	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4055	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4056	}
3681	4057
3682	4058	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4077,20 @@
3701	4077
3702	4078	void ClipMesh()
3703	4079	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4080	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4081	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4082	+ Object3D content = Grafreed.clipboard.get(0);
3707	4083
3708	4084	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4085	content = ((cGroup)content).get(0);
3710	4086
3711	4087	// for (int i=0; i<group.selection.size(); i++)
3712	4088	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4089	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4090	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4091	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4092	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4093	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4094	System.out.println("DONE.");
3719	4095	refreshContents();
3720	4096	}
..	..	@@ -3847,7 +4223,7 @@
3847	4223	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4224
3849	4225	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4226	+ if(elem != group \|\| !newWindow)
3851	4227	{
3852	4228	// if (!(elem instanceof Composite))
3853	4229	// newWindow = false;
..	..	@@ -3952,25 +4328,28 @@
3952	4328	System.err.println("info : " + child.GetPath());
3953	4329	}
3954	4330	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4331	+// else
	4332	+// {
	4333	+// objEditor.SetMaterial(group); // .GetMaterial());
	4334	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4335	+// System.err.println("info : " + group.GetPath());
	4336	+// }
3961	4337
3962	4338	objEditor.SetText(); // jan 2014
3963	4339
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4340	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4341	CameraPane.flash = true;
3966	4342
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4343	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4344	// a camera
3969	4345	{
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;
	4346	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4347	+ {
	4348	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4349	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4350	+ }
	4351	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4352	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4353	}
3975	4354
3976	4355	refreshContents();
..	..	@@ -4052,16 +4431,18 @@
4052	4431	{
4053	4432	if (group.selection.isEmpty())
4054	4433	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4434	+
	4435	+ Grafreed.clipboardIsTempGroup = false;
4056	4436	Composite tGroup = null;
4057	4437	if (group.selection.size() > 0) // 1)
4058	4438	{
4059	4439	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4440	+ Grafreed.clipboardIsTempGroup = true;
4061	4441	}
4062	4442
4063	4443	if (cut)
4064	4444	{
	4445	+ Save();
4065	4446	//int indices[] = jList.getSelectedIndices();
4066	4447	//for (int i = indices.length - 1; i >= 0; i--)
4067	4448	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4478,16 @@
4097	4478	//System.out.println("cut " + child);
4098	4479	//System.out.println("parent = " + child.parent);
4099	4480	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4481	+ if (Grafreed.clipboardIsTempGroup)
4101	4482	tGroup.add/Child/(tmp);
4102	4483	else
4103		- GraphreeD.clipboard = tmp;
	4484	+ Grafreed.clipboard = tmp;
4104	4485	}
4105	4486	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4487	+ if (Grafreed.clipboardIsTempGroup)
4107	4488	tGroup.add/Child/(child);
4108	4489	else
4109		- GraphreeD.clipboard = child;
	4490	+ Grafreed.clipboard = child;
4110	4491	}
4111	4492
4112	4493	//ResetModel();
..	..	@@ -4138,21 +4519,23 @@
4138	4519	//System.out.println("cut " + elem);
4139	4520	//System.out.println("parent = " + elem.parent);
4140	4521	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4522	+ if (Grafreed.clipboardIsTempGroup)
4142	4523	tGroup.add/Child/(tmp);
4143	4524	else
4144		- GraphreeD.clipboard = tmp;
	4525	+ Grafreed.clipboard = tmp;
4145	4526	}
4146	4527	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4528	+ if (Grafreed.clipboardIsTempGroup)
4148	4529	tGroup.add/Child/(child);
4149	4530	else
4150		- GraphreeD.clipboard = child;
	4531	+ Grafreed.clipboard = child;
4151	4532	}
4152	4533
4153	4534	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4535	+
	4536	+ if (Grafreed.clipboardIsTempGroup)
	4537	+ Grafreed.clipboard = tGroup;
	4538	+
4156	4539	if (cut)
4157	4540	{
4158	4541	ResetModel();
..	..	@@ -4162,11 +4545,11 @@
4162	4545
4163	4546	void paste(boolean expand)
4164	4547	{
4165		- // if (GraphreeD.clipboard == null)
	4548	+ // if (GrafreeD.clipboard == null)
4166	4549	// return;
4167	4550	boolean first = true;
4168	4551
4169		- if (GraphreeD.clipboardIsTempGroup)
	4552	+ if (Grafreed.clipboardIsTempGroup)
4170	4553	{
4171	4554	Composite temp;
4172	4555
..	..	@@ -4177,7 +4560,7 @@
4177	4560	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4561	*/
4179	4562	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4563	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4564	{
4182	4565	Object3D child = (Object3D)e.nextElement();
4183	4566
..	..	@@ -4191,7 +4574,7 @@
4191	4574	else
4192	4575	elem = child.deepCopy(); // ?
4193	4576	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4577	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4578	// elem = elem.get(0);
4196	4579	makeSomething(elem, true); // ?? first);
4197	4580	//group.addChild(elem);
..	..	@@ -4211,23 +4594,23 @@
4211	4594	//Object3D cb = Applet3D.clipboard;
4212	4595	//temp.addChild(cb);
4213	4596	//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());
	4597	+ assert(Grafreed.clipboard.parent == null);
	4598	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4599	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4600	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4601	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4602	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4603	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4604	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4605	}
4223	4606
4224	4607	ResetModel();
4225	4608	refreshContents();
4226	4609	}
4227	4610
4228		- void pasteInto(boolean copyit)
	4611	+ void pasteInto(boolean copyit, boolean clone)
4229	4612	{
4230		-// if (GraphreeD.clipboard == null)
	4613	+// if (GrafreeD.clipboard == null)
4231	4614	// return;
4232	4615
4233	4616	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4637,22 @@
4254	4637	if (copyit)
4255	4638	{
4256	4639	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4640	+ if (clone)
	4641	+ {
	4642	+ CloneClipboard(false); // sept 2014
	4643	+ }
	4644	+ else
	4645	+ {
	4646	+ paste(false);
	4647	+ }
4258	4648	}
4259	4649	else
4260	4650	{
4261	4651	boolean first = true;
4262	4652
4263		- if (GraphreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4264	4654	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4655	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4656	Object3D copy;
4267	4657	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4658	{
..	..	@@ -4272,7 +4662,7 @@
4272	4662	}
4273	4663	} else
4274	4664	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4665	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4666	}
4277	4667	}
4278	4668	}
..	..	@@ -4464,6 +4854,26 @@
4464	4854	makeSomething(csg);
4465	4855	}
4466	4856
	4857	+ void Ungroup(Object3D g)
	4858	+ {
	4859	+ if (g instanceof HiddenObject)
	4860	+ {
	4861	+ HiddenObject h = (HiddenObject) g;
	4862	+
	4863	+ for (int i=0; i<h.ActualSize(); i++)
	4864	+ {
	4865	+ objEditor.makeSomething(h.get(i), false);
	4866	+ }
	4867	+ }
	4868	+ else
	4869	+ {
	4870	+ for (int i=0; i<g.Size(); i++)
	4871	+ {
	4872	+ objEditor.makeSomething(g.get(i), false);
	4873	+ }
	4874	+ }
	4875	+ }
	4876	+
4467	4877	void ungroup()
4468	4878	{
4469	4879	/*
..	..	@@ -4657,21 +5067,6 @@
4657	5067	}
4658	5068	*/
4659	5069
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	5070	/*
4676	5071	public void Callback(Object obj)
4677	5072	{
..	..	@@ -4695,26 +5090,9 @@
4695	5090	}
4696	5091	*/
4697	5092
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	5093	String GetFile(String dialogName)
4716	5094	{
4717		- if (GraphreeD.standAlone)
	5095	+ if (Grafreed.standAlone)
4718	5096	{
4719	5097	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5098	browser.show();
..	..	@@ -4778,10 +5156,15 @@
4778	5156	cButton flashSelectionButton;
4779	5157	cButton editButton;
4780	5158	cButton uneditButton;
	5159	+ JCheckBox allParamsButton;
4781	5160	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5161	cButton unselectButton;
4784	5162
	5163	+ cButton saveButton;
	5164	+ cButton undoButton;
	5165	+ cButton redoButton;
	5166	+ cButton oneStepButton;
	5167	+
4785	5168	cButton screenfitButton;
4786	5169	cButton screenfitpointButton;
4787	5170	cButton snapobjectButton;
..	..	@@ -4812,6 +5195,8 @@
4812	5195	private MenuItem lookFromItem;
4813	5196	private MenuItem switchItem;
4814	5197	private MenuItem cutItem;
	5198	+ private MenuItem undoItem;
	5199	+ private MenuItem redoItem;
4815	5200	private MenuItem duplicateItem;
4816	5201	private MenuItem cloneItem;
4817	5202	private MenuItem cloneSupportItem;
..	..	@@ -4823,8 +5208,9 @@
4823	5208	private MenuItem resetsupportItem;
4824	5209	private MenuItem resetreferencesItem;
4825	5210	private MenuItem linkverticesItem;
	5211	+ private MenuItem relinkverticesItem;
4826	5212	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5213	+ private MenuItem resetAllItem;
4828	5214	private MenuItem stepAllItem;
4829	5215	private MenuItem revertMeshItem;
4830	5216	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5221,17 @@
4835	5221	private MenuItem mergeGeometriesItem;
4836	5222	private MenuItem copyItem;
4837	5223	private MenuItem pasteItem;
	5224	+ private MenuItem pasteIntoItem;
4838	5225	private MenuItem pasteLinkItem;
4839	5226	private MenuItem pasteCloneItem;
4840	5227	private MenuItem pasteExpandItem;
4841	5228	private MenuItem clearItem;
4842	5229	private MenuItem clearAllItem;
4843	5230	private MenuItem genUVItem;
	5231	+ private MenuItem genNormalsMESHItem;
4844	5232	private MenuItem genNormalsCADItem;
4845	5233	private MenuItem genNormalsORGANItem;
	5234	+ private MenuItem genNormalsMINEItem;
4846	5235	private MenuItem stripifyItem;
4847	5236	private MenuItem unstripifyItem;
4848	5237	private MenuItem trimItem;
..	..	@@ -4882,8 +5271,11 @@
4882	5271	private MenuItem panoTexturesItem;
4883	5272
4884	5273	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5274	+ private MenuItem resetCentroidXZItem;
4886	5275	private MenuItem resetTransformItem;
	5276	+ private MenuItem transformGeometryItem;
	5277	+ private MenuItem transformChildrenItem;
	5278	+ private MenuItem hideItem;
4887	5279	private MenuItem grabItem;
4888	5280	private MenuItem backItem;
4889	5281	private MenuItem frontItem;
..	..	@@ -4904,6 +5296,7 @@
4904	5296
4905	5297	private MenuItem resetParentItem;
4906	5298	private MenuItem repairParentItem;
	5299	+ private MenuItem repairShadowItem;
4907	5300	private MenuItem sortbysizeItem;
4908	5301	private MenuItem sortbynameItem;
4909	5302
..	..	@@ -4924,10 +5317,11 @@
4924	5317	private MenuItem coneItem;
4925	5318	private MenuItem torusItem;
4926	5319	private MenuItem superItem;
	5320	+ private MenuItem kleinItem;
4927	5321	private MenuItem blobItem;
4928	5322	private MenuItem latheItem;
4929	5323	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5324	+ private MenuItem overlayItem;
4931	5325	private MenuItem meshItem;
4932	5326	// private MenuItem meshGroupItem;
4933	5327	private MenuItem springItem;
..	..	@@ -4936,6 +5330,7 @@
4936	5330	private MenuItem csgItem;
4937	5331	private MenuItem templateItem;
4938	5332	private MenuItem textureItem;
	5333	+ private MenuItem billboardItem;
4939	5334	private MenuItem shadowXItem;
4940	5335	private MenuItem shadowYItem;
4941	5336	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5343,6 @@
4948	5343	private MenuItem doubleItem;
4949	5344	private MenuItem tripleItem;
4950	5345
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5346	private MenuItem computeAOItem;
4957	5347	private MenuItem recompileItem;
4958	5348	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5352,8 @@
4962	5352	private MenuItem analyzeItem;
4963	5353	private MenuItem dumpItem;
4964	5354	//boolean freezemodel = false;
	5355	+
	5356	+ Menu cameraMenu;
	5357	+ MenuItem editCameraItem;
	5358	+ MenuItem revertCameraItem;
4965	5359	}