~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,124 @@
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	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	158	+ duplicateItem.addActionListener(this);
	159	+ cloneItem = menu.add(new MenuItem("Clone"));
	160	+ cloneItem.addActionListener(this);
	161	+ if (Globals.ADVANCED)
	162	+ {
	163	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	164	+ cloneSupportItem.addActionListener(this);
	165	+ }
	166	+ menu.add("-");
	167	+ cutItem = menu.add(new MenuItem("Cut"));
	168	+ cutItem.addActionListener(this);
	169	+ copyItem = menu.add(new MenuItem("Copy"));
	170	+ copyItem.addActionListener(this);
	171	+ pasteItem = menu.add(new MenuItem("Paste"));
	172	+ pasteItem.addActionListener(this);
	173	+ menu.add("-");
	174	+
	175	+ menu.add("-");
	176	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	177	+ pasteIntoItem.addActionListener(this);
	178	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	179	+ pasteLinkItem.addActionListener(this);
	180	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	181	+ pasteCloneItem.addActionListener(this);
	182	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	183	+// pasteExpandItem.addActionListener(this);
	184	+ menu.add("-");
	185	+ clearItem = menu.add(new MenuItem("Clear"));
	186	+ clearItem.addActionListener(this);
	187	+
	188	+ if (Globals.ADVANCED)
	189	+ {
	190	+ // Deletes the cameras...
	191	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	192	+ clearAllItem.addActionListener(this);
	193	+ }
	194	+
	195	+ menuBar.add(cameraMenu = new Menu("View"));
	196	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	197	+ //zBufferItem.addActionListener(this);
	198	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	199	+ //normalLensItem.addActionListener(this);
	200	+ cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
	201	+ revertCameraItem.addActionListener(this);
	202	+
	203	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	204	+ toggleFullScreenItem.addItemListener(this);
	205	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	206	+ cameraMenu.add("-");
	207	+
	208	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	209	+ toggleTextureItem.addItemListener(this);
	210	+ toggleTextureItem.setState(CameraPane.textureon);
	211	+
	212	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	213	+ toggleSwitchItem.addItemListener(this);
	214	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	215	+
	216	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	217	+ toggleHandleItem.addItemListener(this);
	218	+ toggleHandleItem.setState(CameraPane.HANDLES);
	219	+
	220	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	221	+ togglePaintItem.addItemListener(this);
	222	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	223	+
	224	+ if (Globals.ADVANCED)
	225	+ {
	226	+ cameraMenu.add("-");
	227	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	228	+ toggleLiveItem.addItemListener(this);
	229	+ toggleLiveItem.setState(Globals.isLIVE());
	230	+
	231	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	232	+ stepItem.addActionListener(this);
	233	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	234	+ // toggleDLItem.addItemListener(this);
	235	+ // toggleDLItem.setState(false);
	236	+
	237	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	238	+ toggleRenderItem.addItemListener(this);
	239	+ toggleRenderItem.setState(!CameraPane.frozen);
	240	+
	241	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	242	+ toggleDebugItem.addItemListener(this);
	243	+ toggleDebugItem.setState(CameraPane.DEBUG);
	244	+
	245	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	246	+ toggleFrustumItem.addItemListener(this);
	247	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	248	+
	249	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	250	+ toggleFootContactItem.addItemListener(this);
	251	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	252	+
	253	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	254	+ toggleTimelineItem.addItemListener(this);
	255	+ }
	256	+
	257	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	258	+// toggleRootItem.addItemListener(this);
	259	+// toggleRootItem.setState(false);
	260	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	261	+// animationItem.addItemListener(this);
	262	+// animationItem.setState(CameraPane.ANIMATION);
	263	+ cameraMenu.add("-");
	264	+ cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	265	+ editCameraItem.addActionListener(this);
	266	+
	267	+ if (Globals.ADVANCED)
	268	+ {
152	269	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	270	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	271	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +277,17 @@
160	277	lookAtItem.addActionListener(this);
161	278	//lookFromItem.addActinoListener(this);
162	279	//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		-
	280	+ }
	281	+
192	282	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);
	283	+ if (Globals.ADVANCED)
	284	+ {
197	285	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	286	revertMeshItem.addActionListener(this);
199	287	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	288	resetreferencesItem.addActionListener(this);
201	289	menu.add("-");
	290	+ }
202	291	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	292	overwriteGeoItem.addActionListener(this);
204	293	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +299,26 @@
210	299	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	300	overwriteUVItem.addActionListener(this);
212	301	menu.add("-");
	302	+ if (Globals.ADVANCED)
	303	+ {
213	304	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	305	generateMeshItem.addActionListener(this);
215	306	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	307	poseMeshItem.addActionListener(this);
217	308	menu.add("-");
	309	+ }
218	310	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	311	resetsupportItem.addActionListener(this);
220	312	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	313	linkverticesItem.addActionListener(this);
222	314	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	315	relinkverticesItem.addActionListener(this);
	316	+
	317	+ if (Globals.ADVANCED)
	318	+ {
224	319	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	320	setMasterItem.addActionListener(this);
	321	+ }
