~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,110 +574,120 @@
433	574	oe.radioPanel.add(dummyButton);
434	575	oe.buttonGroup.add(dummyButton);
435	576	*/
436		- aConstraints.gridy += 1;
437		-
438	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	578
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
442	582
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	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");
445	605	liveCB.addItemListener(this);
446	606
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
	613	+ fastCB.addItemListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
449	616	trackCB.setToolTipText("Enable tracking");
450	617	trackCB.addItemListener(this);
451	618
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	620	screenfitButton.setToolTipText("Screen fit");
455	621	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	622	+
457	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	624	// 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	625
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);
	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);
471	634	flashSelectionButton.setToolTipText("Show selection");
472	635	flashSelectionButton.addActionListener(this);
473	636
474		- oe.toolbarPanel.add(new cButton(" ", false));
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	638
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);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	640	twoButton.setToolTipText("Show center view only");
483	641	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	643	fourButton.addActionListener(this);
486	644	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	646	sixButton.setToolTipText("2-column layout left");
489	647	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	649	threeButton.setToolTipText("2-column layout right");
492	650	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	652	sevenButton.setToolTipText("3-column layout");
495	653	sevenButton.addActionListener(this);
496	654	//
497	655
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- 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");
500	658	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	661	closeButton.setToolTipText("Close tab");
504	662	closeButton.addActionListener(this);
505	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	664	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	665
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
511	668	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	669
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
517	672	uneditButton.addActionListener(this);
518	673
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);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
531	676	allParamsButton.addActionListener(this);
532	677
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);
	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");
538	684	unselectButton.addActionListener(this);
539	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
540	691	// oe.aConstraints.gridx += 1;
541	692	// oe.aConstraints.weighty = 0;
542	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +699,37 @@
548	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	700	// gcButton.addActionListener(this);
550	701
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;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
562	705	//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);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	707	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
569	711
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);
	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");
574	716	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- 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");
577	720	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- 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");
580	724	textureCB.addItemListener(this);
581	725
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
584	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
585	733	//jList.addListSelectionListener(this);
586	734	oe.jTree.addTreeSelectionListener(this);
587	735	//jTree.setRootVisible(false);
..	..	@@ -604,45 +752,37 @@
604	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	753	}
606	754
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	756	{
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);
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	758	boxCB.setToolTipText("Display bounding boxes");
640	759	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	763	zoomBoxCB.addItemListener(this);
645	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	+
646	786	// constraints.gridy += 1;
647	787	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	788	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +790,16 @@
650	790	if (false)
651	791	{
652	792	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	795	speakerCameraCB.addItemListener(this);
656	796
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	799	speakerFocusCB.addItemListener(this);
660	800
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	803	smoothfocusCB.addItemListener(this);
664	804	}
665	805
..	..	@@ -667,14 +807,20 @@
667	807	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	808	// debugCB.addItemListener(this);
669	809
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	811	oeilCB.addItemListener(this);
673	812
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	813	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	814	lookAtCB.setToolTipText("Look-at target");
677	815	lookAtCB.addItemListener(this);
	816	+
	817	+ }
	818	+
	819	+ cGridBag fill = new cGridBag();
	820	+
	821	+ fill.preferredHeight = 200;
	822	+
	823	+ panel.add(fill);
678	824
679	825	}
680	826
..	..	@@ -689,8 +835,11 @@
689	835	buttonGroup.add(radioButton);
690	836	radioButton.doClick();
691	837	}
	838	+
