~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(CameraPane.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,29 +513,22 @@
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	}
..	..	@@ -433,110 +563,110 @@
433	563	oe.radioPanel.add(dummyButton);
434	564	oe.buttonGroup.add(dummyButton);
435	565	*/
436		- aConstraints.gridy += 1;
437		-
438	566	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	567
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
442	571
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	581	+ liveCB.setToolTipText("Enable animation");
445	582	liveCB.addItemListener(this);
446	583
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ oneStepButton.setToolTipText("Animate one step forward");
	586	+ oneStepButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	589	+ fastCB.setToolTipText("Fast mode");
	590	+ fastCB.addItemListener(this);
	591	+
	592	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	593	trackCB.setToolTipText("Enable tracking");
450	594	trackCB.addItemListener(this);
451	595
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	597	screenfitButton.setToolTipText("Screen fit");
455	598	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	599	+
457	600	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	601	// 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	602
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);
	603	+ if (Globals.ADVANCED)
	604	+ {
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ snapobjectButton.addActionListener(this);
	607	+ snapobjectButton.setToolTipText("Snap Object");
	608	+ }
	609	+
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	611	flashSelectionButton.setToolTipText("Show selection");
472	612	flashSelectionButton.addActionListener(this);
473	613
474		- oe.toolbarPanel.add(new cButton(" ", false));
	614	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	615
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);
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	617	twoButton.setToolTipText("Show center view only");
483	618	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	620	fourButton.addActionListener(this);
486	621	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	623	sixButton.setToolTipText("2-column layout left");
489	624	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	626	threeButton.setToolTipText("2-column layout right");
492	627	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	629	sevenButton.setToolTipText("3-column layout");
495	630	sevenButton.addActionListener(this);
496	631	//
497	632
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ rootButton.setToolTipText("Edit selection in new tab");
500	635	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	636	+
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	638	closeButton.setToolTipText("Close tab");
504	639	closeButton.addActionListener(this);
505	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	641	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	642
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	643	+ cGridBag commandsPanel = new cGridBag();
	644	+
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ editButton.setToolTipText("Edit selection");
511	647	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	648
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ uneditButton.setToolTipText("Unedit selection");
517	651	uneditButton.addActionListener(this);
518	652
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);
	653	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	654	+ allParamsButton.setToolTipText("Edit all params");
531	655	allParamsButton.addActionListener(this);
532	656
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);
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ clearPanelButton.setToolTipText("Clear edit panel");
	659	+ clearPanelButton.addActionListener(this);
	660	+
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ unselectButton.setToolTipText("Unselect");
538	663	unselectButton.addActionListener(this);
539	664
	665	+ commandsPanel.preferredHeight = 1;
	666	+
	667	+ oe.treePanel.add(commandsPanel);
	668	+ oe.treePanel.Return();
	669	+
540	670	// oe.aConstraints.gridx += 1;
541	671	// oe.aConstraints.weighty = 0;
542	672	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +678,37 @@
548	678	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	679	// gcButton.addActionListener(this);
550	680
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;
	681	+ cGridBag jSPPanel = new cGridBag();
	682	+
	683	+ JScrollPane jSP;
562	684	//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);
	685	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	686	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	687	+
	688	+ oe.treePanel.add(jSPPanel);
	689	+ oe.treePanel.Return();
569	690
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);
	691	+ cGridBag copyOptionsPanel = new cGridBag();
	692	+
	693	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	694	+ colorCB.setToolTipText("Copy color when dropped");
574	695	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	696	+
	697	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	698	+ materialCB.setToolTipText("Copy material when dropped");
577	699	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	700	+
	701	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	702	+ textureCB.setToolTipText("Copy texture when dropped");
580	703	textureCB.addItemListener(this);
581	704
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	705	+ copyOptionsPanel.preferredHeight = 1;
	706	+ oe.treePanel.add(copyOptionsPanel);
	707	+ oe.treePanel.Return();
584	708
	709	+// mainPanel.setDividerLocation(0.5); //1.0);
	710	+// mainPanel.setResizeWeight(0.5);
	711	+
