~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	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
	162	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	163	+ duplicateItem.addActionListener(this);
	164	+ cloneItem = menu.add(new MenuItem("Clone"));
	165	+ cloneItem.addActionListener(this);
	166	+ if (Globals.ADVANCED)
	167	+ {
	168	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	169	+ cloneSupportItem.addActionListener(this);
	170	+ }
	171	+ menu.add("-");
	172	+ cutItem = menu.add(new MenuItem("Cut"));
	173	+ cutItem.addActionListener(this);
	174	+ copyItem = menu.add(new MenuItem("Copy"));
	175	+ copyItem.addActionListener(this);
	176	+ pasteItem = menu.add(new MenuItem("Paste"));
	177	+ pasteItem.addActionListener(this);
	178	+ menu.add("-");
	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 Camera"));
	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(CameraPane.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 Camera"));
	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"));
..	..	@@ -268,21 +374,29 @@
268	374	shadowYItem.addActionListener(this);
269	375	shadowZItem = menu.add(new MenuItem("Shadow Z"));
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"));
..	..	@@ -376,29 +504,22 @@
376	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	505	sortbynameItem.addActionListener(this);
378	506	menu.add("-");
	507	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	508	+ shareGeometriesItem.addActionListener(this);
	509	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	510	+ mergeGeometriesItem.addActionListener(this);
	511	+ if (Globals.ADVANCED)
	512	+ {
	513	+ // Pretty much the same as duplicate and clone.
379	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	515	extractGeometriesItem.addActionListener(this);
381	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	517	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);
	518	+ }
387	519
388	520	oe.menuBar.add(menu = new Menu("Insert"));
389	521	buildCreateMenu(menu);
390	522
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	523	oe.menuBar.add(menu = new Menu("Tools"));
403	524	buildToolsMenu(menu);
404	525	}
..	..	@@ -433,110 +554,98 @@
433	554	oe.radioPanel.add(dummyButton);
434	555	oe.buttonGroup.add(dummyButton);
435	556	*/
436		- aConstraints.gridy += 1;
437		-
438	557	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	558
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
442		-
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	559	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	560	+ liveCB.setToolTipText("Enable animation");
445	561	liveCB.addItemListener(this);
446	562
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	564	+ oneStepButton.setToolTipText("Animate one step forward");
	565	+ oneStepButton.addActionListener(this);
	566	+
	567	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	568	+ fastCB.setToolTipText("Fast mode");
	569	+ fastCB.addItemListener(this);
	570	+
	571	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	572	trackCB.setToolTipText("Enable tracking");
450	573	trackCB.addItemListener(this);
451	574
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	576	screenfitButton.setToolTipText("Screen fit");
455	577	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	578	+
457	579	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	580	// 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	581
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);
	582	+ if (Globals.ADVANCED)
	583	+ {
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ snapobjectButton.addActionListener(this);
	586	+ snapobjectButton.setToolTipText("Snap Object");
	587	+ }
	588	+
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	590	flashSelectionButton.setToolTipText("Show selection");
472	591	flashSelectionButton.addActionListener(this);
473	592
474		- oe.toolbarPanel.add(new cButton(" ", false));
	593	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	594
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);
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	596	twoButton.setToolTipText("Show center view only");
483	597	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	599	fourButton.addActionListener(this);
486	600	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	602	sixButton.setToolTipText("2-column layout left");
489	603	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	605	threeButton.setToolTipText("2-column layout right");
492	606	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	608	sevenButton.setToolTipText("3-column layout");
495	609	sevenButton.addActionListener(this);
496	610	//
497	611
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ rootButton.setToolTipText("Edit selection in new tab");
500	614	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	617	closeButton.setToolTipText("Close tab");
504	618	closeButton.addActionListener(this);
505	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	620	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	621
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	622	+ cGridBag commandsPanel = new cGridBag();
	623	+
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	625	+ editButton.setToolTipText("Edit selection");
511	626	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	627
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ uneditButton.setToolTipText("Unedit selection");
517	630	uneditButton.addActionListener(this);
518	631
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);
	632	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	633	+ allParamsButton.setToolTipText("Edit all params");
