~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"));
..	..	@@ -285,6 +405,13 @@
285	405	genNormalsORGANItem.addActionListener(this);
286	406	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	407	genNormalsCADItem.addActionListener(this);
	408	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	409	+ genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
288	415	stripifyItem = menu.add(new MenuItem("Stripify"));
289	416	stripifyItem.addActionListener(this);
290	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +433,34 @@
306	433	reduce34MeshItem.addActionListener(this);
307	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	435	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
313	444
314	445	oe.menuBar.add(menu = new Menu("Attributes"));
315	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	452	menu.add("-");
318	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	454	liveleavesItem.addActionListener(this);
320	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
322	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	460	supportleavesItem.addActionListener(this);
324	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	462	unsupportleavesItem.addActionListener(this);
	463	+ }
326	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	465	hideleavesItem.addActionListener(this);
328	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +469,14 @@
331	469	markleavesItem.addActionListener(this);
332	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	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);
334	480	menu.add("-");
335	481	flipVItem = menu.add(new MenuItem("Flip V"));
336	482	flipVItem.addActionListener(this);
..	..	@@ -366,35 +512,40 @@
366	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	513	sortbynameItem.addActionListener(this);
368	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.
369	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	523	extractGeometriesItem.addActionListener(this);
371	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	525	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	526	+ }
377	527
378	528	oe.menuBar.add(menu = new Menu("Insert"));
379	529	buildCreateMenu(menu);
380	530
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	531	oe.menuBar.add(menu = new Menu("Tools"));
393	532	buildToolsMenu(menu);
394	533	}
395	534
396	535	void SetupUI2(ObjEditor oe)
397	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	+
398	549	//new Exception().printStackTrace();
399	550
400	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +574,120 @@
423	574	oe.radioPanel.add(dummyButton);
424	575	oe.buttonGroup.add(dummyButton);
425	576	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	578
430		- 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");
431	605	liveCB.addItemListener(this);
432	606
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	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");
451	613	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ trackCB.setToolTipText("Enable tracking");
493	617	trackCB.addItemListener(this);
494	618
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ screenfitButton.setToolTipText("Screen fit");
497	621	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	622	+
499	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	624	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	625
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	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");
512	635	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	636
517		- //
518		- 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");
519	641	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	643	fourButton.addActionListener(this);
522		- 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");
523	647	sixButton.addActionListener(this);
524		- 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");
525	650	threeButton.addActionListener(this);
526		- 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");
527	653	sevenButton.addActionListener(this);
528	654	//
529	655
530		- 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");
531	658	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- 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");
534	662	closeButton.addActionListener(this);
535	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	664	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	665
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
541	668	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	669
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
547	672	uneditButton.addActionListener(this);
548	673
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
561	676	allParamsButton.addActionListener(this);
562	677
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	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");
568	684	unselectButton.addActionListener(this);
569	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
570	691	// oe.aConstraints.gridx += 1;
571	692	// oe.aConstraints.weighty = 0;
572	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +699,37 @@
578	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	700	// gcButton.addActionListener(this);
580	701
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
592	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	707	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
599	711
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	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");
604	716	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- 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");
607	720	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- 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");
610	724	textureCB.addItemListener(this);
611	725
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
614	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
615	733	//jList.addListSelectionListener(this);
616	734	oe.jTree.addTreeSelectionListener(this);
617	735	//jTree.setRootVisible(false);
..	..	@@ -633,20 +751,95 @@
633	751	radio.layout = sevenButton;
634	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	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	+ }
636	826
637	827	void EditObject(Object3D obj)
638	828	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	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();
647	837	}
	838	+