585	712	//jList.addListSelectionListener(this);
586	713	oe.jTree.addTreeSelectionListener(this);
587	714	//jTree.setRootVisible(false);
..	..	@@ -604,45 +731,37 @@
604	731	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	732	}
606	733
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	734	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	735	{
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);
	736	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	737	boxCB.setToolTipText("Display bounding boxes");
640	738	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	739	+
	740	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	741	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	742	zoomBoxCB.addItemListener(this);
645	743
	744	+ if (true) // Globals.ADVANCED)
	745	+ {
	746	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	747	+ supportCB.setToolTipText("Enable rigging");
	748	+ supportCB.addItemListener(this);
	749	+
	750	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	751	+ // localCB.addItemListener(this);
	752	+
	753	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	754	+ crowdCB.setToolTipText("Used for crowds");
	755	+ crowdCB.addItemListener(this);
	756	+
	757	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	758	+ smoothCB.setToolTipText("Snapping delay");
	759	+ smoothCB.addItemListener(this);
	760	+
	761	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	762	+ slowCB.setToolTipText("Smooth interpolation");
	763	+ slowCB.addItemListener(this);
	764	+
646	765	// constraints.gridy += 1;
647	766	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	767	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +769,16 @@
650	769	if (false)
651	770	{
652	771	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	772	+ //constraints.gridy += 1;
	773	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	774	speakerCameraCB.addItemListener(this);
656	775
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	776	+ //constraints.gridy += 1;
	777	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	778	speakerFocusCB.addItemListener(this);
660	779
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	780	+ //constraints.gridy += 1;
	781	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	782	smoothfocusCB.addItemListener(this);
664	783	}
665	784
..	..	@@ -667,14 +786,20 @@
667	786	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	787	// debugCB.addItemListener(this);
669	788
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	789	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	790	oeilCB.addItemListener(this);
673	791
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	792	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	793	lookAtCB.setToolTipText("Look-at target");
677	794	lookAtCB.addItemListener(this);
	795	+
	796	+ }
	797	+
	798	+ cGridBag fill = new cGridBag();
	799	+
	800	+ fill.preferredHeight = 200;
	801	+
	802	+ panel.add(fill);
678	803
679	804	}
680	805
..	..	@@ -689,6 +814,7 @@
689	814	buttonGroup.add(radioButton);
690	815	radioButton.doClick();
691	816	}
	817	+