531	634	allParamsButton.addActionListener(this);
532	635
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);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ clearPanelButton.setToolTipText("Clear edit panel");
	638	+ clearPanelButton.addActionListener(this);
	639	+
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ unselectButton.setToolTipText("Unselect");
538	642	unselectButton.addActionListener(this);
539	643
	644	+ commandsPanel.preferredHeight = 1;
	645	+
	646	+ oe.treePanel.add(commandsPanel);
	647	+ oe.treePanel.Return();
	648	+
540	649	// oe.aConstraints.gridx += 1;
541	650	// oe.aConstraints.weighty = 0;
542	651	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +657,37 @@
548	657	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	658	// gcButton.addActionListener(this);
550	659
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;
	660	+ cGridBag jSPPanel = new cGridBag();
	661	+
	662	+ JScrollPane jSP;
562	663	//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);
	664	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	665	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	666	+
	667	+ oe.treePanel.add(jSPPanel);
	668	+ oe.treePanel.Return();
569	669
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);
	670	+ cGridBag copyOptionsPanel = new cGridBag();
	671	+
	672	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	673	+ colorCB.setToolTipText("Copy color when dropped");
574	674	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	675	+
	676	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	677	+ materialCB.setToolTipText("Copy material when dropped");
577	678	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	679	+
	680	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	681	+ textureCB.setToolTipText("Copy texture when dropped");
580	682	textureCB.addItemListener(this);
581	683
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	684	+ copyOptionsPanel.preferredHeight = 1;
	685	+ oe.treePanel.add(copyOptionsPanel);
	686	+ oe.treePanel.Return();
584	687
	688	+// mainPanel.setDividerLocation(0.5); //1.0);
	689	+// mainPanel.setResizeWeight(0.5);
	690	+
585	691	//jList.addListSelectionListener(this);
586	692	oe.jTree.addTreeSelectionListener(this);
587	693	//jTree.setRootVisible(false);
..	..	@@ -604,45 +710,37 @@
604	710	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	711	}
606	712
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	713	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	714	{
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);
	715	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	716	boxCB.setToolTipText("Display bounding boxes");
640	717	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	718	+
	719	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	720	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	721	zoomBoxCB.addItemListener(this);
645	722
	723	+ if (true) // Globals.ADVANCED)
	724	+ {
	725	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	726	+ supportCB.setToolTipText("Enable rigging");
	727	+ supportCB.addItemListener(this);
	728	+
	729	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	730	+ // localCB.addItemListener(this);
	731	+
	732	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	733	+ crowdCB.setToolTipText("Used for crowds");
	734	+ crowdCB.addItemListener(this);
	735	+
	736	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	737	+ smoothCB.setToolTipText("Snapping delay");
	738	+ smoothCB.addItemListener(this);
	739	+
	740	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	741	+ slowCB.setToolTipText("Smooth interpolation");
	742	+ slowCB.addItemListener(this);
	743	+
646	744	// constraints.gridy += 1;
647	745	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	746	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +748,16 @@
650	748	if (false)
651	749	{
652	750	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	751	+ //constraints.gridy += 1;
	752	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	753	speakerCameraCB.addItemListener(this);
656	754
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	755	+ //constraints.gridy += 1;
	756	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	757	speakerFocusCB.addItemListener(this);
660	758
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	759	+ //constraints.gridy += 1;
	760	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	761	smoothfocusCB.addItemListener(this);
664	762	}
665	763
..	..	@@ -667,14 +765,20 @@
667	765	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	766	// debugCB.addItemListener(this);
669	767
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	768	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	769	oeilCB.addItemListener(this);
673	770
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	771	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	772	lookAtCB.setToolTipText("Look-at target");
677	773	lookAtCB.addItemListener(this);
	774	+
	775	+ }
	776	+
	777	+ cGridBag fill = new cGridBag();
	778	+
	779	+ fill.preferredHeight = 200;
	780	+
	781	+ panel.add(fill);