226	322
227	323	oe.menuBar.add(menu = new Menu("Group"));
228	324	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +329,32 @@
233	329	frontItem.addActionListener(this);
234	330	compositeItem = menu.add(new MenuItem("Composite"));
235	331	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	332	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	333	hideItem.addActionListener(this);
238	334	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	335	ungroupItem.addActionListener(this);
240	336	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	337	+ randomItem = menu.add(new MenuItem("Switch node"));
242	338	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	339	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	340	switchGeoItem.addActionListener(this);
249	341	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	342	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	343	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	344	morphItem.addActionListener(this);
	345	+
	346	+ if (Globals.ADVANCED)
	347	+ {
	348	+ menu.add("-");
	349	+ physicsItem = menu.add(new MenuItem("Physics"));
	350	+ physicsItem.addActionListener(this);
	351	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	352	+ frameselectorItem.addActionListener(this);
253	353	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	354	scriptNodeItem.addActionListener(this);
255	355	cameraItem = menu.add(new MenuItem("Camera"));
256	356	cameraItem.addActionListener(this);
	357	+ }
257	358
258	359	oe.menuBar.add(menu = new Menu("Object"));
259	360	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,21 +369,29 @@
268	369	shadowYItem.addActionListener(this);
269	370	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	371	shadowZItem.addActionListener(this);
	372	+ if (Globals.ADVANCED)
	373	+ {
	374	+ menu.add("-");
271	375	linkerItem = menu.add(new MenuItem("Linker"));
272	376	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	377	attributeItem = menu.add(new MenuItem("Attribute"));
276	378	attributeItem.addActionListener(this);
	379	+ templateItem = menu.add(new MenuItem("Template"));
	380	+ templateItem.addActionListener(this);
277	381	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	382	pointflowItem.addActionListener(this);
	383	+ }
279	384	menu.add("-");
280	385	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	386	resetTransformItem.addActionListener(this);
282	387	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	388	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	389	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	390	+ resetCentroidXZItem.addActionListener(this);
	391	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	392	+ transformGeometryItem.addActionListener(this);
	393	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	394	+ transformChildrenItem.addActionListener(this);
286	395
287	396	oe.menuBar.add(menu = new Menu("Geometry"));
288	397	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +402,11 @@
293	402	genNormalsCADItem.addActionListener(this);
294	403	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	404	genNormalsMESHItem.addActionListener(this);
	405	+ if (Globals.ADVANCED)
	406	+ {
296	407	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	408	genNormalsMINEItem.addActionListener(this);
	409	+ }
298	410	stripifyItem = menu.add(new MenuItem("Stripify"));
299	411	stripifyItem.addActionListener(this);
300	412	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +428,34 @@
316	428	reduce34MeshItem.addActionListener(this);
317	429	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	430	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	431	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	432	clipMeshItem.addActionListener(this);
	433	+
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	437	+ smoothMeshItem.addActionListener(this);
	438	+ }
323	439
324	440	oe.menuBar.add(menu = new Menu("Attributes"));
325	441	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	442	clearMaterialsItem.addActionListener(this);
	443	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	444	+ resetAllItem.addActionListener(this);
	445	+ stepAllItem = menu.add(new MenuItem("Step All"));
	446	+ stepAllItem.addActionListener(this);
327	447	menu.add("-");
328	448	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	449	liveleavesItem.addActionListener(this);
330	450	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	451	unliveleavesItem.addActionListener(this);
	452	+ if (Globals.ADVANCED)
	453	+ {
332	454	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	455	supportleavesItem.addActionListener(this);
334	456	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	457	unsupportleavesItem.addActionListener(this);
	458	+ }
336	459	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	460	hideleavesItem.addActionListener(this);
338	461	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -376,29 +499,22 @@
376	499	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	500	sortbynameItem.addActionListener(this);
378	501	menu.add("-");
	502	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	503	+ shareGeometriesItem.addActionListener(this);
	504	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	505	+ mergeGeometriesItem.addActionListener(this);
	506	+ if (Globals.ADVANCED)
	507	+ {
	508	+ // Pretty much the same as duplicate and clone.
379	509	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	510	extractGeometriesItem.addActionListener(this);
381	511	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	512	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);
	513	+ }
387	514
388	515	oe.menuBar.add(menu = new Menu("Insert"));
389	516	buildCreateMenu(menu);
390	517
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	518	oe.menuBar.add(menu = new Menu("Tools"));
403	519	buildToolsMenu(menu);
404	520	}
..	..	@@ -433,110 +549,98 @@
433	549	oe.radioPanel.add(dummyButton);
434	550	oe.buttonGroup.add(dummyButton);
435	551	*/
436		- aConstraints.gridy += 1;
437		-
438	552	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	553
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");
	554	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	555	+ liveCB.setToolTipText("Enable animation");
445	556	liveCB.addItemListener(this);
446	557
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	558	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	559	+ oneStepButton.setToolTipText("Animate one step forward");
	560	+ oneStepButton.addActionListener(this);
	561	+
	562	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	563	+ fastCB.setToolTipText("Fast mode");
	564	+ fastCB.addItemListener(this);
	565	+
	566	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	567	trackCB.setToolTipText("Enable tracking");
