~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,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	286	+ }
	287	+
192	288	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +305,26 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
222	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
224	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	326	setMasterItem.addActionListener(this);
	327	+ }
226	328
227	329	oe.menuBar.add(menu = new Menu("Group"));
228	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +335,32 @@
233	335	frontItem.addActionListener(this);
234	336	compositeItem = menu.add(new MenuItem("Composite"));
235	337	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	339	hideItem.addActionListener(this);
238	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	341	ungroupItem.addActionListener(this);
240	342	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
242	344	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	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	346	switchGeoItem.addActionListener(this);
249	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	348	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
253	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	360	scriptNodeItem.addActionListener(this);
255	361	cameraItem = menu.add(new MenuItem("Camera"));
256	362	cameraItem.addActionListener(this);
	363	+ }
257	364
258	365	oe.menuBar.add(menu = new Menu("Object"));
259	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +375,29 @@
268	375	shadowYItem.addActionListener(this);
269	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
271	381	linkerItem = menu.add(new MenuItem("Linker"));
272	382	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	383	attributeItem = menu.add(new MenuItem("Attribute"));
276	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
277	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	388	pointflowItem.addActionListener(this);
	389	+ }
279	390	menu.add("-");
280	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	392	resetTransformItem.addActionListener(this);
282	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	394	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
286	401
287	402	oe.menuBar.add(menu = new Menu("Geometry"));
288	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +408,11 @@
293	408	genNormalsCADItem.addActionListener(this);
294	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
296	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
298	416	stripifyItem = menu.add(new MenuItem("Stripify"));
299	417	stripifyItem.addActionListener(this);
300	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +434,34 @@
316	434	reduce34MeshItem.addActionListener(this);
317	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	436	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
323	445
324	446	oe.menuBar.add(menu = new Menu("Attributes"));
325	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
327	453	menu.add("-");
328	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	455	liveleavesItem.addActionListener(this);
330	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
332	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	461	supportleavesItem.addActionListener(this);
334	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	463	unsupportleavesItem.addActionListener(this);
	464	+ }
336	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	466	hideleavesItem.addActionListener(this);
338	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +470,14 @@
341	470	markleavesItem.addActionListener(this);
342	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
344	481	menu.add("-");
345	482	flipVItem = menu.add(new MenuItem("Flip V"));
346	483	flipVItem.addActionListener(this);
..	..	@@ -376,35 +513,40 @@
376	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	514	sortbynameItem.addActionListener(this);
378	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
379	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	524	extractGeometriesItem.addActionListener(this);
381	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	526	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);
	527	+ }
387	528
388	529	oe.menuBar.add(menu = new Menu("Insert"));
389	530	buildCreateMenu(menu);
390	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
403	533	buildToolsMenu(menu);
404	534	}
405	535
406	536	void SetupUI2(ObjEditor oe)
407	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
408	550	//new Exception().printStackTrace();
409	551
410	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +575,122 @@
433	575	oe.radioPanel.add(dummyButton);
434	576	oe.buttonGroup.add(dummyButton);
435	577	*/
436		- aConstraints.gridy += 1;
437		-
438	578	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	579
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
442	583
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	605	+ liveCB.setToolTipText("Enable animation");
445	606	liveCB.addItemListener(this);
446	607
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
	612	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
	614	+ fastCB.addItemListener(this);
	615	+
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
449	617	trackCB.setToolTipText("Enable tracking");
450	618	trackCB.addItemListener(this);
451	619
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	621	screenfitButton.setToolTipText("Screen fit");
455	622	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	623	+
457	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	625	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	626
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	635	flashSelectionButton.setToolTipText("Show selection");
472	636	flashSelectionButton.addActionListener(this);
473	637
474		- oe.toolbarPanel.add(new cButton(" ", false));
	638	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	639
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	641	twoButton.setToolTipText("Show center view only");
483	642	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	644	fourButton.addActionListener(this);
486	645	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	647	sixButton.setToolTipText("2-column layout left");
489	648	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	650	threeButton.setToolTipText("2-column layout right");
492	651	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	653	sevenButton.setToolTipText("3-column layout");
495	654	sevenButton.addActionListener(this);
496	655	//
497	656
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ rootButton.setToolTipText("Edit selection in new tab");
500	659	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	660	+
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	662	closeButton.setToolTipText("Close tab");
504	663	closeButton.addActionListener(this);
505	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	665	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	666
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	667	+ cGridBag commandsPanel = new cGridBag();
	668	+
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editButton.setToolTipText("Edit selection");
511	671	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	672
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ uneditButton.setToolTipText("Unedit selection");
517	675	uneditButton.addActionListener(this);
518	676
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
531	679	allParamsButton.addActionListener(this);
532	680
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ clearPanelButton.setToolTipText("Clear edit panel");
	683	+ clearPanelButton.addActionListener(this);
	684	+
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ unselectButton.setToolTipText("Unselect");
538	687	unselectButton.addActionListener(this);
539	688
	689	+ commandsPanel.preferredHeight = 1;
	690	+
	691	+ oe.treePanel.add(commandsPanel);
	692	+ oe.treePanel.Return();
	693	+