692	818	void SetupViews(ObjEditor oe)
693	819	{
694	820	oe.SetupViews();
..	..	@@ -753,6 +879,7 @@
753	879	} else if(e.getSource() == liveCB)
754	880	{
755	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
756	883	}
757	884	else if(e.getSource() == supportCB)
758	885	{
..	..	@@ -905,7 +1032,9 @@
905	1032	// objEditor.DropFile((java.io.File[]) object, true);
906	1033	// return;
907	1034	// }
908		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1038	{
910	1039	// file(s)
911	1040	String[] names = string.split("\n");
..	..	@@ -932,7 +1061,7 @@
932	1061
933	1062	flashIt = false;
934	1063	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1066
938	1067	if (group.selection.size() == 1)
..	..	@@ -959,11 +1088,11 @@
959	1088	{
960	1089	loadClipboard(true);
961	1090	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1091	+ pasteInto(false, false);
963	1092	} else {
964	1093	loadClipboard(false);
965	1094	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1095	+ pasteInto(false, false); // true); // ???
967	1096	}
968	1097	}
969	1098	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1214,33 @@
1085	1214	kleinItem.addActionListener(this);
1086	1215	particleItem = menu.add(new MenuItem("Particle system"));
1087	1216	particleItem.addActionListener(this);
	1217	+ if (Globals.ADVANCED)
	1218	+ {
1088	1219	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1220	ragdollItem.addActionListener(this);
1090	1221	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1222	ragdoll2Item.addActionListener(this);
	1223	+ }
1092	1224	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1225	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1226	meshItem.addActionListener(this);
1095	1227	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1228	// meshGroupItem.addActionListener(this);
	1229	+ if (Globals.ADVANCED)
	1230	+ {
1097	1231	springItem = menu.add(new MenuItem("Spring"));
1098	1232	springItem.addActionListener(this);
1099	1233	flagItem = menu.add(new MenuItem("Flag"));
1100	1234	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	1235	blobItem = menu.add(new MenuItem("Blob"));
1106	1236	blobItem.addActionListener(this);
1107	1237	latheItem = menu.add(new MenuItem("Lathe"));
1108	1238	latheItem.addActionListener(this);
	1239	+ }
	1240	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1241	+ bezierItem.addActionListener(this);
	1242	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1243	+ overlayItem.addActionListener(this);
1109	1244	lightItem = menu.add(new MenuItem("Light"));
1110	1245	lightItem.addActionListener(this);
1111	1246	menu.add("-");
..	..	@@ -1115,39 +1250,44 @@
1115	1250	loopItem.addActionListener(this);
1116	1251	doubleItem = menu.add(new MenuItem("Fork"));
1117	1252	doubleItem.addActionListener(this);
	1253	+ if (Globals.ADVANCED)
	1254	+ {
1118	1255	tripleItem = menu.add(new MenuItem("Trident"));
1119	1256	tripleItem.addActionListener(this);
	1257	+ }
1120	1258	}
1121	1259
1122	1260	void buildToolsMenu(Menu menu)
1123	1261	{
1124	1262	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1263	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1264	+ animationItem.setState(Globals.ANIMATION);
1127	1265
1128	1266	menu.add("-");
1129	1267	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1268	parseverticesItem.addActionListener(this);
1131	1269	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1270	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1272	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1274	reduceMorphItem.addActionListener(this);
1139	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1276	reduce34MorphItem.addActionListener(this);
1141		-
	1277	+ menu.add("-");
1142	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1279	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1280
	1281	+ if (Globals.ADVANCED)
	1282	+ {
	1283	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1284	+ mirrorItem.addActionListener(this);
	1285	+ menu.add("-");
1146	1286	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1287	memoryItem.addActionListener(this);
1148	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1289	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1291	dumpItem.addActionListener(this);
1152	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1293	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1305,7 @@
1165	1305	menu.add("-");
1166	1306	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1307	editScriptItem.addActionListener(this);
	1308	+ }
1168	1309	}
1169	1310
1170	1311	void ScreenFit()
..	..	@@ -1493,9 +1634,9 @@
1493	1634
1494	1635	void Overwrite(int mask)
1495	1636	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1638	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1499	1640
1500	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1642	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1807,7 @@
1666	1807	{
1667	1808	makeSomething(new BezierSurface());
1668	1809	} else
1669		- if (source == checkerItem)
	1810	+ if (source == overlayItem)