450	568	trackCB.addItemListener(this);
451	569
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	570	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	571	screenfitButton.setToolTipText("Screen fit");
455	572	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	573	+
457	574	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	575	// 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	576
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);
	577	+ if (Globals.ADVANCED)
	578	+ {
	579	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ snapobjectButton.addActionListener(this);
	581	+ snapobjectButton.setToolTipText("Snap Object");
	582	+ }
	583	+
	584	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	585	flashSelectionButton.setToolTipText("Show selection");
472	586	flashSelectionButton.addActionListener(this);
473	587
474		- oe.toolbarPanel.add(new cButton(" ", false));
	588	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	589
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);
	590	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	591	twoButton.setToolTipText("Show center view only");
483	592	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	594	fourButton.addActionListener(this);
486	595	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	597	sixButton.setToolTipText("2-column layout left");
489	598	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	599	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	600	threeButton.setToolTipText("2-column layout right");
492	601	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	603	sevenButton.setToolTipText("3-column layout");
495	604	sevenButton.addActionListener(this);
496	605	//
497	606
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	607	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ rootButton.setToolTipText("Edit selection in new tab");
500	609	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	610	+
	611	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	612	closeButton.setToolTipText("Close tab");
504	613	closeButton.addActionListener(this);
505	614	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	615	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	616
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	617	+ cGridBag commandsPanel = new cGridBag();
	618	+
	619	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ editButton.setToolTipText("Edit selection");
511	621	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	622
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	623	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ uneditButton.setToolTipText("Unedit selection");
517	625	uneditButton.addActionListener(this);
518	626
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);
	627	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	628	+ allParamsButton.setToolTipText("Edit all params");
531	629	allParamsButton.addActionListener(this);
532	630
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);
	631	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ clearPanelButton.setToolTipText("Clear edit panel");
	633	+ clearPanelButton.addActionListener(this);
	634	+
	635	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ unselectButton.setToolTipText("Unselect");
538	637	unselectButton.addActionListener(this);
539	638
	639	+ commandsPanel.preferredHeight = 1;
	640	+
	641	+ oe.treePanel.add(commandsPanel);
	642	+ oe.treePanel.Return();
	643	+
540	644	// oe.aConstraints.gridx += 1;
541	645	// oe.aConstraints.weighty = 0;
542	646	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +652,37 @@
548	652	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	653	// gcButton.addActionListener(this);
550	654
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;
	655	+ cGridBag jSPPanel = new cGridBag();
	656	+
	657	+ JScrollPane jSP;
562	658	//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);
	659	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
564	660	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	661	+
	662	+ oe.treePanel.add(jSPPanel);
	663	+ oe.treePanel.Return();
569	664
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);
	665	+ cGridBag copyOptionsPanel = new cGridBag();
	666	+
	667	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	668	+ colorCB.setToolTipText("Copy color when dropped");
574	669	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	670	+
	671	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	672	+ materialCB.setToolTipText("Copy material when dropped");
577	673	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	674	+
	675	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	676	+ textureCB.setToolTipText("Copy texture when dropped");
580	677	textureCB.addItemListener(this);
581	678
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	679	+ copyOptionsPanel.preferredHeight = 1;
	680	+ oe.treePanel.add(copyOptionsPanel);
	681	+ oe.treePanel.Return();
584	682
	683	+// mainPanel.setDividerLocation(0.5); //1.0);
	684	+// mainPanel.setResizeWeight(0.5);
	685	+
585	686	//jList.addListSelectionListener(this);
586	687	oe.jTree.addTreeSelectionListener(this);
587	688	//jTree.setRootVisible(false);
..	..	@@ -604,45 +705,37 @@
604	705	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	706	}
606	707
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	708	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	709	{
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);
	710	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	711	boxCB.setToolTipText("Display bounding boxes");
640	712	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	713	+
	714	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	715	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	716	zoomBoxCB.addItemListener(this);
645	717
	718	+ if (true) // Globals.ADVANCED)
	719	+ {
	720	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	721	+ supportCB.setToolTipText("Enable rigging");
	722	+ supportCB.addItemListener(this);
	723	+
	724	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	725	+ // localCB.addItemListener(this);
	726	+
	727	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	728	+ crowdCB.setToolTipText("Used for crowds");
	729	+ crowdCB.addItemListener(this);
	730	+
	731	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	732	+ smoothCB.setToolTipText("Snapping delay");
	733	+ smoothCB.addItemListener(this);
	734	+
	735	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	736	+ slowCB.setToolTipText("Smooth interpolation");
	737	+ slowCB.addItemListener(this);
	738	+
646	739	// constraints.gridy += 1;
647	740	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	741	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +743,16 @@
650	743	if (false)
651	744	{
652	745	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	746	+ //constraints.gridy += 1;
	747	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	748	speakerCameraCB.addItemListener(this);
656	749
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	750	+ //constraints.gridy += 1;
	751	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	752	speakerFocusCB.addItemListener(this);
660	753
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	754	+ //constraints.gridy += 1;
	755	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	756	smoothfocusCB.addItemListener(this);
664	757	}
665	758
..	..	@@ -667,14 +760,20 @@
667	760	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	761	// debugCB.addItemListener(this);
669	762
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	763	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	764	oeilCB.addItemListener(this);
673	765
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	766	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	767	lookAtCB.setToolTipText("Look-at target");
677	768	lookAtCB.addItemListener(this);
	769	+
	770	+ }
	771	+
	772	+ cGridBag fill = new cGridBag();
	773	+
	774	+ fill.preferredHeight = 200;
	775	+
	776	+ panel.add(fill);
