~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,19 +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);
222	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
224	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	325	setMasterItem.addActionListener(this);
	326	+ }
226	327
227	328	oe.menuBar.add(menu = new Menu("Group"));
228	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +334,32 @@
233	334	frontItem.addActionListener(this);
234	335	compositeItem = menu.add(new MenuItem("Composite"));
235	336	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	338	hideItem.addActionListener(this);
238	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	340	ungroupItem.addActionListener(this);
240	341	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
242	343	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	345	switchGeoItem.addActionListener(this);
249	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	347	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	359	scriptNodeItem.addActionListener(this);
255	360	cameraItem = menu.add(new MenuItem("Camera"));
256	361	cameraItem.addActionListener(this);
	362	+ }
257	363
258	364	oe.menuBar.add(menu = new Menu("Object"));
259	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -262,27 +368,35 @@
262	368	billboardItem.addActionListener(this);
263	369	csgItem = menu.add(new MenuItem("CSG"));
264	370	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	372	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	374	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
271	380	linkerItem = menu.add(new MenuItem("Linker"));
272	381	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	382	attributeItem = menu.add(new MenuItem("Attribute"));
276	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
277	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	387	pointflowItem.addActionListener(this);
	388	+ }
279	389	menu.add("-");
280	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	391	resetTransformItem.addActionListener(this);
282	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	393	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.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);
286	400
287	401	oe.menuBar.add(menu = new Menu("Geometry"));
288	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +407,11 @@
293	407	genNormalsCADItem.addActionListener(this);
294	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
296	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
298	415	stripifyItem = menu.add(new MenuItem("Stripify"));
299	416	stripifyItem.addActionListener(this);
300	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +433,34 @@
316	433	reduce34MeshItem.addActionListener(this);
317	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	435	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
323	444
324	445	oe.menuBar.add(menu = new Menu("Attributes"));
325	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	452	menu.add("-");
328	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	454	liveleavesItem.addActionListener(this);
330	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
332	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	460	supportleavesItem.addActionListener(this);
334	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	462	unsupportleavesItem.addActionListener(this);
	463	+ }
336	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	465	hideleavesItem.addActionListener(this);
338	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +469,14 @@
341	469	markleavesItem.addActionListener(this);
342	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	480	menu.add("-");
345	481	flipVItem = menu.add(new MenuItem("Flip V"));
346	482	flipVItem.addActionListener(this);
..	..	@@ -376,35 +512,40 @@
376	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	513	sortbynameItem.addActionListener(this);
378	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.
379	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	523	extractGeometriesItem.addActionListener(this);
381	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	525	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	526	+ }
387	527
388	528	oe.menuBar.add(menu = new Menu("Insert"));
389	529	buildCreateMenu(menu);
390	530
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	531	oe.menuBar.add(menu = new Menu("Tools"));
403	532	buildToolsMenu(menu);
404	533	}
405	534
406	535	void SetupUI2(ObjEditor oe)
407	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	+
408	549	//new Exception().printStackTrace();
409	550
410	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,176 +574,120 @@
433	574	oe.radioPanel.add(dummyButton);
434	575	oe.buttonGroup.add(dummyButton);
435	576	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	578
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	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");
442	605	liveCB.addItemListener(this);
443	606
444		- oe.aConstraints.gridx += 1;
445		- 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);
446	612	fastCB.setToolTipText("Fast mode");
447	613	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
515	616	trackCB.setToolTipText("Enable tracking");
516	617	trackCB.addItemListener(this);
517	618
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	620	screenfitButton.setToolTipText("Screen fit");
521	621	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	622	+
523	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	624	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	625
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	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);
537	634	flashSelectionButton.setToolTipText("Show selection");
538	635	flashSelectionButton.addActionListener(this);
539	636
540		- oe.toolbarPanel.add(new cButton(" ", false));
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	638
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	640	twoButton.setToolTipText("Show center view only");
549	641	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	643	fourButton.addActionListener(this);
552	644	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	646	sixButton.setToolTipText("2-column layout left");
555	647	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	649	threeButton.setToolTipText("2-column layout right");
558	650	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	652	sevenButton.setToolTipText("3-column layout");
561	653	sevenButton.addActionListener(this);
562	654	//
563	655
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
566	658	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	661	closeButton.setToolTipText("Close tab");
570	662	closeButton.addActionListener(this);
571	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	664	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574	665
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
577	668	editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	669
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
583	672	uneditButton.addActionListener(this);
584	673
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
597	676	allParamsButton.addActionListener(this);
598	677
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	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");
604	684	unselectButton.addActionListener(this);
605	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
606	691	// oe.aConstraints.gridx += 1;
607	692	// oe.aConstraints.weighty = 0;
608	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +699,37 @@
614	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	700	// gcButton.addActionListener(this);
616	701
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
628	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
630	707	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
635	711
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	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");
640	716	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- 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");
643	720	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- 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");
646	724	textureCB.addItemListener(this);
647	725
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
650	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
651	733	//jList.addListSelectionListener(this);
652	734	oe.jTree.addTreeSelectionListener(this);
653	735	//jTree.setRootVisible(false);
..	..	@@ -669,6 +751,78 @@
669	751	radio.layout = sevenButton;
670	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	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	+ }
672	826
673	827	void EditObject(Object3D obj)
674	828	{
..	..	@@ -681,8 +835,11 @@
681	835	buttonGroup.add(radioButton);
682	836	radioButton.doClick();
683	837	}
	838	+
