~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,129 @@
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	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//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		-
	285	+ }
	286	+
192	287	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);
	288	+ if (Globals.ADVANCED)
	289	+ {
197	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	291	revertMeshItem.addActionListener(this);
199	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	293	resetreferencesItem.addActionListener(this);
201	294	menu.add("-");
	295	+ }
202	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	297	overwriteGeoItem.addActionListener(this);
204	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +304,26 @@
210	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	305	overwriteUVItem.addActionListener(this);
212	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
213	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	310	generateMeshItem.addActionListener(this);
215	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	312	poseMeshItem.addActionListener(this);
217	313	menu.add("-");
	314	+ }
218	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	316	resetsupportItem.addActionListener(this);
220	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	318	linkverticesItem.addActionListener(this);
	319	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	320	+ relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
222	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	325	setMasterItem.addActionListener(this);
	326	+ }
224	327
225	328	oe.menuBar.add(menu = new Menu("Group"));
226	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,52 +334,69 @@
231	334	frontItem.addActionListener(this);
232	335	compositeItem = menu.add(new MenuItem("Composite"));
233	336	compositeItem.addActionListener(this);
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	338	+ hideItem.addActionListener(this);
	339	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	340	+ ungroupItem.addActionListener(this);
234	341	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
236	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	345	switchGeoItem.addActionListener(this);
243	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	347	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
247	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	359	scriptNodeItem.addActionListener(this);
249	360	cameraItem = menu.add(new MenuItem("Camera"));
250	361	cameraItem.addActionListener(this);
	362	+ }
251	363
252	364	oe.menuBar.add(menu = new Menu("Object"));
253	365	textureItem = menu.add(new MenuItem("Texture"));
254	366	textureItem.addActionListener(this);
	367	+ billboardItem = menu.add(new MenuItem("Billboard"));
	368	+ billboardItem.addActionListener(this);
255	369	csgItem = menu.add(new MenuItem("CSG"));
256	370	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	372	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	374	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
263	380	linkerItem = menu.add(new MenuItem("Linker"));
264	381	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	382	attributeItem = menu.add(new MenuItem("Attribute"));
268	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
269	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	387	pointflowItem.addActionListener(this);
	388	+ }
271	389	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	391	resetTransformItem.addActionListener(this);
276	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	393	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
280	400
281	401	oe.menuBar.add(menu = new Menu("Geometry"));
282	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +407,11 @@
287	407	genNormalsCADItem.addActionListener(this);
288	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
290	415	stripifyItem = menu.add(new MenuItem("Stripify"));
291	416	stripifyItem.addActionListener(this);
292	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +433,34 @@
308	433	reduce34MeshItem.addActionListener(this);
309	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	435	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
315	444
316	445	oe.menuBar.add(menu = new Menu("Attributes"));
317	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
319	452	menu.add("-");
320	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	454	liveleavesItem.addActionListener(this);
322	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
324	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	460	supportleavesItem.addActionListener(this);
326	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	462	unsupportleavesItem.addActionListener(this);
	463	+ }
328	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	465	hideleavesItem.addActionListener(this);
330	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +469,14 @@
333	469	markleavesItem.addActionListener(this);
334	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
336	480	menu.add("-");
337	481	flipVItem = menu.add(new MenuItem("Flip V"));
338	482	flipVItem.addActionListener(this);
..	..	@@ -368,35 +512,40 @@
368	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	513	sortbynameItem.addActionListener(this);
370	514	menu.add("-");
	515	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	516	+ shareGeometriesItem.addActionListener(this);
	517	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	518	+ mergeGeometriesItem.addActionListener(this);
	519	+ if (Globals.ADVANCED)
	520	+ {
	521	+ // Pretty much the same as duplicate and clone.
371	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	523	extractGeometriesItem.addActionListener(this);
373	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	525	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	526	+ }
379	527
380	528	oe.menuBar.add(menu = new Menu("Insert"));
381	529	buildCreateMenu(menu);
382	530
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	531	oe.menuBar.add(menu = new Menu("Tools"));
395	532	buildToolsMenu(menu);
396	533	}
397	534
398	535	void SetupUI2(ObjEditor oe)
399	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
400	549	//new Exception().printStackTrace();
401	550
402	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -425,150 +574,120 @@
425	574	oe.radioPanel.add(dummyButton);
426	575	oe.buttonGroup.add(dummyButton);
427	576	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	578
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
433	605	liveCB.addItemListener(this);
434	606
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
453	613	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ trackCB.setToolTipText("Enable tracking");
495	617	trackCB.addItemListener(this);
496	618
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ screenfitButton.setToolTipText("Screen fit");
499	621	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	622	+
501	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	624	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	625
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Show selection");
514	635	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	636
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	638	+
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	640	+ twoButton.setToolTipText("Show center view only");
521	641	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	643	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	644	+ fourButton.setToolTipText("Show left panel only");
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ sixButton.setToolTipText("2-column layout left");
525	647	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ threeButton.setToolTipText("2-column layout right");
527	650	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ sevenButton.setToolTipText("3-column layout");
529	653	sevenButton.addActionListener(this);
530	654	//
531	655
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
533	658	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ closeButton.setToolTipText("Close tab");
536	662	closeButton.addActionListener(this);
537	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	664	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	665
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
543	668	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	669
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
549	672	uneditButton.addActionListener(this);
550	673
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
563	676	allParamsButton.addActionListener(this);
564	677
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ clearPanelButton.setToolTipText("Clear edit panel");
	680	+ clearPanelButton.addActionListener(this);
	681	+
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	683	+ unselectButton.setToolTipText("Unselect");
570	684	unselectButton.addActionListener(this);
571	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
572	691	// oe.aConstraints.gridx += 1;
573	692	// oe.aConstraints.weighty = 0;
574	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +699,37 @@
580	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	700	// gcButton.addActionListener(this);
582	701
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
594	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	707	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
601	711
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	712	+ cGridBag copyOptionsPanel = new cGridBag();
	713	+
	714	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	715	+ colorCB.setToolTipText("Copy color when dropped");
606	716	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	717	+
	718	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	719	+ materialCB.setToolTipText("Copy material when dropped");
609	720	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	721	+
	722	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	723	+ textureCB.setToolTipText("Copy texture when dropped");
612	724	textureCB.addItemListener(this);
613	725
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
616	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
617	733	//jList.addListSelectionListener(this);
618	734	oe.jTree.addTreeSelectionListener(this);
619	735	//jTree.setRootVisible(false);
..	..	@@ -635,20 +751,95 @@
635	751	radio.layout = sevenButton;
636	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	753	}
	754	+
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	756	+ {
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	758	+ boxCB.setToolTipText("Display bounding boxes");
	759	+ boxCB.addItemListener(this);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	762	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	763	+ zoomBoxCB.addItemListener(this);
	764	+
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
	767	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	768	+ supportCB.setToolTipText("Enable rigging");
	769	+ supportCB.addItemListener(this);
	770	+
	771	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	772	+ // localCB.addItemListener(this);
	773	+
	774	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	775	+ crowdCB.setToolTipText("Used for crowds");
	776	+ crowdCB.addItemListener(this);
	777	+
	778	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	779	+ smoothCB.setToolTipText("Snapping delay");
	780	+ smoothCB.addItemListener(this);
	781	+
	782	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	783	+ slowCB.setToolTipText("Smooth interpolation");
	784	+ slowCB.addItemListener(this);
	785	+
	786	+// constraints.gridy += 1;
	787	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	788	+// speakerMocapCB.addItemListener(this);
	789	+
	790	+ if (false)
	791	+ {
	792	+ // handled in scripts
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	795	+ speakerCameraCB.addItemListener(this);
	796	+
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	799	+ speakerFocusCB.addItemListener(this);
	800	+
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	803	+ smoothfocusCB.addItemListener(this);
	804	+ }
	805	+
	806	+//constraints.gridx += 1;
	807	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	808	+// debugCB.addItemListener(this);
	809	+
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.addItemListener(this);
	812	+
	813	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	814	+ lookAtCB.setToolTipText("Look-at target");
	815	+ lookAtCB.addItemListener(this);
	816	+
	817	+ }
	818	+
	819	+ cGridBag fill = new cGridBag();
	820	+
	821	+ fill.preferredHeight = 200;
	822	+
	823	+ panel.add(fill);
	824	+
	825	+ }
638	826
639	827	void EditObject(Object3D obj)
640	828	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	829	+ cRadio radioButton = new cRadio(obj.name);
	830	+ radioButton.SetObject(obj);
	831	+ radioButton.layout = sevenButton;
	832	+ radioButton.SetCamera(cameraView.renderCamera, false);
	833	+ radioButton.addActionListener(this);
	834	+ radioPanel.add(radioButton);
	835	+ buttonGroup.add(radioButton);
	836	+ radioButton.doClick();
649	837	}
	838	+