678	777
679	778	}
680	779
..	..	@@ -689,6 +788,7 @@
689	788	buttonGroup.add(radioButton);
690	789	radioButton.doClick();
691	790	}
	791	+
692	792	void SetupViews(ObjEditor oe)
693	793	{
694	794	oe.SetupViews();
..	..	@@ -905,7 +1005,9 @@
905	1005	// objEditor.DropFile((java.io.File[]) object, true);
906	1006	// return;
907	1007	// }
908		- if (string.charAt(0) == '/')
	1008	+
	1009	+ // File path for Mac and Windows
	1010	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1011	{
910	1012	// file(s)
911	1013	String[] names = string.split("\n");
..	..	@@ -932,7 +1034,7 @@
932	1034
933	1035	flashIt = false;
934	1036	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1037	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1038	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1039
938	1040	if (group.selection.size() == 1)
..	..	@@ -959,11 +1061,11 @@
959	1061	{
960	1062	loadClipboard(true);
961	1063	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1064	+ pasteInto(false, false);
963	1065	} else {
964	1066	loadClipboard(false);
965	1067	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1068	+ pasteInto(false, false); // true); // ???
967	1069	}
968	1070	}
969	1071	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1187,33 @@
1085	1187	kleinItem.addActionListener(this);
1086	1188	particleItem = menu.add(new MenuItem("Particle system"));
1087	1189	particleItem.addActionListener(this);
	1190	+ if (Globals.ADVANCED)
	1191	+ {
1088	1192	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1193	ragdollItem.addActionListener(this);
1090	1194	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1195	ragdoll2Item.addActionListener(this);
	1196	+ }
1092	1197	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1198	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1199	meshItem.addActionListener(this);
1095	1200	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1201	// meshGroupItem.addActionListener(this);
	1202	+ if (Globals.ADVANCED)
	1203	+ {
1097	1204	springItem = menu.add(new MenuItem("Spring"));
1098	1205	springItem.addActionListener(this);
1099	1206	flagItem = menu.add(new MenuItem("Flag"));
1100	1207	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	1208	blobItem = menu.add(new MenuItem("Blob"));
1106	1209	blobItem.addActionListener(this);
1107	1210	latheItem = menu.add(new MenuItem("Lathe"));
1108	1211	latheItem.addActionListener(this);
	1212	+ }
	1213	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1214	+ bezierItem.addActionListener(this);
	1215	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1216	+ overlayItem.addActionListener(this);
1109	1217	lightItem = menu.add(new MenuItem("Light"));
1110	1218	lightItem.addActionListener(this);
1111	1219	menu.add("-");
..	..	@@ -1115,34 +1223,39 @@
1115	1223	loopItem.addActionListener(this);
1116	1224	doubleItem = menu.add(new MenuItem("Fork"));
1117	1225	doubleItem.addActionListener(this);
	1226	+ if (Globals.ADVANCED)
	1227	+ {
1118	1228	tripleItem = menu.add(new MenuItem("Trident"));
1119	1229	tripleItem.addActionListener(this);
	1230	+ }
1120	1231	}
1121	1232
1122	1233	void buildToolsMenu(Menu menu)
1123	1234	{
1124	1235	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1236	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1237	+ animationItem.setState(Globals.ANIMATION);
1127	1238
1128	1239	menu.add("-");
1129	1240	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1241	parseverticesItem.addActionListener(this);
1131	1242	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1243	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1244	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1245	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1246	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1247	reduceMorphItem.addActionListener(this);
1139	1248	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1249	reduce34MorphItem.addActionListener(this);
1141		-
	1250	+ menu.add("-");
1142	1251	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1252	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1253
	1254	+ if (Globals.ADVANCED)
	1255	+ {
	1256	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1257	+ mirrorItem.addActionListener(this);
	1258	+ menu.add("-");
1146	1259	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1260	memoryItem.addActionListener(this);
1148	1261	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1278,7 @@
1165	1278	menu.add("-");
1166	1279	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1280	editScriptItem.addActionListener(this);
	1281	+ }
1168	1282	}
1169	1283
1170	1284	void ScreenFit()
..	..	@@ -1493,9 +1607,9 @@
1493	1607
1494	1608	void Overwrite(int mask)
1495	1609	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1610	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1611	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1612	+ Object3D content = Grafreed.clipboard.get(0);
1499	1613
1500	1614	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1615	content = ((cGroup)content).get(0);
..	..	@@ -1666,7 +1780,7 @@
1666	1780	{
1667	1781	makeSomething(new BezierSurface());
1668	1782	} else
1669		- if (source == checkerItem)
	1783	+ if (source == overlayItem)