684	839	void SetupViews(ObjEditor oe)
685	840	{
	841	+ theFrame = this;
	842	+
686	843	oe.SetupViews();
687	844
688	845	System.out.println("SetupViews");
..	..	@@ -745,6 +902,7 @@
745	902	} else if(e.getSource() == liveCB)
746	903	{
747	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
748	906	}
749	907	else if(e.getSource() == supportCB)
750	908	{
..	..	@@ -897,7 +1055,9 @@
897	1055	// objEditor.DropFile((java.io.File[]) object, true);
898	1056	// return;
899	1057	// }
900		- if (string.charAt(0) == '/')
	1058	+
	1059	+ // File path for Mac and Windows
	1060	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1061	{
902	1062	// file(s)
903	1063	String[] names = string.split("\n");
..	..	@@ -924,7 +1084,7 @@
924	1084
925	1085	flashIt = false;
926	1086	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1087	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1088	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1089
930	1090	if (group.selection.size() == 1)
..	..	@@ -951,11 +1111,11 @@
951	1111	{
952	1112	loadClipboard(true);
953	1113	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
	1114	+ pasteInto(false, false);
955	1115	} else {
956	1116	loadClipboard(false);
957	1117	objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
	1118	+ pasteInto(false, false); // true); // ???
959	1119	}
960	1120	}
961	1121	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1077,27 +1237,33 @@
1077	1237	kleinItem.addActionListener(this);
1078	1238	particleItem = menu.add(new MenuItem("Particle system"));
1079	1239	particleItem.addActionListener(this);
	1240	+ if (Globals.ADVANCED)
	1241	+ {
1080	1242	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1243	ragdollItem.addActionListener(this);
1082	1244	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1245	ragdoll2Item.addActionListener(this);
	1246	+ }
1084	1247	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1248	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1249	meshItem.addActionListener(this);
1087	1250	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1251	// meshGroupItem.addActionListener(this);
	1252	+ if (Globals.ADVANCED)
	1253	+ {
1089	1254	springItem = menu.add(new MenuItem("Spring"));
1090	1255	springItem.addActionListener(this);
1091	1256	flagItem = menu.add(new MenuItem("Flag"));
1092	1257	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1258	blobItem = menu.add(new MenuItem("Blob"));
1098	1259	blobItem.addActionListener(this);
1099	1260	latheItem = menu.add(new MenuItem("Lathe"));
1100	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);
1101	1267	lightItem = menu.add(new MenuItem("Light"));
1102	1268	lightItem.addActionListener(this);
1103	1269	menu.add("-");
..	..	@@ -1107,39 +1273,44 @@
1107	1273	loopItem.addActionListener(this);
1108	1274	doubleItem = menu.add(new MenuItem("Fork"));
1109	1275	doubleItem.addActionListener(this);
	1276	+ if (Globals.ADVANCED)
	1277	+ {
1110	1278	tripleItem = menu.add(new MenuItem("Trident"));
1111	1279	tripleItem.addActionListener(this);
	1280	+ }
1112	1281	}
1113	1282
1114	1283	void buildToolsMenu(Menu menu)
1115	1284	{
1116	1285	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1286	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1287	+ animationItem.setState(Globals.ANIMATION);
1119	1288
1120	1289	menu.add("-");
1121	1290	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1291	parseverticesItem.addActionListener(this);
1123	1292	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1293	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1294	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1295	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1296	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1297	reduceMorphItem.addActionListener(this);
1131	1298	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1299	reduce34MorphItem.addActionListener(this);
1133		-
	1300	+ menu.add("-");
1134	1301	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1302	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1303
	1304	+ if (Globals.ADVANCED)
	1305	+ {
	1306	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1307	+ mirrorItem.addActionListener(this);
	1308	+ menu.add("-");
1138	1309	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1310	memoryItem.addActionListener(this);
1140	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1312	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1314	dumpItem.addActionListener(this);
1144	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1316	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1328,7 @@
1157	1328	menu.add("-");
1158	1329	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1330	editScriptItem.addActionListener(this);
	1331	+ }
1160	1332	}
1161	1333
1162	1334	void ScreenFit()
..	..	@@ -1279,6 +1451,7 @@
1279	1451	shadow.material = new cMaterial(obj.material);
1280	1452	shadow.material.diffuse = 0.0001f;
1281	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1282	1455
1283	1456	makeSomething(shadow);
1284	1457	}
..	..	@@ -1485,9 +1658,9 @@
1485	1658
1486	1659	void Overwrite(int mask)
1487	1660	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1661	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1662	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1663	+ Object3D content = Grafreed.clipboard.get(0);
1491	1664
1492	1665	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1666	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1683,7 @@
1510	1683	//
1511	1684	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1685	{
	1686	+ Object source = event.getSource();
1513	1687	/*
1514	1688	if (event.getSource() == nameField)
1515	1689	{
..	..	@@ -1521,11 +1695,11 @@
1521	1695	}
1522	1696	else
1523	1697	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1698	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1699	{
1526	1700	ScreenFit();
1527	1701	} else
1528		- if (event.getSource() == switchItem)
	1702	+ if (source == switchItem)
1529	1703	{
1530	1704	cVector v1 = new cVector();
1531	1705	cVector v2 = new cVector();
..	..	@@ -1534,11 +1708,11 @@
1534	1708	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1709	objEditor.cameraView.repaint();
1536	1710	} else
1537		- if (event.getSource() == rectoidItem)
	1711	+ if (source == rectoidItem)
1538	1712	{
1539	1713	makeSomething(new Box());
1540	1714	} else
1541		- if (event.getSource() == particleItem)
	1715	+ if (source == particleItem)
1542	1716	{
1543	1717	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1718	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1733,9 @@
1559	1733	applyExample(particleGeom, "SMOKE");
1560	1734	makeSomething(particleGeom);
1561	1735	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1736	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1737	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1738	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1739
1566	1740	ragdoll.toParent = LA.newMatrix();
1567	1741	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1753,7 @@
1579	1753	} else
1580	1754	/*
1581	1755	*/
1582		- if (event.getSource() == heightFieldItem)
	1756	+ if (source == heightFieldItem)
1583	1757	{
1584	1758	Object3D obj = new Object3D();
1585	1759
..	..	@@ -1617,31 +1791,31 @@
1617	1791
1618	1792	makeSomething(obj);
1619	1793	} else
1620		- if (event.getSource() == gridItem)
	1794	+ if (source == gridItem)
1621	1795	{
1622	1796	makeSomething(new Grid());
1623	1797	} else
1624		- if (event.getSource() == ellipsoidItem)
	1798	+ if (source == ellipsoidItem)
1625	1799	{
1626	1800	makeSomething(new Sphere());
1627	1801	} else
1628		- if (event.getSource() == coneItem)
	1802	+ if (source == coneItem)
1629	1803	{
1630	1804	makeSomething(new Cone());
1631	1805	} else
1632		- if (event.getSource() == torusItem)
	1806	+ if (source == torusItem)
1633	1807	{
1634	1808	makeSomething(new Torus());
1635	1809	} else
1636		- if (event.getSource() == superItem)
	1810	+ if (source == superItem)
1637	1811	{
1638	1812	makeSomething(new Superellipsoid());
1639	1813	} else
1640		- if (event.getSource() == kleinItem)
	1814	+ if (source == kleinItem)
1641	1815	{
1642	1816	makeSomething(new Klein());
1643	1817	} else
1644		- if (event.getSource() == blobItem)
	1818	+ if (source == blobItem)
1645	1819	{
1646	1820	Blob blob = new Blob();
1647	1821	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1823,15 @@
1649	1823	//blob.retile();
1650	1824	makeSomething(blob);
1651	1825	} else
1652		- if (event.getSource() == latheItem)
	1826	+ if (source == latheItem)
1653	1827	{
1654	1828	makeSomething(new Lathe());
1655	1829	} else
1656		- if (event.getSource() == bezierItem)
	1830	+ if (source == bezierItem)
1657	1831	{
1658	1832	makeSomething(new BezierSurface());
1659	1833	} else
1660		- if (event.getSource() == checkerItem)
	1834	+ if (source == overlayItem)
1661	1835	{
1662	1836	/*
1663	1837	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1846,7 @@
1672	1846	*/
1673	1847	makeSomething(new Checker());
1674	1848	} else
1675		- if (event.getSource() == meshItem)
	1849	+ if (source == meshItem)
1676	1850	{
1677	1851	Object3D itemtomake = new Object3D();
1678	1852	Object3D child;
..	..	@@ -1693,35 +1867,35 @@
1693	1867	makeSomething(child);
1694	1868	}
1695	1869	} else
1696		- if (event.getSource() == springItem)
	1870	+ if (source == springItem)
1697	1871	{
1698	1872	cSpring s = new cSpring();
1699	1873	s.setup();
1700	1874	makeSomething(s);
1701	1875	} else
1702		- if (event.getSource() == flagItem)
	1876	+ if (source == flagItem)
1703	1877	{
1704	1878	cSpring s = new cFlag();
1705	1879	s.setup();
1706	1880	makeSomething(s);
1707	1881	} else
1708		- if (event.getSource() == lightItem)
	1882	+ if (source == lightItem)
1709	1883	{
1710	1884	makeSomething(new Light());
1711	1885	} else
1712		- if (event.getSource() == csgItem)
	1886	+ if (source == csgItem)
1713	1887	{
1714	1888	group(new CSG());
1715	1889	} else
1716		- if (event.getSource() == templateItem)
	1890	+ if (source == templateItem)
1717	1891	{
1718	1892	group(new cTemplate());
1719	1893	} else
1720		- if (event.getSource() == attributeItem)
	1894	+ if (source == attributeItem)
1721	1895	{
1722	1896	makeSomething(new Attribute());
1723	1897	} else
1724		- if (event.getSource() == pointflowItem)
	1898	+ if (source == pointflowItem)