678	782
679	783	}
680	784
..	..	@@ -689,6 +793,7 @@
689	793	buttonGroup.add(radioButton);
690	794	radioButton.doClick();
691	795	}
	796	+
692	797	void SetupViews(ObjEditor oe)
693	798	{
694	799	oe.SetupViews();
..	..	@@ -905,7 +1010,9 @@
905	1010	// objEditor.DropFile((java.io.File[]) object, true);
906	1011	// return;
907	1012	// }
908		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1016	{
910	1017	// file(s)
911	1018	String[] names = string.split("\n");
..	..	@@ -932,7 +1039,7 @@
932	1039
933	1040	flashIt = false;
934	1041	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1044
938	1045	if (group.selection.size() == 1)
..	..	@@ -959,11 +1066,11 @@
959	1066	{
960	1067	loadClipboard(true);
961	1068	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1069	+ pasteInto(false, false);
963	1070	} else {
964	1071	loadClipboard(false);
965	1072	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1073	+ pasteInto(false, false); // true); // ???
967	1074	}
968	1075	}
969	1076	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1192,33 @@
1085	1192	kleinItem.addActionListener(this);
1086	1193	particleItem = menu.add(new MenuItem("Particle system"));
1087	1194	particleItem.addActionListener(this);
	1195	+ if (Globals.ADVANCED)
	1196	+ {
1088	1197	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1198	ragdollItem.addActionListener(this);
1090	1199	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1200	ragdoll2Item.addActionListener(this);
	1201	+ }
1092	1202	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1203	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1204	meshItem.addActionListener(this);
1095	1205	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1206	// meshGroupItem.addActionListener(this);
	1207	+ if (Globals.ADVANCED)
	1208	+ {
1097	1209	springItem = menu.add(new MenuItem("Spring"));
1098	1210	springItem.addActionListener(this);
1099	1211	flagItem = menu.add(new MenuItem("Flag"));
1100	1212	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	1213	blobItem = menu.add(new MenuItem("Blob"));
1106	1214	blobItem.addActionListener(this);
1107	1215	latheItem = menu.add(new MenuItem("Lathe"));
1108	1216	latheItem.addActionListener(this);
	1217	+ }
	1218	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1219	+ bezierItem.addActionListener(this);
	1220	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1221	+ overlayItem.addActionListener(this);
1109	1222	lightItem = menu.add(new MenuItem("Light"));
1110	1223	lightItem.addActionListener(this);
1111	1224	menu.add("-");
..	..	@@ -1115,34 +1228,39 @@
1115	1228	loopItem.addActionListener(this);
1116	1229	doubleItem = menu.add(new MenuItem("Fork"));
1117	1230	doubleItem.addActionListener(this);
	1231	+ if (Globals.ADVANCED)
	1232	+ {
1118	1233	tripleItem = menu.add(new MenuItem("Trident"));
1119	1234	tripleItem.addActionListener(this);
	1235	+ }
1120	1236	}
1121	1237
1122	1238	void buildToolsMenu(Menu menu)
1123	1239	{
1124	1240	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1241	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1242	+ animationItem.setState(Globals.ANIMATION);
1127	1243
1128	1244	menu.add("-");
1129	1245	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1246	parseverticesItem.addActionListener(this);
1131	1247	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1248	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1250	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1252	reduceMorphItem.addActionListener(this);
1139	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1254	reduce34MorphItem.addActionListener(this);
1141		-
	1255	+ menu.add("-");
1142	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1257	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1258
	1259	+ if (Globals.ADVANCED)
	1260	+ {
	1261	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1262	+ mirrorItem.addActionListener(this);
	1263	+ menu.add("-");
1146	1264	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1265	memoryItem.addActionListener(this);
1148	1266	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1283,7 @@
1165	1283	menu.add("-");
1166	1284	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1285	editScriptItem.addActionListener(this);
	1286	+ }
1168	1287	}
1169	1288
1170	1289	void ScreenFit()
..	..	@@ -1493,9 +1612,9 @@
1493	1612
1494	1613	void Overwrite(int mask)
1495	1614	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1616	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1499	1618
1500	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1620	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1785,7 @@
1666	1785	{
1667	1786	makeSomething(new BezierSurface());
1668	1787	} else
1669		- if (source == checkerItem)
	1788	+ if (source == overlayItem)