1670	1784	{
1671	1785	/*
1672	1786	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1800,23 +1914,6 @@
1800	1914	csg.addChild(child);
1801	1915	child.addChild(csg);
1802	1916	} 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	1917	if (source == computeAOItem)
1821	1918	{
1822	1919	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1835,7 +1932,7 @@
1835	1932	if (source == invariantsItem)
1836	1933	{
1837	1934	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	1935	+ Grafreed.grafreeD.universe.invariants();
1839	1936	} else
1840	1937	if (source == memoryItem)
1841	1938	{
..	..	@@ -1853,6 +1950,11 @@
1853	1950	if (source == dumpItem)
1854	1951	{
1855	1952	DumpObject();
	1953	+ } else
	1954	+ if (source == oneStepButton)
	1955	+ {
	1956	+ Globals.ONESTEP = true;
	1957	+ cameraView.repaint();
1856	1958	} else
1857	1959	if (source == screenfitButton)
1858	1960	{
..	..	@@ -1905,10 +2007,10 @@
1905	2007	} else
1906	2008	if (source == duplicateItem)
1907	2009	{
1908		- Object3D keep = GrafreeD.clipboard;
	2010	+ Object3D keep = Grafreed.clipboard;
1909	2011	loadClipboard(false);
1910	2012	paste(false);
1911		- GrafreeD.clipboard = keep;
	2013	+ Grafreed.clipboard = keep;
1912	2014	} else
1913	2015	if (source == cloneItem)
1914	2016	{
..	..	@@ -1926,13 +2028,17 @@
1926	2028	{
1927	2029	paste(false);
1928	2030	} else
	2031	+ if (source == pasteIntoItem)
	2032	+ {
	2033	+ pasteInto(true, false);
	2034	+ } else
1929	2035	if (source == pasteLinkItem)
1930	2036	{
1931		- pasteInto(false);
	2037	+ pasteInto(false, false);
1932	2038	} else
1933	2039	if (source == pasteCloneItem)
1934	2040	{
1935		- pasteInto(true);
	2041	+ pasteInto(true, true);
1936	2042	} else
1937	2043	if (source == pasteExpandItem)
1938	2044	{
..	..	@@ -2124,9 +2230,9 @@
2124	2230	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2231	// refreshContents();
2126	2232	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2233	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2234	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2235	+ Object3D content = Grafreed.clipboard.get(0);
2130	2236
2131	2237	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2238	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2240,11 @@
2134	2240	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2241	for (int i=0; i<group.selection.size(); i++)
2136	2242	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2243	+ boolean random = CameraPane.SWITCH;
	2244	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2245	group.selection.get(i).linkVerticesThis(content);
2140	2246	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2247	+ CameraPane.SWITCH = random;
2142	2248	}
2143	2249	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2250	refreshContents();
..	..	@@ -2148,20 +2254,20 @@
2148	2254	{
2149	2255	for (int i=0; i<group.selection.size(); i++)
2150	2256	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2257	+ boolean random = CameraPane.SWITCH;
	2258	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2259	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2155	2261	}
2156	2262
2157	2263	refreshContents();
2158	2264	} else
2159	2265	if (source == relinkverticesItem)
2160	2266	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2267	+ boolean random = CameraPane.SWITCH;
	2268	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2269	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2270	+ CameraPane.SWITCH = random;
2165	2271
2166	2272	refreshContents();
2167	2273	} else
..	..	@@ -2176,9 +2282,9 @@
2176	2282	} else
2177	2283	if (source == setMasterItem)
2178	2284	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2285	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2286	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2287	+ Object3D content = Grafreed.clipboard.get(0);
2182	2288
2183	2289	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2290	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2297,9 @@
2191	2297	{
2192	2298	if (group.selection.size() == 1)
2193	2299	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2300	+ if (Grafreed.clipboard.size() == 1)
2195	2301	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2302	+ Object3D content = Grafreed.clipboard.get(0);
2197	2303
2198	2304	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2305	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2316,7 @@
2210	2316	{
2211	2317	RevertMeshes();
2212	2318	} else
2213		- if (source == resetMeshItem)
	2319	+ if (source == resetAllItem)
2214	2320	{
2215	2321	ResetAll();
2216	2322	} else
..	..	@@ -2259,7 +2365,7 @@
2259	2365	RandomNode random = new RandomNode();
2260	2366	group(random);
2261	2367	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2368	+ random.name = random.get(0).name + "Switch";
2263	2369	} else
2264	2370	if (source == physicsItem)
2265	2371	{
..	..	@@ -2548,9 +2654,13 @@
2548	2654	{
2549	2655	SmoothMesh();
2550	2656	} else
2551		- if (source == transformgeometryItem)
	2657	+ if (source == transformGeometryItem)
2552	2658	{
2553	2659	TransformGeometry();
	2660	+ } else
	2661	+ if (source == transformChildrenItem)
	2662	+ {
	2663	+ TransformChildren();
2554	2664	} else
2555	2665	if (source == resetTransformItem)
2556	2666	{
..	..	@@ -2558,7 +2668,11 @@
2558	2668	} else
2559	2669	if (source == resetCentroidItem)
2560	2670	{
2561		- ResetCentroid();
	2671	+ ResetCentroid(true);
	2672	+ } else
	2673	+ if (source == resetCentroidXZItem)
	2674	+ {
	2675	+ ResetCentroid(false);
2562	2676	} else
2563	2677	if (source == resetParentItem)
2564	2678	{
..	..	@@ -2720,7 +2834,7 @@
2720	2834	// centralPanel.setVisible(true);
2721	2835	// XYZPanel.setVisible(false);
2722	2836	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	2837	+ bigThree.add(centralPanel);
2724	2838	bigThree.FlushUI();
2725	2839	} else
2726	2840	if (source == threeButton)
..	..	@@ -2755,8 +2869,8 @@
2755	2869	// centralPanel.setVisible(true);
2756	2870	// XYZPanel.setVisible(true);
2757	2871	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	2872	+ bigThree.add(centralPanel);
	2873	+ bigThree.add(XYZPanel);
2760	2874	bigThree.FlushUI();
2761	2875	} else
2762	2876	if (source == fourButton)
..	..	@@ -2791,7 +2905,7 @@
2791	2905	// centralPanel.setVisible(false);
2792	2906	// XYZPanel.setVisible(false);
2793	2907	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	2908	+ bigThree.add(scenePanel);
2795	2909	bigThree.FlushUI();
2796	2910	} else
2797	2911	if (source == sixButton)
..	..	@@ -2826,8 +2940,8 @@
2826	2940	// centralPanel.setVisible(true);
2827	2941	// XYZPanel.setVisible(false);
2828	2942	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	2943	+ bigThree.add(scenePanel);
	2944	+ bigThree.add(centralPanel);
2831	2945	bigThree.FlushUI();
2832	2946	} else
2833	2947	if (source == sevenButton)
..	..	@@ -2862,9 +2976,9 @@
2862	2976	// centralPanel.setVisible(true);
2863	2977	// XYZPanel.setVisible(true);
2864	2978	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	2979	+ bigThree.add(scenePanel);
	2980	+ bigThree.add(centralPanel);
	2981	+ bigThree.add(XYZPanel);
2868	2982	bigThree.FlushUI();
2869	2983	} else
2870	2984	if (source == rootButton)
..	..	@@ -2916,7 +3030,7 @@
2916	3030
2917	3031	child.editWindow = null; // ???????????
2918	3032	}
2919		- objEditor.ctrlPanel.revalidate();
	3033	+ objEditor.ctrlPanel.FlushUI();
2920	3034	//objEditor.jTree.clearSelection();
2921	3035	//objEditor.ResetSliders();
2922	3036	refreshContents(true);
..	..	@@ -3000,7 +3114,9 @@
3000	3114	frontView.object = group;
3001	3115	sideView.object = group;
3002	3116	}
3003		- group.editWindow = this;
	3117	+
	3118	+// fix "+" issue group.editWindow = this;
	3119	+
3004	3120	/*
3005	3121	currentLayout = radio.layout;
3006	3122	if (currentLayout == null)
..	..	@@ -3013,7 +3129,20 @@
3013	3129	//group.attributes = -1;
3014	3130	ResetModel();
3015	3131	refreshContents(true);
3016		- }
	3132	+ } else if (event.getSource() == editCameraItem)
	3133	+ {
	3134	+ cameraView.ProtectCamera();
	3135	+ cameraView.repaint();
	3136	+ return;
	3137	+ } else if (event.getSource() == revertCameraItem)
	3138	+ {
	3139	+ cameraView.RevertCamera();
	3140	+ cameraView.repaint();
	3141	+ return;
	3142	+ // } else if (event.getSource() == textureButton)
	3143	+ // {
	3144	+ // return; // true;
	3145	+ }
3017	3146	else
3018	3147	{
3019	3148	//return super.action(event, arg);
..	..	@@ -3074,6 +3203,28 @@
3074	3203	refreshContents();
3075	3204	}
3076	3205
	3206	+ void TransformChildren()
	3207	+ {
	3208	+ Object3D obj;
	3209	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3210	+ {
	3211	+ obj = (Object3D)e.nextElement();
	3212	+ obj.KeepTextureMatrices();
	3213	+ obj.TransformChildren();
	3214	+ obj.RestoreTextureMatrices();
	3215	+
	3216	+// if (obj.parent == null)
	3217	+// {
	3218	+// System.out.println("NULL PARENT!");
	3219	+// new Exception().printStackTrace();
	3220	+// }
	3221	+// else
	3222	+// TouchTransform(obj);
	3223	+// //obj.parent.Touch();
	3224	+ }
	3225	+
	3226	+ refreshContents();
	3227	+ }
3077	3228
3078	3229	void ResetTransform()
3079	3230	{
..	..	@@ -3186,7 +3337,7 @@
3186	3337	refreshContents();
3187	3338	}
3188	3339
3189		- void ResetCentroid()
	3340	+ void ResetCentroid(boolean full)
3190	3341	{
3191	3342	Object3D obj;
3192	3343	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3352,16 @@
3201	3352	LA.matIdentity(Object3D.mat);
3202	3353	obj.getBounds(minima, maxima, false);
3203	3354	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3355	+ if (full)
	3356	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3357	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3358	obj.TransformMesh(Object3D.mat);
	3359	+
3207	3360	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3361	+ if (full)
	3362	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3363	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3364	+
3210	3365	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3366	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3367	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3272,9 +3427,9 @@
3272	3427	obj = (Object3D)e.nextElement();
3273	3428
3274	3429	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3430	+ Grafreed.AnalyzeObject(obj);
3276	3431	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3432	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3433
3279	3434	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3435	}
..	..	@@ -3488,8 +3643,8 @@
3488	3643
3489	3644	void ParseVertices()
3490	3645	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	3646	+ boolean epsequal = Grafreed.epsequal;
	3647	+ Grafreed.epsequal = true;
3493	3648
3494	3649	for (int i=0; i<group.selection.size(); i++)
3495	3650	{
..	..	@@ -3514,7 +3669,7 @@
3514	3669	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	3670	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	3671
3517		- g.add(GrafreeD.clipboard);
	3672	+ g.add(Grafreed.clipboard);
3518	3673
3519	3674	buffer.add(g);
3520	3675	}
..	..	@@ -3529,7 +3684,7 @@
3529	3684	makeSomething(buffer, i==group.selection.size()-1);
3530	3685	}
3531	3686
3532		- GrafreeD.epsequal = epsequal;
	3687	+ Grafreed.epsequal = epsequal;
3533	3688
3534	3689	refreshContents();
3535	3690	}
..	..	@@ -3547,7 +3702,16 @@
3547	3702	String pigment = Object3D.GetPigment(tex);
3548	3703	//String bump = Object3D.GetBump(tex);
3549	3704
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3705	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3706	+
	3707	+ try
	3708	+ {
	3709	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3710	+ }
	3711	+ catch (Exception e)
	3712	+ {
	3713	+ System.err.println("FAIL: " + node);
	3714	+ }
3551	3715
3552	3716	double s = v.s;
3553	3717
..	..	@@ -3635,11 +3799,11 @@
3635	3799
3636	3800	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	3801
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	3802	+ boolean random = CameraPane.SWITCH;
	3803	+ CameraPane.SWITCH = false; // parse all random nodes
3640	3804	lowres.linkVerticesThis(null);
3641	3805	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	3806	+ CameraPane.SWITCH = random;
3643	3807
3644	3808	System.err.flush();
3645	3809
..	..	@@ -3679,7 +3843,7 @@
3679	3843	return;
3680	3844
3681	3845	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	3846	+ Object3D ref = Grafreed.clipboard.get(0);
3683	3847
3684	3848	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	3849
..	..	@@ -3873,9 +4037,9 @@
3873	4037
3874	4038	void ClipMesh()
3875	4039	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4040	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4041	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4042	+ Object3D content = Grafreed.clipboard.get(0);
3879	4043
3880	4044	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4045	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4048,7 @@
3884	4048	// {
3885	4049	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4050	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4051	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4052	}
3889	4053	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4054	System.out.println("DONE.");
..	..	@@ -4019,7 +4183,7 @@
4019	4183	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4184
4021	4185	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4186	+ if(elem != group \|\| !newWindow)
4023	4187	{
4024	4188	// if (!(elem instanceof Composite))
4025	4189	// newWindow = false;
..	..	@@ -4124,12 +4288,12 @@
4124	4288	System.err.println("info : " + child.GetPath());
4125	4289	}
4126	4290	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4291	+// else
	4292	+// {
	4293	+// objEditor.SetMaterial(group); // .GetMaterial());
	4294	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4295	+// System.err.println("info : " + group.GetPath());
	4296	+// }
4133	4297
4134	4298	objEditor.SetText(); // jan 2014
4135	4299
..	..	@@ -4224,12 +4388,12 @@
4224	4388	{
4225	4389	if (group.selection.isEmpty())
4226	4390	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4391	+ Grafreed.clipboardIsTempGroup = false;
4228	4392	Composite tGroup = null;
4229	4393	if (group.selection.size() > 0) // 1)
4230	4394	{
4231	4395	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4396	+ Grafreed.clipboardIsTempGroup = true;
4233	4397	}
4234	4398
4235	4399	if (cut)
..	..	@@ -4269,16 +4433,16 @@
4269	4433	//System.out.println("cut " + child);
4270	4434	//System.out.println("parent = " + child.parent);
4271	4435	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4273	4437	tGroup.add/Child/(tmp);
4274	4438	else
4275		- GrafreeD.clipboard = tmp;
	4439	+ Grafreed.clipboard = tmp;
4276	4440	}
4277	4441	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4442	+ if (Grafreed.clipboardIsTempGroup)
4279	4443	tGroup.add/Child/(child);
4280	4444	else
4281		- GrafreeD.clipboard = child;
	4445	+ Grafreed.clipboard = child;
4282	4446	}
4283	4447
4284	4448	//ResetModel();
..	..	@@ -4310,21 +4474,21 @@
4310	4474	//System.out.println("cut " + elem);
4311	4475	//System.out.println("parent = " + elem.parent);
4312	4476	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4477	+ if (Grafreed.clipboardIsTempGroup)
4314	4478	tGroup.add/Child/(tmp);
4315	4479	else
4316		- GrafreeD.clipboard = tmp;
	4480	+ Grafreed.clipboard = tmp;
4317	4481	}
4318	4482	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4483	+ if (Grafreed.clipboardIsTempGroup)
4320	4484	tGroup.add/Child/(child);
4321	4485	else
4322		- GrafreeD.clipboard = child;
	4486	+ Grafreed.clipboard = child;
4323	4487	}
4324	4488
4325	4489	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4490	+ if (Grafreed.clipboardIsTempGroup)
	4491	+ Grafreed.clipboard = tGroup;
4328	4492	if (cut)
4329	4493	{
4330	4494	ResetModel();
..	..	@@ -4338,7 +4502,7 @@
4338	4502	// return;
4339	4503	boolean first = true;
4340	4504
4341		- if (GrafreeD.clipboardIsTempGroup)
	4505	+ if (Grafreed.clipboardIsTempGroup)
4342	4506	{
4343	4507	Composite temp;
4344	4508
..	..	@@ -4349,7 +4513,7 @@
4349	4513	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4514	*/
4351	4515	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4516	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4517	{
4354	4518	Object3D child = (Object3D)e.nextElement();
4355	4519
..	..	@@ -4383,21 +4547,21 @@
4383	4547	//Object3D cb = Applet3D.clipboard;
4384	4548	//temp.addChild(cb);
4385	4549	//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());
	4550	+ assert(Grafreed.clipboard.parent == null);
	4551	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4552	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4553	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4554	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	4555	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	4556	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4557	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	4558	}
4395	4559
4396	4560	ResetModel();
4397	4561	refreshContents();
4398	4562	}
4399	4563
4400		- void pasteInto(boolean copyit)
	4564	+ void pasteInto(boolean copyit, boolean clone)