540	694	// oe.aConstraints.gridx += 1;
541	695	// oe.aConstraints.weighty = 0;
542	696	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +702,37 @@
548	702	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	703	// gcButton.addActionListener(this);
550	704
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	705	+ cGridBag jSPPanel = new cGridBag();
	706	+
	707	+ JScrollPane jSP;
562	708	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	709	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	710	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	711	+
	712	+ oe.treePanel.add(jSPPanel);
	713	+ oe.treePanel.Return();
569	714
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	715	+ cGridBag copyOptionsPanel = new cGridBag();
	716	+
	717	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	718	+ colorCB.setToolTipText("Copy color when dropped");
574	719	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	720	+
	721	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	722	+ materialCB.setToolTipText("Copy material when dropped");
577	723	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	724	+
	725	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	726	+ textureCB.setToolTipText("Copy texture when dropped");
580	727	textureCB.addItemListener(this);
581	728
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	729	+ copyOptionsPanel.preferredHeight = 1;
	730	+ oe.treePanel.add(copyOptionsPanel);
	731	+ oe.treePanel.Return();
584	732
	733	+// mainPanel.setDividerLocation(0.5); //1.0);
	734	+// mainPanel.setResizeWeight(0.5);
	735	+
585	736	//jList.addListSelectionListener(this);
586	737	oe.jTree.addTreeSelectionListener(this);
587	738	//jTree.setRootVisible(false);
..	..	@@ -604,45 +755,37 @@
604	755	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	756	}
606	757
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	758	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	759	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	760	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	761	boxCB.setToolTipText("Display bounding boxes");
640	762	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	763	+
	764	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	765	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	766	zoomBoxCB.addItemListener(this);
645	767
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
	770	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	771	+ supportCB.setToolTipText("Enable rigging");
	772	+ supportCB.addItemListener(this);
	773	+
	774	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	775	+ // localCB.addItemListener(this);
	776	+
	777	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	778	+ crowdCB.setToolTipText("Used for crowds");
	779	+ crowdCB.addItemListener(this);
	780	+
	781	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	782	+ smoothCB.setToolTipText("Snapping delay");
	783	+ smoothCB.addItemListener(this);
	784	+
	785	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	786	+ slowCB.setToolTipText("Smooth interpolation");
	787	+ slowCB.addItemListener(this);
	788	+