1670	1789	{
1671	1790	/*
1672	1791	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1919,6 @@
1800	1919	csg.addChild(child);
1801	1920	child.addChild(csg);
1802	1921	} 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	1922	if (source == computeAOItem)
1821	1923	{
1822	1924	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +1937,7 @@
1835	1937	if (source == invariantsItem)
1836	1938	{
1837	1939	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1839	1941	} else
1840	1942	if (source == memoryItem)
1841	1943	{
..	..	@@ -1853,6 +1955,11 @@
1853	1955	if (source == dumpItem)
1854	1956	{
1855	1957	DumpObject();
	1958	+ } else
	1959	+ if (source == oneStepButton)
	1960	+ {
	1961	+ Globals.ONESTEP = true;
	1962	+ cameraView.repaint();
1856	1963	} else
1857	1964	if (source == screenfitButton)
1858	1965	{
..	..	@@ -1903,12 +2010,20 @@
1903	2010	{
1904	2011	loadClipboard(true);
1905	2012	} else
	2013	+ if (source == undoItem)
	2014	+ {
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
1906	2021	if (source == duplicateItem)
1907	2022	{
1908		- Object3D keep = GrafreeD.clipboard;
	2023	+ Object3D keep = Grafreed.clipboard;
1909	2024	loadClipboard(false);
1910	2025	paste(false);
1911		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1912	2027	} else
1913	2028	if (source == cloneItem)
1914	2029	{
..	..	@@ -1926,13 +2041,17 @@
1926	2041	{
1927	2042	paste(false);
1928	2043	} else
	2044	+ if (source == pasteIntoItem)
	2045	+ {
	2046	+ pasteInto(true, false);
	2047	+ } else
1929	2048	if (source == pasteLinkItem)
1930	2049	{
1931		- pasteInto(false);
	2050	+ pasteInto(false, false);
1932	2051	} else
1933	2052	if (source == pasteCloneItem)
1934	2053	{
1935		- pasteInto(true);
	2054	+ pasteInto(true, true);
1936	2055	} else
1937	2056	if (source == pasteExpandItem)
1938	2057	{
..	..	@@ -2124,9 +2243,9 @@
2124	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2244	// refreshContents();
2126	2245	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2247	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2130	2249
2131	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2251	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2253,11 @@
2134	2253	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2254	for (int i=0; i<group.selection.size(); i++)
2136	2255	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2256	+ boolean random = CameraPane.SWITCH;
	2257	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2258	group.selection.get(i).linkVerticesThis(content);
2140	2259	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2142	2261	}
2143	2262	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2263	refreshContents();
..	..	@@ -2148,20 +2267,20 @@
2148	2267	{
2149	2268	for (int i=0; i<group.selection.size(); i++)
2150	2269	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2270	+ boolean random = CameraPane.SWITCH;
	2271	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2272	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2273	+ CameraPane.SWITCH = random;
2155	2274	}
2156	2275
2157	2276	refreshContents();
2158	2277	} else
2159	2278	if (source == relinkverticesItem)
2160	2279	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2280	+ boolean random = CameraPane.SWITCH;
	2281	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2282	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2283	+ CameraPane.SWITCH = random;
2165	2284
2166	2285	refreshContents();
2167	2286	} else
..	..	@@ -2176,9 +2295,9 @@
2176	2295	} else
2177	2296	if (source == setMasterItem)
2178	2297	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2299	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2182	2301
2183	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2303	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2310,9 @@
2191	2310	{
2192	2311	if (group.selection.size() == 1)
2193	2312	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2195	2314	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2197	2316
2198	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2318	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2329,7 @@
2210	2329	{
2211	2330	RevertMeshes();
2212	2331	} else
2213		- if (source == resetMeshItem)
	2332	+ if (source == resetAllItem)
2214	2333	{
2215	2334	ResetAll();
2216	2335	} else
..	..	@@ -2259,7 +2378,7 @@
2259	2378	RandomNode random = new RandomNode();
2260	2379	group(random);
2261	2380	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2381	+ random.name = random.get(0).name + "Switch";
2263	2382	} else
2264	2383	if (source == physicsItem)
2265	2384	{
..	..	@@ -2548,9 +2667,13 @@
2548	2667	{
2549	2668	SmoothMesh();
2550	2669	} else
2551		- if (source == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2552	2671	{
2553	2672	TransformGeometry();
	2673	+ } else
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
2554	2677	} else
2555	2678	if (source == resetTransformItem)
2556	2679	{
..	..	@@ -2558,7 +2681,11 @@
2558	2681	} else
2559	2682	if (source == resetCentroidItem)
2560	2683	{
2561		- ResetCentroid();
	2684	+ ResetCentroid(true);
	2685	+ } else
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
2562	2689	} else
2563	2690	if (source == resetParentItem)
2564	2691	{
..	..	@@ -2914,9 +3041,9 @@
2914	3041	child.CloseUI();
2915	3042	listUI.remove(child);
2916	3043
2917		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2918	3045	}
2919		- objEditor.ctrlPanel.revalidate();
	3046	+ objEditor.ctrlPanel.FlushUI();
2920	3047	//objEditor.jTree.clearSelection();
2921	3048	//objEditor.ResetSliders();
2922	3049	refreshContents(true);
..	..	@@ -3000,7 +3127,9 @@
3000	3127	frontView.object = group;
3001	3128	sideView.object = group;
3002	3129	}
3003		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
3004	3133	/*
3005	3134	currentLayout = radio.layout;
3006	3135	if (currentLayout == null)
..	..	@@ -3013,7 +3142,20 @@
3013	3142	//group.attributes = -1;
3014	3143	ResetModel();
3015	3144	refreshContents(true);
3016		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
3017	3159	else
3018	3160	{
3019	3161	//return super.action(event, arg);
..	..	@@ -3074,6 +3216,28 @@
3074	3216	refreshContents();
3075	3217	}
3076	3218
	3219	+ void TransformChildren()
	3220	+ {
	3221	+ Object3D obj;
	3222	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3223	+ {
	3224	+ obj = (Object3D)e.nextElement();
	3225	+ obj.KeepTextureMatrices();
	3226	+ obj.TransformChildren();
	3227	+ obj.RestoreTextureMatrices();
	3228	+
	3229	+// if (obj.parent == null)
	3230	+// {
	3231	+// System.out.println("NULL PARENT!");
	3232	+// new Exception().printStackTrace();
	3233	+// }
	3234	+// else
	3235	+// TouchTransform(obj);
	3236	+// //obj.parent.Touch();
	3237	+ }
	3238	+
	3239	+ refreshContents();
	3240	+ }
3077	3241
3078	3242	void ResetTransform()
3079	3243	{
..	..	@@ -3186,7 +3350,7 @@
3186	3350	refreshContents();
3187	3351	}
3188	3352
3189		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3190	3354	{
3191	3355	Object3D obj;
3192	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3365,16 @@
3201	3365	LA.matIdentity(Object3D.mat);
3202	3366	obj.getBounds(minima, maxima, false);
3203	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3207	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3210	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3272,9 +3440,9 @@
3272	3440	obj = (Object3D)e.nextElement();
3273	3441
3274	3442	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3276	3444	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3446
3279	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3448	}
..	..	@@ -3488,8 +3656,8 @@
3488	3656
3489	3657	void ParseVertices()
3490	3658	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3493	3661
3494	3662	for (int i=0; i<group.selection.size(); i++)
3495	3663	{
..	..	@@ -3514,7 +3682,7 @@
3514	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3684
3517		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3518	3686
3519	3687	buffer.add(g);
3520	3688	}
..	..	@@ -3529,7 +3697,7 @@
3529	3697	makeSomething(buffer, i==group.selection.size()-1);
3530	3698	}
3531	3699
3532		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3533	3701
3534	3702	refreshContents();
3535	3703	}
..	..	@@ -3547,7 +3715,16 @@
3547	3715	String pigment = Object3D.GetPigment(tex);
3548	3716	//String bump = Object3D.GetBump(tex);
3549	3717
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3551	3728
3552	3729	double s = v.s;
3553	3730
..	..	@@ -3635,11 +3812,11 @@
3635	3812
3636	3813	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3814
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3815	+ boolean random = CameraPane.SWITCH;
	3816	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3817	lowres.linkVerticesThis(null);
3641	3818	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3819	+ CameraPane.SWITCH = random;
3643	3820
3644	3821	System.err.flush();
3645	3822
..	..	@@ -3679,7 +3856,7 @@
3679	3856	return;
3680	3857
3681	3858	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3683	3860
3684	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	3862
..	..	@@ -3873,9 +4050,9 @@
3873	4050
3874	4051	void ClipMesh()
3875	4052	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4054	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3879	4056
3880	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4058	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4061,7 @@
3884	4061	// {
3885	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4063	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4065	}
3889	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4067	System.out.println("DONE.");
..	..	@@ -4019,7 +4196,7 @@
4019	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4197
4021	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
4023	4200	{
4024	4201	// if (!(elem instanceof Composite))
4025	4202	// newWindow = false;
..	..	@@ -4124,23 +4301,26 @@
4124	4301	System.err.println("info : " + child.GetPath());
4125	4302	}
4126	4303	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4304	+// else
	4305	+// {
	4306	+// objEditor.SetMaterial(group); // .GetMaterial());
	4307	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4308	+// System.err.println("info : " + group.GetPath());
	4309	+// }
4133	4310
4134	4311	objEditor.SetText(); // jan 2014
4135	4312
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4314	CameraPane.flash = true;
4138	4315
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4317	// a camera
4141	4318	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
4144	4324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4326	}
..	..	@@ -4224,12 +4404,12 @@
4224	4404	{
4225	4405	if (group.selection.isEmpty())
4226	4406	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4228	4408	Composite tGroup = null;
4229	4409	if (group.selection.size() > 0) // 1)
4230	4410	{
4231	4411	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4233	4413	}
4234	4414
4235	4415	if (cut)
..	..	@@ -4269,16 +4449,16 @@
4269	4449	//System.out.println("cut " + child);
4270	4450	//System.out.println("parent = " + child.parent);
4271	4451	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4273	4453	tGroup.add/Child/(tmp);
4274	4454	else
4275		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4276	4456	}
4277	4457	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4279	4459	tGroup.add/Child/(child);
4280	4460	else
4281		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4282	4462	}
4283	4463
4284	4464	//ResetModel();
..	..	@@ -4310,21 +4490,21 @@
4310	4490	//System.out.println("cut " + elem);
4311	4491	//System.out.println("parent = " + elem.parent);
4312	4492	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4314	4494	tGroup.add/Child/(tmp);
4315	4495	else
4316		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4317	4497	}
4318	4498	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4320	4500	tGroup.add/Child/(child);
4321	4501	else
4322		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4323	4503	}
4324	4504
4325	4505	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4328	4508	if (cut)
4329	4509	{
4330	4510	ResetModel();
..	..	@@ -4338,7 +4518,7 @@
4338	4518	// return;
4339	4519	boolean first = true;
4340	4520
4341		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4342	4522	{
4343	4523	Composite temp;
4344	4524
..	..	@@ -4349,7 +4529,7 @@
4349	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4530	*/
4351	4531	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4532	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4533	{
4354	4534	Object3D child = (Object3D)e.nextElement();
4355	4535
..	..	@@ -4383,21 +4563,21 @@
4383	4563	//Object3D cb = Applet3D.clipboard;
4384	4564	//temp.addChild(cb);
4385	4565	//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());
	4566	+ assert(Grafreed.clipboard.parent == null);
	4567	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4568	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4569	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4570	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4571	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4574	}
4395	4575
4396	4576	ResetModel();
4397	4577	refreshContents();
4398	4578	}
4399	4579
4400		- void pasteInto(boolean copyit)
	4580	+ void pasteInto(boolean copyit, boolean clone)