4401	4565	{
4402	4566	// if (GrafreeD.clipboard == null)
4403	4567	// return;
..	..	@@ -4426,15 +4590,22 @@
4426	4590	if (copyit)
4427	4591	{
4428	4592	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	4593	+ if (clone)
	4594	+ {
	4595	+ CloneClipboard(false); // sept 2014
	4596	+ }
	4597	+ else
	4598	+ {
	4599	+ paste(false);
	4600	+ }
4430	4601	}
4431	4602	else
4432	4603	{
4433	4604	boolean first = true;
4434	4605
4435		- if (GrafreeD.clipboardIsTempGroup)
	4606	+ if (Grafreed.clipboardIsTempGroup)
4436	4607	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	4608	+ Composite temp = (Composite)Grafreed.clipboard;
4438	4609	Object3D copy;
4439	4610	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	4611	{
..	..	@@ -4444,7 +4615,7 @@
4444	4615	}
4445	4616	} else
4446	4617	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	4618	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	4619	}
4449	4620	}
4450	4621	}
..	..	@@ -4849,21 +5020,6 @@
4849	5020	}
4850	5021	*/
4851	5022
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	5023	/*
4868	5024	public void Callback(Object obj)
4869	5025	{
..	..	@@ -4887,26 +5043,9 @@
4887	5043	}
4888	5044	*/
4889	5045
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	5046	String GetFile(String dialogName)
4908	5047	{
4909		- if (GrafreeD.standAlone)
	5048	+ if (Grafreed.standAlone)
4910	5049	{
4911	5050	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5051	browser.show();
..	..	@@ -4970,10 +5109,12 @@
4970	5109	cButton flashSelectionButton;
4971	5110	cButton editButton;
4972	5111	cButton uneditButton;
	5112	+ JCheckBox allParamsButton;
4973	5113	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5114	cButton unselectButton;
4976	5115
	5116	+ cButton oneStepButton;
	5117	+
4977	5118	cButton screenfitButton;
4978	5119	cButton screenfitpointButton;
4979	5120	cButton snapobjectButton;
..	..	@@ -5017,7 +5158,7 @@
5017	5158	private MenuItem linkverticesItem;
5018	5159	private MenuItem relinkverticesItem;
5019	5160	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5161	+ private MenuItem resetAllItem;
5021	5162	private MenuItem stepAllItem;
5022	5163	private MenuItem revertMeshItem;
5023	5164	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5169,7 @@
5028	5169	private MenuItem mergeGeometriesItem;
5029	5170	private MenuItem copyItem;
5030	5171	private MenuItem pasteItem;
	5172	+ private MenuItem pasteIntoItem;
5031	5173	private MenuItem pasteLinkItem;
5032	5174	private MenuItem pasteCloneItem;
5033	5175	private MenuItem pasteExpandItem;
..	..	@@ -5077,8 +5219,10 @@
5077	5219	private MenuItem panoTexturesItem;
5078	5220
5079	5221	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5222	+ private MenuItem resetCentroidXZItem;
5081	5223	private MenuItem resetTransformItem;
	5224	+ private MenuItem transformGeometryItem;
	5225	+ private MenuItem transformChildrenItem;
5082	5226	private MenuItem hideItem;
5083	5227	private MenuItem grabItem;
5084	5228	private MenuItem backItem;
..	..	@@ -5125,7 +5269,7 @@
5125	5269	private MenuItem blobItem;
5126	5270	private MenuItem latheItem;
5127	5271	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5272	+ private MenuItem overlayItem;
5129	5273	private MenuItem meshItem;
5130	5274	// private MenuItem meshGroupItem;
5131	5275	private MenuItem springItem;
..	..	@@ -5147,11 +5291,6 @@
5147	5291	private MenuItem doubleItem;
5148	5292	private MenuItem tripleItem;
5149	5293
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5294	private MenuItem computeAOItem;
5156	5295	private MenuItem recompileItem;
5157	5296	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5300,8 @@
5161	5300	private MenuItem analyzeItem;
5162	5301	private MenuItem dumpItem;
5163	5302	//boolean freezemodel = false;
	5303	+
	5304	+ Menu cameraMenu;
	5305	+ MenuItem editCameraItem;
	5306	+ MenuItem revertCameraItem;
5164	5307	}