646	789	// constraints.gridy += 1;
647	790	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	791	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +793,16 @@
650	793	if (false)
651	794	{
652	795	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	796	+ //constraints.gridy += 1;
	797	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	798	speakerCameraCB.addItemListener(this);
656	799
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	800	+ //constraints.gridy += 1;
	801	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	802	speakerFocusCB.addItemListener(this);
660	803
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	804	+ //constraints.gridy += 1;
	805	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	806	smoothfocusCB.addItemListener(this);
664	807	}
665	808
..	..	@@ -667,14 +810,20 @@
667	810	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	811	// debugCB.addItemListener(this);
669	812
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	813	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	814	oeilCB.addItemListener(this);
673	815
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	816	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	817	lookAtCB.setToolTipText("Look-at target");
677	818	lookAtCB.addItemListener(this);
	819	+
	820	+ }
	821	+
	822	+ cGridBag fill = new cGridBag();
	823	+
	824	+ fill.preferredHeight = 200;
	825	+
	826	+ panel.add(fill);
678	827
679	828	}
680	829
..	..	@@ -689,8 +838,11 @@
689	838	buttonGroup.add(radioButton);
690	839	radioButton.doClick();
691	840	}
	841	+
692	842	void SetupViews(ObjEditor oe)
693	843	{
	844	+ theFrame = this;
	845	+
694	846	oe.SetupViews();
695	847
696	848	System.out.println("SetupViews");
..	..	@@ -753,6 +905,7 @@
753	905	} else if(e.getSource() == liveCB)
754	906	{
755	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
756	909	}
757	910	else if(e.getSource() == supportCB)
758	911	{
..	..	@@ -905,7 +1058,9 @@
905	1058	// objEditor.DropFile((java.io.File[]) object, true);
906	1059	// return;
907	1060	// }
908		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1064	{
910	1065	// file(s)
911	1066	String[] names = string.split("\n");
..	..	@@ -932,7 +1087,7 @@
932	1087
933	1088	flashIt = false;
934	1089	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1092
938	1093	if (group.selection.size() == 1)
..	..	@@ -959,11 +1114,11 @@
959	1114	{
960	1115	loadClipboard(true);
961	1116	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1117	+ pasteInto(false, false);
963	1118	} else {
964	1119	loadClipboard(false);
965	1120	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
967	1122	}
968	1123	}
969	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1240,33 @@
1085	1240	kleinItem.addActionListener(this);
1086	1241	particleItem = menu.add(new MenuItem("Particle system"));
1087	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1088	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1246	ragdollItem.addActionListener(this);
1090	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1092	1250	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1252	meshItem.addActionListener(this);
1095	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1097	1257	springItem = menu.add(new MenuItem("Spring"));
1098	1258	springItem.addActionListener(this);
1099	1259	flagItem = menu.add(new MenuItem("Flag"));
1100	1260	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1261	blobItem = menu.add(new MenuItem("Blob"));
1106	1262	blobItem.addActionListener(this);
1107	1263	latheItem = menu.add(new MenuItem("Lathe"));
1108	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1109	1270	lightItem = menu.add(new MenuItem("Light"));
1110	1271	lightItem.addActionListener(this);
1111	1272	menu.add("-");
..	..	@@ -1115,39 +1276,44 @@
1115	1276	loopItem.addActionListener(this);
1116	1277	doubleItem = menu.add(new MenuItem("Fork"));
1117	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1118	1281	tripleItem = menu.add(new MenuItem("Trident"));
1119	1282	tripleItem.addActionListener(this);
	1283	+ }
1120	1284	}
1121	1285
1122	1286	void buildToolsMenu(Menu menu)
1123	1287	{
1124	1288	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1289	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1290	+ animationItem.setState(Globals.ANIMATION);
1127	1291
1128	1292	menu.add("-");
1129	1293	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1294	parseverticesItem.addActionListener(this);
1131	1295	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1296	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1298	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1300	reduceMorphItem.addActionListener(this);
1139	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1302	reduce34MorphItem.addActionListener(this);
1141		-
	1303	+ menu.add("-");
1142	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1305	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1146	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1313	memoryItem.addActionListener(this);
1148	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1315	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1317	dumpItem.addActionListener(this);
1152	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1319	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1331,7 @@
1165	1331	menu.add("-");
1166	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1333	editScriptItem.addActionListener(this);
	1334	+ }