648	839	void SetupViews(ObjEditor oe)
649	840	{
	841	+ theFrame = this;
	842	+
650	843	oe.SetupViews();
651	844
652	845	System.out.println("SetupViews");
..	..	@@ -663,6 +856,7 @@
663	856	JCheckBox fastCB;
664	857	JCheckBox slowCB;
665	858	JCheckBox boxCB;
	859	+ JCheckBox zoomBoxCB;
666	860	JCheckBox trackCB;
667	861	JCheckBox smoothfocusCB;
668	862	// JCheckBox speakerMocapCB;
..	..	@@ -705,10 +899,10 @@
705	899	dropAttributes \|= Object3D.TEXTURE;
706	900	else
707	901	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	902	+ } else if(e.getSource() == liveCB)
710	903	{
711	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
712	906	}
713	907	else if(e.getSource() == supportCB)
714	908	{
..	..	@@ -743,6 +937,10 @@
743	937	Recompile();
744	938	cameraView.repaint();
745	939	// refreshContents();
	940	+ }
	941	+ else if(e.getSource() == zoomBoxCB)
	942	+ {
	943	+ cameraView.ToggleZoomBoxMode();
746	944	}
747	945	else if(e.getSource() == smoothfocusCB)
748	946	{
..	..	@@ -857,7 +1055,9 @@
857	1055	// objEditor.DropFile((java.io.File[]) object, true);
858	1056	// return;
859	1057	// }
860		- if (string.charAt(0) == '/')
	1058	+
	1059	+ // File path for Mac and Windows
	1060	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1061	{
862	1062	// file(s)
863	1063	String[] names = string.split("\n");
..	..	@@ -884,7 +1084,7 @@
884	1084
885	1085	flashIt = false;
886	1086	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1087	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1088	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1089
890	1090	if (group.selection.size() == 1)
..	..	@@ -911,11 +1111,11 @@
911	1111	{
912	1112	loadClipboard(true);
913	1113	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1114	+ pasteInto(false, false);
915	1115	} else {
916	1116	loadClipboard(false);
917	1117	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1118	+ pasteInto(false, false); // true); // ???
919	1119	}
920	1120	}
921	1121	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1233,37 @@
1033	1233	torusItem.addActionListener(this);
1034	1234	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1235	superItem.addActionListener(this);
	1236	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1237	+ kleinItem.addActionListener(this);
1036	1238	particleItem = menu.add(new MenuItem("Particle system"));
1037	1239	particleItem.addActionListener(this);
	1240	+ if (Globals.ADVANCED)
	1241	+ {
1038	1242	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1243	ragdollItem.addActionListener(this);
1040	1244	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1245	ragdoll2Item.addActionListener(this);
	1246	+ }
1042	1247	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1248	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1249	meshItem.addActionListener(this);
1045	1250	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1251	// meshGroupItem.addActionListener(this);
	1252	+ if (Globals.ADVANCED)
	1253	+ {
1047	1254	springItem = menu.add(new MenuItem("Spring"));
1048	1255	springItem.addActionListener(this);
1049	1256	flagItem = menu.add(new MenuItem("Flag"));
1050	1257	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1258	blobItem = menu.add(new MenuItem("Blob"));
1056	1259	blobItem.addActionListener(this);
1057	1260	latheItem = menu.add(new MenuItem("Lathe"));
1058	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);
1059	1267	lightItem = menu.add(new MenuItem("Light"));
1060	1268	lightItem.addActionListener(this);
1061	1269	menu.add("-");
..	..	@@ -1065,39 +1273,44 @@
1065	1273	loopItem.addActionListener(this);
1066	1274	doubleItem = menu.add(new MenuItem("Fork"));
1067	1275	doubleItem.addActionListener(this);
	1276	+ if (Globals.ADVANCED)
	1277	+ {
1068	1278	tripleItem = menu.add(new MenuItem("Trident"));
1069	1279	tripleItem.addActionListener(this);
	1280	+ }
1070	1281	}
1071	1282
1072	1283	void buildToolsMenu(Menu menu)
1073	1284	{
1074	1285	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1286	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1287	+ animationItem.setState(Globals.ANIMATION);
1077	1288
1078	1289	menu.add("-");
1079	1290	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1291	parseverticesItem.addActionListener(this);
1081	1292	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1293	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1294	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1295	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1296	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1297	reduceMorphItem.addActionListener(this);
1089	1298	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1299	reduce34MorphItem.addActionListener(this);
1091		-
	1300	+ menu.add("-");
1092	1301	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1302	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1303
	1304	+ if (Globals.ADVANCED)
	1305	+ {
	1306	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1307	+ mirrorItem.addActionListener(this);
	1308	+ menu.add("-");
1096	1309	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1310	memoryItem.addActionListener(this);
1098	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1312	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1314	dumpItem.addActionListener(this);
1102	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1316	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1319,8 @@
1106	1319	resetParentItem.addActionListener(this);
1107	1320	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1321	repairParentItem.addActionListener(this);
	1322	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1323	+ repairShadowItem.addActionListener(this);
1109	1324	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1325	invariantsItem.addActionListener(this);
1111	1326	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1328,7 @@
1113	1328	menu.add("-");
1114	1329	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1330	editScriptItem.addActionListener(this);
	1331	+ }
1116	1332	}
1117	1333
1118	1334	void ScreenFit()
..	..	@@ -1235,6 +1451,7 @@
1235	1451	shadow.material = new cMaterial(obj.material);
1236	1452	shadow.material.diffuse = 0.0001f;
1237	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1238	1455
1239	1456	makeSomething(shadow);
1240	1457	}
..	..	@@ -1441,9 +1658,9 @@
1441	1658
1442	1659	void Overwrite(int mask)
1443	1660	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1661	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1662	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	1663	+ Object3D content = Grafreed.clipboard.get(0);
1447	1664
1448	1665	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1666	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1683,7 @@
1466	1683	//
1467	1684	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1685	{
	1686	+ Object source = event.getSource();
1469	1687	/*
1470	1688	if (event.getSource() == nameField)
1471	1689	{
..	..	@@ -1477,11 +1695,11 @@
1477	1695	}
1478	1696	else
1479	1697	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1698	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1699	{
1482	1700	ScreenFit();
1483	1701	} else
1484		- if (event.getSource() == switchItem)
	1702	+ if (source == switchItem)
1485	1703	{
1486	1704	cVector v1 = new cVector();
1487	1705	cVector v2 = new cVector();
..	..	@@ -1490,11 +1708,11 @@
1490	1708	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1709	objEditor.cameraView.repaint();
1492	1710	} else
1493		- if (event.getSource() == rectoidItem)
	1711	+ if (source == rectoidItem)
1494	1712	{
1495	1713	makeSomething(new Box());
1496	1714	} else
1497		- if (event.getSource() == particleItem)
	1715	+ if (source == particleItem)
1498	1716	{
1499	1717	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1718	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1733,9 @@
1515	1733	applyExample(particleGeom, "SMOKE");
1516	1734	makeSomething(particleGeom);
1517	1735	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1736	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1737	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1738	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1739
1522	1740	ragdoll.toParent = LA.newMatrix();
1523	1741	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1753,7 @@
1535	1753	} else
1536	1754	/*
1537	1755	*/
1538		- if (event.getSource() == heightFieldItem)
	1756	+ if (source == heightFieldItem)
1539	1757	{
1540	1758	Object3D obj = new Object3D();
1541	1759
..	..	@@ -1573,27 +1791,31 @@
1573	1791
1574	1792	makeSomething(obj);
1575	1793	} else
1576		- if (event.getSource() == gridItem)
	1794	+ if (source == gridItem)
1577	1795	{
1578	1796	makeSomething(new Grid());
1579	1797	} else
1580		- if (event.getSource() == ellipsoidItem)
	1798	+ if (source == ellipsoidItem)
1581	1799	{
1582	1800	makeSomething(new Sphere());
1583	1801	} else
1584		- if (event.getSource() == coneItem)
	1802	+ if (source == coneItem)
1585	1803	{
1586	1804	makeSomething(new Cone());
1587	1805	} else
1588		- if (event.getSource() == torusItem)
	1806	+ if (source == torusItem)
1589	1807	{
1590	1808	makeSomething(new Torus());
1591	1809	} else
1592		- if (event.getSource() == superItem)
	1810	+ if (source == superItem)
1593	1811	{
1594	1812	makeSomething(new Superellipsoid());
1595	1813	} else
1596		- if (event.getSource() == blobItem)
	1814	+ if (source == kleinItem)
	1815	+ {
	1816	+ makeSomething(new Klein());
	1817	+ } else
	1818	+ if (source == blobItem)
1597	1819	{
1598	1820	Blob blob = new Blob();
1599	1821	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1823,15 @@
1601	1823	//blob.retile();
1602	1824	makeSomething(blob);
1603	1825	} else
1604		- if (event.getSource() == latheItem)
	1826	+ if (source == latheItem)
1605	1827	{
1606	1828	makeSomething(new Lathe());
1607	1829	} else
1608		- if (event.getSource() == bezierItem)
	1830	+ if (source == bezierItem)
1609	1831	{
1610	1832	makeSomething(new BezierSurface());
1611	1833	} else
1612		- if (event.getSource() == checkerItem)
	1834	+ if (source == overlayItem)
1613	1835	{
1614	1836	/*
1615	1837	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1846,7 @@
1624	1846	*/
1625	1847	makeSomething(new Checker());
1626	1848	} else
1627		- if (event.getSource() == meshItem)
	1849	+ if (source == meshItem)
1628	1850	{
1629	1851	Object3D itemtomake = new Object3D();
1630	1852	Object3D child;
..	..	@@ -1645,35 +1867,35 @@
1645	1867	makeSomething(child);
1646	1868	}
1647	1869	} else
1648		- if (event.getSource() == springItem)
	1870	+ if (source == springItem)
1649	1871	{
1650	1872	cSpring s = new cSpring();
1651	1873	s.setup();
1652	1874	makeSomething(s);
1653	1875	} else
1654		- if (event.getSource() == flagItem)
	1876	+ if (source == flagItem)
1655	1877	{
1656	1878	cSpring s = new cFlag();
1657	1879	s.setup();
1658	1880	makeSomething(s);
1659	1881	} else
1660		- if (event.getSource() == lightItem)
	1882	+ if (source == lightItem)
1661	1883	{
1662	1884	makeSomething(new Light());
1663	1885	} else
1664		- if (event.getSource() == csgItem)
	1886	+ if (source == csgItem)
1665	1887	{
1666	1888	group(new CSG());
1667	1889	} else
1668		- if (event.getSource() == templateItem)
	1890	+ if (source == templateItem)
1669	1891	{
1670	1892	group(new cTemplate());
1671	1893	} else
1672		- if (event.getSource() == attributeItem)
	1894	+ if (source == attributeItem)
1673	1895	{
1674	1896	makeSomething(new Attribute());
1675	1897	} else
1676		- if (event.getSource() == pointflowItem)
	1898	+ if (source == pointflowItem)
1677	1899	{
1678	1900	makeSomething(new PointFlow());
1679	1901	} else
..	..	@@ -1685,7 +1907,7 @@
1685	1907	} else
1686	1908	*/
1687	1909
1688		- if (event.getSource() == superLoopItem)
	1910	+ if (source == superLoopItem)
1689	1911	{
1690	1912	Composite g = new cGroup();
1691	1913	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1929,7 @@
1707	1929
1708	1930	group(g);
1709	1931	} else
1710		- if (event.getSource() == loopItem)
	1932	+ if (source == loopItem)
1711	1933	{
1712	1934	Composite csg = new GroupLeaf();
1713	1935	csg.count = 5;
..	..	@@ -1716,7 +1938,7 @@
1716	1938	csg.addChild(child);
1717	1939	child.addChild(csg);
1718	1940	} else
1719		- if (event.getSource() == doubleItem)
	1941	+ if (source == doubleItem)
1720	1942	{
1721	1943	Composite csg = new GroupLeaf();
1722	1944	csg.count = 5;
..	..	@@ -1728,7 +1950,7 @@
1728	1950	csg.addChild(child);
1729	1951	child.addChild(csg);
1730	1952	} else
1731		- if (event.getSource() == tripleItem)
	1953	+ if (source == tripleItem)