692	839	void SetupViews(ObjEditor oe)
693	840	{
	841	+ theFrame = this;
	842	+
694	843	oe.SetupViews();
695	844
696	845	System.out.println("SetupViews");
..	..	@@ -753,6 +902,7 @@
753	902	} else if(e.getSource() == liveCB)
754	903	{
755	904	cameraView.ToggleLive();
	905	+ refreshContents(false);
756	906	}
757	907	else if(e.getSource() == supportCB)
758	908	{
..	..	@@ -905,7 +1055,9 @@
905	1055	// objEditor.DropFile((java.io.File[]) object, true);
906	1056	// return;
907	1057	// }
908		- if (string.charAt(0) == '/')
	1058	+
	1059	+ // File path for Mac and Windows
	1060	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1061	{
910	1062	// file(s)
911	1063	String[] names = string.split("\n");
..	..	@@ -932,7 +1084,7 @@
932	1084
933	1085	flashIt = false;
934	1086	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1087	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1088	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1089
938	1090	if (group.selection.size() == 1)
..	..	@@ -959,11 +1111,11 @@
959	1111	{
960	1112	loadClipboard(true);
961	1113	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1114	+ pasteInto(false, false);
963	1115	} else {
964	1116	loadClipboard(false);
965	1117	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1118	+ pasteInto(false, false); // true); // ???
967	1119	}
968	1120	}
969	1121	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1237,33 @@
1085	1237	kleinItem.addActionListener(this);
1086	1238	particleItem = menu.add(new MenuItem("Particle system"));
1087	1239	particleItem.addActionListener(this);
	1240	+ if (Globals.ADVANCED)
	1241	+ {
1088	1242	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1243	ragdollItem.addActionListener(this);
1090	1244	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1245	ragdoll2Item.addActionListener(this);
	1246	+ }
1092	1247	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1248	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1249	meshItem.addActionListener(this);
1095	1250	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1251	// meshGroupItem.addActionListener(this);
	1252	+ if (Globals.ADVANCED)
	1253	+ {
1097	1254	springItem = menu.add(new MenuItem("Spring"));
1098	1255	springItem.addActionListener(this);
1099	1256	flagItem = menu.add(new MenuItem("Flag"));
1100	1257	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	1258	blobItem = menu.add(new MenuItem("Blob"));
1106	1259	blobItem.addActionListener(this);
1107	1260	latheItem = menu.add(new MenuItem("Lathe"));
1108	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);
1109	1267	lightItem = menu.add(new MenuItem("Light"));
1110	1268	lightItem.addActionListener(this);
1111	1269	menu.add("-");
..	..	@@ -1115,39 +1273,44 @@
1115	1273	loopItem.addActionListener(this);
1116	1274	doubleItem = menu.add(new MenuItem("Fork"));
1117	1275	doubleItem.addActionListener(this);
	1276	+ if (Globals.ADVANCED)
	1277	+ {
1118	1278	tripleItem = menu.add(new MenuItem("Trident"));
1119	1279	tripleItem.addActionListener(this);
	1280	+ }
1120	1281	}
1121	1282
1122	1283	void buildToolsMenu(Menu menu)
1123	1284	{
1124	1285	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1286	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1287	+ animationItem.setState(Globals.ANIMATION);
1127	1288
1128	1289	menu.add("-");
1129	1290	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1291	parseverticesItem.addActionListener(this);
1131	1292	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1293	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1294	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1295	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1296	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1297	reduceMorphItem.addActionListener(this);
1139	1298	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1299	reduce34MorphItem.addActionListener(this);
1141		-
	1300	+ menu.add("-");
1142	1301	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1302	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1303
	1304	+ if (Globals.ADVANCED)
	1305	+ {
	1306	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1307	+ mirrorItem.addActionListener(this);
	1308	+ menu.add("-");
1146	1309	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1310	memoryItem.addActionListener(this);
1148	1311	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1312	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1313	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1314	dumpItem.addActionListener(this);
1152	1315	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1316	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1328,7 @@
1165	1328	menu.add("-");
1166	1329	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1330	editScriptItem.addActionListener(this);
	1331	+ }
1168	1332	}
1169	1333
1170	1334	void ScreenFit()
..	..	@@ -1287,6 +1451,7 @@
1287	1451	shadow.material = new cMaterial(obj.material);
1288	1452	shadow.material.diffuse = 0.0001f;
1289	1453	shadow.material.specular = 0.0001f;
	1454	+ //shadow.projectedVertices[1].x = 300;
1290	1455
1291	1456	makeSomething(shadow);
1292	1457	}
..	..	@@ -1493,9 +1658,9 @@
1493	1658
1494	1659	void Overwrite(int mask)
1495	1660	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1661	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1662	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1663	+ Object3D content = Grafreed.clipboard.get(0);
1499	1664
1500	1665	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1666	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1831,7 @@
1666	1831	{
1667	1832	makeSomething(new BezierSurface());
1668	1833	} else
1669		- if (source == checkerItem)
	1834	+ if (source == overlayItem)