1725	1899	{
1726	1900	makeSomething(new PointFlow());
1727	1901	} else
..	..	@@ -1733,7 +1907,7 @@
1733	1907	} else
1734	1908	*/
1735	1909
1736		- if (event.getSource() == superLoopItem)
	1910	+ if (source == superLoopItem)
1737	1911	{
1738	1912	Composite g = new cGroup();
1739	1913	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +1929,7 @@
1755	1929
1756	1930	group(g);
1757	1931	} else
1758		- if (event.getSource() == loopItem)
	1932	+ if (source == loopItem)
1759	1933	{
1760	1934	Composite csg = new GroupLeaf();
1761	1935	csg.count = 5;
..	..	@@ -1764,7 +1938,7 @@
1764	1938	csg.addChild(child);
1765	1939	child.addChild(csg);
1766	1940	} else
1767		- if (event.getSource() == doubleItem)
	1941	+ if (source == doubleItem)
1768	1942	{
1769	1943	Composite csg = new GroupLeaf();
1770	1944	csg.count = 5;
..	..	@@ -1776,7 +1950,7 @@
1776	1950	csg.addChild(child);
1777	1951	child.addChild(csg);
1778	1952	} else
1779		- if (event.getSource() == tripleItem)
	1953	+ if (source == tripleItem)
1780	1954	{
1781	1955	Composite csg = new GroupLeaf();
1782	1956	csg.count = 4;
..	..	@@ -1791,71 +1965,83 @@
1791	1965	csg.addChild(child);
1792	1966	child.addChild(csg);
1793	1967	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	1968	+ if (source == computeAOItem)
1812	1969	{
1813	1970	Globals.drawMode = CameraPane.OCCLUSION;
1814	1971	Globals.theRenderer.repaint();
1815	1972	} else
1816		- if (event.getSource() == recompileItem)
	1973	+ if (source == recompileItem)
1817	1974	{
1818	1975	Recompile();
1819	1976	refreshContents();
1820	1977	} else
1821		- if (event.getSource() == editScriptItem)
	1978	+ if (source == editScriptItem)
1822	1979	{
1823	1980	OpenDialog();
1824	1981	refreshContents();
1825	1982	} else
1826		- if (event.getSource() == invariantsItem)
	1983	+ if (source == invariantsItem)
1827	1984	{
1828	1985	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	1986	+ Grafreed.grafreeD.universe.invariants();
1830	1987	} else
1831		- if (event.getSource() == memoryItem)
	1988	+ if (source == memoryItem)
1832	1989	{
1833	1990	//System.out.println("Invariants:");
1834	1991	PrintMemory();
1835	1992	} else
1836		- if (event.getSource() == pathItem)
	1993	+ if (source == pathItem)
1837	1994	{
1838	1995	PrintPath();
1839	1996	} else
1840		- if (event.getSource() == analyzeItem)
	1997	+ if (source == analyzeItem)
1841	1998	{
1842	1999	AnalyzeObject();
1843	2000	} else
1844		- if (event.getSource() == dumpItem)
	2001	+ if (source == dumpItem)
1845	2002	{
1846	2003	DumpObject();
1847	2004	} else
1848		- 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)
1849	2035	{
1850	2036	//Reload(lastConverter, lastFilename, true);
1851	2037	ScreenFit();
1852	2038	} else
1853		- if (event.getSource() == screenfitpointButton)
	2039	+ if (source == screenfitpointButton)
1854	2040	{
1855	2041	//Reload(lastConverter, lastFilename, true);
1856	2042	ScreenFitPoint();
1857	2043	} else
1858		- if (event.getSource() == snapobjectButton)
	2044	+ if (source == snapobjectButton)
1859	2045	{
1860	2046	//Reload(lastConverter, lastFilename, true);
1861	2047	SnapObject();
..	..	@@ -1866,13 +2052,13 @@
1866	2052	// Recompile();
1867	2053	// refreshContents();
1868	2054	// } else
1869		- if (event.getSource() == gcButton)
	2055	+ if (source == gcButton)
1870	2056	{
1871	2057	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2058	System.gc();
1873	2059	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2060	} else
1875		- if (event.getSource() == editLeafItem)
	2061	+ if (source == editLeafItem)
1876	2062	{
1877	2063	Object3D obj;
1878	2064	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2072,74 @@
1886	2072	}
1887	2073	refreshContents(true);
1888	2074	} else
1889		- if (event.getSource() == openWindowItem)
	2075	+ if (source == openWindowItem)