1168	1335	}
1169	1336
1170	1337	void ScreenFit()
..	..	@@ -1493,9 +1660,9 @@
1493	1660
1494	1661	void Overwrite(int mask)
1495	1662	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1664	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1499	1666
1500	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1668	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1833,7 @@
1666	1833	{
1667	1834	makeSomething(new BezierSurface());
1668	1835	} else
1669		- if (source == checkerItem)
	1836	+ if (source == overlayItem)
1670	1837	{
1671	1838	/*
1672	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1967,6 @@
1800	1967	csg.addChild(child);
1801	1968	child.addChild(csg);
1802	1969	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	1970	if (source == computeAOItem)
1821	1971	{
1822	1972	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +1985,7 @@
1835	1985	if (source == invariantsItem)
1836	1986	{
1837	1987	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1839	1989	} else
1840	1990	if (source == memoryItem)
1841	1991	{
..	..	@@ -1853,6 +2003,35 @@
1853	2003	if (source == dumpItem)
1854	2004	{
1855	2005	DumpObject();
	2006	+ } else
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
1856	2035	} else
1857	2036	if (source == screenfitButton)
1858	2037	{
..	..	@@ -1903,12 +2082,20 @@
1903	2082	{
1904	2083	loadClipboard(true);
1905	2084	} else
	2085	+ if (source == undoItem)
	2086	+ {
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
1906	2093	if (source == duplicateItem)
1907	2094	{
1908		- Object3D keep = GrafreeD.clipboard;
	2095	+ Object3D keep = Grafreed.clipboard;
1909	2096	loadClipboard(false);
1910	2097	paste(false);
1911		- GrafreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1912	2099	} else
1913	2100	if (source == cloneItem)
1914	2101	{
..	..	@@ -1926,13 +2113,17 @@
1926	2113	{
1927	2114	paste(false);
1928	2115	} else
	2116	+ if (source == pasteIntoItem)
	2117	+ {
	2118	+ pasteInto(true, false);
	2119	+ } else
1929	2120	if (source == pasteLinkItem)
1930	2121	{
1931		- pasteInto(false);
	2122	+ pasteInto(false, false);
1932	2123	} else
1933	2124	if (source == pasteCloneItem)
1934	2125	{
1935		- pasteInto(true);
	2126	+ pasteInto(true, true);
1936	2127	} else
1937	2128	if (source == pasteExpandItem)
1938	2129	{
..	..	@@ -2124,9 +2315,9 @@
2124	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2316	// refreshContents();
2126	2317	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2319	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2130	2321
2131	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2323	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2325,11 @@
2134	2325	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2326	for (int i=0; i<group.selection.size(); i++)
2136	2327	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2330	group.selection.get(i).linkVerticesThis(content);
2140	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2142	2333	}
2143	2334	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2335	refreshContents();
..	..	@@ -2148,20 +2339,20 @@
2148	2339	{
2149	2340	for (int i=0; i<group.selection.size(); i++)
2150	2341	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2344	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2155	2346	}
2156	2347
2157	2348	refreshContents();
2158	2349	} else
2159	2350	if (source == relinkverticesItem)
2160	2351	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2354	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2355	+ CameraPane.SWITCH = random;
2165	2356
2166	2357	refreshContents();
2167	2358	} else
..	..	@@ -2176,9 +2367,9 @@
2176	2367	} else
2177	2368	if (source == setMasterItem)
2178	2369	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2371	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2182	2373
2183	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2375	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2382,9 @@
2191	2382	{
2192	2383	if (group.selection.size() == 1)
2193	2384	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2195	2386	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2197	2388
2198	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2390	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2401,7 @@
2210	2401	{
2211	2402	RevertMeshes();
2212	2403	} else
2213		- if (source == resetMeshItem)
	2404	+ if (source == resetAllItem)
2214	2405	{
2215	2406	ResetAll();
2216	2407	} else
..	..	@@ -2259,7 +2450,7 @@
2259	2450	RandomNode random = new RandomNode();
2260	2451	group(random);
2261	2452	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2263	2454	} else
2264	2455	if (source == physicsItem)
2265	2456	{
..	..	@@ -2398,7 +2589,7 @@
2398	2589	} else
2399	2590	if (source == genNormalsMESHItem)
2400	2591	{
2401		- GenNormals(true); // TODO
	2592	+ GenNormalsMESH();
2402	2593	} else
2403	2594	if (source == genNormalsORGANItem)
2404	2595	{
..	..	@@ -2463,6 +2654,22 @@
2463	2654	if (source == unmarkleavesItem)
2464	2655	{
2465	2656	MarkLeaves(false);
	2657	+ } else
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
2466	2673	} else
2467	2674	if (source == flipVItem)
2468	2675	{
..	..	@@ -2548,9 +2755,13 @@
2548	2755	{
2549	2756	SmoothMesh();
2550	2757	} else
2551		- if (source == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2552	2759	{
2553	2760	TransformGeometry();
	2761	+ } else
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
2554	2765	} else
2555	2766	if (source == resetTransformItem)
2556	2767	{
..	..	@@ -2558,7 +2769,11 @@
2558	2769	} else
2559	2770	if (source == resetCentroidItem)
2560	2771	{
2561		- ResetCentroid();
	2772	+ ResetCentroid(true);
	2773	+ } else
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
2562	2777	} else
2563	2778	if (source == resetParentItem)
2564	2779	{
..	..	@@ -2720,8 +2935,26 @@
2720	2935	// centralPanel.setVisible(true);
2721	2936	// XYZPanel.setVisible(false);
2722	2937	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	2938	+ bigThree.add(centralPanel);
2724	2939	bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2725	2958	} else
2726	2959	if (source == threeButton)
2727	2960	{
..	..	@@ -2755,9 +2988,11 @@
2755	2988	// centralPanel.setVisible(true);
2756	2989	// XYZPanel.setVisible(true);
2757	2990	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	2991	+ bigThree.add(centralPanel);
	2992	+ bigThree.add(XYZPanel);
2760	2993	bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2761	2996	} else
2762	2997	if (source == fourButton)
2763	2998	{
..	..	@@ -2791,8 +3026,10 @@
2791	3026	// centralPanel.setVisible(false);
2792	3027	// XYZPanel.setVisible(false);
2793	3028	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3029	+ bigThree.add(scenePanel);
2795	3030	bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2796	3033	} else
2797	3034	if (source == sixButton)
2798	3035	{
..	..	@@ -2826,9 +3063,11 @@
2826	3063	// centralPanel.setVisible(true);
2827	3064	// XYZPanel.setVisible(false);
2828	3065	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3066	+ bigThree.add(scenePanel);
	3067	+ bigThree.add(centralPanel);
2831	3068	bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2832	3071	} else
2833	3072	if (source == sevenButton)
2834	3073	{
..	..	@@ -2862,10 +3101,12 @@
2862	3101	// centralPanel.setVisible(true);
2863	3102	// XYZPanel.setVisible(true);
2864	3103	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3104	+ bigThree.add(scenePanel);
	3105	+ bigThree.add(centralPanel);
	3106	+ bigThree.add(XYZPanel);
2868	3107	bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2869	3110	} else
2870	3111	if (source == rootButton)
2871	3112	{
..	..	@@ -2877,6 +3118,7 @@
2877	3118	EditObject(obj);
2878	3119	}
2879	3120
	3121	+ cameraView.requestFocusInWindow();
2880	3122	refreshContents(true);
2881	3123	} else
2882	3124	if (source == closeButton)
..	..	@@ -2898,6 +3140,8 @@
2898	3140	break;
2899	3141	}
2900	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2901	3145	refreshContents(true);
2902	3146	} else
2903	3147	if (source == editItem \|\| source == editButton)
..	..	@@ -2914,9 +3158,9 @@
2914	3158	child.CloseUI();
2915	3159	listUI.remove(child);
2916	3160
2917		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2918	3162	}
2919		- objEditor.ctrlPanel.revalidate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2920	3164	//objEditor.jTree.clearSelection();
2921	3165	//objEditor.ResetSliders();
2922	3166	refreshContents(true);
..	..	@@ -3000,7 +3244,10 @@
3000	3244	frontView.object = group;
3001	3245	sideView.object = group;
3002	3246	}
3003		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
3004	3251	/*
3005	3252	currentLayout = radio.layout;
3006	3253	if (currentLayout == null)
..	..	@@ -3012,8 +3259,23 @@
3012	3259	//group.parent = null; // ROOT
3013	3260	//group.attributes = -1;
3014	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
3015	3264	refreshContents(true);
3016		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
3017	3279	else
3018	3280	{
3019	3281	//return super.action(event, arg);
..	..	@@ -3022,7 +3284,6 @@
3022	3284	}
3023	3285
3024	3286	boolean useclient = false;
3025		- cRadio radio;
3026	3287
3027	3288	void ToggleRoot()
3028	3289	{
..	..	@@ -3074,6 +3335,28 @@
3074	3335	refreshContents();
3075	3336	}
3076	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
3077	3360
3078	3361	void ResetTransform()
3079	3362	{
..	..	@@ -3186,7 +3469,7 @@
3186	3469	refreshContents();
3187	3470	}
3188	3471
3189		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
3190	3473	{
3191	3474	Object3D obj;
3192	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3484,16 @@
3201	3484	LA.matIdentity(Object3D.mat);
3202	3485	obj.getBounds(minima, maxima, false);
3203	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3207	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3210	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3522,8 @@
3235	3522
3236	3523	int size = obj.MemorySize();
3237	3524
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3527	}
3240	3528	}
3241	3529	catch (Exception e)
..	..	@@ -3272,9 +3560,9 @@
3272	3560	obj = (Object3D)e.nextElement();
3273	3561
3274	3562	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3276	3564	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3566
3279	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3568	}
..	..	@@ -3316,6 +3604,13 @@
3316	3604	void GenNormals(boolean crease)
3317	3605	{
3318	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
3319	3614
3320	3615	refreshContents();
3321	3616	}
..	..	@@ -3488,8 +3783,8 @@
3488	3783
3489	3784	void ParseVertices()
3490	3785	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3493	3788
3494	3789	for (int i=0; i<group.selection.size(); i++)
3495	3790	{
..	..	@@ -3514,7 +3809,7 @@
3514	3809	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3810	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3811
3517		- g.add(GrafreeD.clipboard);
	3812	+ g.add(Grafreed.clipboard);
3518	3813
3519	3814	buffer.add(g);
3520	3815	}
..	..	@@ -3529,7 +3824,7 @@
3529	3824	makeSomething(buffer, i==group.selection.size()-1);
3530	3825	}
3531	3826
3532		- GrafreeD.epsequal = epsequal;
	3827	+ Grafreed.epsequal = epsequal;
3533	3828
3534	3829	refreshContents();
3535	3830	}
..	..	@@ -3547,7 +3842,16 @@
3547	3842	String pigment = Object3D.GetPigment(tex);
3548	3843	//String bump = Object3D.GetBump(tex);
3549	3844
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
3551	3855
3552	3856	double s = v.s;
3553	3857
..	..	@@ -3635,11 +3939,11 @@
3635	3939
3636	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3941
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3944	lowres.linkVerticesThis(null);
3641	3945	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3643	3947
3644	3948	System.err.flush();
3645	3949
..	..	@@ -3679,7 +3983,7 @@
3679	3983	return;
3680	3984
3681	3985	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3683	3987
3684	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	3989
..	..	@@ -3873,9 +4177,9 @@
3873	4177
3874	4178	void ClipMesh()
3875	4179	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4181	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3879	4183
3880	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4185	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4188,7 @@
3884	4188	// {
3885	4189	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4190	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4192	}
3889	4193	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4194	System.out.println("DONE.");
..	..	@@ -3931,6 +4235,18 @@
3931	4235	void MarkLeaves(boolean hide)
3932	4236	{
3933	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3934	4250	refreshContents();
3935	4251	}
3936	4252
..	..	@@ -4019,7 +4335,7 @@
4019	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4336
4021	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
4023	4339	{
4024	4340	// if (!(elem instanceof Composite))
4025	4341	// newWindow = false;
..	..	@@ -4109,7 +4425,6 @@
4109	4425	//case 702: // Event.LIST_DESELECT
4110	4426	group.deselectAll();
4111	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4428	if (tps != null)
4114	4429	{
4115	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,29 +4433,28 @@
4118	4433
4119	4434	//if (child.parent != null)
4120	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
4121	4437	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4438	}
4126	4439	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4440	+// else
	4441	+// {
	4442	+// objEditor.SetMaterial(group); // .GetMaterial());
	4443	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4444	+// System.err.println("info : " + group.GetPath());
	4445	+// }
4133	4446
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4448	CameraPane.flash = true;
4138	4449
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4451	// a camera
4141	4452	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
4144	4458	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4459	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4460	}
..	..	@@ -4153,6 +4467,26 @@
4153	4467
4154	4468	freezemodel = false;
4155	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
4156	4490
4157	4491	void linkSomething(Object3D thing)
4158	4492	{
..	..	@@ -4224,16 +4558,18 @@
4224	4558	{
4225	4559	if (group.selection.isEmpty())
4226	4560	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
4228	4563	Composite tGroup = null;
4229	4564	if (group.selection.size() > 0) // 1)
4230	4565	{
4231	4566	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
4233	4568	}
4234	4569
4235	4570	if (cut)
4236	4571	{
	4572	+ Save();
4237	4573	//int indices[] = jList.getSelectedIndices();
4238	4574	//for (int i = indices.length - 1; i >= 0; i--)
4239	4575	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4605,16 @@
4269	4605	//System.out.println("cut " + child);
4270	4606	//System.out.println("parent = " + child.parent);
4271	4607	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
4273	4609	tGroup.add/Child/(tmp);
4274	4610	else
4275		- GrafreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
4276	4612	}
4277	4613	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
4279	4615	tGroup.add/Child/(child);
4280	4616	else
4281		- GrafreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
4282	4618	}
4283	4619
4284	4620	//ResetModel();
..	..	@@ -4310,21 +4646,23 @@
4310	4646	//System.out.println("cut " + elem);
4311	4647	//System.out.println("parent = " + elem.parent);
4312	4648	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
4314	4650	tGroup.add/Child/(tmp);
4315	4651	else
4316		- GrafreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
4317	4653	}
4318	4654	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
4320	4656	tGroup.add/Child/(child);
4321	4657	else
4322		- GrafreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
4323	4659	}
4324	4660
4325	4661	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
4328	4666	if (cut)
4329	4667	{
4330	4668	ResetModel();
..	..	@@ -4338,7 +4676,7 @@
4338	4676	// return;
4339	4677	boolean first = true;
4340	4678
4341		- if (GrafreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
4342	4680	{
4343	4681	Composite temp;
4344	4682
..	..	@@ -4349,7 +4687,7 @@
4349	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4688	*/
4351	4689	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4691	{
4354	4692	Object3D child = (Object3D)e.nextElement();
4355	4693
..	..	@@ -4383,21 +4721,21 @@
4383	4721	//Object3D cb = Applet3D.clipboard;
4384	4722	//temp.addChild(cb);
4385	4723	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4729	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4732	}
4395	4733
4396	4734	ResetModel();
4397	4735	refreshContents();
4398	4736	}
4399	4737
4400		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4401	4739	{
4402	4740	// if (GrafreeD.clipboard == null)
4403	4741	// return;
..	..	@@ -4426,15 +4764,22 @@
4426	4764	if (copyit)
4427	4765	{
4428	4766	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4430	4775	}
4431	4776	else
4432	4777	{
4433	4778	boolean first = true;
4434	4779
4435		- if (GrafreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4436	4781	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4783	Object3D copy;
4439	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4785	{
..	..	@@ -4444,7 +4789,7 @@
4444	4789	}
4445	4790	} else
4446	4791	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4793	}
4449	4794	}
4450	4795	}
..	..	@@ -4849,21 +5194,6 @@
4849	5194	}
4850	5195	*/
4851	5196
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5197	/*
4868	5198	public void Callback(Object obj)
4869	5199	{
..	..	@@ -4887,26 +5217,9 @@
4887	5217	}
4888	5218	*/
4889	5219
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5220	String GetFile(String dialogName)
4908	5221	{
4909		- if (GrafreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4910	5223	{
4911	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5225	browser.show();
..	..	@@ -4970,10 +5283,18 @@
4970	5283	cButton flashSelectionButton;
4971	5284	cButton editButton;
4972	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4973	5287	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5288	cButton unselectButton;
4976	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4977	5298	cButton screenfitButton;
4978	5299	cButton screenfitpointButton;
4979	5300	cButton snapobjectButton;
..	..	@@ -4984,14 +5305,6 @@
4984	5305	cButton closeButton;
4985	5306
4986	5307	cButton setsupportButton;
4987		-
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995	5308
4996	5309	//
4997	5310	//Composite
..	..	@@ -5004,6 +5317,8 @@
5004	5317	private MenuItem lookFromItem;
5005	5318	private MenuItem switchItem;
5006	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
5007	5322	private MenuItem duplicateItem;
5008	5323	private MenuItem cloneItem;
5009	5324	private MenuItem cloneSupportItem;
..	..	@@ -5017,7 +5332,7 @@
5017	5332	private MenuItem linkverticesItem;
5018	5333	private MenuItem relinkverticesItem;
5019	5334	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
5021	5336	private MenuItem stepAllItem;
5022	5337	private MenuItem revertMeshItem;
5023	5338	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5343,7 @@
5028	5343	private MenuItem mergeGeometriesItem;
5029	5344	private MenuItem copyItem;
5030	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
5031	5347	private MenuItem pasteLinkItem;
5032	5348	private MenuItem pasteCloneItem;
5033	5349	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5382,10 @@
5066	5382	private MenuItem showleavesItem;
5067	5383	private MenuItem markleavesItem;
5068	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
5069	5389
5070	5390	private MenuItem flipVItem;
5071	5391	private MenuItem unflipVItem;
..	..	@@ -5077,8 +5397,10 @@
5077	5397	private MenuItem panoTexturesItem;
5078	5398
5079	5399	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
5081	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
5082	5404	private MenuItem hideItem;
5083	5405	private MenuItem grabItem;
5084	5406	private MenuItem backItem;
..	..	@@ -5125,7 +5447,7 @@
5125	5447	private MenuItem blobItem;
5126	5448	private MenuItem latheItem;
5127	5449	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
5129	5451	private MenuItem meshItem;
5130	5452	// private MenuItem meshGroupItem;
5131	5453	private MenuItem springItem;
..	..	@@ -5147,11 +5469,6 @@
5147	5469	private MenuItem doubleItem;
5148	5470	private MenuItem tripleItem;
5149	5471
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5472	private MenuItem computeAOItem;
5156	5473	private MenuItem recompileItem;
5157	5474	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5478,8 @@
5161	5478	private MenuItem analyzeItem;
5162	5479	private MenuItem dumpItem;
5163	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
5164	5485	}