650	839	void SetupViews(ObjEditor oe)
651	840	{
	841	+ theFrame = this;
	842	+
652	843	oe.SetupViews();
653	844
654	845	System.out.println("SetupViews");
..	..	@@ -665,6 +856,7 @@
665	856	JCheckBox fastCB;
666	857	JCheckBox slowCB;
667	858	JCheckBox boxCB;
	859	+ JCheckBox zoomBoxCB;
668	860	JCheckBox trackCB;
669	861	JCheckBox smoothfocusCB;
670	862	// JCheckBox speakerMocapCB;
..	..	@@ -707,10 +899,10 @@
707	899	dropAttributes \|= Object3D.TEXTURE;
708	900	else
709	901	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	902	+ } else if(e.getSource() == liveCB)
712	903	{
713	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
714	906	}
715	907	else if(e.getSource() == supportCB)
716	908	{
..	..	@@ -745,6 +937,10 @@
745	937	Recompile();
746	938	cameraView.repaint();
747	939	// refreshContents();
	940	+ }
	941	+ else if(e.getSource() == zoomBoxCB)
	942	+ {
	943	+ cameraView.ToggleZoomBoxMode();
748	944	}
749	945	else if(e.getSource() == smoothfocusCB)
750	946	{
..	..	@@ -859,7 +1055,9 @@
859	1055	// objEditor.DropFile((java.io.File[]) object, true);
860	1056	// return;
861	1057	// }
862		- if (string.charAt(0) == '/')
	1058	+
	1059	+ // File path for Mac and Windows
	1060	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1061	{
864	1062	// file(s)
865	1063	String[] names = string.split("\n");
..	..	@@ -886,7 +1084,7 @@
886	1084
887	1085	flashIt = false;
888	1086	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1087	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1088	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1089
892	1090	if (group.selection.size() == 1)
..	..	@@ -913,11 +1111,11 @@
913	1111	{
914	1112	loadClipboard(true);
915	1113	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	1114	+ pasteInto(false, false);
917	1115	} else {
918	1116	loadClipboard(false);
919	1117	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1118	+ pasteInto(false, false); // true); // ???
921	1119	}
922	1120	}
923	1121	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1233,37 @@
1035	1233	torusItem.addActionListener(this);
1036	1234	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1235	superItem.addActionListener(this);
	1236	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1237	+ kleinItem.addActionListener(this);
1038	1238	particleItem = menu.add(new MenuItem("Particle system"));
1039	1239	particleItem.addActionListener(this);
	1240	+ if (Globals.ADVANCED)
	1241	+ {
1040	1242	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1243	ragdollItem.addActionListener(this);
1042	1244	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1245	ragdoll2Item.addActionListener(this);
	1246	+ }
1044	1247	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1248	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1249	meshItem.addActionListener(this);
1047	1250	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1251	// meshGroupItem.addActionListener(this);
	1252	+ if (Globals.ADVANCED)
	1253	+ {
1049	1254	springItem = menu.add(new MenuItem("Spring"));
1050	1255	springItem.addActionListener(this);
1051	1256	flagItem = menu.add(new MenuItem("Flag"));
1052	1257	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1258	blobItem = menu.add(new MenuItem("Blob"));
1058	1259	blobItem.addActionListener(this);
1059	1260	latheItem = menu.add(new MenuItem("Lathe"));
1060	1261	latheItem.addActionListener(this);
	1262	+ }
	1263	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1264	+ bezierItem.addActionListener(this);
	1265	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1266	+ overlayItem.addActionListener(this);
1061	1267	lightItem = menu.add(new MenuItem("Light"));
1062	1268	lightItem.addActionListener(this);
1063	1269	menu.add("-");
..	..	@@ -1067,39 +1273,44 @@
1067	1273	loopItem.addActionListener(this);
1068	1274	doubleItem = menu.add(new MenuItem("Fork"));
1069	1275	doubleItem.addActionListener(this);
	1276	+ if (Globals.ADVANCED)
	1277	+ {
1070	1278	tripleItem = menu.add(new MenuItem("Trident"));
1071	1279	tripleItem.addActionListener(this);
	1280	+ }
1072	1281	}
1073	1282
1074	1283	void buildToolsMenu(Menu menu)
1075	1284	{
1076	1285	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1286	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1287	+ animationItem.setState(Globals.ANIMATION);
1079	1288
1080	1289	menu.add("-");
1081	1290	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1291	parseverticesItem.addActionListener(this);
1083	1292	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1293	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1294	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1295	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1296	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1297	reduceMorphItem.addActionListener(this);
1091	1298	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1299	reduce34MorphItem.addActionListener(this);
1093		-
	1300	+ menu.add("-");
1094	1301	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1302	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1303
	1304	+ if (Globals.ADVANCED)
	1305	+ {
	1306	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1307	+ mirrorItem.addActionListener(this);
	1308	+ menu.add("-");
1098	1309	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1310	memoryItem.addActionListener(this);
1100	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	1312	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1103	1314	dumpItem.addActionListener(this);
1104	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1105	1316	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +1319,8 @@
1108	1319	resetParentItem.addActionListener(this);
1109	1320	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1321	repairParentItem.addActionListener(this);
	1322	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1323	+ repairShadowItem.addActionListener(this);
1111	1324	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1325	invariantsItem.addActionListener(this);
1113	1326	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1328,7 @@
1115	1328	menu.add("-");
1116	1329	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1330	editScriptItem.addActionListener(this);
	1331	+ }
1118	1332	}
1119	1333
1120	1334	void ScreenFit()
..	..	@@ -1237,6 +1451,7 @@
1237	1451	shadow.material = new cMaterial(obj.material);
1238	1452	shadow.material.diffuse = 0.0001f;
1239	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1240	1455
1241	1456	makeSomething(shadow);
1242	1457	}
..	..	@@ -1443,9 +1658,9 @@
1443	1658
1444	1659	void Overwrite(int mask)
1445	1660	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1661	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1662	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1663	+ Object3D content = Grafreed.clipboard.get(0);
1449	1664
1450	1665	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1666	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1683,7 @@
1468	1683	//
1469	1684	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1685	{
	1686	+ Object source = event.getSource();
1471	1687	/*
1472	1688	if (event.getSource() == nameField)
1473	1689	{
..	..	@@ -1479,11 +1695,11 @@
1479	1695	}
1480	1696	else
1481	1697	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1698	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1699	{
1484	1700	ScreenFit();
1485	1701	} else
1486		- if (event.getSource() == switchItem)
	1702	+ if (source == switchItem)
1487	1703	{
1488	1704	cVector v1 = new cVector();
1489	1705	cVector v2 = new cVector();
..	..	@@ -1492,11 +1708,11 @@
1492	1708	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1709	objEditor.cameraView.repaint();
1494	1710	} else
1495		- if (event.getSource() == rectoidItem)
	1711	+ if (source == rectoidItem)
1496	1712	{
1497	1713	makeSomething(new Box());
1498	1714	} else
1499		- if (event.getSource() == particleItem)
	1715	+ if (source == particleItem)
1500	1716	{
1501	1717	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1718	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1733,9 @@
1517	1733	applyExample(particleGeom, "SMOKE");
1518	1734	makeSomething(particleGeom);
1519	1735	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1736	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1737	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1738	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1739
1524	1740	ragdoll.toParent = LA.newMatrix();
1525	1741	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1753,7 @@
1537	1753	} else
1538	1754	/*
1539	1755	*/
1540		- if (event.getSource() == heightFieldItem)
	1756	+ if (source == heightFieldItem)
1541	1757	{
1542	1758	Object3D obj = new Object3D();
1543	1759
..	..	@@ -1575,27 +1791,31 @@
1575	1791
1576	1792	makeSomething(obj);
1577	1793	} else
1578		- if (event.getSource() == gridItem)
	1794	+ if (source == gridItem)
1579	1795	{
1580	1796	makeSomething(new Grid());
1581	1797	} else
1582		- if (event.getSource() == ellipsoidItem)
	1798	+ if (source == ellipsoidItem)
1583	1799	{
1584	1800	makeSomething(new Sphere());
1585	1801	} else
1586		- if (event.getSource() == coneItem)
	1802	+ if (source == coneItem)
1587	1803	{
1588	1804	makeSomething(new Cone());
1589	1805	} else
1590		- if (event.getSource() == torusItem)
	1806	+ if (source == torusItem)
1591	1807	{
1592	1808	makeSomething(new Torus());
1593	1809	} else
1594		- if (event.getSource() == superItem)
	1810	+ if (source == superItem)
1595	1811	{
1596	1812	makeSomething(new Superellipsoid());
1597	1813	} else
1598		- if (event.getSource() == blobItem)
	1814	+ if (source == kleinItem)
	1815	+ {
	1816	+ makeSomething(new Klein());
	1817	+ } else
	1818	+ if (source == blobItem)
1599	1819	{
1600	1820	Blob blob = new Blob();
1601	1821	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1823,15 @@
1603	1823	//blob.retile();
1604	1824	makeSomething(blob);
1605	1825	} else
1606		- if (event.getSource() == latheItem)
	1826	+ if (source == latheItem)
1607	1827	{
1608	1828	makeSomething(new Lathe());
1609	1829	} else
1610		- if (event.getSource() == bezierItem)
	1830	+ if (source == bezierItem)
1611	1831	{
1612	1832	makeSomething(new BezierSurface());
1613	1833	} else
1614		- if (event.getSource() == checkerItem)
	1834	+ if (source == overlayItem)
1615	1835	{
1616	1836	/*
1617	1837	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1846,7 @@
1626	1846	*/
1627	1847	makeSomething(new Checker());
1628	1848	} else
1629		- if (event.getSource() == meshItem)
	1849	+ if (source == meshItem)
1630	1850	{
1631	1851	Object3D itemtomake = new Object3D();
1632	1852	Object3D child;
..	..	@@ -1647,35 +1867,35 @@
1647	1867	makeSomething(child);
1648	1868	}
1649	1869	} else
1650		- if (event.getSource() == springItem)
	1870	+ if (source == springItem)
1651	1871	{
1652	1872	cSpring s = new cSpring();
1653	1873	s.setup();
1654	1874	makeSomething(s);
1655	1875	} else
1656		- if (event.getSource() == flagItem)
	1876	+ if (source == flagItem)
1657	1877	{
1658	1878	cSpring s = new cFlag();
1659	1879	s.setup();
1660	1880	makeSomething(s);
1661	1881	} else
1662		- if (event.getSource() == lightItem)
	1882	+ if (source == lightItem)
1663	1883	{
1664	1884	makeSomething(new Light());
1665	1885	} else
1666		- if (event.getSource() == csgItem)
	1886	+ if (source == csgItem)
1667	1887	{
1668	1888	group(new CSG());
1669	1889	} else
1670		- if (event.getSource() == templateItem)
	1890	+ if (source == templateItem)
1671	1891	{
1672	1892	group(new cTemplate());
1673	1893	} else
1674		- if (event.getSource() == attributeItem)
	1894	+ if (source == attributeItem)
1675	1895	{
1676	1896	makeSomething(new Attribute());
1677	1897	} else
1678		- if (event.getSource() == pointflowItem)
	1898	+ if (source == pointflowItem)
1679	1899	{
1680	1900	makeSomething(new PointFlow());
1681	1901	} else
..	..	@@ -1687,7 +1907,7 @@
1687	1907	} else
1688	1908	*/
1689	1909
1690		- if (event.getSource() == superLoopItem)
	1910	+ if (source == superLoopItem)
1691	1911	{
1692	1912	Composite g = new cGroup();
1693	1913	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1929,7 @@
1709	1929
1710	1930	group(g);
1711	1931	} else
1712		- if (event.getSource() == loopItem)
	1932	+ if (source == loopItem)
1713	1933	{
1714	1934	Composite csg = new GroupLeaf();
1715	1935	csg.count = 5;
..	..	@@ -1718,7 +1938,7 @@
1718	1938	csg.addChild(child);
1719	1939	child.addChild(csg);
1720	1940	} else
1721		- if (event.getSource() == doubleItem)
	1941	+ if (source == doubleItem)