1890	2076	{
1891	2077	EditSelection(true);
1892	2078	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2079	+ if (source == cutItem \|\| source == clearButton)
1894	2080	{
1895	2081	loadClipboard(true);
1896	2082	} else
1897		- if (event.getSource() == duplicateItem)
	2083	+ if (source == undoItem)
1898	2084	{
1899		- 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;
1900	2094	loadClipboard(false);
1901	2095	paste(false);
1902		- GrafreeD.clipboard = keep;
	2096	+ Grafreed.clipboard = keep;
1903	2097	} else
1904		- if (event.getSource() == cloneItem)
	2098	+ if (source == cloneItem)
1905	2099	{
1906	2100	CloneSelection(false);
1907	2101	} else
1908		- if (event.getSource() == cloneSupportItem)
	2102	+ if (source == cloneSupportItem)
1909	2103	{
1910	2104	CloneSelection(true);
1911	2105	} else
1912		- if (event.getSource() == copyItem)
	2106	+ if (source == copyItem)
1913	2107	{
1914	2108	loadClipboard(false);
1915	2109	} else
1916		- if (event.getSource() == pasteItem)
	2110	+ if (source == pasteItem)
1917	2111	{
1918	2112	paste(false);
1919	2113	} else
1920		- if (event.getSource() == pasteLinkItem)
	2114	+ if (source == pasteIntoItem)
1921	2115	{
1922		- pasteInto(false);
	2116	+ pasteInto(true, false);
1923	2117	} else
1924		- if (event.getSource() == pasteCloneItem)
	2118	+ if (source == pasteLinkItem)
1925	2119	{
1926		- pasteInto(true);
	2120	+ pasteInto(false, false);
1927	2121	} else
1928		- if (event.getSource() == pasteExpandItem)
	2122	+ if (source == pasteCloneItem)
	2123	+ {
	2124	+ pasteInto(true, true);
	2125	+ } else
	2126	+ if (source == pasteExpandItem)
1929	2127	{
1930	2128	paste(true);
1931	2129	} else
1932		- if (event.getSource() == synchronizeItem)
	2130	+ if (source == synchronizeItem)
1933	2131	{
1934	2132	Overwrite(Object3D.TRANSFORM);
1935	2133	} else
1936		- if (event.getSource() == overwriteNameItem)
	2134	+ if (source == overwriteNameItem)
1937	2135	{
1938	2136	Overwrite(Object3D.NAME);
1939	2137	} else
1940		- if (event.getSource() == overwriteUVItem)
	2138	+ if (source == overwriteUVItem)
1941	2139	{
1942	2140	Overwrite(Object3D.UV);
1943	2141	} else
1944		- if (event.getSource() == overwriteMatItem)
	2142	+ if (source == overwriteMatItem)
1945	2143	{
1946	2144	/* july 2015
1947	2145	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2159,7 @@
1961	2159
1962	2160	Overwrite(dropAttributes);
1963	2161	}
1964		- if (event.getSource() == overwriteGeoItem)
	2162	+ if (source == overwriteGeoItem)
1965	2163	{
1966	2164	Overwrite(Object3D.GEOMETRY);
1967	2165	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2176,7 @@
1978	2176	// refreshContents();
1979	2177	// }
1980	2178	} else
1981		- if (event.getSource() == generateMeshItem)
	2179	+ if (source == generateMeshItem)
1982	2180	{
1983	2181	//if (group.selection.size() == 1)
1984	2182	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2187,7 @@
1989	2187	ResetModel();
1990	2188	refreshContents();
1991	2189	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2190	+ if (source == extractGeometriesItem)
1993	2191	{
1994	2192	boolean one = false;
1995	2193
..	..	@@ -2016,7 +2214,7 @@
2016	2214	ResetModel();
2017	2215	refreshContents();
2018	2216	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2217	+ if (source == cloneGeometriesItem)
2020	2218	{
2021	2219	boolean one = false;
2022	2220
..	..	@@ -2042,7 +2240,7 @@
2042	2240	ResetModel();
2043	2241	refreshContents();
2044	2242	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2243	+ if (source == shareGeometriesItem)
2046	2244	{
2047	2245	boolean one = false;
2048	2246
..	..	@@ -2072,7 +2270,7 @@
2072	2270	refreshContents();
2073	2271	}
2074	2272	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2273	+ if (source == mergeGeometriesItem)
2076	2274	{
2077	2275	boolean one = false;
2078	2276
..	..	@@ -2102,7 +2300,7 @@
2102	2300	ResetModel();
2103	2301	refreshContents();
2104	2302	} else
2105		- if (event.getSource() == linkverticesItem)
	2303	+ if (source == linkverticesItem)
2106	2304	{
2107	2305	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2306	// {
..	..	@@ -2115,9 +2313,9 @@
2115	2313	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2314	// refreshContents();
2117	2315	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2316	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2317	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2318	+ Object3D content = Grafreed.clipboard.get(0);
2121	2319
2122	2320	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2321	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2323,38 @@
2125	2323	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2324	for (int i=0; i<group.selection.size(); i++)
2127	2325	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2326	+ boolean random = CameraPane.SWITCH;
	2327	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2328	group.selection.get(i).linkVerticesThis(content);
2131	2329	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2330	+ CameraPane.SWITCH = random;
2133	2331	}
2134	2332	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2333	refreshContents();
2136	2334	}
2137	2335	} else
2138		- if (event.getSource() == resetsupportItem)
	2336	+ if (source == resetsupportItem)
2139	2337	{
2140	2338	for (int i=0; i<group.selection.size(); i++)
2141	2339	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2340	+ boolean random = CameraPane.SWITCH;
	2341	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2342	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2343	+ CameraPane.SWITCH = random;
2146	2344	}
2147	2345
2148	2346	refreshContents();
2149	2347	} else
2150		- if (event.getSource() == relinkverticesItem)
	2348	+ if (source == relinkverticesItem)
2151	2349	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2350	+ boolean random = CameraPane.SWITCH;
	2351	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2352	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2353	+ CameraPane.SWITCH = random;
2156	2354
2157	2355	refreshContents();
2158	2356	} else
2159		- if (event.getSource() == resetreferencesItem)
	2357	+ if (source == resetreferencesItem)
2160	2358	{
2161	2359	for (int i=0; i<group.selection.size(); i++)
2162	2360	{
..	..	@@ -2165,11 +2363,11 @@
2165	2363
2166	2364	refreshContents();
2167	2365	} else
2168		- if (event.getSource() == setMasterItem)
	2366	+ if (source == setMasterItem)
2169	2367	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2368	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2369	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2370	+ Object3D content = Grafreed.clipboard.get(0);
2173	2371
2174	2372	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2373	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2376,13 @@
2178	2376	refreshContents();
2179	2377	}
2180	2378	} else
2181		- if (event.getSource() == poseMeshItem)
	2379	+ if (source == poseMeshItem)
2182	2380	{
2183	2381	if (group.selection.size() == 1)
2184	2382	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2383	+ if (Grafreed.clipboard.size() == 1)
2186	2384	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2385	+ Object3D content = Grafreed.clipboard.get(0);
2188	2386
2189	2387	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2388	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2395,19 @@
2197	2395	}
2198	2396
2199	2397	} else
2200		- if (event.getSource() == revertMeshItem)
	2398	+ if (source == revertMeshItem)
2201	2399	{
2202	2400	RevertMeshes();
2203	2401	} else
2204		- if (event.getSource() == resetMeshItem)
	2402	+ if (source == resetAllItem)
2205	2403	{
2206	2404	ResetAll();
2207	2405	} else
2208		- if (event.getSource() == stepAllItem)
	2406	+ if (source == stepAllItem)
2209	2407	{
2210	2408	StepAll();
2211	2409	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2410	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2411	{
2214	2412	//int indices[] = jList.getSelectedIndices();
2215	2413	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2415,46 @@
2217	2415
2218	2416	ClearSelection(false);
2219	2417	} else
2220		- if (event.getSource() == clearAllItem)
	2418	+ if (source == clearAllItem)
2221	2419	{
2222	2420	ClearSelection(true);
2223	2421	} else
2224		- if (event.getSource() == grabItem)
	2422	+ if (source == grabItem)
2225	2423	{
2226	2424	group(new cGroup(), true);
2227	2425	} else
2228		- if (event.getSource() == hideItem)
	2426	+ if (source == hideItem)
2229	2427	{
2230	2428	group(new HiddenObject());
2231	2429	} else
2232		- if (event.getSource() == frontItem)
	2430	+ if (source == frontItem)
2233	2431	{
2234	2432	front();
2235	2433	} else
2236		- if (event.getSource() == backItem)
	2434	+ if (source == backItem)
2237	2435	{
2238	2436	back();
2239	2437	} else
2240		- if (event.getSource() == cameraItem)
	2438	+ if (source == cameraItem)
2241	2439	{
2242	2440	makeSomething(new Camera());
2243	2441	} else
2244		- if (event.getSource() == compositeItem)
	2442	+ if (source == compositeItem)
2245	2443	{
2246	2444	group(new Composite());
2247	2445	} else
2248		- if (event.getSource() == randomItem)
	2446	+ if (source == randomItem)
2249	2447	{
2250	2448	RandomNode random = new RandomNode();
2251	2449	group(random);
2252	2450	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2451	+ random.name = random.get(0).name + "Switch";
2254	2452	} else
2255		- if (event.getSource() == physicsItem)
	2453	+ if (source == physicsItem)
2256	2454	{
2257	2455	group(new PhysicsNode());
2258	2456	} else
2259		- if (event.getSource() == frameselectorItem)
	2457	+ if (source == frameselectorItem)
2260	2458	{
2261	2459	for (int i=0; i<group.selection.size(); i++)
2262	2460	{
..	..	@@ -2268,7 +2466,7 @@
2268	2466	ResetModel();
2269	2467	refreshContents();
2270	2468	} else
2271		- if (event.getSource() == switchGeoItem)
	2469	+ if (source == switchGeoItem)
2272	2470	{
2273	2471	for (int i=0; i<group.selection.size(); i++)
2274	2472	{
..	..	@@ -2280,7 +2478,7 @@
2280	2478	ResetModel();
2281	2479	refreshContents();
2282	2480	} else
2283		- if (event.getSource() == switchTransfoItem)
	2481	+ if (source == switchTransfoItem)
2284	2482	{
2285	2483	for (int i=0; i<group.selection.size(); i++)
2286	2484	{
..	..	@@ -2292,7 +2490,7 @@
2292	2490	ResetModel();
2293	2491	refreshContents();
2294	2492	} else
2295		- if (event.getSource() == morphItem)
	2493	+ if (source == morphItem)
2296	2494	{
2297	2495	for (int i=0; i<group.selection.size(); i++)
2298	2496	{
..	..	@@ -2304,7 +2502,7 @@
2304	2502	ResetModel();
2305	2503	refreshContents();
2306	2504	} else
2307		- if (event.getSource() == scriptNodeItem)
	2505	+ if (source == scriptNodeItem)
2308	2506	{
2309	2507	boolean atleastone = false;
2310	2508
..	..	@@ -2343,31 +2541,31 @@
2343	2541	}
2344	2542	}
2345	2543	} else
2346		- if (event.getSource() == linkerItem)
	2544	+ if (source == linkerItem)
2347	2545	{
2348	2546	group(new cLinker());
2349	2547	} else
2350		- if (event.getSource() == textureItem)
	2548	+ if (source == textureItem)
2351	2549	{
2352	2550	group(new TextureNode());
2353	2551	} else
2354		- if (event.getSource() == billboardItem)
	2552	+ if (source == billboardItem)
2355	2553	{
2356	2554	group(new BillboardNode());
2357	2555	} else
2358		- if (event.getSource() == shadowXItem)
	2556	+ if (source == shadowXItem)
2359	2557	{
2360	2558	CastShadow(0);
2361	2559	} else
2362		- if (event.getSource() == shadowYItem)
	2560	+ if (source == shadowYItem)
2363	2561	{
2364	2562	CastShadow(1);
2365	2563	} else
2366		- if (event.getSource() == shadowZItem)
	2564	+ if (source == shadowZItem)
2367	2565	{
2368	2566	CastShadow(2);
2369	2567	} else
2370		- if (event.getSource() == ungroupItem)
	2568	+ if (source == ungroupItem)
2371	2569	{
2372	2570	//ungroup();
2373	2571	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2577,203 @@
2379	2577
2380	2578	refreshContents();
2381	2579	} else
2382		- if (event.getSource() == genUVItem)
	2580	+ if (source == genUVItem)
2383	2581	{
2384	2582	GenUV();
2385	2583	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2584	+ if (source == genNormalsCADItem)
2387	2585	{
2388	2586	GenNormals(true);
2389	2587	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2588	+ if (source == genNormalsMESHItem)
2391	2589	{
2392		- GenNormals(true); // TODO
	2590	+ GenNormalsMESH();
2393	2591	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2592	+ if (source == genNormalsORGANItem)
2395	2593	{
2396	2594	GenNormals(false);
2397	2595	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2596	+ if (source == genNormalsMINEItem)
2399	2597	{
2400	2598	GenNormalsMINE();
2401	2599	} else
2402		- if (event.getSource() == stripifyItem)
	2600	+ if (source == stripifyItem)
2403	2601	{
2404	2602	Stripify();
2405	2603	} else
2406		- if (event.getSource() == unstripifyItem)
	2604	+ if (source == unstripifyItem)
2407	2605	{
2408	2606	Unstripify();
2409	2607	} else
2410		- if (event.getSource() == trimItem)
	2608	+ if (source == trimItem)
2411	2609	{
2412	2610	Trim();
2413	2611	} else
2414		- if (event.getSource() == untrimItem)
	2612	+ if (source == untrimItem)
2415	2613	{
2416	2614	Untrim();
2417	2615	} else
2418		- if (event.getSource() == clearColorsItem)
	2616	+ if (source == clearColorsItem)
2419	2617	{
2420	2618	ClearColors();
2421	2619	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2620	+ if (source == clearMaterialsItem)
2423	2621	{
2424	2622	ClearMaterials();
2425	2623	} else
2426		- if (event.getSource() == liveleavesItem)
	2624	+ if (source == liveleavesItem)
2427	2625	{
2428	2626	LiveLeaves(true);
2429	2627	} else
2430		- if (event.getSource() == unliveleavesItem)
	2628	+ if (source == unliveleavesItem)
2431	2629	{
2432	2630	LiveLeaves(false);
2433	2631	} else
2434		- if (event.getSource() == supportleavesItem)
	2632	+ if (source == supportleavesItem)
2435	2633	{
2436	2634	SupportLeaves(true);
2437	2635	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2636	+ if (source == unsupportleavesItem)
2439	2637	{
2440	2638	SupportLeaves(false);
2441	2639	} else
2442		- if (event.getSource() == hideleavesItem)
	2640	+ if (source == hideleavesItem)
2443	2641	{
2444	2642	HideLeaves(true);
2445	2643	} else
2446		- if (event.getSource() == showleavesItem)
	2644	+ if (source == showleavesItem)
2447	2645	{
2448	2646	HideLeaves(false);
2449	2647	} else
2450		- if (event.getSource() == markleavesItem)
	2648	+ if (source == markleavesItem)
2451	2649	{
2452	2650	MarkLeaves(true);
2453	2651	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2652	+ if (source == unmarkleavesItem)
2455	2653	{
2456	2654	MarkLeaves(false);
2457	2655	} else
2458		- 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)
2459	2673	{
2460	2674	FlipV(true);
2461	2675	} else
2462		- if (event.getSource() == unflipVItem)
	2676	+ if (source == unflipVItem)
2463	2677	{
2464	2678	FlipV(false);
2465	2679	} else
2466		- if (event.getSource() == lowTexturesItem)
	2680	+ if (source == lowTexturesItem)
2467	2681	{
2468	2682	SetTexRes(0);
2469	2683	} else
2470		- if (event.getSource() == normalTexturesItem)
	2684	+ if (source == normalTexturesItem)
2471	2685	{
2472	2686	SetTexRes(1);
2473	2687	} else
2474		- if (event.getSource() == highTexturesItem)
	2688	+ if (source == highTexturesItem)
2475	2689	{
2476	2690	SetTexRes(2);
2477	2691	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2692	+ if (source == veryhighTexturesItem)
2479	2693	{
2480	2694	SetTexRes(3);
2481	2695	} else
2482		- if (event.getSource() == maxTexturesItem)
	2696	+ if (source == maxTexturesItem)
2483	2697	{
2484	2698	SetTexRes(4);
2485	2699	} else
2486		- if (event.getSource() == panoTexturesItem)
	2700	+ if (source == panoTexturesItem)
2487	2701	{
2488	2702	SetTexRes(5);
2489	2703	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2704	+ if (source == reverseNormalsItem)
2491	2705	{
2492	2706	ReverseNormals();
2493	2707	} else
2494		- if (event.getSource() == parseverticesItem)
	2708	+ if (source == parseverticesItem)
2495	2709	{
2496	2710	ParseVertices();
2497	2711	} else
2498		- if (event.getSource() == textureFieldItem)
	2712	+ if (source == textureFieldItem)
2499	2713	{
2500	2714	TextureVertices();
2501	2715	} else
2502		- if (event.getSource() == alignItem)
	2716	+ if (source == alignItem)
2503	2717	{
2504	2718	Align();
2505	2719	} else
2506		- if (event.getSource() == mirrorItem)
	2720	+ if (source == mirrorItem)
2507	2721	{
2508	2722	MirrorPoses();
2509	2723	} else
2510		- if (event.getSource() == reduceMorphItem)
	2724	+ if (source == reduceMorphItem)
2511	2725	{
2512	2726	MeshReduction(false);
2513	2727	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2728	+ if (source == reduce34MorphItem)
2515	2729	{
2516	2730	MeshReduction(true);
2517	2731	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2732	+ if (source == reverseTrianglesItem)
2519	2733	{
2520	2734	ReverseTriangles();
2521	2735	} else
2522		- if (event.getSource() == reduceMeshItem)
	2736	+ if (source == reduceMeshItem)
2523	2737	{
2524	2738	ReduceMesh(false);
2525	2739	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2740	+ if (source == reduce34MeshItem)
2527	2741	{
2528	2742	ReduceMesh(true);
2529	2743	} else
2530		- if (event.getSource() == increaseMeshItem)
	2744	+ if (source == increaseMeshItem)
2531	2745	{
2532	2746	IncreaseMesh();
2533	2747	} else
2534		- if (event.getSource() == clipMeshItem)
	2748	+ if (source == clipMeshItem)
2535	2749	{
2536	2750	ClipMesh();
2537	2751	} else
2538		- if (event.getSource() == smoothMeshItem)
	2752	+ if (source == smoothMeshItem)
2539	2753	{
2540	2754	SmoothMesh();
2541	2755	} else
2542		- if (event.getSource() == transformgeometryItem)
	2756	+ if (source == transformGeometryItem)
2543	2757	{
2544	2758	TransformGeometry();
2545	2759	} else
2546		- if (event.getSource() == resetTransformItem)
	2760	+ if (source == transformChildrenItem)
	2761	+ {
	2762	+ TransformChildren();
	2763	+ } else
	2764	+ if (source == resetTransformItem)
2547	2765	{
2548	2766	ResetTransform();
2549	2767	} else
2550		- if (event.getSource() == resetCentroidItem)
	2768	+ if (source == resetCentroidItem)
2551	2769	{
2552		- ResetCentroid();
	2770	+ ResetCentroid(true);
2553	2771	} else
2554		- if (event.getSource() == resetParentItem)
	2772	+ if (source == resetCentroidXZItem)
	2773	+ {
	2774	+ ResetCentroid(false);
	2775	+ } else
	2776	+ if (source == resetParentItem)
2555	2777	{
2556	2778	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2779	{
..	..	@@ -2561,7 +2783,7 @@
2561	2783
2562	2784	refreshContents();
2563	2785	} else
2564		- if (event.getSource() == repairParentItem)
	2786	+ if (source == repairParentItem)
2565	2787	{
2566	2788	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2789	{
..	..	@@ -2575,7 +2797,7 @@
2575	2797
2576	2798	refreshContents();
2577	2799	} else
2578		- if (event.getSource() == repairShadowItem)
	2800	+ if (source == repairShadowItem)
2579	2801	{
2580	2802	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2803	{
..	..	@@ -2589,7 +2811,7 @@
2589	2811
2590	2812	refreshContents();
2591	2813	} else
2592		- if (event.getSource() == sortbysizeItem)
	2814	+ if (source == sortbysizeItem)
2593	2815	{
2594	2816	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2817	{
..	..	@@ -2601,7 +2823,7 @@
2601	2823	ResetModel();
2602	2824	refreshContents();
2603	2825	} else
2604		- if (event.getSource() == sortbynameItem)
	2826	+ if (source == sortbynameItem)
2605	2827	{
2606	2828	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2829	{
..	..	@@ -2613,7 +2835,7 @@
2613	2835	ResetModel();
2614	2836	refreshContents();
2615	2837	} else
2616		- if (event.getSource() == attachPigmentItem)
	2838	+ if (source == attachPigmentItem)
2617	2839	{
2618	2840	String texture = GetFile("Attach pigment");
2619	2841	Object3D obj;
..	..	@@ -2625,7 +2847,7 @@
2625	2847
2626	2848	refreshContents();
2627	2849	} else
2628		- if (event.getSource() == detachPigmentItem)
	2850	+ if (source == detachPigmentItem)
2629	2851	{
2630	2852	Object3D obj;
2631	2853	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2858,7 @@
2636	2858
2637	2859	refreshContents();
2638	2860	} else
2639		- if (event.getSource() == attachBumpItem)
	2861	+ if (source == attachBumpItem)
2640	2862	{
2641	2863	String texture = GetFile("Attach bump");
2642	2864	Object3D obj;
..	..	@@ -2648,7 +2870,7 @@
2648	2870
2649	2871	refreshContents();
2650	2872	} else
2651		- if (event.getSource() == detachBumpItem)
	2873	+ if (source == detachBumpItem)
2652	2874	{
2653	2875	Object3D obj;
2654	2876	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2881,7 @@
2659	2881
2660	2882	refreshContents();
2661	2883	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2884	+ if (source == pigmentBumpItem)
2663	2885	{
2664	2886	Object3D obj;
2665	2887	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2892,221 @@
2670	2892
2671	2893	refreshContents();
2672	2894	} else
2673		- if (event.getSource() == flashSelectionButton)
	2895	+ if (source == flashSelectionButton)
2674	2896	{
2675	2897	CameraPane.flash = true;
2676	2898	refreshContents();
2677	2899	} else
2678		- if (event.getSource() == oneButton)
	2900	+ if (source == oneButton)
2679	2901	{
2680	2902	} else
2681		- if (event.getSource() == twoButton)
	2903	+ if (source == twoButton)
2682	2904	{
2683	2905	radio.layout = twoButton;
2684	2906	// bug
2685	2907	//gridPanel.setDividerLocation(1.0);
2686	2908	//bigPanel.setDividerLocation(0.0);
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	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	+
2711	2956	} else
2712		- if (event.getSource() == threeButton)
	2957	+ if (source == threeButton)
2713	2958	{
2714	2959	radio.layout = threeButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- bigThree.add(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	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();
2739	2994	} else
2740		- if (event.getSource() == fourButton)
	2995	+ if (source == fourButton)
2741	2996	{
2742	2997	radio.layout = fourButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aWindowConstraints);
2766		- bigThree.revalidate();
	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();
2767	3031	} else
2768		- if (event.getSource() == sixButton)
	3032	+ if (source == sixButton)
2769	3033	{
2770	3034	radio.layout = sixButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	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();
2795	3069	} else
2796		- if (event.getSource() == sevenButton)
	3070	+ if (source == sevenButton)
2797	3071	{
2798	3072	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	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();
2823	3108	} else
2824		- if (event.getSource() == rootButton)
	3109	+ if (source == rootButton)
2825	3110	{
2826	3111	Object3D obj;
2827	3112	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,9 +3116,10 @@
2831	3116	EditObject(obj);
2832	3117	}
2833	3118
	3119	+ cameraView.requestFocusInWindow();
2834	3120	refreshContents(true);
2835	3121	} else
2836		- if (event.getSource() == closeButton)
	3122	+ if (source == closeButton)
2837	3123	{
2838	3124	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3125	cRadio ab;
..	..	@@ -2852,13 +3138,15 @@
2852	3138	break;
2853	3139	}
2854	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2855	3143	refreshContents(true);
2856	3144	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3145	+ if (source == editItem \|\| source == editButton)
2858	3146	{
2859	3147	EditSelection(false);
2860	3148	} else
2861		- if (event.getSource() == uneditButton)
	3149	+ if (source == uneditButton)
2862	3150	{
2863	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3152	{
..	..	@@ -2868,14 +3156,14 @@
2868	3156	child.CloseUI();
2869	3157	listUI.remove(child);
2870	3158
2871		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2872	3160	}
2873		- objEditor.ctrlPanel.revalidate();
	3161	+ objEditor.ctrlPanel.FlushUI();
2874	3162	//objEditor.jTree.clearSelection();
2875	3163	//objEditor.ResetSliders();
2876	3164	refreshContents(true);
2877	3165	} else
2878		- if (event.getSource() == clearPanelButton)
	3166	+ if (source == clearPanelButton)
2879	3167	{
2880	3168	assert(copy == group);
2881	3169	//copy.ClearUI();
..	..	@@ -2886,7 +3174,7 @@
2886	3174	listUI.clear();
2887	3175	refreshContents(true);
2888	3176	} else
2889		- if (event.getSource() == allParamsButton)
	3177	+ if (source == allParamsButton)
2890	3178	{
2891	3179	assert(copy == group);
2892	3180
..	..	@@ -2907,19 +3195,19 @@
2907	3195
2908	3196	refreshContents(true);
2909	3197	} else
2910		- if (event.getSource() == unselectButton)
	3198	+ if (source == unselectButton)
2911	3199	{
2912	3200	objEditor.jTree.clearSelection();
2913	3201	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3202	objEditor.ResetSliders();
2915	3203	refreshContents(true);
2916	3204	} else
2917		- if(event.getSource() instanceof cRadio)
	3205	+ if(source instanceof cRadio)
2918	3206	{
2919	3207	group.parent = keepparent;
2920	3208	group.attributes = 0;
2921	3209	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3210	+ /cRadio/ radio = (cRadio)source;
2923	3211	Object3D obj = radio.GetObject();
2924	3212	System.out.println("Edit " + obj);
2925	3213	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2954,7 +3242,10 @@
2954	3242	frontView.object = group;
2955	3243	sideView.object = group;
2956	3244	}
2957		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
2958	3249	/*
2959	3250	currentLayout = radio.layout;
2960	3251	if (currentLayout == null)
..	..	@@ -2966,8 +3257,23 @@
2966	3257	//group.parent = null; // ROOT
2967	3258	//group.attributes = -1;
2968	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2969	3262	refreshContents(true);
2970		- }
	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	+ }
2971	3277	else
2972	3278	{
2973	3279	//return super.action(event, arg);
..	..	@@ -2976,7 +3282,6 @@
2976	3282	}
2977	3283
2978	3284	boolean useclient = false;
2979		- cRadio radio;
2980	3285
2981	3286	void ToggleRoot()
2982	3287	{
..	..	@@ -3028,6 +3333,28 @@
3028	3333	refreshContents();
3029	3334	}
3030	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	+ }
3031	3358
3032	3359	void ResetTransform()
3033	3360	{
..	..	@@ -3140,7 +3467,7 @@
3140	3467	refreshContents();
3141	3468	}
3142	3469
3143		- void ResetCentroid()
	3470	+ void ResetCentroid(boolean full)
3144	3471	{
3145	3472	Object3D obj;
3146	3473	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3482,16 @@
3155	3482	LA.matIdentity(Object3D.mat);
3156	3483	obj.getBounds(minima, maxima, false);
3157	3484	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3485	+ if (full)
	3486	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3487	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3488	obj.TransformMesh(Object3D.mat);
	3489	+
3161	3490	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3491	+ if (full)
	3492	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3493	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3494	+
3164	3495	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3496	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3497	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3520,8 @@
3189	3520
3190	3521	int size = obj.MemorySize();
3191	3522
3192		- 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)");
3193	3525	}
3194	3526	}
3195	3527	catch (Exception e)
..	..	@@ -3226,9 +3558,9 @@
3226	3558	obj = (Object3D)e.nextElement();
3227	3559
3228	3560	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3561	+ Grafreed.AnalyzeObject(obj);
3230	3562	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3563	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3564
3233	3565	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3566	}
..	..	@@ -3270,6 +3602,13 @@
3270	3602	void GenNormals(boolean crease)
3271	3603	{
3272	3604	group.GenNormalsS(crease);
	3605	+
	3606	+ refreshContents();
	3607	+ }
	3608	+
	3609	+ void GenNormalsMESH()
	3610	+ {
	3611	+ group.GenNormalsMeshS();
3273	3612
3274	3613	refreshContents();
3275	3614	}
..	..	@@ -3442,8 +3781,8 @@
3442	3781
3443	3782	void ParseVertices()
3444	3783	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3784	+ boolean epsequal = Grafreed.epsequal;
	3785	+ Grafreed.epsequal = true;
3447	3786
3448	3787	for (int i=0; i<group.selection.size(); i++)
3449	3788	{
..	..	@@ -3468,7 +3807,7 @@
3468	3807	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3808	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3809
3471		- g.add(GrafreeD.clipboard);
	3810	+ g.add(Grafreed.clipboard);
3472	3811
3473	3812	buffer.add(g);
3474	3813	}
..	..	@@ -3483,7 +3822,7 @@
3483	3822	makeSomething(buffer, i==group.selection.size()-1);
3484	3823	}
3485	3824
3486		- GrafreeD.epsequal = epsequal;
	3825	+ Grafreed.epsequal = epsequal;
3487	3826
3488	3827	refreshContents();
3489	3828	}
..	..	@@ -3501,7 +3840,16 @@
3501	3840	String pigment = Object3D.GetPigment(tex);
3502	3841	//String bump = Object3D.GetBump(tex);
3503	3842
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.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	+ }
3505	3853
3506	3854	double s = v.s;
3507	3855
..	..	@@ -3589,11 +3937,11 @@
3589	3937
3590	3938	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	3939
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	3940	+ boolean random = CameraPane.SWITCH;
	3941	+ CameraPane.SWITCH = false; // parse all random nodes
3594	3942	lowres.linkVerticesThis(null);
3595	3943	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	3944	+ CameraPane.SWITCH = random;
3597	3945
3598	3946	System.err.flush();
3599	3947
..	..	@@ -3633,7 +3981,7 @@
3633	3981	return;
3634	3982
3635	3983	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	3984	+ Object3D ref = Grafreed.clipboard.get(0);
3637	3985
3638	3986	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	3987
..	..	@@ -3827,9 +4175,9 @@
3827	4175
3828	4176	void ClipMesh()
3829	4177	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4178	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4179	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4180	+ Object3D content = Grafreed.clipboard.get(0);
3833	4181
3834	4182	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4183	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4186,7 @@
3838	4186	// {
3839	4187	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4188	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4189	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4190	}
3843	4191	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4192	System.out.println("DONE.");
..	..	@@ -3885,6 +4233,18 @@
3885	4233	void MarkLeaves(boolean hide)
3886	4234	{
3887	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);
3888	4248	refreshContents();
3889	4249	}
3890	4250
..	..	@@ -3973,7 +4333,7 @@
3973	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4334
3975	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
3977	4337	{
3978	4338	// if (!(elem instanceof Composite))
3979	4339	// newWindow = false;
..	..	@@ -4063,7 +4423,6 @@
4063	4423	//case 702: // Event.LIST_DESELECT
4064	4424	group.deselectAll();
4065	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4426	if (tps != null)
4068	4427	{
4069	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,29 +4431,28 @@
4072	4431
4073	4432	//if (child.parent != null)
4074	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
4075	4435	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4436	}
4080	4437	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4438	+// else
	4439	+// {
	4440	+// objEditor.SetMaterial(group); // .GetMaterial());
	4441	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4442	+// System.err.println("info : " + group.GetPath());
	4443	+// }
4087	4444
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.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))
4091	4446	CameraPane.flash = true;
4092	4447
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4449	// a camera
4095	4450	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	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	+ }
4098	4456	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4457	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4458	}
..	..	@@ -4107,6 +4465,26 @@
4107	4465
4108	4466	freezemodel = false;
4109	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	+ }
4110	4488
4111	4489	void linkSomething(Object3D thing)
4112	4490	{
..	..	@@ -4178,16 +4556,18 @@
4178	4556	{
4179	4557	if (group.selection.isEmpty())
4180	4558	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4559	+
	4560	+ Grafreed.clipboardIsTempGroup = false;
4182	4561	Composite tGroup = null;
4183	4562	if (group.selection.size() > 0) // 1)
4184	4563	{
4185	4564	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4565	+ Grafreed.clipboardIsTempGroup = true;
4187	4566	}
4188	4567
4189	4568	if (cut)
4190	4569	{
	4570	+ Save();
4191	4571	//int indices[] = jList.getSelectedIndices();
4192	4572	//for (int i = indices.length - 1; i >= 0; i--)
4193	4573	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4603,16 @@
4223	4603	//System.out.println("cut " + child);
4224	4604	//System.out.println("parent = " + child.parent);
4225	4605	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4227	4607	tGroup.add/Child/(tmp);
4228	4608	else
4229		- GrafreeD.clipboard = tmp;
	4609	+ Grafreed.clipboard = tmp;
4230	4610	}
4231	4611	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4612	+ if (Grafreed.clipboardIsTempGroup)
4233	4613	tGroup.add/Child/(child);
4234	4614	else
4235		- GrafreeD.clipboard = child;
	4615	+ Grafreed.clipboard = child;
4236	4616	}
4237	4617
4238	4618	//ResetModel();
..	..	@@ -4264,21 +4644,23 @@
4264	4644	//System.out.println("cut " + elem);
4265	4645	//System.out.println("parent = " + elem.parent);
4266	4646	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4647	+ if (Grafreed.clipboardIsTempGroup)
4268	4648	tGroup.add/Child/(tmp);
4269	4649	else
4270		- GrafreeD.clipboard = tmp;
	4650	+ Grafreed.clipboard = tmp;
4271	4651	}
4272	4652	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4274	4654	tGroup.add/Child/(child);
4275	4655	else
4276		- GrafreeD.clipboard = child;
	4656	+ Grafreed.clipboard = child;
4277	4657	}
4278	4658
4279	4659	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4660	+
	4661	+ if (Grafreed.clipboardIsTempGroup)
	4662	+ Grafreed.clipboard = tGroup;
	4663	+
4282	4664	if (cut)
4283	4665	{
4284	4666	ResetModel();
..	..	@@ -4292,7 +4674,7 @@
4292	4674	// return;
4293	4675	boolean first = true;
4294	4676
4295		- if (GrafreeD.clipboardIsTempGroup)
	4677	+ if (Grafreed.clipboardIsTempGroup)
4296	4678	{
4297	4679	Composite temp;
4298	4680
..	..	@@ -4303,7 +4685,7 @@
4303	4685	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4686	*/
4305	4687	Object3D elem;
4306		- 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))
4307	4689	{
4308	4690	Object3D child = (Object3D)e.nextElement();
4309	4691
..	..	@@ -4337,21 +4719,21 @@
4337	4719	//Object3D cb = Applet3D.clipboard;
4338	4720	//temp.addChild(cb);
4339	4721	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4345	4727	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4728	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4729	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4730	}
4349	4731
4350	4732	ResetModel();
4351	4733	refreshContents();
4352	4734	}
4353	4735
4354		- void pasteInto(boolean copyit)
	4736	+ void pasteInto(boolean copyit, boolean clone)