4401	4581	{
4402	4582	// if (GrafreeD.clipboard == null)
4403	4583	// return;
..	..	@@ -4426,15 +4606,22 @@
4426	4606	if (copyit)
4427	4607	{
4428	4608	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4609	+ if (clone)
	4610	+ {
	4611	+ CloneClipboard(false); // sept 2014
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ paste(false);
	4616	+ }
4430	4617	}
4431	4618	else
4432	4619	{
4433	4620	boolean first = true;
4434	4621
4435		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4436	4623	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4625	Object3D copy;
4439	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4627	{
..	..	@@ -4444,7 +4631,7 @@
4444	4631	}
4445	4632	} else
4446	4633	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4635	}
4449	4636	}
4450	4637	}
..	..	@@ -4849,21 +5036,6 @@
4849	5036	}
4850	5037	*/
4851	5038
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	5039	/*
4868	5040	public void Callback(Object obj)
4869	5041	{
..	..	@@ -4887,26 +5059,9 @@
4887	5059	}
4888	5060	*/
4889	5061
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	5062	String GetFile(String dialogName)
4908	5063	{
4909		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4910	5065	{
4911	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5067	browser.show();
..	..	@@ -4970,10 +5125,12 @@
4970	5125	cButton flashSelectionButton;
4971	5126	cButton editButton;
4972	5127	cButton uneditButton;
	5128	+ JCheckBox allParamsButton;
4973	5129	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5130	cButton unselectButton;
4976	5131
	5132	+ cButton oneStepButton;
	5133	+
4977	5134	cButton screenfitButton;
4978	5135	cButton screenfitpointButton;
4979	5136	cButton snapobjectButton;
..	..	@@ -5004,6 +5161,8 @@
5004	5161	private MenuItem lookFromItem;
5005	5162	private MenuItem switchItem;
5006	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
5007	5166	private MenuItem duplicateItem;
5008	5167	private MenuItem cloneItem;
5009	5168	private MenuItem cloneSupportItem;
..	..	@@ -5017,7 +5176,7 @@
5017	5176	private MenuItem linkverticesItem;
5018	5177	private MenuItem relinkverticesItem;
5019	5178	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
5021	5180	private MenuItem stepAllItem;
5022	5181	private MenuItem revertMeshItem;
5023	5182	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5187,7 @@
5028	5187	private MenuItem mergeGeometriesItem;
5029	5188	private MenuItem copyItem;
5030	5189	private MenuItem pasteItem;
	5190	+ private MenuItem pasteIntoItem;
5031	5191	private MenuItem pasteLinkItem;
5032	5192	private MenuItem pasteCloneItem;
5033	5193	private MenuItem pasteExpandItem;
..	..	@@ -5077,8 +5237,10 @@
5077	5237	private MenuItem panoTexturesItem;
5078	5238
5079	5239	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
5081	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
5082	5244	private MenuItem hideItem;
5083	5245	private MenuItem grabItem;
5084	5246	private MenuItem backItem;
..	..	@@ -5125,7 +5287,7 @@
5125	5287	private MenuItem blobItem;
5126	5288	private MenuItem latheItem;
5127	5289	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5290	+ private MenuItem overlayItem;
5129	5291	private MenuItem meshItem;
5130	5292	// private MenuItem meshGroupItem;
5131	5293	private MenuItem springItem;
..	..	@@ -5147,11 +5309,6 @@
5147	5309	private MenuItem doubleItem;
5148	5310	private MenuItem tripleItem;
5149	5311
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5312	private MenuItem computeAOItem;
5156	5313	private MenuItem recompileItem;
5157	5314	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5318,8 @@
5161	5318	private MenuItem analyzeItem;
5162	5319	private MenuItem dumpItem;
5163	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5164	5325	}