1722	1942	{
1723	1943	Composite csg = new GroupLeaf();
1724	1944	csg.count = 5;
..	..	@@ -1730,7 +1950,7 @@
1730	1950	csg.addChild(child);
1731	1951	child.addChild(csg);
1732	1952	} else
1733		- if (event.getSource() == tripleItem)
	1953	+ if (source == tripleItem)
1734	1954	{
1735	1955	Composite csg = new GroupLeaf();
1736	1956	csg.count = 4;
..	..	@@ -1745,71 +1965,83 @@
1745	1965	csg.addChild(child);
1746	1966	child.addChild(csg);
1747	1967	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	1968	+ if (source == computeAOItem)
1750	1969	{
1751		- ImportGFD();
	1970	+ Globals.drawMode = CameraPane.OCCLUSION;
	1971	+ Globals.theRenderer.repaint();
1752	1972	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	1973	+ if (source == recompileItem)
1771	1974	{
1772	1975	Recompile();
1773	1976	refreshContents();
1774	1977	} else
1775		- if (event.getSource() == editScriptItem)
	1978	+ if (source == editScriptItem)
1776	1979	{
1777	1980	OpenDialog();
1778	1981	refreshContents();
1779	1982	} else
1780		- if (event.getSource() == invariantsItem)
	1983	+ if (source == invariantsItem)
1781	1984	{
1782	1985	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1986	+ Grafreed.grafreeD.universe.invariants();
1784	1987	} else
1785		- if (event.getSource() == memoryItem)
	1988	+ if (source == memoryItem)
1786	1989	{
1787	1990	//System.out.println("Invariants:");
1788	1991	PrintMemory();
1789	1992	} else
1790		- if (event.getSource() == pathItem)
	1993	+ if (source == pathItem)
1791	1994	{
1792	1995	PrintPath();
1793	1996	} else
1794		- if (event.getSource() == analyzeItem)
	1997	+ if (source == analyzeItem)
1795	1998	{
1796	1999	AnalyzeObject();
1797	2000	} else
1798		- if (event.getSource() == dumpItem)
	2001	+ if (source == dumpItem)
1799	2002	{
1800	2003	DumpObject();
1801	2004	} else
1802		- if (event.getSource() == screenfitButton)
	2005	+ if (source == minButton)
	2006	+ {
	2007	+ Minimize();
	2008	+ } else
	2009	+ if (source == maxButton)
	2010	+ {
	2011	+ Maximize();
	2012	+ } else
	2013	+ if (source == fullButton)
	2014	+ {
	2015	+ ToggleFullScreen();
	2016	+ } else
	2017	+ if (source == undoButton)
	2018	+ {
	2019	+ Undo();
	2020	+ } else
	2021	+ if (source == redoButton)
	2022	+ {
	2023	+ Redo();
	2024	+ } else
	2025	+ if (source == saveButton)
	2026	+ {
	2027	+ Save();
	2028	+ } else
	2029	+ if (source == oneStepButton)
	2030	+ {
	2031	+ Globals.ONESTEP = true;
	2032	+ cameraView.repaint();
	2033	+ } else
	2034	+ if (source == screenfitButton)
1803	2035	{
1804	2036	//Reload(lastConverter, lastFilename, true);
1805	2037	ScreenFit();
1806	2038	} else
1807		- if (event.getSource() == screenfitpointButton)
	2039	+ if (source == screenfitpointButton)
1808	2040	{
1809	2041	//Reload(lastConverter, lastFilename, true);
1810	2042	ScreenFitPoint();
1811	2043	} else
1812		- if (event.getSource() == snapobjectButton)
	2044	+ if (source == snapobjectButton)
1813	2045	{
1814	2046	//Reload(lastConverter, lastFilename, true);
1815	2047	SnapObject();
..	..	@@ -1820,13 +2052,13 @@
1820	2052	// Recompile();
1821	2053	// refreshContents();
1822	2054	// } else
1823		- if (event.getSource() == gcButton)
	2055	+ if (source == gcButton)
1824	2056	{
1825	2057	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2058	System.gc();
1827	2059	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2060	} else
1829		- if (event.getSource() == editLeafItem)
	2061	+ if (source == editLeafItem)
1830	2062	{
1831	2063	Object3D obj;
1832	2064	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2072,74 @@
1840	2072	}
1841	2073	refreshContents(true);
1842	2074	} else
1843		- if (event.getSource() == openWindowItem)
	2075	+ if (source == openWindowItem)
1844	2076	{
1845	2077	EditSelection(true);
1846	2078	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2079	+ if (source == cutItem \|\| source == clearButton)
1848	2080	{
1849	2081	loadClipboard(true);
1850	2082	} else
1851		- if (event.getSource() == duplicateItem)
	2083	+ if (source == undoItem)
1852	2084	{
1853		- Object3D keep = GrafreeD.clipboard;
	2085	+ Undo();
	2086	+ } else
	2087	+ if (source == redoItem)
	2088	+ {
	2089	+ Redo();
	2090	+ } else
	2091	+ if (source == duplicateItem)
	2092	+ {
	2093	+ Object3D keep = Grafreed.clipboard;
1854	2094	loadClipboard(false);
1855	2095	paste(false);
1856		- GrafreeD.clipboard = keep;
	2096	+ Grafreed.clipboard = keep;
1857	2097	} else
1858		- if (event.getSource() == cloneItem)
	2098	+ if (source == cloneItem)
1859	2099	{
1860	2100	CloneSelection(false);
1861	2101	} else
1862		- if (event.getSource() == cloneSupportItem)
	2102	+ if (source == cloneSupportItem)
1863	2103	{
1864	2104	CloneSelection(true);
1865	2105	} else
1866		- if (event.getSource() == copyItem)
	2106	+ if (source == copyItem)
1867	2107	{
1868	2108	loadClipboard(false);
1869	2109	} else
1870		- if (event.getSource() == pasteItem)
	2110	+ if (source == pasteItem)
1871	2111	{
1872	2112	paste(false);
1873	2113	} else
1874		- if (event.getSource() == pasteLinkItem)
	2114	+ if (source == pasteIntoItem)
1875	2115	{
1876		- pasteInto(false);
	2116	+ pasteInto(true, false);
1877	2117	} else
1878		- if (event.getSource() == pasteCloneItem)
	2118	+ if (source == pasteLinkItem)
1879	2119	{
1880		- pasteInto(true);
	2120	+ pasteInto(false, false);
1881	2121	} else
1882		- if (event.getSource() == pasteExpandItem)
	2122	+ if (source == pasteCloneItem)
	2123	+ {
	2124	+ pasteInto(true, true);
	2125	+ } else
	2126	+ if (source == pasteExpandItem)
1883	2127	{
1884	2128	paste(true);
1885	2129	} else
1886		- if (event.getSource() == synchronizeItem)
	2130	+ if (source == synchronizeItem)
1887	2131	{
1888	2132	Overwrite(Object3D.TRANSFORM);
1889	2133	} else
1890		- if (event.getSource() == overwriteNameItem)
	2134	+ if (source == overwriteNameItem)
1891	2135	{
1892	2136	Overwrite(Object3D.NAME);
1893	2137	} else
1894		- if (event.getSource() == overwriteUVItem)
	2138	+ if (source == overwriteUVItem)
1895	2139	{
1896	2140	Overwrite(Object3D.UV);
1897	2141	} else
1898		- if (event.getSource() == overwriteMatItem)
	2142	+ if (source == overwriteMatItem)
1899	2143	{
1900	2144	/* july 2015
1901	2145	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2159,7 @@
1915	2159
1916	2160	Overwrite(dropAttributes);
1917	2161	}
1918		- if (event.getSource() == overwriteGeoItem)
	2162	+ if (source == overwriteGeoItem)
1919	2163	{
1920	2164	Overwrite(Object3D.GEOMETRY);
1921	2165	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2176,7 @@
1932	2176	// refreshContents();
1933	2177	// }
1934	2178	} else
1935		- if (event.getSource() == generateMeshItem)
	2179	+ if (source == generateMeshItem)
1936	2180	{
1937	2181	//if (group.selection.size() == 1)
1938	2182	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2187,7 @@
1943	2187	ResetModel();
1944	2188	refreshContents();
1945	2189	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2190	+ if (source == extractGeometriesItem)
1947	2191	{
1948	2192	boolean one = false;
1949	2193
..	..	@@ -1970,7 +2214,7 @@
1970	2214	ResetModel();
1971	2215	refreshContents();
1972	2216	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2217	+ if (source == cloneGeometriesItem)
1974	2218	{
1975	2219	boolean one = false;
1976	2220
..	..	@@ -1996,32 +2240,37 @@
1996	2240	ResetModel();
1997	2241	refreshContents();
1998	2242	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2243	+ if (source == shareGeometriesItem)
2000	2244	{
2001	2245	boolean one = false;
2002	2246
2003	2247	if (group.selection.size() == 1)
2004	2248	one = true;
2005	2249
	2250	+ Object3D merge = null;
	2251	+
2006	2252	Object3D content = new cGroup();
2007	2253
2008	2254	for (int i=0; i<group.selection.size(); i++)
2009	2255	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2256	+ merge = new Merge(group.selection.get(i));
2011	2257
2012	2258	if (one)
2013		- makeSomething(sel, false);
	2259	+ makeSomething(merge, false);
2014	2260	else
2015		- content.addChild(sel);
	2261	+ content.addChild(merge);
2016	2262	}
2017	2263
2018	2264	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2265	+ makeSomething(content, true);
	2266	+ else
	2267	+ {
	2268	+ ResetModel();
	2269	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2270	+ refreshContents();
	2271	+ }
2023	2272	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2273	+ if (source == mergeGeometriesItem)
2025	2274	{
2026	2275	boolean one = false;
2027	2276
..	..	@@ -2051,7 +2300,7 @@
2051	2300	ResetModel();
2052	2301	refreshContents();
2053	2302	} else
2054		- if (event.getSource() == linkverticesItem)
	2303	+ if (source == linkverticesItem)
2055	2304	{
2056	2305	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2306	// {
..	..	@@ -2064,39 +2313,48 @@
2064	2313	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2314	// refreshContents();
2066	2315	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2316	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2317	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2318	+ Object3D content = Grafreed.clipboard.get(0);
2070	2319
2071	2320	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2321	content = ((cGroup)content).get(0);
2073	2322
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2323	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2324	for (int i=0; i<group.selection.size(); i++)
2076	2325	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2326	+ boolean random = CameraPane.SWITCH;
	2327	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2328	group.selection.get(i).linkVerticesThis(content);
2080	2329	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2330	+ CameraPane.SWITCH = random;
2082	2331	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2332	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2333	refreshContents();
2085	2334	}
2086	2335	} else
2087		- if (event.getSource() == resetsupportItem)
	2336	+ if (source == resetsupportItem)
2088	2337	{
2089	2338	for (int i=0; i<group.selection.size(); i++)
2090	2339	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2340	+ boolean random = CameraPane.SWITCH;
	2341	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2342	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2343	+ CameraPane.SWITCH = random;
2095	2344	}
2096	2345
2097	2346	refreshContents();
2098	2347	} else
2099		- if (event.getSource() == resetreferencesItem)
	2348	+ if (source == relinkverticesItem)
	2349	+ {
	2350	+ boolean random = CameraPane.SWITCH;
	2351	+ CameraPane.SWITCH = false; // parse all random nodes
	2352	+ group.selection.RelinkToSupport();
	2353	+ CameraPane.SWITCH = random;
	2354	+
	2355	+ refreshContents();
	2356	+ } else
	2357	+ if (source == resetreferencesItem)
2100	2358	{
2101	2359	for (int i=0; i<group.selection.size(); i++)
2102	2360	{
..	..	@@ -2105,11 +2363,11 @@
2105	2363
2106	2364	refreshContents();
2107	2365	} else
2108		- if (event.getSource() == setMasterItem)
	2366	+ if (source == setMasterItem)
2109	2367	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2368	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2369	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2370	+ Object3D content = Grafreed.clipboard.get(0);
2113	2371
2114	2372	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2373	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2376,13 @@
2118	2376	refreshContents();
2119	2377	}
2120	2378	} else
2121		- if (event.getSource() == poseMeshItem)
	2379	+ if (source == poseMeshItem)
2122	2380	{
2123	2381	if (group.selection.size() == 1)
2124	2382	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2383	+ if (Grafreed.clipboard.size() == 1)
2126	2384	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2385	+ Object3D content = Grafreed.clipboard.get(0);
2128	2386
2129	2387	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2388	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2395,19 @@
2137	2395	}
2138	2396
2139	2397	} else
2140		- if (event.getSource() == revertMeshItem)
	2398	+ if (source == revertMeshItem)
2141	2399	{
2142	2400	RevertMeshes();
2143	2401	} else
2144		- if (event.getSource() == resetMeshItem)
	2402	+ if (source == resetAllItem)
2145	2403	{
2146	2404	ResetAll();
2147	2405	} else
2148		- if (event.getSource() == stepAllItem)
	2406	+ if (source == stepAllItem)
2149	2407	{
2150	2408	StepAll();
2151	2409	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2410	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2411	{
2154	2412	//int indices[] = jList.getSelectedIndices();
2155	2413	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2415,46 @@
2157	2415
2158	2416	ClearSelection(false);
2159	2417	} else
2160		- if (event.getSource() == clearAllItem)
	2418	+ if (source == clearAllItem)
2161	2419	{
2162	2420	ClearSelection(true);
2163	2421	} else
2164		- if (event.getSource() == grabItem)
	2422	+ if (source == grabItem)
2165	2423	{
2166	2424	group(new cGroup(), true);
2167	2425	} else
2168		- if (event.getSource() == frontItem)
	2426	+ if (source == hideItem)
	2427	+ {
	2428	+ group(new HiddenObject());
	2429	+ } else
	2430	+ if (source == frontItem)
2169	2431	{
2170	2432	front();
2171	2433	} else
2172		- if (event.getSource() == backItem)
	2434	+ if (source == backItem)
2173	2435	{
2174	2436	back();
2175	2437	} else
2176		- if (event.getSource() == cameraItem)
	2438	+ if (source == cameraItem)
2177	2439	{
2178	2440	makeSomething(new Camera());
2179	2441	} else
2180		- if (event.getSource() == compositeItem)
	2442	+ if (source == compositeItem)
2181	2443	{
2182	2444	group(new Composite());
2183	2445	} else
2184		- if (event.getSource() == randomItem)
	2446	+ if (source == randomItem)
2185	2447	{
2186	2448	RandomNode random = new RandomNode();
2187	2449	group(random);
2188	2450	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2451	+ random.name = random.get(0).name + "Switch";
2190	2452	} else
2191		- if (event.getSource() == physicsItem)
	2453	+ if (source == physicsItem)
2192	2454	{
2193	2455	group(new PhysicsNode());
2194	2456	} else
2195		- if (event.getSource() == frameselectorItem)
	2457	+ if (source == frameselectorItem)
2196	2458	{
2197	2459	for (int i=0; i<group.selection.size(); i++)
2198	2460	{
..	..	@@ -2204,7 +2466,7 @@
2204	2466	ResetModel();
2205	2467	refreshContents();
2206	2468	} else
2207		- if (event.getSource() == switchGeoItem)
	2469	+ if (source == switchGeoItem)
2208	2470	{
2209	2471	for (int i=0; i<group.selection.size(); i++)
2210	2472	{
..	..	@@ -2216,7 +2478,7 @@
2216	2478	ResetModel();
2217	2479	refreshContents();
2218	2480	} else
2219		- if (event.getSource() == switchTransfoItem)
	2481	+ if (source == switchTransfoItem)
2220	2482	{
2221	2483	for (int i=0; i<group.selection.size(); i++)
2222	2484	{
..	..	@@ -2228,7 +2490,7 @@
2228	2490	ResetModel();
2229	2491	refreshContents();
2230	2492	} else
2231		- if (event.getSource() == morphItem)
	2493	+ if (source == morphItem)
2232	2494	{
2233	2495	for (int i=0; i<group.selection.size(); i++)
2234	2496	{
..	..	@@ -2240,7 +2502,7 @@
2240	2502	ResetModel();
2241	2503	refreshContents();
2242	2504	} else
2243		- if (event.getSource() == scriptNodeItem)
	2505	+ if (source == scriptNodeItem)
2244	2506	{
2245	2507	boolean atleastone = false;
2246	2508
..	..	@@ -2279,199 +2541,239 @@
2279	2541	}
2280	2542	}
2281	2543	} else
2282		- if (event.getSource() == linkerItem)
	2544	+ if (source == linkerItem)
2283	2545	{
2284	2546	group(new cLinker());
2285	2547	} else
2286		- if (event.getSource() == textureItem)
	2548	+ if (source == textureItem)
2287	2549	{
2288	2550	group(new TextureNode());
2289	2551	} else
2290		- if (event.getSource() == shadowXItem)
	2552	+ if (source == billboardItem)
	2553	+ {
	2554	+ group(new BillboardNode());
	2555	+ } else
	2556	+ if (source == shadowXItem)
2291	2557	{
2292	2558	CastShadow(0);
2293	2559	} else
2294		- if (event.getSource() == shadowYItem)
	2560	+ if (source == shadowYItem)
2295	2561	{
2296	2562	CastShadow(1);
2297	2563	} else
2298		- if (event.getSource() == shadowZItem)
	2564	+ if (source == shadowZItem)
2299	2565	{
2300	2566	CastShadow(2);
2301	2567	} else
2302		- if (event.getSource() == ungroupItem)
	2568	+ if (source == ungroupItem)
2303	2569	{
2304		- ungroup();
	2570	+ //ungroup();
	2571	+ for (int i=0; i<group.selection.size(); i++)
	2572	+ {
	2573	+ Ungroup(group.selection.get(i));
	2574	+ }
	2575	+
	2576	+ ClearSelection(false);
	2577	+
	2578	+ refreshContents();
2305	2579	} else
2306		- if (event.getSource() == genUVItem)
	2580	+ if (source == genUVItem)
2307	2581	{
2308	2582	GenUV();
2309	2583	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2584	+ if (source == genNormalsCADItem)
2311	2585	{
2312	2586	GenNormals(true);
2313	2587	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2588	+ if (source == genNormalsMESHItem)
2315	2589	{
2316		- GenNormals(true); // TODO
	2590	+ GenNormalsMESH();
2317	2591	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2592	+ if (source == genNormalsORGANItem)
2319	2593	{
2320	2594	GenNormals(false);
2321	2595	} else
2322		- if (event.getSource() == stripifyItem)
	2596	+ if (source == genNormalsMINEItem)
	2597	+ {
	2598	+ GenNormalsMINE();
	2599	+ } else
	2600	+ if (source == stripifyItem)
2323	2601	{
2324	2602	Stripify();
2325	2603	} else
2326		- if (event.getSource() == unstripifyItem)
	2604	+ if (source == unstripifyItem)
2327	2605	{
2328	2606	Unstripify();
2329	2607	} else
2330		- if (event.getSource() == trimItem)
	2608	+ if (source == trimItem)
2331	2609	{
2332	2610	Trim();
2333	2611	} else
2334		- if (event.getSource() == untrimItem)
	2612	+ if (source == untrimItem)
2335	2613	{
2336	2614	Untrim();
2337	2615	} else
2338		- if (event.getSource() == clearColorsItem)
	2616	+ if (source == clearColorsItem)
2339	2617	{
2340	2618	ClearColors();
2341	2619	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2620	+ if (source == clearMaterialsItem)
2343	2621	{
2344	2622	ClearMaterials();
2345	2623	} else
2346		- if (event.getSource() == liveleavesItem)
	2624	+ if (source == liveleavesItem)
2347	2625	{
2348	2626	LiveLeaves(true);
2349	2627	} else
2350		- if (event.getSource() == unliveleavesItem)
	2628	+ if (source == unliveleavesItem)
2351	2629	{
2352	2630	LiveLeaves(false);
2353	2631	} else
2354		- if (event.getSource() == supportleavesItem)
	2632	+ if (source == supportleavesItem)
2355	2633	{
2356	2634	SupportLeaves(true);
2357	2635	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2636	+ if (source == unsupportleavesItem)
2359	2637	{
2360	2638	SupportLeaves(false);
2361	2639	} else
2362		- if (event.getSource() == hideleavesItem)
	2640	+ if (source == hideleavesItem)
2363	2641	{
2364	2642	HideLeaves(true);
2365	2643	} else
2366		- if (event.getSource() == showleavesItem)
	2644	+ if (source == showleavesItem)
2367	2645	{
2368	2646	HideLeaves(false);
2369	2647	} else
2370		- if (event.getSource() == markleavesItem)
	2648	+ if (source == markleavesItem)
2371	2649	{
2372	2650	MarkLeaves(true);
2373	2651	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2652	+ if (source == unmarkleavesItem)
2375	2653	{
2376	2654	MarkLeaves(false);
2377	2655	} else
2378		- if (event.getSource() == flipVItem)
	2656	+ if (source == rewindleavesItem)
	2657	+ {
	2658	+ RewindLeaves(true);
	2659	+ } else
	2660	+ if (source == unrewindleavesItem)
	2661	+ {
	2662	+ RewindLeaves(false);
	2663	+ } else
	2664	+ if (source == randomleavesItem)
	2665	+ {
	2666	+ RandomLeaves(true);
	2667	+ } else
	2668	+ if (source == unrandomleavesItem)
	2669	+ {
	2670	+ RandomLeaves(false);
	2671	+ } else
	2672	+ if (source == flipVItem)
2379	2673	{
2380	2674	FlipV(true);
2381	2675	} else
2382		- if (event.getSource() == unflipVItem)
	2676	+ if (source == unflipVItem)
2383	2677	{
2384	2678	FlipV(false);
2385	2679	} else
2386		- if (event.getSource() == lowTexturesItem)
	2680	+ if (source == lowTexturesItem)
2387	2681	{
2388	2682	SetTexRes(0);
2389	2683	} else
2390		- if (event.getSource() == normalTexturesItem)
	2684	+ if (source == normalTexturesItem)
2391	2685	{
2392	2686	SetTexRes(1);
2393	2687	} else
2394		- if (event.getSource() == highTexturesItem)
	2688	+ if (source == highTexturesItem)
2395	2689	{
2396	2690	SetTexRes(2);
2397	2691	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2692	+ if (source == veryhighTexturesItem)
2399	2693	{
2400	2694	SetTexRes(3);
2401	2695	} else
2402		- if (event.getSource() == maxTexturesItem)
	2696	+ if (source == maxTexturesItem)
2403	2697	{
2404	2698	SetTexRes(4);
2405	2699	} else
2406		- if (event.getSource() == panoTexturesItem)
	2700	+ if (source == panoTexturesItem)
2407	2701	{
2408	2702	SetTexRes(5);
2409	2703	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2704	+ if (source == reverseNormalsItem)
2411	2705	{
2412	2706	ReverseNormals();
2413	2707	} else
2414		- if (event.getSource() == parseverticesItem)
	2708	+ if (source == parseverticesItem)
2415	2709	{
2416	2710	ParseVertices();
2417	2711	} else
2418		- if (event.getSource() == textureFieldItem)
	2712	+ if (source == textureFieldItem)
2419	2713	{
2420	2714	TextureVertices();
2421	2715	} else
2422		- if (event.getSource() == alignItem)
	2716	+ if (source == alignItem)
2423	2717	{
2424	2718	Align();
2425	2719	} else
2426		- if (event.getSource() == mirrorItem)
	2720	+ if (source == mirrorItem)
2427	2721	{
2428	2722	MirrorPoses();
2429	2723	} else
2430		- if (event.getSource() == reduceMorphItem)
	2724	+ if (source == reduceMorphItem)
2431	2725	{
2432	2726	MeshReduction(false);
2433	2727	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2728	+ if (source == reduce34MorphItem)
2435	2729	{
2436	2730	MeshReduction(true);
2437	2731	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2732	+ if (source == reverseTrianglesItem)
2439	2733	{
2440	2734	ReverseTriangles();
2441	2735	} else
2442		- if (event.getSource() == reduceMeshItem)
	2736	+ if (source == reduceMeshItem)
2443	2737	{
2444	2738	ReduceMesh(false);
2445	2739	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2740	+ if (source == reduce34MeshItem)
2447	2741	{
2448	2742	ReduceMesh(true);
2449	2743	} else
2450		- if (event.getSource() == increaseMeshItem)
	2744	+ if (source == increaseMeshItem)
2451	2745	{
2452	2746	IncreaseMesh();
2453	2747	} else
2454		- if (event.getSource() == clipMeshItem)
	2748	+ if (source == clipMeshItem)
2455	2749	{
2456	2750	ClipMesh();
2457	2751	} else
2458		- if (event.getSource() == smoothMeshItem)
	2752	+ if (source == smoothMeshItem)
2459	2753	{
2460	2754	SmoothMesh();
2461	2755	} else
2462		- if (event.getSource() == transformgeometryItem)
	2756	+ if (source == transformGeometryItem)
2463	2757	{
2464	2758	TransformGeometry();
2465	2759	} else
2466		- if (event.getSource() == resetTransformItem)
	2760	+ if (source == transformChildrenItem)
	2761	+ {
	2762	+ TransformChildren();
	2763	+ } else
	2764	+ if (source == resetTransformItem)
2467	2765	{
2468	2766	ResetTransform();
2469	2767	} else
2470		- if (event.getSource() == resetCentroidItem)
	2768	+ if (source == resetCentroidItem)
2471	2769	{
2472		- ResetCentroid();
	2770	+ ResetCentroid(true);
2473	2771	} else
2474		- if (event.getSource() == resetParentItem)
	2772	+ if (source == resetCentroidXZItem)
	2773	+ {
	2774	+ ResetCentroid(false);
	2775	+ } else
	2776	+ if (source == resetParentItem)
2475	2777	{
2476	2778	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2779	{
..	..	@@ -2481,7 +2783,7 @@
2481	2783
2482	2784	refreshContents();
2483	2785	} else
2484		- if (event.getSource() == repairParentItem)
	2786	+ if (source == repairParentItem)
2485	2787	{
2486	2788	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2789	{
..	..	@@ -2495,7 +2797,21 @@
2495	2797
2496	2798	refreshContents();
2497	2799	} else
2498		- if (event.getSource() == sortbysizeItem)
	2800	+ if (source == repairShadowItem)
	2801	+ {
	2802	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2803	+ {
	2804	+ Object3D obj = (Object3D)e.nextElement();
	2805	+ obj.RepairShadow();
	2806	+// for (int i=0; i<obj.size(); i++)
	2807	+// {
	2808	+// obj.get(i).parent = obj;
	2809	+// }
	2810	+ }
	2811	+
	2812	+ refreshContents();
	2813	+ } else
	2814	+ if (source == sortbysizeItem)
2499	2815	{
2500	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2817	{
..	..	@@ -2507,7 +2823,7 @@
2507	2823	ResetModel();
2508	2824	refreshContents();
2509	2825	} else
2510		- if (event.getSource() == sortbynameItem)
	2826	+ if (source == sortbynameItem)
2511	2827	{
2512	2828	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2829	{
..	..	@@ -2519,7 +2835,7 @@
2519	2835	ResetModel();
2520	2836	refreshContents();
2521	2837	} else
2522		- if (event.getSource() == attachPigmentItem)
	2838	+ if (source == attachPigmentItem)
2523	2839	{
2524	2840	String texture = GetFile("Attach pigment");
2525	2841	Object3D obj;
..	..	@@ -2531,7 +2847,7 @@
2531	2847
2532	2848	refreshContents();
2533	2849	} else
2534		- if (event.getSource() == detachPigmentItem)
	2850	+ if (source == detachPigmentItem)
2535	2851	{
2536	2852	Object3D obj;
2537	2853	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2858,7 @@
2542	2858
2543	2859	refreshContents();
2544	2860	} else
2545		- if (event.getSource() == attachBumpItem)
	2861	+ if (source == attachBumpItem)
2546	2862	{
2547	2863	String texture = GetFile("Attach bump");
2548	2864	Object3D obj;
..	..	@@ -2554,7 +2870,7 @@
2554	2870
2555	2871	refreshContents();
2556	2872	} else
2557		- if (event.getSource() == detachBumpItem)
	2873	+ if (source == detachBumpItem)
2558	2874	{
2559	2875	Object3D obj;
2560	2876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2881,7 @@
2565	2881
2566	2882	refreshContents();
2567	2883	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2884	+ if (source == pigmentBumpItem)
2569	2885	{
2570	2886	Object3D obj;
2571	2887	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2892,221 @@
2576	2892
2577	2893	refreshContents();
2578	2894	} else
2579		- if (event.getSource() == flashSelectionButton)
	2895	+ if (source == flashSelectionButton)
2580	2896	{
2581	2897	CameraPane.flash = true;
2582	2898	refreshContents();
2583	2899	} else
2584		- if (event.getSource() == oneButton)
	2900	+ if (source == oneButton)
2585	2901	{
2586	2902	} else
2587		- if (event.getSource() == twoButton)
	2903	+ if (source == twoButton)
2588	2904	{
2589	2905	radio.layout = twoButton;
2590	2906	// bug
2591	2907	//gridPanel.setDividerLocation(1.0);
2592	2908	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	2909	+// bigThree.remove(scenePanel);
	2910	+// bigThree.remove(centralPanel);
	2911	+// bigThree.remove(XYZPanel);
	2912	+// aWindowConstraints.gridx = 0;
	2913	+// aWindowConstraints.gridy = 0;
	2914	+// aWindowConstraints.gridwidth = 1;
	2915	+// // aConstraints.gridheight = 3;
	2916	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2917	+// aWindowConstraints.weightx = 0;
	2918	+// aWindowConstraints.weighty = 1;
	2919	+// //bigThree.add(jtp, aWindowConstraints);
	2920	+// aWindowConstraints.weightx = 1;
	2921	+// aWindowConstraints.gridwidth = 3;
	2922	+// // aConstraints.gridheight = 3;
	2923	+// aWindowConstraints.gridx = 1;
	2924	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2925	+// bigThree.add(centralPanel, aWindowConstraints);
	2926	+// aWindowConstraints.weightx = 0;
	2927	+// aWindowConstraints.gridx = 4;
	2928	+// aWindowConstraints.gridwidth = 1;
	2929	+// // aConstraints.gridheight = 3;
	2930	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2931	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2932	+// scenePanel.setVisible(false);
	2933	+// centralPanel.setVisible(true);
	2934	+// XYZPanel.setVisible(false);
	2935	+ bigThree.ClearUI();
	2936	+ bigThree.add(centralPanel);
	2937	+ bigThree.FlushUI();
	2938	+
	2939	+ cameraView.requestFocusInWindow();
	2940	+
	2941	+// refreshContents(true);
	2942	+//
	2943	+// try
	2944	+// {
	2945	+// java.awt.Robot bot = new java.awt.Robot();
	2946	+// int mask = InputEvent.BUTTON1_MASK;
	2947	+// bot.mouseMove(100, 100);
	2948	+// bot.mousePress(mask);
	2949	+// bot.mouseRelease(mask);
	2950	+// }
	2951	+// catch (Exception e)
	2952	+// {
	2953	+//
	2954	+// }
	2955	+
2617	2956	} else
2618		- if (event.getSource() == threeButton)
	2957	+ if (source == threeButton)
2619	2958	{
2620	2959	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	2960	+
	2961	+// bigThree.remove(scenePanel);
	2962	+// bigThree.remove(centralPanel);
	2963	+// bigThree.remove(XYZPanel);
	2964	+// aWindowConstraints.gridx = 0;
	2965	+// aWindowConstraints.gridy = 0;
	2966	+// aWindowConstraints.gridwidth = 1;
	2967	+// // aConstraints.gridheight = 3;
	2968	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2969	+// aWindowConstraints.weightx = 0;
	2970	+// aWindowConstraints.weighty = 1;
	2971	+// //bigThree.add(jtp, aWindowConstraints);
	2972	+// aWindowConstraints.weightx = 1;
	2973	+// aWindowConstraints.gridwidth = 3;
	2974	+// // aConstraints.gridheight = 3;
	2975	+// aWindowConstraints.gridx = 1;
	2976	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2977	+// bigThree.add(centralPanel, aWindowConstraints);
	2978	+// aWindowConstraints.weightx = 0;
	2979	+// aWindowConstraints.gridx = 4;
	2980	+// aWindowConstraints.gridwidth = 1;
	2981	+// // aConstraints.gridheight = 3;
	2982	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2983	+// bigThree.add(XYZPanel, aWindowConstraints);
	2984	+// bigThree.validate();
	2985	+// scenePanel.setVisible(false);
	2986	+// centralPanel.setVisible(true);
	2987	+// XYZPanel.setVisible(true);
	2988	+ bigThree.ClearUI();
	2989	+ bigThree.add(centralPanel);
	2990	+ bigThree.add(XYZPanel);
	2991	+ bigThree.FlushUI();
	2992	+
	2993	+ cameraView.requestFocusInWindow();
2645	2994	} else
2646		- if (event.getSource() == fourButton)
	2995	+ if (source == fourButton)
2647	2996	{
2648	2997	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	2998	+
	2999	+// bigThree.remove(scenePanel);
	3000	+// bigThree.remove(centralPanel);
	3001	+// bigThree.remove(XYZPanel);
	3002	+// aWindowConstraints.gridx = 0;
	3003	+// aWindowConstraints.gridy = 0;
	3004	+// aWindowConstraints.gridwidth = 1;
	3005	+// // aWindowConstraints.gridheight = 3;
	3006	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3007	+// aWindowConstraints.weightx = 1;
	3008	+// aWindowConstraints.weighty = 1;
	3009	+// bigThree.add(scenePanel, aWindowConstraints);
	3010	+// aWindowConstraints.weightx = 1;
	3011	+// aWindowConstraints.gridwidth = 3;
	3012	+// // aConstraints.gridheight = 3;
	3013	+// aWindowConstraints.gridx = 1;
	3014	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3015	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3016	+// aWindowConstraints.weightx = 0;
	3017	+// aWindowConstraints.gridx = 4;
	3018	+// aWindowConstraints.gridwidth = 1;
	3019	+// // aWindowConstraints.gridheight = 3;
	3020	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3021	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3022	+// bigThree.validate();
	3023	+// scenePanel.setVisible(true);
	3024	+// centralPanel.setVisible(false);
	3025	+// XYZPanel.setVisible(false);
	3026	+ bigThree.ClearUI();
	3027	+ bigThree.add(scenePanel);
	3028	+ bigThree.FlushUI();
	3029	+
	3030	+ cameraView.requestFocusInWindow();
2673	3031	} else
2674		- if (event.getSource() == sixButton)
	3032	+ if (source == sixButton)
2675	3033	{
2676	3034	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3035	+
	3036	+// bigThree.remove(scenePanel);
	3037	+// bigThree.remove(centralPanel);
	3038	+// bigThree.remove(XYZPanel);
	3039	+// aWindowConstraints.gridx = 0;
	3040	+// aWindowConstraints.gridy = 0;
	3041	+// aWindowConstraints.gridwidth = 1;
	3042	+// // aConstraints.gridheight = 3;
	3043	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3044	+// aWindowConstraints.weightx = 0;
	3045	+// aWindowConstraints.weighty = 1;
	3046	+// bigThree.add(scenePanel, aWindowConstraints);
	3047	+// aWindowConstraints.weightx = 1;
	3048	+// aWindowConstraints.gridwidth = 3;
	3049	+// // aWindowConstraints.gridheight = 3;
	3050	+// aWindowConstraints.gridx = 1;
	3051	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3052	+// bigThree.add(centralPanel, aWindowConstraints);
	3053	+// aWindowConstraints.weightx = 0;
	3054	+// aWindowConstraints.gridx = 4;
	3055	+// aWindowConstraints.gridwidth = 1;
	3056	+// // aWindowConstraints.gridheight = 3;
	3057	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3058	+// //bigThree.add(XYZPanel, aConstraints);
	3059	+// bigThree.validate();
	3060	+// scenePanel.setVisible(true);
	3061	+// centralPanel.setVisible(true);
	3062	+// XYZPanel.setVisible(false);
	3063	+ bigThree.ClearUI();
	3064	+ bigThree.add(scenePanel);
	3065	+ bigThree.add(centralPanel);
	3066	+ bigThree.FlushUI();
	3067	+
	3068	+ cameraView.requestFocusInWindow();
2701	3069	} else
2702		- if (event.getSource() == sevenButton)
	3070	+ if (source == sevenButton)
2703	3071	{
2704	3072	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3073	+
	3074	+// bigThree.remove(scenePanel);
	3075	+// bigThree.remove(centralPanel);
	3076	+// bigThree.remove(XYZPanel);
	3077	+// aWindowConstraints.gridx = 0;
	3078	+// aWindowConstraints.gridy = 0;
	3079	+// aWindowConstraints.gridwidth = 1;
	3080	+// // aWindowConstraints.gridheight = 3;
	3081	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3082	+// aWindowConstraints.weightx = 0;
	3083	+// aWindowConstraints.weighty = 1;
	3084	+// bigThree.add(scenePanel, aWindowConstraints);
	3085	+// aWindowConstraints.weightx = 1;
	3086	+// aWindowConstraints.gridwidth = 3;
	3087	+// // aWindowConstraints.gridheight = 3;
	3088	+// aWindowConstraints.gridx = 1;
	3089	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3090	+// bigThree.add(centralPanel, aWindowConstraints);
	3091	+// aWindowConstraints.weightx = 0;
	3092	+// aWindowConstraints.gridx = 4;
	3093	+// aWindowConstraints.gridwidth = 1;
	3094	+// // aConstraints.gridheight = 3;
	3095	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3096	+// bigThree.add(XYZPanel, aWindowConstraints);
	3097	+// bigThree.validate();
	3098	+// scenePanel.setVisible(true);
	3099	+// centralPanel.setVisible(true);
	3100	+// XYZPanel.setVisible(true);
	3101	+ bigThree.ClearUI();
	3102	+ bigThree.add(scenePanel);
	3103	+ bigThree.add(centralPanel);
	3104	+ bigThree.add(XYZPanel);
	3105	+ bigThree.FlushUI();
	3106	+
	3107	+ cameraView.requestFocusInWindow();
2729	3108	} else
2730		- if (event.getSource() == rootButton)
	3109	+ if (source == rootButton)
2731	3110	{
2732	3111	Object3D obj;
2733	3112	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2737,9 +3116,10 @@
2737	3116	EditObject(obj);
2738	3117	}
2739	3118
	3119	+ cameraView.requestFocusInWindow();
2740	3120	refreshContents(true);
2741	3121	} else
2742		- if (event.getSource() == closeButton)
	3122	+ if (source == closeButton)
2743	3123	{
2744	3124	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3125	cRadio ab;
..	..	@@ -2758,13 +3138,15 @@
2758	3138	break;
2759	3139	}
2760	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2761	3143	refreshContents(true);
2762	3144	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3145	+ if (source == editItem \|\| source == editButton)
2764	3146	{
2765	3147	EditSelection(false);
2766	3148	} else
2767		- if (event.getSource() == uneditButton)
	3149	+ if (source == uneditButton)
2768	3150	{
2769	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3152	{
..	..	@@ -2774,14 +3156,14 @@
2774	3156	child.CloseUI();
2775	3157	listUI.remove(child);
2776	3158
2777		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2778	3160	}
2779		- objEditor.ctrlPanel.revalidate();
	3161	+ objEditor.ctrlPanel.FlushUI();
2780	3162	//objEditor.jTree.clearSelection();
2781	3163	//objEditor.ResetSliders();
2782	3164	refreshContents(true);
2783	3165	} else
2784		- if (event.getSource() == clearPanelButton)
	3166	+ if (source == clearPanelButton)
2785	3167	{
2786	3168	assert(copy == group);
2787	3169	//copy.ClearUI();
..	..	@@ -2792,7 +3174,7 @@
2792	3174	listUI.clear();
2793	3175	refreshContents(true);
2794	3176	} else
2795		- if (event.getSource() == allParamsButton)
	3177	+ if (source == allParamsButton)
2796	3178	{
2797	3179	assert(copy == group);
2798	3180
..	..	@@ -2813,19 +3195,19 @@
2813	3195
2814	3196	refreshContents(true);
2815	3197	} else
2816		- if (event.getSource() == unselectButton)
	3198	+ if (source == unselectButton)
2817	3199	{
2818	3200	objEditor.jTree.clearSelection();
2819	3201	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3202	objEditor.ResetSliders();
2821	3203	refreshContents(true);
2822	3204	} else
2823		- if(event.getSource() instanceof cRadio)
	3205	+ if(source instanceof cRadio)
2824	3206	{
2825	3207	group.parent = keepparent;
2826	3208	group.attributes = 0;
2827	3209	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3210	+ /cRadio/ radio = (cRadio)source;
2829	3211	Object3D obj = radio.GetObject();
2830	3212	System.out.println("Edit " + obj);
2831	3213	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3227,7 @@
2845	3227	}
2846	3228
2847	3229	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3230	+ //Globals.theRenderer.object = group;
2849	3231	if(!useclient)
2850	3232	{
2851	3233	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,12 +3236,16 @@
2854	3236	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3237	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3238	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3239	+ //cameraView.lighttouched = true;
	3240	+ Globals.lighttouched = true;
2858	3241	topView.object = group;
2859	3242	frontView.object = group;
2860	3243	sideView.object = group;
2861	3244	}
2862		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
2863	3249	/*
2864	3250	currentLayout = radio.layout;
2865	3251	if (currentLayout == null)
..	..	@@ -2871,8 +3257,23 @@
2871	3257	//group.parent = null; // ROOT
2872	3258	//group.attributes = -1;
2873	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2874	3262	refreshContents(true);
2875		- }
	3263	+ } else if (event.getSource() == editCameraItem)
	3264	+ {
	3265	+ cameraView.ProtectCamera();
	3266	+ cameraView.repaint();
	3267	+ return;
	3268	+ } else if (event.getSource() == revertCameraItem)
	3269	+ {
	3270	+ cameraView.RevertCamera();
	3271	+ cameraView.repaint();
	3272	+ return;
	3273	+ // } else if (event.getSource() == textureButton)
	3274	+ // {
	3275	+ // return; // true;
	3276	+ }
2876	3277	else
2877	3278	{
2878	3279	//return super.action(event, arg);
..	..	@@ -2881,7 +3282,6 @@
2881	3282	}
2882	3283
2883	3284	boolean useclient = false;
2884		- cRadio radio;
2885	3285
2886	3286	void ToggleRoot()
2887	3287	{
..	..	@@ -2890,7 +3290,7 @@
2890	3290	if (useclient)
2891	3291	{
2892	3292	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3293	+ Globals.lighttouched = true;
2894	3294	//topView.object = client;
2895	3295	//frontView.object = client;
2896	3296	//sideView.object = client;
..	..	@@ -2898,7 +3298,7 @@
2898	3298	else
2899	3299	{
2900	3300	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3301	+ Globals.lighttouched = true;
2902	3302	//topView.object = group;
2903	3303	//frontView.object = group;
2904	3304	//sideView.object = group;
..	..	@@ -2933,6 +3333,28 @@
2933	3333	refreshContents();
2934	3334	}
2935	3335
	3336	+ void TransformChildren()
	3337	+ {
	3338	+ Object3D obj;
	3339	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3340	+ {
	3341	+ obj = (Object3D)e.nextElement();
	3342	+ obj.KeepTextureMatrices();
	3343	+ obj.TransformChildren();
	3344	+ obj.RestoreTextureMatrices();
	3345	+
	3346	+// if (obj.parent == null)
	3347	+// {
	3348	+// System.out.println("NULL PARENT!");
	3349	+// new Exception().printStackTrace();
	3350	+// }
	3351	+// else
	3352	+// TouchTransform(obj);
	3353	+// //obj.parent.Touch();
	3354	+ }
	3355	+
	3356	+ refreshContents();
	3357	+ }
2936	3358
2937	3359	void ResetTransform()
2938	3360	{
..	..	@@ -3045,7 +3467,7 @@
3045	3467	refreshContents();
3046	3468	}
3047	3469
3048		- void ResetCentroid()
	3470	+ void ResetCentroid(boolean full)
3049	3471	{
3050	3472	Object3D obj;
3051	3473	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3482,16 @@
3060	3482	LA.matIdentity(Object3D.mat);
3061	3483	obj.getBounds(minima, maxima, false);
3062	3484	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3485	+ if (full)
	3486	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3487	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3488	obj.TransformMesh(Object3D.mat);
	3489	+
3066	3490	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3491	+ if (full)
	3492	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3493	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3494	+
3069	3495	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3496	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3497	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +3520,8 @@
3094	3520
3095	3521	int size = obj.MemorySize();
3096	3522
3097		- System.err.println((size/1024) + " KB is the size of " + obj);
	3523	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3524	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3098	3525	}
3099	3526	}
3100	3527	catch (Exception e)
..	..	@@ -3131,9 +3558,9 @@
3131	3558	obj = (Object3D)e.nextElement();
3132	3559
3133	3560	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3561	+ Grafreed.AnalyzeObject(obj);
3135	3562	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3563	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3564
3138	3565	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3566	}
..	..	@@ -3175,6 +3602,20 @@
3175	3602	void GenNormals(boolean crease)
3176	3603	{
3177	3604	group.GenNormalsS(crease);
	3605	+
	3606	+ refreshContents();
	3607	+ }
	3608	+
	3609	+ void GenNormalsMESH()
	3610	+ {
	3611	+ group.GenNormalsMeshS();
	3612	+
	3613	+ refreshContents();
	3614	+ }
	3615	+
	3616	+ void GenNormalsMINE()
	3617	+ {
	3618	+ group.selection.GenNormalsMINE();
3178	3619
3179	3620	refreshContents();
3180	3621	}
..	..	@@ -3340,8 +3781,8 @@
3340	3781
3341	3782	void ParseVertices()
3342	3783	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	3784	+ boolean epsequal = Grafreed.epsequal;
	3785	+ Grafreed.epsequal = true;
3345	3786
3346	3787	for (int i=0; i<group.selection.size(); i++)
3347	3788	{
..	..	@@ -3366,7 +3807,7 @@
3366	3807	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	3808	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	3809
3369		- g.add(GrafreeD.clipboard);
	3810	+ g.add(Grafreed.clipboard);
3370	3811
3371	3812	buffer.add(g);
3372	3813	}
..	..	@@ -3381,7 +3822,7 @@
3381	3822	makeSomething(buffer, i==group.selection.size()-1);
3382	3823	}
3383	3824
3384		- GrafreeD.epsequal = epsequal;
	3825	+ Grafreed.epsequal = epsequal;
3385	3826
3386	3827	refreshContents();
3387	3828	}
..	..	@@ -3399,7 +3840,16 @@
3399	3840	String pigment = Object3D.GetPigment(tex);
3400	3841	//String bump = Object3D.GetBump(tex);
3401	3842
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3843	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3844	+
	3845	+ try
	3846	+ {
	3847	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3848	+ }
	3849	+ catch (Exception e)
	3850	+ {
	3851	+ System.err.println("FAIL: " + node);
	3852	+ }
3403	3853
3404	3854	double s = v.s;
3405	3855
..	..	@@ -3447,12 +3897,26 @@
3447	3897
3448	3898	void Align()
3449	3899	{
	3900	+ if (group.selection.size() == 0)
	3901	+ return;
	3902	+
	3903	+ cVector bbmin = new cVector();
	3904	+ cVector bbmax = new cVector();
	3905	+
	3906	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3907	+
	3908	+ double dx = bbmax.x - bbmin.x;
	3909	+ double dy = bbmax.y - bbmin.y;
	3910	+ double dz = bbmax.z - bbmin.z;
	3911	+
	3912	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3913	+
3450	3914	for (int i=0; i<group.selection.size(); i++)
3451	3915	{
3452	3916	Object3D obj = group.selection.get(i);
3453	3917
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3918	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3919	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3920	}
3457	3921
3458	3922	refreshContents();
..	..	@@ -3473,11 +3937,11 @@
3473	3937
3474	3938	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3939
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3940	+ boolean random = CameraPane.SWITCH;
	3941	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3942	lowres.linkVerticesThis(null);
3479	3943	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3944	+ CameraPane.SWITCH = random;
3481	3945
3482	3946	System.err.flush();
3483	3947
..	..	@@ -3517,7 +3981,7 @@
3517	3981	return;
3518	3982
3519	3983	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	3984	+ Object3D ref = Grafreed.clipboard.get(0);
3521	3985
3522	3986	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	3987
..	..	@@ -3686,7 +4150,7 @@
3686	4150	group.selection.RelinkToSupport(); // july 2014
3687	4151	System.out.println("DONE.");
3688	4152	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4153	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4154	}
3691	4155
3692	4156	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4175,9 @@
3711	4175
3712	4176	void ClipMesh()
3713	4177	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4178	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4179	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4180	+ Object3D content = Grafreed.clipboard.get(0);
3717	4181
3718	4182	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4183	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4186,7 @@
3722	4186	// {
3723	4187	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4188	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4189	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4190	}
3727	4191	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4192	System.out.println("DONE.");
..	..	@@ -3769,6 +4233,18 @@
3769	4233	void MarkLeaves(boolean hide)
3770	4234	{
3771	4235	group.selection.MarkLeaves(hide);
	4236	+ refreshContents();
	4237	+ }
	4238	+
	4239	+ void RewindLeaves(boolean hide)
	4240	+ {
	4241	+ group.selection.RewindLeaves(hide);
	4242	+ refreshContents();
	4243	+ }
	4244	+
	4245	+ void RandomLeaves(boolean hide)
	4246	+ {
	4247	+ group.selection.RandomLeaves(hide);
3772	4248	refreshContents();
3773	4249	}
3774	4250
..	..	@@ -3857,7 +4333,7 @@
3857	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4334
3859	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
3861	4337	{
3862	4338	// if (!(elem instanceof Composite))
3863	4339	// newWindow = false;
..	..	@@ -3947,7 +4423,6 @@
3947	4423	//case 702: // Event.LIST_DESELECT
3948	4424	group.deselectAll();
3949	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	4426	if (tps != null)
3952	4427	{
3953	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,31 +4431,30 @@
3956	4431
3957	4432	//if (child.parent != null)
3958	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
3959	4435	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	4436	}
3964	4437	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4438	+// else
	4439	+// {
	4440	+// objEditor.SetMaterial(group); // .GetMaterial());
	4441	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4442	+// System.err.println("info : " + group.GetPath());
	4443	+// }
3971	4444
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4445	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3975	4446	CameraPane.flash = true;
3976	4447
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	4449	// a camera
3979	4450	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4451	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4452	+ {
	4453	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4454	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4455	+ }
	4456	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4457	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4458	}
3985	4459
3986	4460	refreshContents();
..	..	@@ -3991,6 +4465,26 @@
3991	4465
3992	4466	freezemodel = false;
3993	4467	}
	4468	+
	4469	+ void refreshContents(boolean cp)
	4470	+ {
	4471	+ if (!Globals.MOUSEDRAGGED)
	4472	+ {
	4473	+ objEditor.ClearInfo(); // .GetMaterial());
	4474	+
	4475	+ for (int i=0; i < group.selection.Size(); i++)
	4476	+ {
	4477	+ Object3D child = (Object3D) group.selection.get(i);
	4478	+
	4479	+ objEditor.AddInfo(child, this, true);
	4480	+ System.err.println("info : " + child.GetPath());
	4481	+ }
	4482	+
	4483	+ objEditor.SetText(); // jan 2014
	4484	+ }
	4485	+
	4486	+ super.refreshContents(cp);
	4487	+ }
3994	4488
3995	4489	void linkSomething(Object3D thing)
3996	4490	{
..	..	@@ -4062,16 +4556,18 @@
4062	4556	{
4063	4557	if (group.selection.isEmpty())
4064	4558	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4559	+
	4560	+ Grafreed.clipboardIsTempGroup = false;
4066	4561	Composite tGroup = null;
4067	4562	if (group.selection.size() > 0) // 1)
4068	4563	{
4069	4564	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4565	+ Grafreed.clipboardIsTempGroup = true;
4071	4566	}
4072	4567
4073	4568	if (cut)
4074	4569	{
	4570	+ Save();
4075	4571	//int indices[] = jList.getSelectedIndices();
4076	4572	//for (int i = indices.length - 1; i >= 0; i--)
4077	4573	//jList.remove(indices[i]);
..	..	@@ -4107,16 +4603,16 @@
4107	4603	//System.out.println("cut " + child);
4108	4604	//System.out.println("parent = " + child.parent);
4109	4605	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4111	4607	tGroup.add/Child/(tmp);
4112	4608	else
4113		- GrafreeD.clipboard = tmp;
	4609	+ Grafreed.clipboard = tmp;
4114	4610	}
4115	4611	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4612	+ if (Grafreed.clipboardIsTempGroup)
4117	4613	tGroup.add/Child/(child);
4118	4614	else
4119		- GrafreeD.clipboard = child;
	4615	+ Grafreed.clipboard = child;
4120	4616	}
4121	4617
4122	4618	//ResetModel();
..	..	@@ -4148,21 +4644,23 @@
4148	4644	//System.out.println("cut " + elem);
4149	4645	//System.out.println("parent = " + elem.parent);
4150	4646	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4647	+ if (Grafreed.clipboardIsTempGroup)
4152	4648	tGroup.add/Child/(tmp);
4153	4649	else
4154		- GrafreeD.clipboard = tmp;
	4650	+ Grafreed.clipboard = tmp;
4155	4651	}
4156	4652	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4158	4654	tGroup.add/Child/(child);
4159	4655	else
4160		- GrafreeD.clipboard = child;
	4656	+ Grafreed.clipboard = child;
4161	4657	}
4162	4658
4163	4659	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4660	+
	4661	+ if (Grafreed.clipboardIsTempGroup)
	4662	+ Grafreed.clipboard = tGroup;
	4663	+
4166	4664	if (cut)
4167	4665	{
4168	4666	ResetModel();
..	..	@@ -4176,7 +4674,7 @@
4176	4674	// return;
4177	4675	boolean first = true;
4178	4676
4179		- if (GrafreeD.clipboardIsTempGroup)
	4677	+ if (Grafreed.clipboardIsTempGroup)
4180	4678	{
4181	4679	Composite temp;
4182	4680
..	..	@@ -4187,7 +4685,7 @@
4187	4685	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	4686	*/
4189	4687	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4688	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	4689	{
4192	4690	Object3D child = (Object3D)e.nextElement();
4193	4691
..	..	@@ -4221,21 +4719,21 @@
4221	4719	//Object3D cb = Applet3D.clipboard;
4222	4720	//temp.addChild(cb);
4223	4721	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4722	+ assert(Grafreed.clipboard.parent == null);
	4723	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4724	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4725	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4726	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	4727	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	4728	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4729	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	4730	}
4233	4731
4234	4732	ResetModel();
4235	4733	refreshContents();
4236	4734	}
4237	4735
4238		- void pasteInto(boolean copyit)
	4736	+ void pasteInto(boolean copyit, boolean clone)
4239	4737	{
4240	4738	// if (GrafreeD.clipboard == null)
4241	4739	// return;
..	..	@@ -4264,15 +4762,22 @@
4264	4762	if (copyit)
4265	4763	{
4266	4764	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4765	+ if (clone)
	4766	+ {
	4767	+ CloneClipboard(false); // sept 2014
	4768	+ }
	4769	+ else
	4770	+ {
	4771	+ paste(false);
	4772	+ }
4268	4773	}
4269	4774	else
4270	4775	{
4271	4776	boolean first = true;
4272	4777
4273		- if (GrafreeD.clipboardIsTempGroup)
	4778	+ if (Grafreed.clipboardIsTempGroup)
4274	4779	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	4780	+ Composite temp = (Composite)Grafreed.clipboard;
4276	4781	Object3D copy;
4277	4782	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	4783	{
..	..	@@ -4282,7 +4787,7 @@
4282	4787	}
4283	4788	} else
4284	4789	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	4790	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	4791	}
4287	4792	}
4288	4793	}
..	..	@@ -4474,6 +4979,26 @@
4474	4979	makeSomething(csg);
4475	4980	}
4476	4981
	4982	+ void Ungroup(Object3D g)
	4983	+ {
	4984	+ if (g instanceof HiddenObject)
	4985	+ {
	4986	+ HiddenObject h = (HiddenObject) g;
	4987	+
	4988	+ for (int i=0; i<h.ActualSize(); i++)
	4989	+ {
	4990	+ objEditor.makeSomething(h.get(i), false);
	4991	+ }
	4992	+ }
	4993	+ else
	4994	+ {
	4995	+ for (int i=0; i<g.Size(); i++)
	4996	+ {
	4997	+ objEditor.makeSomething(g.get(i), false);
	4998	+ }
	4999	+ }
	5000	+ }
	5001	+