4355	4737	{
4356	4738	// if (GrafreeD.clipboard == null)
4357	4739	// return;
..	..	@@ -4380,15 +4762,22 @@
4380	4762	if (copyit)
4381	4763	{
4382	4764	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4765	+ if (clone)
	4766	+ {
	4767	+ CloneClipboard(false); // sept 2014
	4768	+ }
	4769	+ else
	4770	+ {
	4771	+ paste(false);
	4772	+ }
4384	4773	}
4385	4774	else
4386	4775	{
4387	4776	boolean first = true;
4388	4777
4389		- if (GrafreeD.clipboardIsTempGroup)
	4778	+ if (Grafreed.clipboardIsTempGroup)
4390	4779	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4780	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4781	Object3D copy;
4393	4782	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4783	{
..	..	@@ -4398,7 +4787,7 @@
4398	4787	}
4399	4788	} else
4400	4789	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4790	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4791	}
4403	4792	}
4404	4793	}
..	..	@@ -4803,21 +5192,6 @@
4803	5192	}
4804	5193	*/
4805	5194
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5195	/*
4822	5196	public void Callback(Object obj)
4823	5197	{
..	..	@@ -4841,26 +5215,9 @@
4841	5215	}
4842	5216	*/
4843	5217
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5218	String GetFile(String dialogName)
4862	5219	{
4863		- if (GrafreeD.standAlone)
	5220	+ if (Grafreed.standAlone)
4864	5221	{
4865	5222	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5223	browser.show();
..	..	@@ -4924,10 +5281,18 @@
4924	5281	cButton flashSelectionButton;
4925	5282	cButton editButton;
4926	5283	cButton uneditButton;
	5284	+ JCheckBox allParamsButton;
4927	5285	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5286	cButton unselectButton;
4930	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
	5294	+ cButton oneStepButton;
	5295	+
4931	5296	cButton screenfitButton;
4932	5297	cButton screenfitpointButton;
4933	5298	cButton snapobjectButton;
..	..	@@ -4938,14 +5303,6 @@
4938	5303	cButton closeButton;
4939	5304
4940	5305	cButton setsupportButton;
4941		-
4942		- cButton twoButton;
4943		- cButton sixButton;
4944		- cButton threeButton;
4945		- cButton sevenButton;
4946		- cButton fourButton; // full panel
4947		- cButton oneButton; // full XYZ
4948		- //cButton currentLayout;
4949	5306
4950	5307	//
4951	5308	//Composite
..	..	@@ -4958,6 +5315,8 @@
4958	5315	private MenuItem lookFromItem;
4959	5316	private MenuItem switchItem;
4960	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
4961	5320	private MenuItem duplicateItem;
4962	5321	private MenuItem cloneItem;
4963	5322	private MenuItem cloneSupportItem;
..	..	@@ -4971,7 +5330,7 @@
4971	5330	private MenuItem linkverticesItem;
4972	5331	private MenuItem relinkverticesItem;
4973	5332	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5333	+ private MenuItem resetAllItem;
4975	5334	private MenuItem stepAllItem;
4976	5335	private MenuItem revertMeshItem;
4977	5336	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5341,7 @@
4982	5341	private MenuItem mergeGeometriesItem;
4983	5342	private MenuItem copyItem;
4984	5343	private MenuItem pasteItem;
	5344	+ private MenuItem pasteIntoItem;
4985	5345	private MenuItem pasteLinkItem;
4986	5346	private MenuItem pasteCloneItem;
4987	5347	private MenuItem pasteExpandItem;
..	..	@@ -5020,6 +5380,10 @@
5020	5380	private MenuItem showleavesItem;
5021	5381	private MenuItem markleavesItem;
5022	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
5023	5387
5024	5388	private MenuItem flipVItem;
5025	5389	private MenuItem unflipVItem;
..	..	@@ -5031,8 +5395,10 @@
5031	5395	private MenuItem panoTexturesItem;
5032	5396
5033	5397	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5398	+ private MenuItem resetCentroidXZItem;
5035	5399	private MenuItem resetTransformItem;
	5400	+ private MenuItem transformGeometryItem;
	5401	+ private MenuItem transformChildrenItem;
5036	5402	private MenuItem hideItem;
5037	5403	private MenuItem grabItem;
5038	5404	private MenuItem backItem;
..	..	@@ -5079,7 +5445,7 @@
5079	5445	private MenuItem blobItem;
5080	5446	private MenuItem latheItem;
5081	5447	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5448	+ private MenuItem overlayItem;
5083	5449	private MenuItem meshItem;
5084	5450	// private MenuItem meshGroupItem;
5085	5451	private MenuItem springItem;
..	..	@@ -5101,11 +5467,6 @@
5101	5467	private MenuItem doubleItem;
5102	5468	private MenuItem tripleItem;
5103	5469
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5470	private MenuItem computeAOItem;
5110	5471	private MenuItem recompileItem;
5111	5472	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5476,8 @@
5115	5476	private MenuItem analyzeItem;
5116	5477	private MenuItem dumpItem;
5117	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
5118	5483	}