1670	1835	{
1671	1836	/*
1672	1837	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1965,6 @@
1800	1965	csg.addChild(child);
1801	1966	child.addChild(csg);
1802	1967	} 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	1968	if (source == computeAOItem)
1821	1969	{
1822	1970	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +1983,7 @@
1835	1983	if (source == invariantsItem)
1836	1984	{
1837	1985	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	1986	+ Grafreed.grafreeD.universe.invariants();
1839	1987	} else
1840	1988	if (source == memoryItem)
1841	1989	{
..	..	@@ -1853,6 +2001,35 @@
1853	2001	if (source == dumpItem)
1854	2002	{
1855	2003	DumpObject();
	2004	+ } else
	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();
1856	2033	} else
1857	2034	if (source == screenfitButton)
1858	2035	{
..	..	@@ -1903,12 +2080,20 @@
1903	2080	{
1904	2081	loadClipboard(true);
1905	2082	} else
	2083	+ if (source == undoItem)
	2084	+ {
	2085	+ Undo();
	2086	+ } else
	2087	+ if (source == redoItem)
	2088	+ {
	2089	+ Redo();
	2090	+ } else
1906	2091	if (source == duplicateItem)
1907	2092	{
1908		- Object3D keep = GrafreeD.clipboard;
	2093	+ Object3D keep = Grafreed.clipboard;
1909	2094	loadClipboard(false);
1910	2095	paste(false);
1911		- GrafreeD.clipboard = keep;
	2096	+ Grafreed.clipboard = keep;
1912	2097	} else
1913	2098	if (source == cloneItem)
1914	2099	{
..	..	@@ -1926,13 +2111,17 @@
1926	2111	{
1927	2112	paste(false);
1928	2113	} else
	2114	+ if (source == pasteIntoItem)
	2115	+ {
	2116	+ pasteInto(true, false);
	2117	+ } else
1929	2118	if (source == pasteLinkItem)
1930	2119	{
1931		- pasteInto(false);
	2120	+ pasteInto(false, false);
1932	2121	} else
1933	2122	if (source == pasteCloneItem)
1934	2123	{
1935		- pasteInto(true);
	2124	+ pasteInto(true, true);
1936	2125	} else
1937	2126	if (source == pasteExpandItem)
1938	2127	{
..	..	@@ -2124,9 +2313,9 @@
2124	2313	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2314	// refreshContents();
2126	2315	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2316	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2317	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2318	+ Object3D content = Grafreed.clipboard.get(0);
2130	2319
2131	2320	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2321	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2323,11 @@
2134	2323	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2324	for (int i=0; i<group.selection.size(); i++)
2136	2325	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2326	+ boolean random = CameraPane.SWITCH;
	2327	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2328	group.selection.get(i).linkVerticesThis(content);
2140	2329	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2330	+ CameraPane.SWITCH = random;
2142	2331	}
2143	2332	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2333	refreshContents();
..	..	@@ -2148,20 +2337,20 @@
2148	2337	{
2149	2338	for (int i=0; i<group.selection.size(); i++)
2150	2339	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2340	+ boolean random = CameraPane.SWITCH;
	2341	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2342	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2343	+ CameraPane.SWITCH = random;
2155	2344	}
2156	2345
2157	2346	refreshContents();
2158	2347	} else
2159	2348	if (source == relinkverticesItem)
2160	2349	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2350	+ boolean random = CameraPane.SWITCH;
	2351	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2352	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2353	+ CameraPane.SWITCH = random;
2165	2354
2166	2355	refreshContents();
2167	2356	} else
..	..	@@ -2176,9 +2365,9 @@
2176	2365	} else
2177	2366	if (source == setMasterItem)
2178	2367	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2368	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2369	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2370	+ Object3D content = Grafreed.clipboard.get(0);
2182	2371
2183	2372	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2373	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2380,9 @@
2191	2380	{
2192	2381	if (group.selection.size() == 1)
2193	2382	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2383	+ if (Grafreed.clipboard.size() == 1)
2195	2384	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2385	+ Object3D content = Grafreed.clipboard.get(0);
2197	2386
2198	2387	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2388	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2399,7 @@
2210	2399	{
2211	2400	RevertMeshes();
2212	2401	} else
2213		- if (source == resetMeshItem)
	2402	+ if (source == resetAllItem)
2214	2403	{
2215	2404	ResetAll();
2216	2405	} else
..	..	@@ -2259,7 +2448,7 @@
2259	2448	RandomNode random = new RandomNode();
2260	2449	group(random);
2261	2450	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2451	+ random.name = random.get(0).name + "Switch";
2263	2452	} else
2264	2453	if (source == physicsItem)
2265	2454	{
..	..	@@ -2398,7 +2587,7 @@
2398	2587	} else
2399	2588	if (source == genNormalsMESHItem)
2400	2589	{
2401		- GenNormals(true); // TODO
	2590	+ GenNormalsMESH();
2402	2591	} else
2403	2592	if (source == genNormalsORGANItem)
2404	2593	{
..	..	@@ -2463,6 +2652,22 @@
2463	2652	if (source == unmarkleavesItem)
2464	2653	{
2465	2654	MarkLeaves(false);
	2655	+ } else
	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);
2466	2671	} else
2467	2672	if (source == flipVItem)
2468	2673	{
..	..	@@ -2548,9 +2753,13 @@
2548	2753	{
2549	2754	SmoothMesh();
2550	2755	} else
2551		- if (source == transformgeometryItem)
	2756	+ if (source == transformGeometryItem)
2552	2757	{
2553	2758	TransformGeometry();
	2759	+ } else
	2760	+ if (source == transformChildrenItem)
	2761	+ {
	2762	+ TransformChildren();
2554	2763	} else
2555	2764	if (source == resetTransformItem)
2556	2765	{
..	..	@@ -2558,7 +2767,11 @@
2558	2767	} else
2559	2768	if (source == resetCentroidItem)
2560	2769	{
2561		- ResetCentroid();
	2770	+ ResetCentroid(true);
	2771	+ } else
	2772	+ if (source == resetCentroidXZItem)
	2773	+ {
	2774	+ ResetCentroid(false);
2562	2775	} else
2563	2776	if (source == resetParentItem)
2564	2777	{
..	..	@@ -2720,8 +2933,26 @@
2720	2933	// centralPanel.setVisible(true);
2721	2934	// XYZPanel.setVisible(false);
2722	2935	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	2936	+ bigThree.add(centralPanel);
2724	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	+
2725	2956	} else
2726	2957	if (source == threeButton)
2727	2958	{
..	..	@@ -2755,9 +2986,11 @@
2755	2986	// centralPanel.setVisible(true);
2756	2987	// XYZPanel.setVisible(true);
2757	2988	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	2989	+ bigThree.add(centralPanel);
	2990	+ bigThree.add(XYZPanel);
2760	2991	bigThree.FlushUI();
	2992	+
	2993	+ cameraView.requestFocusInWindow();
2761	2994	} else
2762	2995	if (source == fourButton)
2763	2996	{
..	..	@@ -2791,8 +3024,10 @@
2791	3024	// centralPanel.setVisible(false);
2792	3025	// XYZPanel.setVisible(false);
2793	3026	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3027	+ bigThree.add(scenePanel);
2795	3028	bigThree.FlushUI();
	3029	+
	3030	+ cameraView.requestFocusInWindow();
2796	3031	} else
2797	3032	if (source == sixButton)
2798	3033	{
..	..	@@ -2826,9 +3061,11 @@
2826	3061	// centralPanel.setVisible(true);
2827	3062	// XYZPanel.setVisible(false);
2828	3063	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3064	+ bigThree.add(scenePanel);
	3065	+ bigThree.add(centralPanel);
2831	3066	bigThree.FlushUI();
	3067	+
	3068	+ cameraView.requestFocusInWindow();
2832	3069	} else
2833	3070	if (source == sevenButton)
2834	3071	{
..	..	@@ -2862,10 +3099,12 @@
2862	3099	// centralPanel.setVisible(true);
2863	3100	// XYZPanel.setVisible(true);
2864	3101	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3102	+ bigThree.add(scenePanel);
	3103	+ bigThree.add(centralPanel);
	3104	+ bigThree.add(XYZPanel);
2868	3105	bigThree.FlushUI();
	3106	+
	3107	+ cameraView.requestFocusInWindow();
2869	3108	} else
2870	3109	if (source == rootButton)
2871	3110	{
..	..	@@ -2877,6 +3116,7 @@
2877	3116	EditObject(obj);
2878	3117	}
2879	3118
	3119	+ cameraView.requestFocusInWindow();
2880	3120	refreshContents(true);
2881	3121	} else
2882	3122	if (source == closeButton)
..	..	@@ -2898,6 +3138,8 @@
2898	3138	break;
2899	3139	}
2900	3140	}
	3141	+
	3142	+ cameraView.requestFocusInWindow();
2901	3143	refreshContents(true);
2902	3144	} else
2903	3145	if (source == editItem \|\| source == editButton)
..	..	@@ -2914,9 +3156,9 @@
2914	3156	child.CloseUI();
2915	3157	listUI.remove(child);
2916	3158
2917		- child.editWindow = null; // ???????????
	3159	+ //child.editWindow = null; // ???????????
2918	3160	}
2919		- objEditor.ctrlPanel.revalidate();
	3161	+ objEditor.ctrlPanel.FlushUI();
2920	3162	//objEditor.jTree.clearSelection();
2921	3163	//objEditor.ResetSliders();
2922	3164	refreshContents(true);
..	..	@@ -3000,7 +3242,10 @@
3000	3242	frontView.object = group;
3001	3243	sideView.object = group;
3002	3244	}
3003		- group.editWindow = this;
	3245	+
	3246	+// fix "+" issue
	3247	+ //group.editWindow = this;
	3248	+
3004	3249	/*
3005	3250	currentLayout = radio.layout;
3006	3251	if (currentLayout == null)
..	..	@@ -3012,8 +3257,23 @@
3012	3257	//group.parent = null; // ROOT
3013	3258	//group.attributes = -1;
3014	3259	ResetModel();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
3015	3262	refreshContents(true);
3016		- }
	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	+ }
3017	3277	else
3018	3278	{
3019	3279	//return super.action(event, arg);
..	..	@@ -3022,7 +3282,6 @@
3022	3282	}
3023	3283
3024	3284	boolean useclient = false;
3025		- cRadio radio;
3026	3285
3027	3286	void ToggleRoot()
3028	3287	{
..	..	@@ -3074,6 +3333,28 @@
3074	3333	refreshContents();
3075	3334	}
3076	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	+ }
3077	3358
3078	3359	void ResetTransform()
3079	3360	{
..	..	@@ -3186,7 +3467,7 @@
3186	3467	refreshContents();
3187	3468	}
3188	3469
3189		- void ResetCentroid()
	3470	+ void ResetCentroid(boolean full)
3190	3471	{
3191	3472	Object3D obj;
3192	3473	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3482,16 @@
3201	3482	LA.matIdentity(Object3D.mat);
3202	3483	obj.getBounds(minima, maxima, false);
3203	3484	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3485	+ if (full)
	3486	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3487	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3488	obj.TransformMesh(Object3D.mat);
	3489	+
3207	3490	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3491	+ if (full)
	3492	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3493	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3494	+
3210	3495	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3496	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3497	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3520,8 @@
3235	3520
3236	3521	int size = obj.MemorySize();
3237	3522
3238		- 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)");
3239	3525	}
3240	3526	}
3241	3527	catch (Exception e)
..	..	@@ -3272,9 +3558,9 @@
3272	3558	obj = (Object3D)e.nextElement();
3273	3559
3274	3560	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3561	+ Grafreed.AnalyzeObject(obj);
3276	3562	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3563	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3564
3279	3565	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3566	}
..	..	@@ -3316,6 +3602,13 @@
3316	3602	void GenNormals(boolean crease)
3317	3603	{
3318	3604	group.GenNormalsS(crease);
	3605	+
	3606	+ refreshContents();
	3607	+ }
	3608	+
	3609	+ void GenNormalsMESH()
	3610	+ {
	3611	+ group.GenNormalsMeshS();
3319	3612
3320	3613	refreshContents();
3321	3614	}
..	..	@@ -3488,8 +3781,8 @@
3488	3781
3489	3782	void ParseVertices()
3490	3783	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3784	+ boolean epsequal = Grafreed.epsequal;
	3785	+ Grafreed.epsequal = true;
3493	3786
3494	3787	for (int i=0; i<group.selection.size(); i++)
3495	3788	{
..	..	@@ -3514,7 +3807,7 @@
3514	3807	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3808	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3809
3517		- g.add(GrafreeD.clipboard);
	3810	+ g.add(Grafreed.clipboard);
3518	3811
3519	3812	buffer.add(g);
3520	3813	}
..	..	@@ -3529,7 +3822,7 @@
3529	3822	makeSomething(buffer, i==group.selection.size()-1);
3530	3823	}
3531	3824
3532		- GrafreeD.epsequal = epsequal;
	3825	+ Grafreed.epsequal = epsequal;
3533	3826
3534	3827	refreshContents();
3535	3828	}
..	..	@@ -3547,7 +3840,16 @@
3547	3840	String pigment = Object3D.GetPigment(tex);
3548	3841	//String bump = Object3D.GetBump(tex);
3549	3842
3550		- 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	+ }
3551	3853
3552	3854	double s = v.s;
3553	3855
..	..	@@ -3635,11 +3937,11 @@
3635	3937
3636	3938	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3939
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3940	+ boolean random = CameraPane.SWITCH;
	3941	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3942	lowres.linkVerticesThis(null);
3641	3943	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3944	+ CameraPane.SWITCH = random;
3643	3945
3644	3946	System.err.flush();
3645	3947
..	..	@@ -3679,7 +3981,7 @@
3679	3981	return;
3680	3982
3681	3983	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	3984	+ Object3D ref = Grafreed.clipboard.get(0);
3683	3985
3684	3986	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	3987
..	..	@@ -3873,9 +4175,9 @@
3873	4175
3874	4176	void ClipMesh()
3875	4177	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4178	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4179	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4180	+ Object3D content = Grafreed.clipboard.get(0);
3879	4181
3880	4182	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4183	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4186,7 @@
3884	4186	// {
3885	4187	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4188	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4189	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4190	}
3889	4191	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4192	System.out.println("DONE.");
..	..	@@ -3931,6 +4233,18 @@
3931	4233	void MarkLeaves(boolean hide)
3932	4234	{
3933	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);
3934	4248	refreshContents();
3935	4249	}
3936	4250
..	..	@@ -4019,7 +4333,7 @@
4019	4333	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4334
4021	4335	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4336	+ if(elem != group \|\| !newWindow)
4023	4337	{
4024	4338	// if (!(elem instanceof Composite))
4025	4339	// newWindow = false;
..	..	@@ -4109,7 +4423,6 @@
4109	4423	//case 702: // Event.LIST_DESELECT
4110	4424	group.deselectAll();
4111	4425	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4426	if (tps != null)
4114	4427	{
4115	4428	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,29 +4431,28 @@
4118	4431
4119	4432	//if (child.parent != null)
4120	4433	//child.parent.addSelectee(child);
	4434	+ objEditor.SetMaterial(child);
4121	4435	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4436	}
4126	4437	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4438	+// else
	4439	+// {
	4440	+// objEditor.SetMaterial(group); // .GetMaterial());
	4441	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4442	+// System.err.println("info : " + group.GetPath());
	4443	+// }
4133	4444
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- 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))
4137	4446	CameraPane.flash = true;
4138	4447
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4448	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4449	// a camera
4141	4450	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- 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	+ }
4144	4456	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4457	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4458	}
..	..	@@ -4153,6 +4465,26 @@
4153	4465
4154	4466	freezemodel = false;
4155	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	+ }
4156	4488
4157	4489	void linkSomething(Object3D thing)
4158	4490	{
..	..	@@ -4224,16 +4556,18 @@
4224	4556	{
4225	4557	if (group.selection.isEmpty())
4226	4558	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4559	+
	4560	+ Grafreed.clipboardIsTempGroup = false;
4228	4561	Composite tGroup = null;
4229	4562	if (group.selection.size() > 0) // 1)
4230	4563	{
4231	4564	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4565	+ Grafreed.clipboardIsTempGroup = true;
4233	4566	}
4234	4567
4235	4568	if (cut)
4236	4569	{
	4570	+ Save();
4237	4571	//int indices[] = jList.getSelectedIndices();
4238	4572	//for (int i = indices.length - 1; i >= 0; i--)
4239	4573	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4603,16 @@
4269	4603	//System.out.println("cut " + child);
4270	4604	//System.out.println("parent = " + child.parent);
4271	4605	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4273	4607	tGroup.add/Child/(tmp);
4274	4608	else
4275		- GrafreeD.clipboard = tmp;
	4609	+ Grafreed.clipboard = tmp;
4276	4610	}
4277	4611	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4612	+ if (Grafreed.clipboardIsTempGroup)
4279	4613	tGroup.add/Child/(child);
4280	4614	else
4281		- GrafreeD.clipboard = child;
	4615	+ Grafreed.clipboard = child;
4282	4616	}
4283	4617
4284	4618	//ResetModel();
..	..	@@ -4310,21 +4644,23 @@
4310	4644	//System.out.println("cut " + elem);
4311	4645	//System.out.println("parent = " + elem.parent);
4312	4646	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4647	+ if (Grafreed.clipboardIsTempGroup)
4314	4648	tGroup.add/Child/(tmp);
4315	4649	else
4316		- GrafreeD.clipboard = tmp;
	4650	+ Grafreed.clipboard = tmp;
4317	4651	}
4318	4652	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4653	+ if (Grafreed.clipboardIsTempGroup)
4320	4654	tGroup.add/Child/(child);
4321	4655	else
4322		- GrafreeD.clipboard = child;
	4656	+ Grafreed.clipboard = child;
4323	4657	}
4324	4658
4325	4659	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4660	+
	4661	+ if (Grafreed.clipboardIsTempGroup)
	4662	+ Grafreed.clipboard = tGroup;
	4663	+
4328	4664	if (cut)
4329	4665	{
4330	4666	ResetModel();
..	..	@@ -4338,7 +4674,7 @@
4338	4674	// return;
4339	4675	boolean first = true;
4340	4676
4341		- if (GrafreeD.clipboardIsTempGroup)
	4677	+ if (Grafreed.clipboardIsTempGroup)
4342	4678	{
4343	4679	Composite temp;
4344	4680
..	..	@@ -4349,7 +4685,7 @@
4349	4685	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4686	*/
4351	4687	Object3D elem;
4352		- 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))
4353	4689	{
4354	4690	Object3D child = (Object3D)e.nextElement();
4355	4691
..	..	@@ -4383,21 +4719,21 @@
4383	4719	//Object3D cb = Applet3D.clipboard;
4384	4720	//temp.addChild(cb);
4385	4721	//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());
	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());