4477	5002	void ungroup()
4478	5003	{
4479	5004	/*
..	..	@@ -4667,21 +5192,6 @@
4667	5192	}
4668	5193	*/
4669	5194
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5195	/*
4686	5196	public void Callback(Object obj)
4687	5197	{
..	..	@@ -4705,26 +5215,9 @@
4705	5215	}
4706	5216	*/
4707	5217
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5218	String GetFile(String dialogName)
4726	5219	{
4727		- if (GrafreeD.standAlone)
	5220	+ if (Grafreed.standAlone)
4728	5221	{
4729	5222	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5223	browser.show();
..	..	@@ -4788,10 +5281,18 @@
4788	5281	cButton flashSelectionButton;
4789	5282	cButton editButton;
4790	5283	cButton uneditButton;
	5284	+ JCheckBox allParamsButton;
4791	5285	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5286	cButton unselectButton;
4794	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
	5294	+ cButton oneStepButton;
	5295	+
4795	5296	cButton screenfitButton;
4796	5297	cButton screenfitpointButton;
4797	5298	cButton snapobjectButton;
..	..	@@ -4802,14 +5303,6 @@
4802	5303	cButton closeButton;
4803	5304
4804	5305	cButton setsupportButton;
4805		-
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813	5306
4814	5307	//
4815	5308	//Composite
..	..	@@ -4822,6 +5315,8 @@
4822	5315	private MenuItem lookFromItem;
4823	5316	private MenuItem switchItem;
4824	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
4825	5320	private MenuItem duplicateItem;
4826	5321	private MenuItem cloneItem;
4827	5322	private MenuItem cloneSupportItem;
..	..	@@ -4833,8 +5328,9 @@
4833	5328	private MenuItem resetsupportItem;
4834	5329	private MenuItem resetreferencesItem;
4835	5330	private MenuItem linkverticesItem;
	5331	+ private MenuItem relinkverticesItem;
4836	5332	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5333	+ private MenuItem resetAllItem;
4838	5334	private MenuItem stepAllItem;
4839	5335	private MenuItem revertMeshItem;
4840	5336	private MenuItem poseMeshItem;
..	..	@@ -4845,6 +5341,7 @@
4845	5341	private MenuItem mergeGeometriesItem;
4846	5342	private MenuItem copyItem;
4847	5343	private MenuItem pasteItem;
	5344	+ private MenuItem pasteIntoItem;
4848	5345	private MenuItem pasteLinkItem;
4849	5346	private MenuItem pasteCloneItem;
4850	5347	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5351,7 @@
4854	5351	private MenuItem genNormalsMESHItem;
4855	5352	private MenuItem genNormalsCADItem;
4856	5353	private MenuItem genNormalsORGANItem;
	5354	+ private MenuItem genNormalsMINEItem;
4857	5355	private MenuItem stripifyItem;
4858	5356	private MenuItem unstripifyItem;
4859	5357	private MenuItem trimItem;
..	..	@@ -4882,6 +5380,10 @@
4882	5380	private MenuItem showleavesItem;
4883	5381	private MenuItem markleavesItem;
4884	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
4885	5387
4886	5388	private MenuItem flipVItem;
4887	5389	private MenuItem unflipVItem;
..	..	@@ -4893,8 +5395,11 @@
4893	5395	private MenuItem panoTexturesItem;
4894	5396
4895	5397	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5398	+ private MenuItem resetCentroidXZItem;
4897	5399	private MenuItem resetTransformItem;
	5400	+ private MenuItem transformGeometryItem;
	5401	+ private MenuItem transformChildrenItem;
	5402	+ private MenuItem hideItem;
4898	5403	private MenuItem grabItem;
4899	5404	private MenuItem backItem;
4900	5405	private MenuItem frontItem;
..	..	@@ -4915,6 +5420,7 @@
4915	5420
4916	5421	private MenuItem resetParentItem;
4917	5422	private MenuItem repairParentItem;
	5423	+ private MenuItem repairShadowItem;
4918	5424	private MenuItem sortbysizeItem;
4919	5425	private MenuItem sortbynameItem;
4920	5426
..	..	@@ -4935,10 +5441,11 @@
4935	5441	private MenuItem coneItem;
4936	5442	private MenuItem torusItem;
4937	5443	private MenuItem superItem;
	5444	+ private MenuItem kleinItem;
4938	5445	private MenuItem blobItem;
4939	5446	private MenuItem latheItem;
4940	5447	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5448	+ private MenuItem overlayItem;
4942	5449	private MenuItem meshItem;
4943	5450	// private MenuItem meshGroupItem;
4944	5451	private MenuItem springItem;
..	..	@@ -4947,6 +5454,7 @@
4947	5454	private MenuItem csgItem;
4948	5455	private MenuItem templateItem;
4949	5456	private MenuItem textureItem;
	5457	+ private MenuItem billboardItem;
4950	5458	private MenuItem shadowXItem;
4951	5459	private MenuItem shadowYItem;
4952	5460	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5467,6 @@
4959	5467	private MenuItem doubleItem;
4960	5468	private MenuItem tripleItem;
4961	5469
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5470	private MenuItem computeAOItem;
4968	5471	private MenuItem recompileItem;
4969	5472	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5476,8 @@
4973	5476	private MenuItem analyzeItem;
4974	5477	private MenuItem dumpItem;
4975	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
4976	5483	}