1732	1954	{
1733	1955	Composite csg = new GroupLeaf();
1734	1956	csg.count = 4;
..	..	@@ -1743,71 +1965,83 @@
1743	1965	csg.addChild(child);
1744	1966	child.addChild(csg);
1745	1967	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1968	+ if (source == computeAOItem)
1748	1969	{
1749		- ImportGFD();
	1970	+ Globals.drawMode = CameraPane.OCCLUSION;
	1971	+ Globals.theRenderer.repaint();
1750	1972	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	1973	+ if (source == recompileItem)
1769	1974	{
1770	1975	Recompile();
1771	1976	refreshContents();
1772	1977	} else
1773		- if (event.getSource() == editScriptItem)
	1978	+ if (source == editScriptItem)
1774	1979	{
1775	1980	OpenDialog();
1776	1981	refreshContents();
1777	1982	} else
1778		- if (event.getSource() == invariantsItem)
	1983	+ if (source == invariantsItem)
1779	1984	{
1780	1985	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1986	+ Grafreed.grafreeD.universe.invariants();
1782	1987	} else
1783		- if (event.getSource() == memoryItem)
	1988	+ if (source == memoryItem)
1784	1989	{
1785	1990	//System.out.println("Invariants:");
1786	1991	PrintMemory();
1787	1992	} else
1788		- if (event.getSource() == pathItem)
	1993	+ if (source == pathItem)
1789	1994	{
1790	1995	PrintPath();
1791	1996	} else
1792		- if (event.getSource() == analyzeItem)
	1997	+ if (source == analyzeItem)
1793	1998	{
1794	1999	AnalyzeObject();
1795	2000	} else
1796		- if (event.getSource() == dumpItem)
	2001	+ if (source == dumpItem)
1797	2002	{
1798	2003	DumpObject();
1799	2004	} else
1800		- 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)
1801	2035	{
1802	2036	//Reload(lastConverter, lastFilename, true);
1803	2037	ScreenFit();
1804	2038	} else
1805		- if (event.getSource() == screenfitpointButton)
	2039	+ if (source == screenfitpointButton)
1806	2040	{
1807	2041	//Reload(lastConverter, lastFilename, true);
1808	2042	ScreenFitPoint();
1809	2043	} else
1810		- if (event.getSource() == snapobjectButton)
	2044	+ if (source == snapobjectButton)
1811	2045	{
1812	2046	//Reload(lastConverter, lastFilename, true);
1813	2047	SnapObject();
..	..	@@ -1818,13 +2052,13 @@
1818	2052	// Recompile();
1819	2053	// refreshContents();
1820	2054	// } else
1821		- if (event.getSource() == gcButton)
	2055	+ if (source == gcButton)
1822	2056	{
1823	2057	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2058	System.gc();
1825	2059	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2060	} else
1827		- if (event.getSource() == editLeafItem)
	2061	+ if (source == editLeafItem)
1828	2062	{
1829	2063	Object3D obj;
1830	2064	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2072,74 @@
1838	2072	}
1839	2073	refreshContents(true);
1840	2074	} else
1841		- if (event.getSource() == openWindowItem)
	2075	+ if (source == openWindowItem)
1842	2076	{
1843	2077	EditSelection(true);
1844	2078	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2079	+ if (source == cutItem \|\| source == clearButton)
1846	2080	{
1847	2081	loadClipboard(true);
1848	2082	} else
1849		- if (event.getSource() == duplicateItem)
	2083	+ if (source == undoItem)
1850	2084	{
1851		- 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;
1852	2094	loadClipboard(false);
1853	2095	paste(false);
1854		- GrafreeD.clipboard = keep;
	2096	+ Grafreed.clipboard = keep;
1855	2097	} else
1856		- if (event.getSource() == cloneItem)
	2098	+ if (source == cloneItem)
1857	2099	{
1858	2100	CloneSelection(false);
1859	2101	} else
1860		- if (event.getSource() == cloneSupportItem)
	2102	+ if (source == cloneSupportItem)
1861	2103	{
1862	2104	CloneSelection(true);
1863	2105	} else
1864		- if (event.getSource() == copyItem)
	2106	+ if (source == copyItem)
1865	2107	{
1866	2108	loadClipboard(false);
1867	2109	} else
1868		- if (event.getSource() == pasteItem)
	2110	+ if (source == pasteItem)
1869	2111	{
1870	2112	paste(false);
1871	2113	} else
1872		- if (event.getSource() == pasteLinkItem)
	2114	+ if (source == pasteIntoItem)
1873	2115	{
1874		- pasteInto(false);
	2116	+ pasteInto(true, false);
1875	2117	} else
1876		- if (event.getSource() == pasteCloneItem)
	2118	+ if (source == pasteLinkItem)
1877	2119	{
1878		- pasteInto(true);
	2120	+ pasteInto(false, false);
1879	2121	} else
1880		- if (event.getSource() == pasteExpandItem)
	2122	+ if (source == pasteCloneItem)
	2123	+ {
	2124	+ pasteInto(true, true);
	2125	+ } else
	2126	+ if (source == pasteExpandItem)
1881	2127	{
1882	2128	paste(true);
1883	2129	} else
1884		- if (event.getSource() == synchronizeItem)
	2130	+ if (source == synchronizeItem)
1885	2131	{
1886	2132	Overwrite(Object3D.TRANSFORM);
1887	2133	} else
1888		- if (event.getSource() == overwriteNameItem)
	2134	+ if (source == overwriteNameItem)
1889	2135	{
1890	2136	Overwrite(Object3D.NAME);
1891	2137	} else
1892		- if (event.getSource() == overwriteUVItem)
	2138	+ if (source == overwriteUVItem)
1893	2139	{
1894	2140	Overwrite(Object3D.UV);
1895	2141	} else
1896		- if (event.getSource() == overwriteMatItem)
	2142	+ if (source == overwriteMatItem)
1897	2143	{
1898	2144	/* july 2015
1899	2145	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2159,7 @@
1913	2159
1914	2160	Overwrite(dropAttributes);
1915	2161	}
1916		- if (event.getSource() == overwriteGeoItem)
	2162	+ if (source == overwriteGeoItem)
1917	2163	{
1918	2164	Overwrite(Object3D.GEOMETRY);
1919	2165	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2176,7 @@
1930	2176	// refreshContents();
1931	2177	// }
1932	2178	} else
1933		- if (event.getSource() == generateMeshItem)
	2179	+ if (source == generateMeshItem)
1934	2180	{
1935	2181	//if (group.selection.size() == 1)
1936	2182	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2187,7 @@
1941	2187	ResetModel();
1942	2188	refreshContents();
1943	2189	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2190	+ if (source == extractGeometriesItem)
1945	2191	{
1946	2192	boolean one = false;
1947	2193
..	..	@@ -1968,7 +2214,7 @@
1968	2214	ResetModel();
1969	2215	refreshContents();
1970	2216	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2217	+ if (source == cloneGeometriesItem)
1972	2218	{
1973	2219	boolean one = false;
1974	2220
..	..	@@ -1994,32 +2240,37 @@
1994	2240	ResetModel();
1995	2241	refreshContents();
1996	2242	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2243	+ if (source == shareGeometriesItem)
1998	2244	{
1999	2245	boolean one = false;
2000	2246
2001	2247	if (group.selection.size() == 1)
2002	2248	one = true;
2003	2249
	2250	+ Object3D merge = null;
	2251	+
2004	2252	Object3D content = new cGroup();
2005	2253
2006	2254	for (int i=0; i<group.selection.size(); i++)
2007	2255	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2256	+ merge = new Merge(group.selection.get(i));
2009	2257
2010	2258	if (one)
2011		- makeSomething(sel, false);
	2259	+ makeSomething(merge, false);
2012	2260	else
2013		- content.addChild(sel);
	2261	+ content.addChild(merge);
2014	2262	}
2015	2263
2016	2264	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2265	+ makeSomething(content, true);
	2266	+ else
	2267	+ {
	2268	+ ResetModel();
	2269	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2270	+ refreshContents();
	2271	+ }
2021	2272	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2273	+ if (source == mergeGeometriesItem)
2023	2274	{
2024	2275	boolean one = false;
2025	2276
..	..	@@ -2049,7 +2300,7 @@
2049	2300	ResetModel();
2050	2301	refreshContents();
2051	2302	} else
2052		- if (event.getSource() == linkverticesItem)
	2303	+ if (source == linkverticesItem)
2053	2304	{
2054	2305	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2306	// {
..	..	@@ -2062,39 +2313,48 @@
2062	2313	// group.selection.get(0).setMasterThis(content); // should be identity
2063	2314	// refreshContents();
2064	2315	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2316	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	2317	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	2318	+ Object3D content = Grafreed.clipboard.get(0);
2068	2319
2069	2320	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2321	content = ((cGroup)content).get(0);
2071	2322
2072		- 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));
2073	2324	for (int i=0; i<group.selection.size(); i++)
2074	2325	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2326	+ boolean random = CameraPane.SWITCH;
	2327	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2328	group.selection.get(i).linkVerticesThis(content);
2078	2329	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2330	+ CameraPane.SWITCH = random;
2080	2331	}
2081		- 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));
2082	2333	refreshContents();
2083	2334	}
2084	2335	} else
2085		- if (event.getSource() == resetsupportItem)
	2336	+ if (source == resetsupportItem)
2086	2337	{
2087	2338	for (int i=0; i<group.selection.size(); i++)
2088	2339	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2340	+ boolean random = CameraPane.SWITCH;
	2341	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2342	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2343	+ CameraPane.SWITCH = random;
2093	2344	}
2094	2345
2095	2346	refreshContents();
2096	2347	} else
2097		- 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)
2098	2358	{
2099	2359	for (int i=0; i<group.selection.size(); i++)
2100	2360	{
..	..	@@ -2103,11 +2363,11 @@
2103	2363
2104	2364	refreshContents();
2105	2365	} else
2106		- if (event.getSource() == setMasterItem)
	2366	+ if (source == setMasterItem)
2107	2367	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2368	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	2369	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	2370	+ Object3D content = Grafreed.clipboard.get(0);
2111	2371
2112	2372	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	2373	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +2376,13 @@
2116	2376	refreshContents();
2117	2377	}
2118	2378	} else
2119		- if (event.getSource() == poseMeshItem)
	2379	+ if (source == poseMeshItem)
2120	2380	{
2121	2381	if (group.selection.size() == 1)
2122	2382	{
2123		- if (GrafreeD.clipboard.size() == 1)
	2383	+ if (Grafreed.clipboard.size() == 1)
2124	2384	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	2385	+ Object3D content = Grafreed.clipboard.get(0);
2126	2386
2127	2387	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	2388	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +2395,19 @@
2135	2395	}
2136	2396
2137	2397	} else
2138		- if (event.getSource() == revertMeshItem)
	2398	+ if (source == revertMeshItem)
2139	2399	{
2140	2400	RevertMeshes();
2141	2401	} else
2142		- if (event.getSource() == resetMeshItem)
	2402	+ if (source == resetAllItem)
2143	2403	{
2144	2404	ResetAll();
2145	2405	} else
2146		- if (event.getSource() == stepAllItem)
	2406	+ if (source == stepAllItem)
2147	2407	{
2148	2408	StepAll();
2149	2409	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2410	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2411	{
2152	2412	//int indices[] = jList.getSelectedIndices();
2153	2413	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2415,46 @@
2155	2415
2156	2416	ClearSelection(false);
2157	2417	} else
2158		- if (event.getSource() == clearAllItem)
	2418	+ if (source == clearAllItem)
2159	2419	{
2160	2420	ClearSelection(true);
2161	2421	} else
2162		- if (event.getSource() == grabItem)
	2422	+ if (source == grabItem)
2163	2423	{
2164	2424	group(new cGroup(), true);
2165	2425	} else
2166		- if (event.getSource() == frontItem)
	2426	+ if (source == hideItem)
	2427	+ {
	2428	+ group(new HiddenObject());
	2429	+ } else
	2430	+ if (source == frontItem)
2167	2431	{
2168	2432	front();
2169	2433	} else
2170		- if (event.getSource() == backItem)
	2434	+ if (source == backItem)
2171	2435	{
2172	2436	back();
2173	2437	} else
2174		- if (event.getSource() == cameraItem)
	2438	+ if (source == cameraItem)
2175	2439	{
2176	2440	makeSomething(new Camera());
2177	2441	} else
2178		- if (event.getSource() == compositeItem)
	2442	+ if (source == compositeItem)
2179	2443	{
2180	2444	group(new Composite());
2181	2445	} else
2182		- if (event.getSource() == randomItem)
	2446	+ if (source == randomItem)
2183	2447	{
2184	2448	RandomNode random = new RandomNode();
2185	2449	group(random);
2186	2450	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2451	+ random.name = random.get(0).name + "Switch";
2188	2452	} else
2189		- if (event.getSource() == physicsItem)
	2453	+ if (source == physicsItem)
2190	2454	{
2191	2455	group(new PhysicsNode());
2192	2456	} else
2193		- if (event.getSource() == frameselectorItem)
	2457	+ if (source == frameselectorItem)
2194	2458	{
2195	2459	for (int i=0; i<group.selection.size(); i++)
2196	2460	{
..	..	@@ -2202,7 +2466,7 @@
2202	2466	ResetModel();
2203	2467	refreshContents();
2204	2468	} else
2205		- if (event.getSource() == switchGeoItem)
	2469	+ if (source == switchGeoItem)
2206	2470	{
2207	2471	for (int i=0; i<group.selection.size(); i++)
2208	2472	{
..	..	@@ -2214,7 +2478,7 @@
2214	2478	ResetModel();
2215	2479	refreshContents();
2216	2480	} else
2217		- if (event.getSource() == switchTransfoItem)
	2481	+ if (source == switchTransfoItem)
2218	2482	{
2219	2483	for (int i=0; i<group.selection.size(); i++)
2220	2484	{
..	..	@@ -2226,7 +2490,7 @@
2226	2490	ResetModel();
2227	2491	refreshContents();
2228	2492	} else
2229		- if (event.getSource() == morphItem)
	2493	+ if (source == morphItem)
2230	2494	{
2231	2495	for (int i=0; i<group.selection.size(); i++)
2232	2496	{
..	..	@@ -2238,7 +2502,7 @@
2238	2502	ResetModel();
2239	2503	refreshContents();
2240	2504	} else
2241		- if (event.getSource() == scriptNodeItem)
	2505	+ if (source == scriptNodeItem)
2242	2506	{
2243	2507	boolean atleastone = false;
2244	2508
..	..	@@ -2277,195 +2541,239 @@
2277	2541	}
2278	2542	}
2279	2543	} else
2280		- if (event.getSource() == linkerItem)
	2544	+ if (source == linkerItem)
2281	2545	{
2282	2546	group(new cLinker());
2283	2547	} else
2284		- if (event.getSource() == textureItem)
	2548	+ if (source == textureItem)
2285	2549	{
2286	2550	group(new TextureNode());
2287	2551	} else
2288		- if (event.getSource() == shadowXItem)
	2552	+ if (source == billboardItem)
	2553	+ {
	2554	+ group(new BillboardNode());
	2555	+ } else
	2556	+ if (source == shadowXItem)
2289	2557	{
2290	2558	CastShadow(0);
2291	2559	} else
2292		- if (event.getSource() == shadowYItem)
	2560	+ if (source == shadowYItem)
2293	2561	{
2294	2562	CastShadow(1);
2295	2563	} else
2296		- if (event.getSource() == shadowZItem)
	2564	+ if (source == shadowZItem)
2297	2565	{
2298	2566	CastShadow(2);
2299	2567	} else
2300		- if (event.getSource() == ungroupItem)
	2568	+ if (source == ungroupItem)
2301	2569	{
2302		- 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();
2303	2579	} else
2304		- if (event.getSource() == genUVItem)
	2580	+ if (source == genUVItem)
2305	2581	{
2306	2582	GenUV();
2307	2583	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2584	+ if (source == genNormalsCADItem)
2309	2585	{
2310	2586	GenNormals(true);
2311	2587	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2588	+ if (source == genNormalsMESHItem)
	2589	+ {
	2590	+ GenNormalsMESH();
	2591	+ } else
	2592	+ if (source == genNormalsORGANItem)
2313	2593	{
2314	2594	GenNormals(false);
2315	2595	} else
2316		- if (event.getSource() == stripifyItem)
	2596	+ if (source == genNormalsMINEItem)
	2597	+ {
	2598	+ GenNormalsMINE();
	2599	+ } else
	2600	+ if (source == stripifyItem)
2317	2601	{
2318	2602	Stripify();
2319	2603	} else
2320		- if (event.getSource() == unstripifyItem)
	2604	+ if (source == unstripifyItem)
2321	2605	{
2322	2606	Unstripify();
2323	2607	} else
2324		- if (event.getSource() == trimItem)
	2608	+ if (source == trimItem)
2325	2609	{
2326	2610	Trim();
2327	2611	} else
2328		- if (event.getSource() == untrimItem)
	2612	+ if (source == untrimItem)
2329	2613	{
2330	2614	Untrim();
2331	2615	} else
2332		- if (event.getSource() == clearColorsItem)
	2616	+ if (source == clearColorsItem)
2333	2617	{
2334	2618	ClearColors();
2335	2619	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2620	+ if (source == clearMaterialsItem)
2337	2621	{
2338	2622	ClearMaterials();
2339	2623	} else
2340		- if (event.getSource() == liveleavesItem)
	2624	+ if (source == liveleavesItem)
2341	2625	{
2342	2626	LiveLeaves(true);
2343	2627	} else
2344		- if (event.getSource() == unliveleavesItem)
	2628	+ if (source == unliveleavesItem)
2345	2629	{
2346	2630	LiveLeaves(false);
2347	2631	} else
2348		- if (event.getSource() == supportleavesItem)
	2632	+ if (source == supportleavesItem)
2349	2633	{
2350	2634	SupportLeaves(true);
2351	2635	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2636	+ if (source == unsupportleavesItem)
2353	2637	{
2354	2638	SupportLeaves(false);
2355	2639	} else
2356		- if (event.getSource() == hideleavesItem)
	2640	+ if (source == hideleavesItem)
2357	2641	{
2358	2642	HideLeaves(true);
2359	2643	} else
2360		- if (event.getSource() == showleavesItem)
	2644	+ if (source == showleavesItem)
2361	2645	{
2362	2646	HideLeaves(false);
2363	2647	} else
2364		- if (event.getSource() == markleavesItem)
	2648	+ if (source == markleavesItem)
2365	2649	{
2366	2650	MarkLeaves(true);
2367	2651	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2652	+ if (source == unmarkleavesItem)
2369	2653	{
2370	2654	MarkLeaves(false);
2371	2655	} else
2372		- 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)
2373	2673	{
2374	2674	FlipV(true);
2375	2675	} else
2376		- if (event.getSource() == unflipVItem)
	2676	+ if (source == unflipVItem)
2377	2677	{
2378	2678	FlipV(false);
2379	2679	} else
2380		- if (event.getSource() == lowTexturesItem)
	2680	+ if (source == lowTexturesItem)
2381	2681	{
2382	2682	SetTexRes(0);
2383	2683	} else
2384		- if (event.getSource() == normalTexturesItem)
	2684	+ if (source == normalTexturesItem)
2385	2685	{
2386	2686	SetTexRes(1);
2387	2687	} else
2388		- if (event.getSource() == highTexturesItem)
	2688	+ if (source == highTexturesItem)
2389	2689	{
2390	2690	SetTexRes(2);
2391	2691	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2692	+ if (source == veryhighTexturesItem)
2393	2693	{
2394	2694	SetTexRes(3);
2395	2695	} else
2396		- if (event.getSource() == maxTexturesItem)
	2696	+ if (source == maxTexturesItem)
2397	2697	{
2398	2698	SetTexRes(4);
2399	2699	} else
2400		- if (event.getSource() == panoTexturesItem)
	2700	+ if (source == panoTexturesItem)
2401	2701	{
2402	2702	SetTexRes(5);
2403	2703	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2704	+ if (source == reverseNormalsItem)
2405	2705	{
2406	2706	ReverseNormals();
2407	2707	} else
2408		- if (event.getSource() == parseverticesItem)
	2708	+ if (source == parseverticesItem)
2409	2709	{
2410	2710	ParseVertices();
2411	2711	} else
2412		- if (event.getSource() == textureFieldItem)
	2712	+ if (source == textureFieldItem)
2413	2713	{
2414	2714	TextureVertices();
2415	2715	} else
2416		- if (event.getSource() == alignItem)
	2716	+ if (source == alignItem)
2417	2717	{
2418	2718	Align();
2419	2719	} else
2420		- if (event.getSource() == mirrorItem)
	2720	+ if (source == mirrorItem)
2421	2721	{
2422	2722	MirrorPoses();
2423	2723	} else
2424		- if (event.getSource() == reduceMorphItem)
	2724	+ if (source == reduceMorphItem)
2425	2725	{
2426	2726	MeshReduction(false);
2427	2727	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2728	+ if (source == reduce34MorphItem)
2429	2729	{
2430	2730	MeshReduction(true);
2431	2731	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2732	+ if (source == reverseTrianglesItem)
2433	2733	{
2434	2734	ReverseTriangles();
2435	2735	} else
2436		- if (event.getSource() == reduceMeshItem)
	2736	+ if (source == reduceMeshItem)
2437	2737	{
2438	2738	ReduceMesh(false);
2439	2739	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2740	+ if (source == reduce34MeshItem)
2441	2741	{
2442	2742	ReduceMesh(true);
2443	2743	} else
2444		- if (event.getSource() == increaseMeshItem)
	2744	+ if (source == increaseMeshItem)
2445	2745	{
2446	2746	IncreaseMesh();
2447	2747	} else
2448		- if (event.getSource() == clipMeshItem)
	2748	+ if (source == clipMeshItem)
2449	2749	{
2450	2750	ClipMesh();
2451	2751	} else
2452		- if (event.getSource() == smoothMeshItem)
	2752	+ if (source == smoothMeshItem)
2453	2753	{
2454	2754	SmoothMesh();
2455	2755	} else
2456		- if (event.getSource() == transformgeometryItem)
	2756	+ if (source == transformGeometryItem)
2457	2757	{
2458	2758	TransformGeometry();
2459	2759	} else
2460		- if (event.getSource() == resetTransformItem)
	2760	+ if (source == transformChildrenItem)
	2761	+ {
	2762	+ TransformChildren();
	2763	+ } else
	2764	+ if (source == resetTransformItem)
2461	2765	{
2462	2766	ResetTransform();
2463	2767	} else
2464		- if (event.getSource() == resetCentroidItem)
	2768	+ if (source == resetCentroidItem)
2465	2769	{
2466		- ResetCentroid();
	2770	+ ResetCentroid(true);
2467	2771	} else
2468		- if (event.getSource() == resetParentItem)
	2772	+ if (source == resetCentroidXZItem)
	2773	+ {
	2774	+ ResetCentroid(false);
	2775	+ } else
	2776	+ if (source == resetParentItem)
2469	2777	{
2470	2778	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2779	{
..	..	@@ -2475,7 +2783,7 @@
2475	2783
2476	2784	refreshContents();
2477	2785	} else
2478		- if (event.getSource() == repairParentItem)
	2786	+ if (source == repairParentItem)
2479	2787	{
2480	2788	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2789	{
..	..	@@ -2489,7 +2797,21 @@
2489	2797
2490	2798	refreshContents();
2491	2799	} else
2492		- 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)
2493	2815	{
2494	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2817	{
..	..	@@ -2501,7 +2823,7 @@
2501	2823	ResetModel();
2502	2824	refreshContents();
2503	2825	} else
2504		- if (event.getSource() == sortbynameItem)
	2826	+ if (source == sortbynameItem)
2505	2827	{
2506	2828	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2829	{
..	..	@@ -2513,7 +2835,7 @@
2513	2835	ResetModel();
2514	2836	refreshContents();
2515	2837	} else
2516		- if (event.getSource() == attachPigmentItem)
	2838	+ if (source == attachPigmentItem)
2517	2839	{
2518	2840	String texture = GetFile("Attach pigment");
2519	2841	Object3D obj;
..	..	@@ -2525,7 +2847,7 @@
2525	2847
2526	2848	refreshContents();
2527	2849	} else
2528		- if (event.getSource() == detachPigmentItem)
	2850	+ if (source == detachPigmentItem)
2529	2851	{
2530	2852	Object3D obj;
2531	2853	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2858,7 @@
2536	2858
2537	2859	refreshContents();
2538	2860	} else
2539		- if (event.getSource() == attachBumpItem)
	2861	+ if (source == attachBumpItem)
2540	2862	{
2541	2863	String texture = GetFile("Attach bump");
2542	2864	Object3D obj;
..	..	@@ -2548,7 +2870,7 @@
2548	2870
2549	2871	refreshContents();
2550	2872	} else
2551		- if (event.getSource() == detachBumpItem)
	2873	+ if (source == detachBumpItem)
2552	2874	{
2553	2875	Object3D obj;
2554	2876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2881,7 @@
2559	2881
2560	2882	refreshContents();
2561	2883	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2884	+ if (source == pigmentBumpItem)
2563	2885	{
2564	2886	Object3D obj;
2565	2887	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2892,221 @@
2570	2892
2571	2893	refreshContents();
2572	2894	} else
2573		- if (event.getSource() == flashSelectionButton)
	2895	+ if (source == flashSelectionButton)
2574	2896	{
2575	2897	CameraPane.flash = true;
2576	2898	refreshContents();
2577	2899	} else
2578		- if (event.getSource() == oneButton)
	2900	+ if (source == oneButton)
2579	2901	{
2580	2902	} else
2581		- if (event.getSource() == twoButton)
	2903	+ if (source == twoButton)
2582	2904	{
2583	2905	radio.layout = twoButton;
2584	2906	// bug
2585	2907	//gridPanel.setDividerLocation(1.0);
2586	2908	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	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	+
2611	2956	} else
2612		- if (event.getSource() == threeButton)
	2957	+ if (source == threeButton)
2613	2958	{
2614	2959	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	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();
2639	2994	} else
2640		- if (event.getSource() == fourButton)
	2995	+ if (source == fourButton)
2641	2996	{
2642	2997	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	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();
2667	3031	} else
2668		- if (event.getSource() == sixButton)
	3032	+ if (source == sixButton)
2669	3033	{
2670	3034	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	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();
2695	3069	} else
2696		- if (event.getSource() == sevenButton)
	3070	+ if (source == sevenButton)
2697	3071	{
2698	3072	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	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();
2723	3108	} else
2724		- if (event.getSource() == rootButton)
	3109	+ if (source == rootButton)
2725	3110	{
2726	3111	Object3D obj;
2727	3112	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2731,9 +3116,10 @@
2731	3116	EditObject(obj);
2732	3117	}
2733	3118
	3119	+ cameraView.requestFocusInWindow();
2734	3120	refreshContents(true);
2735	3121	} else
2736		- if (event.getSource() == closeButton)
	3122	+ if (source == closeButton)
2737	3123	{
2738	3124	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3125	cRadio ab;
..	..	@@ -2752,13 +3138,15 @@
2752	3138	break;
2753	3139	}
2754	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2755	3143	refreshContents(true);
2756	3144	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3145	+ if (source == editItem \|\| source == editButton)
2758	3146	{
2759	3147	EditSelection(false);
2760	3148	} else
2761		- if (event.getSource() == uneditButton)
	3149	+ if (source == uneditButton)
2762	3150	{
2763	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	3152	{
..	..	@@ -2768,14 +3156,14 @@
2768	3156	child.CloseUI();
2769	3157	listUI.remove(child);
2770	3158
2771		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2772	3160	}
2773		- objEditor.ctrlPanel.revalidate();
	3161	+ objEditor.ctrlPanel.FlushUI();
2774	3162	//objEditor.jTree.clearSelection();
2775	3163	//objEditor.ResetSliders();
2776	3164	refreshContents(true);
2777	3165	} else
2778		- if (event.getSource() == clearPanelButton)
	3166	+ if (source == clearPanelButton)
2779	3167	{
2780	3168	assert(copy == group);
2781	3169	//copy.ClearUI();
..	..	@@ -2786,7 +3174,7 @@
2786	3174	listUI.clear();
2787	3175	refreshContents(true);
2788	3176	} else
2789		- if (event.getSource() == allParamsButton)
	3177	+ if (source == allParamsButton)
2790	3178	{
2791	3179	assert(copy == group);
2792	3180
..	..	@@ -2807,19 +3195,19 @@
2807	3195
2808	3196	refreshContents(true);
2809	3197	} else
2810		- if (event.getSource() == unselectButton)
	3198	+ if (source == unselectButton)
2811	3199	{
2812	3200	objEditor.jTree.clearSelection();
2813	3201	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3202	objEditor.ResetSliders();
2815	3203	refreshContents(true);
2816	3204	} else
2817		- if(event.getSource() instanceof cRadio)
	3205	+ if(source instanceof cRadio)
2818	3206	{
2819	3207	group.parent = keepparent;
2820	3208	group.attributes = 0;
2821	3209	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3210	+ /cRadio/ radio = (cRadio)source;
2823	3211	Object3D obj = radio.GetObject();
2824	3212	System.out.println("Edit " + obj);
2825	3213	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3227,7 @@
2839	3227	}
2840	3228
2841	3229	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3230	+ //Globals.theRenderer.object = group;
2843	3231	if(!useclient)
2844	3232	{
2845	3233	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,12 +3236,16 @@
2848	3236	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3237	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3238	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3239	+ //cameraView.lighttouched = true;
	3240	+ Globals.lighttouched = true;
2852	3241	topView.object = group;
2853	3242	frontView.object = group;
2854	3243	sideView.object = group;
2855	3244	}
2856		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
2857	3249	/*
2858	3250	currentLayout = radio.layout;
2859	3251	if (currentLayout == null)
..	..	@@ -2865,8 +3257,23 @@
2865	3257	//group.parent = null; // ROOT
2866	3258	//group.attributes = -1;
2867	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2868	3262	refreshContents(true);
2869		- }
	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	+ }
2870	3277	else
2871	3278	{
2872	3279	//return super.action(event, arg);
..	..	@@ -2875,7 +3282,6 @@
2875	3282	}
2876	3283
2877	3284	boolean useclient = false;
2878		- cRadio radio;
2879	3285
2880	3286	void ToggleRoot()
2881	3287	{
..	..	@@ -2884,7 +3290,7 @@
2884	3290	if (useclient)
2885	3291	{
2886	3292	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3293	+ Globals.lighttouched = true;
2888	3294	//topView.object = client;
2889	3295	//frontView.object = client;
2890	3296	//sideView.object = client;
..	..	@@ -2892,7 +3298,7 @@
2892	3298	else
2893	3299	{
2894	3300	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3301	+ Globals.lighttouched = true;
2896	3302	//topView.object = group;
2897	3303	//frontView.object = group;
2898	3304	//sideView.object = group;
..	..	@@ -2927,6 +3333,28 @@
2927	3333	refreshContents();
2928	3334	}
2929	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	+ }
2930	3358
2931	3359	void ResetTransform()
2932	3360	{
..	..	@@ -3039,7 +3467,7 @@
3039	3467	refreshContents();
3040	3468	}
3041	3469
3042		- void ResetCentroid()
	3470	+ void ResetCentroid(boolean full)
3043	3471	{
3044	3472	Object3D obj;
3045	3473	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +3482,16 @@
3054	3482	LA.matIdentity(Object3D.mat);
3055	3483	obj.getBounds(minima, maxima, false);
3056	3484	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3485	+ if (full)
	3486	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	3487	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	3488	obj.TransformMesh(Object3D.mat);
	3489	+
3060	3490	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3491	+ if (full)
	3492	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	3493	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3494	+
3063	3495	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	3496	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	3497	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +3520,8 @@
3088	3520
3089	3521	int size = obj.MemorySize();
3090	3522
3091		- 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)");
3092	3525	}
3093	3526	}
3094	3527	catch (Exception e)
..	..	@@ -3125,9 +3558,9 @@
3125	3558	obj = (Object3D)e.nextElement();
3126	3559
3127	3560	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	3561	+ Grafreed.AnalyzeObject(obj);
3129	3562	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	3563	+ Grafreed.AnalyzeObject(obj.bRep);
3131	3564
3132	3565	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	3566	}
..	..	@@ -3169,6 +3602,20 @@
3169	3602	void GenNormals(boolean crease)
3170	3603	{
3171	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();
3172	3619
3173	3620	refreshContents();
3174	3621	}
..	..	@@ -3334,8 +3781,8 @@
3334	3781
3335	3782	void ParseVertices()
3336	3783	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	3784	+ boolean epsequal = Grafreed.epsequal;
	3785	+ Grafreed.epsequal = true;
3339	3786
3340	3787	for (int i=0; i<group.selection.size(); i++)
3341	3788	{
..	..	@@ -3360,7 +3807,7 @@
3360	3807	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	3808	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	3809
3363		- g.add(GrafreeD.clipboard);
	3810	+ g.add(Grafreed.clipboard);
3364	3811
3365	3812	buffer.add(g);
3366	3813	}
..	..	@@ -3375,7 +3822,7 @@
3375	3822	makeSomething(buffer, i==group.selection.size()-1);
3376	3823	}
3377	3824
3378		- GrafreeD.epsequal = epsequal;
	3825	+ Grafreed.epsequal = epsequal;
3379	3826
3380	3827	refreshContents();
3381	3828	}
..	..	@@ -3393,7 +3840,16 @@
3393	3840	String pigment = Object3D.GetPigment(tex);
3394	3841	//String bump = Object3D.GetBump(tex);
3395	3842
3396		- 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	+ }
3397	3853
3398	3854	double s = v.s;
3399	3855
..	..	@@ -3441,12 +3897,26 @@
3441	3897
3442	3898	void Align()
3443	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	+
3444	3914	for (int i=0; i<group.selection.size(); i++)
3445	3915	{
3446	3916	Object3D obj = group.selection.get(i);
3447	3917
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- 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);
3450	3920	}
3451	3921
3452	3922	refreshContents();
..	..	@@ -3467,11 +3937,11 @@
3467	3937
3468	3938	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	3939
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	3940	+ boolean random = CameraPane.SWITCH;
	3941	+ CameraPane.SWITCH = false; // parse all random nodes
3472	3942	lowres.linkVerticesThis(null);
3473	3943	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	3944	+ CameraPane.SWITCH = random;
3475	3945
3476	3946	System.err.flush();
3477	3947
..	..	@@ -3511,7 +3981,7 @@
3511	3981	return;
3512	3982
3513	3983	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	3984	+ Object3D ref = Grafreed.clipboard.get(0);
3515	3985
3516	3986	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	3987
..	..	@@ -3680,7 +4150,7 @@
3680	4150	group.selection.RelinkToSupport(); // july 2014
3681	4151	System.out.println("DONE.");
3682	4152	refreshContents();
3683		- 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));
3684	4154	}
3685	4155
3686	4156	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +4175,9 @@
3705	4175
3706	4176	void ClipMesh()
3707	4177	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4178	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	4179	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	4180	+ Object3D content = Grafreed.clipboard.get(0);
3711	4181
3712	4182	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	4183	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +4186,7 @@
3716	4186	// {
3717	4187	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	4188	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	4189	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	4190	}
3721	4191	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	4192	System.out.println("DONE.");
..	..	@@ -3763,6 +4233,18 @@
3763	4233	void MarkLeaves(boolean hide)
3764	4234	{
3765	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);
3766	4248	refreshContents();
3767	4249	}
3768	4250
..	..	@@ -3851,7 +4333,7 @@
3851	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	4334
3853	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
3855	4337	{
3856	4338	// if (!(elem instanceof Composite))
3857	4339	// newWindow = false;
..	..	@@ -3941,7 +4423,6 @@
3941	4423	//case 702: // Event.LIST_DESELECT
3942	4424	group.deselectAll();
3943	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	4426	if (tps != null)
3946	4427	{
3947	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,31 +4431,30 @@
3950	4431
3951	4432	//if (child.parent != null)
3952	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
3953	4435	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	4436	}
3958	4437	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4438	+// else
	4439	+// {
	4440	+// objEditor.SetMaterial(group); // .GetMaterial());
	4441	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4442	+// System.err.println("info : " + group.GetPath());
	4443	+// }
3965	4444
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- 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))
3969	4446	CameraPane.flash = true;
3970	4447
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	4449	// a camera
3973	4450	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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;
3978	4458	}
3979	4459
3980	4460	refreshContents();
..	..	@@ -3985,6 +4465,26 @@
3985	4465
3986	4466	freezemodel = false;
3987	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	+ }
3988	4488
3989	4489	void linkSomething(Object3D thing)
3990	4490	{
..	..	@@ -4056,16 +4556,18 @@
4056	4556	{
4057	4557	if (group.selection.isEmpty())
4058	4558	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	4559	+
	4560	+ Grafreed.clipboardIsTempGroup = false;
4060	4561	Composite tGroup = null;
4061	4562	if (group.selection.size() > 0) // 1)
4062	4563	{
4063	4564	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	4565	+ Grafreed.clipboardIsTempGroup = true;
4065	4566	}
4066	4567
4067	4568	if (cut)
4068	4569	{
	4570	+ Save();
4069	4571	//int indices[] = jList.getSelectedIndices();
4070	4572	//for (int i = indices.length - 1; i >= 0; i--)
4071	4573	//jList.remove(indices[i]);
..	..	@@ -4101,16 +4603,16 @@
4101	4603	//System.out.println("cut " + child);
4102	4604	//System.out.println("parent = " + child.parent);
4103	4605	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4105	4607	tGroup.add/Child/(tmp);
4106	4608	else
4107		- GrafreeD.clipboard = tmp;
	4609	+ Grafreed.clipboard = tmp;
4108	4610	}
4109	4611	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	4612	+ if (Grafreed.clipboardIsTempGroup)
4111	4613	tGroup.add/Child/(child);
4112	4614	else
4113		- GrafreeD.clipboard = child;
	4615	+ Grafreed.clipboard = child;
4114	4616	}
4115	4617
4116	4618	//ResetModel();
..	..	@@ -4142,21 +4644,23 @@
4142	4644	//System.out.println("cut " + elem);
4143	4645	//System.out.println("parent = " + elem.parent);
4144	4646	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	4647	+ if (Grafreed.clipboardIsTempGroup)
4146	4648	tGroup.add/Child/(tmp);
4147	4649	else
4148		- GrafreeD.clipboard = tmp;
	4650	+ Grafreed.clipboard = tmp;
4149	4651	}
4150	4652	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4152	4654	tGroup.add/Child/(child);
4153	4655	else
4154		- GrafreeD.clipboard = child;
	4656	+ Grafreed.clipboard = child;
4155	4657	}
4156	4658
4157	4659	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	4660	+
	4661	+ if (Grafreed.clipboardIsTempGroup)
	4662	+ Grafreed.clipboard = tGroup;
	4663	+
4160	4664	if (cut)
4161	4665	{
4162	4666	ResetModel();
..	..	@@ -4170,7 +4674,7 @@
4170	4674	// return;
4171	4675	boolean first = true;
4172	4676
4173		- if (GrafreeD.clipboardIsTempGroup)
	4677	+ if (Grafreed.clipboardIsTempGroup)
4174	4678	{
4175	4679	Composite temp;
4176	4680
..	..	@@ -4181,7 +4685,7 @@
4181	4685	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	4686	*/
4183	4687	Object3D elem;
4184		- 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))
4185	4689	{
4186	4690	Object3D child = (Object3D)e.nextElement();
4187	4691
..	..	@@ -4215,21 +4719,21 @@
4215	4719	//Object3D cb = Applet3D.clipboard;
4216	4720	//temp.addChild(cb);
4217	4721	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4223	4727	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	4728	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4729	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	4730	}
4227	4731
4228	4732	ResetModel();
4229	4733	refreshContents();
4230	4734	}
4231	4735
4232		- void pasteInto(boolean copyit)
	4736	+ void pasteInto(boolean copyit, boolean clone)