1670	1811	{
1671	1812	/*
1672	1813	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1941,6 @@
1800	1941	csg.addChild(child);
1801	1942	child.addChild(csg);
1802	1943	} 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	1944	if (source == computeAOItem)
1821	1945	{
1822	1946	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +1959,7 @@
1835	1959	if (source == invariantsItem)
1836	1960	{
1837	1961	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1839	1963	} else
1840	1964	if (source == memoryItem)
1841	1965	{
..	..	@@ -1853,6 +1977,23 @@
1853	1977	if (source == dumpItem)
1854	1978	{
1855	1979	DumpObject();
	1980	+ } else
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
	1992	+ } else
	1993	+ if (source == oneStepButton)
	1994	+ {
	1995	+ Globals.ONESTEP = true;
	1996	+ cameraView.repaint();
1856	1997	} else
1857	1998	if (source == screenfitButton)
1858	1999	{
..	..	@@ -1903,12 +2044,20 @@
1903	2044	{
1904	2045	loadClipboard(true);
1905	2046	} else
	2047	+ if (source == undoItem)
	2048	+ {
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
1906	2055	if (source == duplicateItem)
1907	2056	{
1908		- Object3D keep = GrafreeD.clipboard;
	2057	+ Object3D keep = Grafreed.clipboard;
1909	2058	loadClipboard(false);
1910	2059	paste(false);
1911		- GrafreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1912	2061	} else
1913	2062	if (source == cloneItem)
1914	2063	{
..	..	@@ -1926,13 +2075,17 @@
1926	2075	{
1927	2076	paste(false);
1928	2077	} else
	2078	+ if (source == pasteIntoItem)
	2079	+ {
	2080	+ pasteInto(true, false);
	2081	+ } else
1929	2082	if (source == pasteLinkItem)
1930	2083	{
1931		- pasteInto(false);
	2084	+ pasteInto(false, false);
1932	2085	} else
1933	2086	if (source == pasteCloneItem)
1934	2087	{
1935		- pasteInto(true);
	2088	+ pasteInto(true, true);
1936	2089	} else
1937	2090	if (source == pasteExpandItem)
1938	2091	{
..	..	@@ -2124,9 +2277,9 @@
2124	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2278	// refreshContents();
2126	2279	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2281	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2130	2283
2131	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2285	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2287,11 @@
2134	2287	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2288	for (int i=0; i<group.selection.size(); i++)
2136	2289	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2290	+ boolean random = CameraPane.SWITCH;
	2291	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2292	group.selection.get(i).linkVerticesThis(content);
2140	2293	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2294	+ CameraPane.SWITCH = random;
2142	2295	}
2143	2296	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2297	refreshContents();
..	..	@@ -2148,20 +2301,20 @@
2148	2301	{
2149	2302	for (int i=0; i<group.selection.size(); i++)
2150	2303	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2304	+ boolean random = CameraPane.SWITCH;
	2305	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2306	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2307	+ CameraPane.SWITCH = random;
2155	2308	}
2156	2309
2157	2310	refreshContents();
2158	2311	} else
2159	2312	if (source == relinkverticesItem)
2160	2313	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2314	+ boolean random = CameraPane.SWITCH;
	2315	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2316	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2317	+ CameraPane.SWITCH = random;
2165	2318
2166	2319	refreshContents();
2167	2320	} else
..	..	@@ -2176,9 +2329,9 @@
2176	2329	} else
2177	2330	if (source == setMasterItem)
2178	2331	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2333	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2182	2335
2183	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2337	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2344,9 @@
2191	2344	{
2192	2345	if (group.selection.size() == 1)
2193	2346	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2195	2348	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2197	2350
2198	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2352	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2363,7 @@
2210	2363	{
2211	2364	RevertMeshes();
2212	2365	} else
2213		- if (source == resetMeshItem)
	2366	+ if (source == resetAllItem)
2214	2367	{
2215	2368	ResetAll();
2216	2369	} else
..	..	@@ -2259,7 +2412,7 @@
2259	2412	RandomNode random = new RandomNode();
2260	2413	group(random);
2261	2414	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2415	+ random.name = random.get(0).name + "Switch";
2263	2416	} else
2264	2417	if (source == physicsItem)
2265	2418	{
..	..	@@ -2398,7 +2551,7 @@
2398	2551	} else
2399	2552	if (source == genNormalsMESHItem)
2400	2553	{
2401		- GenNormals(true); // TODO
	2554	+ GenNormalsMESH();
2402	2555	} else
2403	2556	if (source == genNormalsORGANItem)
2404	2557	{
..	..	@@ -2463,6 +2616,22 @@
2463	2616	if (source == unmarkleavesItem)
2464	2617	{
2465	2618	MarkLeaves(false);
	2619	+ } else
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
2466	2635	} else
2467	2636	if (source == flipVItem)
2468	2637	{
..	..	@@ -2548,9 +2717,13 @@
2548	2717	{
2549	2718	SmoothMesh();
2550	2719	} else
2551		- if (source == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2552	2721	{
2553	2722	TransformGeometry();
	2723	+ } else
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
2554	2727	} else
2555	2728	if (source == resetTransformItem)
2556	2729	{
..	..	@@ -2558,7 +2731,11 @@
2558	2731	} else
2559	2732	if (source == resetCentroidItem)
2560	2733	{
2561		- ResetCentroid();
	2734	+ ResetCentroid(true);
	2735	+ } else
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
2562	2739	} else
2563	2740	if (source == resetParentItem)
2564	2741	{
..	..	@@ -2914,9 +3091,9 @@
2914	3091	child.CloseUI();
2915	3092	listUI.remove(child);
2916	3093
2917		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2918	3095	}
2919		- objEditor.ctrlPanel.revalidate();
	3096	+ objEditor.ctrlPanel.FlushUI();
2920	3097	//objEditor.jTree.clearSelection();
2921	3098	//objEditor.ResetSliders();
2922	3099	refreshContents(true);
..	..	@@ -3000,7 +3177,10 @@
3000	3177	frontView.object = group;
3001	3178	sideView.object = group;
3002	3179	}
	3180	+
	3181	+// fix "+" issue
3003	3182	group.editWindow = this;
	3183	+
3004	3184	/*
3005	3185	currentLayout = radio.layout;
3006	3186	if (currentLayout == null)
..	..	@@ -3013,7 +3193,20 @@
3013	3193	//group.attributes = -1;
3014	3194	ResetModel();
3015	3195	refreshContents(true);
3016		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
3017	3210	else
3018	3211	{
3019	3212	//return super.action(event, arg);
..	..	@@ -3074,6 +3267,28 @@
3074	3267	refreshContents();
3075	3268	}
3076	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
3077	3292
3078	3293	void ResetTransform()
3079	3294	{
..	..	@@ -3186,7 +3401,7 @@
3186	3401	refreshContents();
3187	3402	}
3188	3403
3189		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3190	3405	{
3191	3406	Object3D obj;
3192	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3416,16 @@
3201	3416	LA.matIdentity(Object3D.mat);
3202	3417	obj.getBounds(minima, maxima, false);
3203	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3207	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3210	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3454,8 @@
3235	3454
3236	3455	int size = obj.MemorySize();
3237	3456
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3459	}
3240	3460	}
3241	3461	catch (Exception e)
..	..	@@ -3272,9 +3492,9 @@
3272	3492	obj = (Object3D)e.nextElement();
3273	3493
3274	3494	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3276	3496	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3498
3279	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3500	}
..	..	@@ -3316,6 +3536,13 @@
3316	3536	void GenNormals(boolean crease)
3317	3537	{
3318	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
3319	3546
3320	3547	refreshContents();
3321	3548	}
..	..	@@ -3488,8 +3715,8 @@
3488	3715
3489	3716	void ParseVertices()
3490	3717	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3493	3720
3494	3721	for (int i=0; i<group.selection.size(); i++)
3495	3722	{
..	..	@@ -3514,7 +3741,7 @@
3514	3741	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3742	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3743
3517		- g.add(GrafreeD.clipboard);
	3744	+ g.add(Grafreed.clipboard);
3518	3745
3519	3746	buffer.add(g);
3520	3747	}
..	..	@@ -3529,7 +3756,7 @@
3529	3756	makeSomething(buffer, i==group.selection.size()-1);
3530	3757	}
3531	3758
3532		- GrafreeD.epsequal = epsequal;
	3759	+ Grafreed.epsequal = epsequal;
3533	3760
3534	3761	refreshContents();
3535	3762	}
..	..	@@ -3547,7 +3774,16 @@
3547	3774	String pigment = Object3D.GetPigment(tex);
3548	3775	//String bump = Object3D.GetBump(tex);
3549	3776
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3551	3787
3552	3788	double s = v.s;
3553	3789
..	..	@@ -3635,11 +3871,11 @@
3635	3871
3636	3872	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3873
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3874	+ boolean random = CameraPane.SWITCH;
	3875	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3876	lowres.linkVerticesThis(null);
3641	3877	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3878	+ CameraPane.SWITCH = random;
3643	3879
3644	3880	System.err.flush();
3645	3881
..	..	@@ -3679,7 +3915,7 @@
3679	3915	return;
3680	3916
3681	3917	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3683	3919
3684	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	3921
..	..	@@ -3873,9 +4109,9 @@
3873	4109
3874	4110	void ClipMesh()
3875	4111	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4113	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3879	4115
3880	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4117	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4120,7 @@
3884	4120	// {
3885	4121	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4122	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4124	}
3889	4125	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4126	System.out.println("DONE.");
..	..	@@ -3931,6 +4167,18 @@
3931	4167	void MarkLeaves(boolean hide)
3932	4168	{
3933	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3934	4182	refreshContents();
3935	4183	}
3936	4184
..	..	@@ -4019,7 +4267,7 @@
4019	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4268
4021	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
4023	4271	{
4024	4272	// if (!(elem instanceof Composite))
4025	4273	// newWindow = false;
..	..	@@ -4109,7 +4357,6 @@
4109	4357	//case 702: // Event.LIST_DESELECT
4110	4358	group.deselectAll();
4111	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4360	if (tps != null)
4114	4361	{
4115	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,29 +4365,28 @@
4118	4365
4119	4366	//if (child.parent != null)
4120	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
4121	4369	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4370	}
4126	4371	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4372	+// else
	4373	+// {
	4374	+// objEditor.SetMaterial(group); // .GetMaterial());
	4375	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4376	+// System.err.println("info : " + group.GetPath());
	4377	+// }
4133	4378
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4380	CameraPane.flash = true;
4138	4381
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4383	// a camera
4141	4384	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
4144	4390	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4391	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4392	}
..	..	@@ -4153,6 +4399,26 @@
4153	4399
4154	4400	freezemodel = false;
4155	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
4156	4422
4157	4423	void linkSomething(Object3D thing)
4158	4424	{
..	..	@@ -4224,16 +4490,18 @@
4224	4490	{
4225	4491	if (group.selection.isEmpty())
4226	4492	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
4228	4495	Composite tGroup = null;
4229	4496	if (group.selection.size() > 0) // 1)
4230	4497	{
4231	4498	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
4233	4500	}
4234	4501
4235	4502	if (cut)
4236	4503	{
	4504	+ Save();
4237	4505	//int indices[] = jList.getSelectedIndices();
4238	4506	//for (int i = indices.length - 1; i >= 0; i--)
4239	4507	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4537,16 @@
4269	4537	//System.out.println("cut " + child);
4270	4538	//System.out.println("parent = " + child.parent);
4271	4539	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
4273	4541	tGroup.add/Child/(tmp);
4274	4542	else
4275		- GrafreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
4276	4544	}
4277	4545	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
4279	4547	tGroup.add/Child/(child);
4280	4548	else
4281		- GrafreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
4282	4550	}
4283	4551
4284	4552	//ResetModel();
..	..	@@ -4310,21 +4578,23 @@
4310	4578	//System.out.println("cut " + elem);
4311	4579	//System.out.println("parent = " + elem.parent);
4312	4580	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
4314	4582	tGroup.add/Child/(tmp);
4315	4583	else
4316		- GrafreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
4317	4585	}
4318	4586	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
4320	4588	tGroup.add/Child/(child);
4321	4589	else
4322		- GrafreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
4323	4591	}
4324	4592
4325	4593	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
4328	4598	if (cut)
4329	4599	{
4330	4600	ResetModel();
..	..	@@ -4338,7 +4608,7 @@
4338	4608	// return;
4339	4609	boolean first = true;
4340	4610
4341		- if (GrafreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
4342	4612	{
4343	4613	Composite temp;
4344	4614
..	..	@@ -4349,7 +4619,7 @@
4349	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4620	*/
4351	4621	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4623	{
4354	4624	Object3D child = (Object3D)e.nextElement();
4355	4625
..	..	@@ -4383,21 +4653,21 @@
4383	4653	//Object3D cb = Applet3D.clipboard;
4384	4654	//temp.addChild(cb);
4385	4655	//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());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4661	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4664	}
4395	4665
4396	4666	ResetModel();
4397	4667	refreshContents();
4398	4668	}
4399	4669
4400		- void pasteInto(boolean copyit)
	4670	+ void pasteInto(boolean copyit, boolean clone)
4401	4671	{
4402	4672	// if (GrafreeD.clipboard == null)
4403	4673	// return;
..	..	@@ -4426,15 +4696,22 @@
4426	4696	if (copyit)
4427	4697	{
4428	4698	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4699	+ if (clone)
	4700	+ {
	4701	+ CloneClipboard(false); // sept 2014
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ paste(false);
	4706	+ }
4430	4707	}
4431	4708	else
4432	4709	{
4433	4710	boolean first = true;
4434	4711
4435		- if (GrafreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4436	4713	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4715	Object3D copy;
4439	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4717	{
..	..	@@ -4444,7 +4721,7 @@
4444	4721	}
4445	4722	} else
4446	4723	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4725	}
4449	4726	}
4450	4727	}
..	..	@@ -4849,21 +5126,6 @@
4849	5126	}
4850	5127	*/
4851	5128
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	5129	/*
4868	5130	public void Callback(Object obj)
4869	5131	{
..	..	@@ -4887,26 +5149,9 @@
4887	5149	}
4888	5150	*/
4889	5151
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	5152	String GetFile(String dialogName)
4908	5153	{
4909		- if (GrafreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4910	5155	{
4911	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5157	browser.show();
..	..	@@ -4970,10 +5215,15 @@
4970	5215	cButton flashSelectionButton;
4971	5216	cButton editButton;
4972	5217	cButton uneditButton;
	5218	+ JCheckBox allParamsButton;
4973	5219	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5220	cButton unselectButton;
4976	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
	5225	+ cButton oneStepButton;
	5226	+
4977	5227	cButton screenfitButton;
4978	5228	cButton screenfitpointButton;
4979	5229	cButton snapobjectButton;
..	..	@@ -5004,6 +5254,8 @@
5004	5254	private MenuItem lookFromItem;
5005	5255	private MenuItem switchItem;
5006	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
5007	5259	private MenuItem duplicateItem;
5008	5260	private MenuItem cloneItem;
5009	5261	private MenuItem cloneSupportItem;
..	..	@@ -5017,7 +5269,7 @@
5017	5269	private MenuItem linkverticesItem;
5018	5270	private MenuItem relinkverticesItem;
5019	5271	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
5021	5273	private MenuItem stepAllItem;
5022	5274	private MenuItem revertMeshItem;
5023	5275	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5280,7 @@
5028	5280	private MenuItem mergeGeometriesItem;
5029	5281	private MenuItem copyItem;
5030	5282	private MenuItem pasteItem;
	5283	+ private MenuItem pasteIntoItem;
5031	5284	private MenuItem pasteLinkItem;
5032	5285	private MenuItem pasteCloneItem;
5033	5286	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5319,10 @@
5066	5319	private MenuItem showleavesItem;
5067	5320	private MenuItem markleavesItem;
5068	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
5069	5326
5070	5327	private MenuItem flipVItem;
5071	5328	private MenuItem unflipVItem;
..	..	@@ -5077,8 +5334,10 @@
5077	5334	private MenuItem panoTexturesItem;
5078	5335
5079	5336	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
5081	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
5082	5341	private MenuItem hideItem;
5083	5342	private MenuItem grabItem;
5084	5343	private MenuItem backItem;
..	..	@@ -5125,7 +5384,7 @@
5125	5384	private MenuItem blobItem;
5126	5385	private MenuItem latheItem;
5127	5386	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5387	+ private MenuItem overlayItem;
5129	5388	private MenuItem meshItem;
5130	5389	// private MenuItem meshGroupItem;
5131	5390	private MenuItem springItem;
..	..	@@ -5147,11 +5406,6 @@
5147	5406	private MenuItem doubleItem;
5148	5407	private MenuItem tripleItem;
5149	5408
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5409	private MenuItem computeAOItem;
5156	5410	private MenuItem recompileItem;
5157	5411	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5415,8 @@
5161	5415	private MenuItem analyzeItem;
5162	5416	private MenuItem dumpItem;
5163	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
5164	5422	}