4391	4727	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4728	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4729	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4730	}
4395	4731
4396	4732	ResetModel();
4397	4733	refreshContents();
4398	4734	}
4399	4735
4400		- void pasteInto(boolean copyit)
	4736	+ void pasteInto(boolean copyit, boolean clone)
4401	4737	{
4402	4738	// if (GrafreeD.clipboard == null)
4403	4739	// return;
..	..	@@ -4426,15 +4762,22 @@
4426	4762	if (copyit)
4427	4763	{
4428	4764	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4765	+ if (clone)
	4766	+ {
	4767	+ CloneClipboard(false); // sept 2014
	4768	+ }
	4769	+ else
	4770	+ {
	4771	+ paste(false);
	4772	+ }
4430	4773	}
4431	4774	else
4432	4775	{
4433	4776	boolean first = true;
4434	4777
4435		- if (GrafreeD.clipboardIsTempGroup)
	4778	+ if (Grafreed.clipboardIsTempGroup)
4436	4779	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4780	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4781	Object3D copy;
4439	4782	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4783	{
..	..	@@ -4444,7 +4787,7 @@
4444	4787	}
4445	4788	} else
4446	4789	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4790	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4791	}
4449	4792	}
4450	4793	}
..	..	@@ -4849,21 +5192,6 @@
4849	5192	}
4850	5193	*/
4851	5194
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	5195	/*
4868	5196	public void Callback(Object obj)
4869	5197	{
..	..	@@ -4887,26 +5215,9 @@
4887	5215	}
4888	5216	*/
4889	5217
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	5218	String GetFile(String dialogName)
4908	5219	{
4909		- if (GrafreeD.standAlone)
	5220	+ if (Grafreed.standAlone)
4910	5221	{
4911	5222	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5223	browser.show();
..	..	@@ -4970,10 +5281,18 @@
4970	5281	cButton flashSelectionButton;
4971	5282	cButton editButton;
4972	5283	cButton uneditButton;
	5284	+ JCheckBox allParamsButton;
4973	5285	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5286	cButton unselectButton;
4976	5287
	5288	+ cButton minButton;
	5289	+ cButton maxButton;
	5290	+ cButton fullButton;
	5291	+ cButton undoButton;
	5292	+ cButton redoButton;
	5293	+ cButton saveButton;
	5294	+ cButton oneStepButton;
	5295	+
4977	5296	cButton screenfitButton;
4978	5297	cButton screenfitpointButton;
4979	5298	cButton snapobjectButton;
..	..	@@ -4984,14 +5303,6 @@
4984	5303	cButton closeButton;
4985	5304
4986	5305	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	5306
4996	5307	//
4997	5308	//Composite
..	..	@@ -5004,6 +5315,8 @@
5004	5315	private MenuItem lookFromItem;
5005	5316	private MenuItem switchItem;
5006	5317	private MenuItem cutItem;
	5318	+ private MenuItem undoItem;
	5319	+ private MenuItem redoItem;
5007	5320	private MenuItem duplicateItem;
5008	5321	private MenuItem cloneItem;
5009	5322	private MenuItem cloneSupportItem;
..	..	@@ -5017,7 +5330,7 @@
5017	5330	private MenuItem linkverticesItem;
5018	5331	private MenuItem relinkverticesItem;
5019	5332	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5333	+ private MenuItem resetAllItem;
5021	5334	private MenuItem stepAllItem;
5022	5335	private MenuItem revertMeshItem;
5023	5336	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5341,7 @@
5028	5341	private MenuItem mergeGeometriesItem;
5029	5342	private MenuItem copyItem;
5030	5343	private MenuItem pasteItem;
	5344	+ private MenuItem pasteIntoItem;
5031	5345	private MenuItem pasteLinkItem;
5032	5346	private MenuItem pasteCloneItem;
5033	5347	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5380,10 @@
5066	5380	private MenuItem showleavesItem;
5067	5381	private MenuItem markleavesItem;
5068	5382	private MenuItem unmarkleavesItem;
	5383	+ private MenuItem rewindleavesItem;
	5384	+ private MenuItem unrewindleavesItem;
	5385	+ private MenuItem randomleavesItem;
	5386	+ private MenuItem unrandomleavesItem;
5069	5387
5070	5388	private MenuItem flipVItem;
5071	5389	private MenuItem unflipVItem;
..	..	@@ -5077,8 +5395,10 @@
5077	5395	private MenuItem panoTexturesItem;
5078	5396
5079	5397	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5398	+ private MenuItem resetCentroidXZItem;
5081	5399	private MenuItem resetTransformItem;
	5400	+ private MenuItem transformGeometryItem;
	5401	+ private MenuItem transformChildrenItem;
5082	5402	private MenuItem hideItem;
5083	5403	private MenuItem grabItem;
5084	5404	private MenuItem backItem;
..	..	@@ -5125,7 +5445,7 @@
5125	5445	private MenuItem blobItem;
5126	5446	private MenuItem latheItem;
5127	5447	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5448	+ private MenuItem overlayItem;
5129	5449	private MenuItem meshItem;
5130	5450	// private MenuItem meshGroupItem;
5131	5451	private MenuItem springItem;
..	..	@@ -5147,11 +5467,6 @@
5147	5467	private MenuItem doubleItem;
5148	5468	private MenuItem tripleItem;
5149	5469
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5470	private MenuItem computeAOItem;
5156	5471	private MenuItem recompileItem;
5157	5472	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5476,8 @@
5161	5476	private MenuItem analyzeItem;
5162	5477	private MenuItem dumpItem;
5163	5478	//boolean freezemodel = false;
	5479	+
	5480	+ Menu cameraMenu;
	5481	+ MenuItem editCameraItem;
	5482	+ MenuItem revertCameraItem;
5164	5483	}