4233	4737	{
4234	4738	// if (GrafreeD.clipboard == null)
4235	4739	// return;
..	..	@@ -4258,15 +4762,22 @@
4258	4762	if (copyit)
4259	4763	{
4260	4764	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4765	+ if (clone)
	4766	+ {
	4767	+ CloneClipboard(false); // sept 2014
	4768	+ }
	4769	+ else
	4770	+ {
	4771	+ paste(false);
	4772	+ }
4262	4773	}
4263	4774	else
4264	4775	{
4265	4776	boolean first = true;
4266	4777
4267		- if (GrafreeD.clipboardIsTempGroup)
	4778	+ if (Grafreed.clipboardIsTempGroup)
4268	4779	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	4780	+ Composite temp = (Composite)Grafreed.clipboard;
4270	4781	Object3D copy;
4271	4782	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	4783	{
..	..	@@ -4276,7 +4787,7 @@
4276	4787	}
4277	4788	} else
4278	4789	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	4790	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	4791	}
4281	4792	}
4282	4793	}
..	..	@@ -4468,6 +4979,26 @@
4468	4979	makeSomething(csg);
4469	4980	}
4470	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	+
4471	5002	void ungroup()
4472	5003	{
4473	5004	/*
..	..	@@ -4661,21 +5192,6 @@
4661	5192	}
4662	5193	*/
4663	5194
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	5195	/*
4680	5196	public void Callback(Object obj)
4681	5197	{
..	..	@@ -4699,26 +5215,9 @@
4699	5215	}
4700	5216	*/
4701	5217
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	5218	String GetFile(String dialogName)
4720	5219	{
4721		- if (GrafreeD.standAlone)
	5220	+ if (Grafreed.standAlone)
4722	5221	{
4723	5222	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	5223	browser.show();
..	..	@@ -4782,10 +5281,18 @@
4782	5281	cButton flashSelectionButton;
4783	5282	cButton editButton;
4784	5283	cButton uneditButton;
	5284	+ JCheckBox allParamsButton;
4785	5285	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5286	cButton unselectButton;
4788	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
	5294	+ cButton oneStepButton;
	5295	+
4789	5296	cButton screenfitButton;
4790	5297	cButton screenfitpointButton;
4791	5298	cButton snapobjectButton;
..	..	@@ -4796,14 +5303,6 @@
4796	5303	cButton closeButton;
4797	5304
4798	5305	cButton setsupportButton;
4799		-
4800		- cButton twoButton;
4801		- cButton sixButton;
4802		- cButton threeButton;
4803		- cButton sevenButton;
4804		- cButton fourButton; // full panel
4805		- cButton oneButton; // full XYZ
4806		- //cButton currentLayout;
4807	5306
4808	5307	//
4809	5308	//Composite
..	..	@@ -4816,6 +5315,8 @@
4816	5315	private MenuItem lookFromItem;
4817	5316	private MenuItem switchItem;
4818	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
4819	5320	private MenuItem duplicateItem;
4820	5321	private MenuItem cloneItem;
4821	5322	private MenuItem cloneSupportItem;
..	..	@@ -4827,8 +5328,9 @@
4827	5328	private MenuItem resetsupportItem;
4828	5329	private MenuItem resetreferencesItem;
4829	5330	private MenuItem linkverticesItem;
	5331	+ private MenuItem relinkverticesItem;
4830	5332	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	5333	+ private MenuItem resetAllItem;
4832	5334	private MenuItem stepAllItem;
4833	5335	private MenuItem revertMeshItem;
4834	5336	private MenuItem poseMeshItem;
..	..	@@ -4839,14 +5341,17 @@
4839	5341	private MenuItem mergeGeometriesItem;
4840	5342	private MenuItem copyItem;
4841	5343	private MenuItem pasteItem;
	5344	+ private MenuItem pasteIntoItem;
4842	5345	private MenuItem pasteLinkItem;
4843	5346	private MenuItem pasteCloneItem;
4844	5347	private MenuItem pasteExpandItem;
4845	5348	private MenuItem clearItem;
4846	5349	private MenuItem clearAllItem;
4847	5350	private MenuItem genUVItem;
	5351	+ private MenuItem genNormalsMESHItem;
4848	5352	private MenuItem genNormalsCADItem;
4849	5353	private MenuItem genNormalsORGANItem;
	5354	+ private MenuItem genNormalsMINEItem;
4850	5355	private MenuItem stripifyItem;
4851	5356	private MenuItem unstripifyItem;
4852	5357	private MenuItem trimItem;
..	..	@@ -4875,6 +5380,10 @@
4875	5380	private MenuItem showleavesItem;
4876	5381	private MenuItem markleavesItem;
4877	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
4878	5387
4879	5388	private MenuItem flipVItem;
4880	5389	private MenuItem unflipVItem;
..	..	@@ -4886,8 +5395,11 @@
4886	5395	private MenuItem panoTexturesItem;
4887	5396
4888	5397	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	5398	+ private MenuItem resetCentroidXZItem;
4890	5399	private MenuItem resetTransformItem;
	5400	+ private MenuItem transformGeometryItem;
	5401	+ private MenuItem transformChildrenItem;
	5402	+ private MenuItem hideItem;
4891	5403	private MenuItem grabItem;
4892	5404	private MenuItem backItem;
4893	5405	private MenuItem frontItem;
..	..	@@ -4908,6 +5420,7 @@
4908	5420
4909	5421	private MenuItem resetParentItem;
4910	5422	private MenuItem repairParentItem;
	5423	+ private MenuItem repairShadowItem;
4911	5424	private MenuItem sortbysizeItem;
4912	5425	private MenuItem sortbynameItem;
4913	5426
..	..	@@ -4928,10 +5441,11 @@
4928	5441	private MenuItem coneItem;
4929	5442	private MenuItem torusItem;
4930	5443	private MenuItem superItem;
	5444	+ private MenuItem kleinItem;
4931	5445	private MenuItem blobItem;
4932	5446	private MenuItem latheItem;
4933	5447	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5448	+ private MenuItem overlayItem;
4935	5449	private MenuItem meshItem;
4936	5450	// private MenuItem meshGroupItem;
4937	5451	private MenuItem springItem;
..	..	@@ -4940,6 +5454,7 @@
4940	5454	private MenuItem csgItem;
4941	5455	private MenuItem templateItem;
4942	5456	private MenuItem textureItem;
	5457	+ private MenuItem billboardItem;
4943	5458	private MenuItem shadowXItem;
4944	5459	private MenuItem shadowYItem;
4945	5460	private MenuItem shadowZItem;
..	..	@@ -4952,11 +5467,6 @@
4952	5467	private MenuItem doubleItem;
4953	5468	private MenuItem tripleItem;
4954	5469
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	5470	private MenuItem computeAOItem;
4961	5471	private MenuItem recompileItem;
4962	5472	private MenuItem editScriptItem;
..	..	@@ -4966,4 +5476,8 @@
4966	5476	private MenuItem analyzeItem;
4967	5477	private MenuItem dumpItem;
4968	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
4969	5483	}