~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
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));
	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));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,8 +148,130 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
153	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -161,45 +283,17 @@
161	283	lookAtItem.addActionListener(this);
162	284	//lookFromItem.addActinoListener(this);
163	285	//switchItem.addActionListener(this);
164		- Menu menu;
165		- oe.menuBar.add(menu = new Menu("Edit"));
166		- //editItem = menu.add(new MenuItem("Edit"));
167		- //editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
169		- duplicateItem.addActionListener(this);
170		- menu.add("-");
171		- cloneItem = menu.add(new MenuItem("Clone"));
172		- cloneItem.addActionListener(this);
173		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174		- cloneSupportItem.addActionListener(this);
175		- menu.add("-");
176		- cutItem = menu.add(new MenuItem("Cut"));
177		- cutItem.addActionListener(this);
178		- copyItem = menu.add(new MenuItem("Copy"));
179		- copyItem.addActionListener(this);
180		- pasteItem = menu.add(new MenuItem("Paste"));
181		- pasteItem.addActionListener(this);
182		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
183		- pasteLinkItem.addActionListener(this);
184		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185		- pasteCloneItem.addActionListener(this);
186		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187		-// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
190		- clearAllItem = menu.add(new MenuItem("Clear All"));
191		- clearAllItem.addActionListener(this);
192		-
	286	+ }
	287	+
193	288	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	289	+ if (Globals.ADVANCED)
	290	+ {
198	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	292	revertMeshItem.addActionListener(this);
200	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	294	resetreferencesItem.addActionListener(this);
202	295	menu.add("-");
	296	+ }
203	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	298	overwriteGeoItem.addActionListener(this);
205	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,19 +305,26 @@
211	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	306	overwriteUVItem.addActionListener(this);
213	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
214	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	311	generateMeshItem.addActionListener(this);
216	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	313	poseMeshItem.addActionListener(this);
218	314	menu.add("-");
	315	+ }
219	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	317	resetsupportItem.addActionListener(this);
221	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	319	linkverticesItem.addActionListener(this);
223	320	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	321	relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
225	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	326	setMasterItem.addActionListener(this);
	327	+ }
227	328
228	329	oe.menuBar.add(menu = new Menu("Group"));
229	330	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -234,7 +335,7 @@
234	335	frontItem.addActionListener(this);
235	336	compositeItem = menu.add(new MenuItem("Composite"));
236	337	compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	339	hideItem.addActionListener(this);
239	340	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	341	ungroupItem.addActionListener(this);
..	..	@@ -245,16 +346,21 @@
245	346	switchGeoItem.addActionListener(this);
246	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	348	switchTransfoItem.addActionListener(this);
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
	350	+ morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
248	355	physicsItem = menu.add(new MenuItem("Physics"));
249	356	physicsItem.addActionListener(this);
250	357	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	358	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	360	scriptNodeItem.addActionListener(this);
256	361	cameraItem = menu.add(new MenuItem("Camera"));
257	362	cameraItem.addActionListener(this);
	363	+ }
258	364
259	365	oe.menuBar.add(menu = new Menu("Object"));
260	366	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -269,21 +375,29 @@
269	375	shadowYItem.addActionListener(this);
270	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
271	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
272	381	linkerItem = menu.add(new MenuItem("Linker"));
273	382	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	383	attributeItem = menu.add(new MenuItem("Attribute"));
277	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
278	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	388	pointflowItem.addActionListener(this);
	389	+ }
280	390	menu.add("-");
281	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	392	resetTransformItem.addActionListener(this);
283	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	394	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
287	401
288	402	oe.menuBar.add(menu = new Menu("Geometry"));
289	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +408,11 @@
294	408	genNormalsCADItem.addActionListener(this);
295	409	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	410	genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
297	413	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	414	genNormalsMINEItem.addActionListener(this);
	415	+ }
299	416	stripifyItem = menu.add(new MenuItem("Stripify"));
300	417	stripifyItem.addActionListener(this);
301	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +434,34 @@
317	434	reduce34MeshItem.addActionListener(this);
318	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	436	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
324	445
325	446	oe.menuBar.add(menu = new Menu("Attributes"));
326	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
328	453	menu.add("-");
329	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	455	liveleavesItem.addActionListener(this);
331	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
333	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	461	supportleavesItem.addActionListener(this);
335	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	463	unsupportleavesItem.addActionListener(this);
	464	+ }
337	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	466	hideleavesItem.addActionListener(this);
339	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -377,29 +505,22 @@
377	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	506	sortbynameItem.addActionListener(this);
379	507	menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
380	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	516	extractGeometriesItem.addActionListener(this);
382	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	518	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	519	+ }
388	520
389	521	oe.menuBar.add(menu = new Menu("Insert"));
390	522	buildCreateMenu(menu);
391	523
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	524	oe.menuBar.add(menu = new Menu("Tools"));
404	525	buildToolsMenu(menu);
405	526	}
..	..	@@ -436,10 +557,26 @@
436	557	*/
437	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	559
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
439	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
441	574	liveCB.addItemListener(this);
442	575
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
443	580	oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444	581	fastCB.setToolTipText("Fast mode");
445	582	fastCB.addItemListener(this);
..	..	@@ -448,7 +585,7 @@
448	585	trackCB.setToolTipText("Enable tracking");
449	586	trackCB.addItemListener(this);
450	587
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	589	screenfitButton.setToolTipText("Screen fit");
453	590	screenfitButton.addActionListener(this);
454	591
..	..	@@ -457,39 +594,39 @@
457	594
458	595	if (Globals.ADVANCED)
459	596	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	598	snapobjectButton.addActionListener(this);
462	599	snapobjectButton.setToolTipText("Snap Object");
463	600	}
464	601
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
466	603	flashSelectionButton.setToolTipText("Show selection");
467	604	flashSelectionButton.addActionListener(this);
468	605
469	606	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470	607
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
472	609	twoButton.setToolTipText("Show center view only");
473	610	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	612	fourButton.addActionListener(this);
476	613	fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	615	sixButton.setToolTipText("2-column layout left");
479	616	sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	618	threeButton.setToolTipText("2-column layout right");
482	619	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	621	sevenButton.setToolTipText("3-column layout");
485	622	sevenButton.addActionListener(this);
486	623	//
487	624
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
489	626	rootButton.setToolTipText("Edit selection in new tab");
490	627	rootButton.addActionListener(this);
491	628
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	630	closeButton.setToolTipText("Close tab");
494	631	closeButton.addActionListener(this);
495	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -497,23 +634,23 @@
497	634
498	635	cGridBag commandsPanel = new cGridBag();
499	636
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
501	638	editButton.setToolTipText("Edit selection");
502	639	editButton.addActionListener(this);
503	640
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
505	642	uneditButton.setToolTipText("Unedit selection");
506	643	uneditButton.addActionListener(this);
507	644
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
	647	+ allParamsButton.addActionListener(this);
	648	+
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	650	clearPanelButton.setToolTipText("Clear edit panel");
510	651	clearPanelButton.addActionListener(this);
511	652
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	654	unselectButton.setToolTipText("Unselect");
518	655	unselectButton.addActionListener(this);
519	656
..	..	@@ -588,8 +725,18 @@
588	725
589	726	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	727	{
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
591	738	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
	739	+ supportCB.setToolTipText("Enable rigging");
593	740	supportCB.addItemListener(this);
594	741
595	742	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
..	..	@@ -607,14 +754,6 @@
607	754	slowCB.setToolTipText("Smooth interpolation");
608	755	slowCB.addItemListener(this);
609	756
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	757	// constraints.gridy += 1;
619	758	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	759	// speakerMocapCB.addItemListener(this);
..	..	@@ -645,6 +784,8 @@
645	784	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	785	lookAtCB.setToolTipText("Look-at target");
647	786	lookAtCB.addItemListener(this);
	787	+
	788	+ }
648	789
649	790	cGridBag fill = new cGridBag();
650	791
..	..	@@ -665,6 +806,7 @@
665	806	buttonGroup.add(radioButton);
666	807	radioButton.doClick();
667	808	}
	809	+
668	810	void SetupViews(ObjEditor oe)
669	811	{
670	812	oe.SetupViews();
..	..	@@ -881,7 +1023,9 @@
881	1023	// objEditor.DropFile((java.io.File[]) object, true);
882	1024	// return;
883	1025	// }
884		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1029	{
886	1030	// file(s)
887	1031	String[] names = string.split("\n");
..	..	@@ -908,7 +1052,7 @@
908	1052
909	1053	flashIt = false;
910	1054	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1057
914	1058	if (group.selection.size() == 1)
..	..	@@ -935,11 +1079,11 @@
935	1079	{
936	1080	loadClipboard(true);
937	1081	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
	1082	+ pasteInto(false, false);
939	1083	} else {
940	1084	loadClipboard(false);
941	1085	objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
	1086	+ pasteInto(false, false); // true); // ???
943	1087	}
944	1088	}
945	1089	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1061,27 +1205,33 @@
1061	1205	kleinItem.addActionListener(this);
1062	1206	particleItem = menu.add(new MenuItem("Particle system"));
1063	1207	particleItem.addActionListener(this);
	1208	+ if (Globals.ADVANCED)
	1209	+ {
1064	1210	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1211	ragdollItem.addActionListener(this);
1066	1212	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1213	ragdoll2Item.addActionListener(this);
	1214	+ }
1068	1215	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1216	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1217	meshItem.addActionListener(this);
1071	1218	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1219	// meshGroupItem.addActionListener(this);
	1220	+ if (Globals.ADVANCED)
	1221	+ {
1073	1222	springItem = menu.add(new MenuItem("Spring"));
1074	1223	springItem.addActionListener(this);
1075	1224	flagItem = menu.add(new MenuItem("Flag"));
1076	1225	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1226	blobItem = menu.add(new MenuItem("Blob"));
1082	1227	blobItem.addActionListener(this);
1083	1228	latheItem = menu.add(new MenuItem("Lathe"));
1084	1229	latheItem.addActionListener(this);
	1230	+ }
	1231	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1232	+ bezierItem.addActionListener(this);
	1233	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1234	+ overlayItem.addActionListener(this);
1085	1235	lightItem = menu.add(new MenuItem("Light"));
1086	1236	lightItem.addActionListener(this);
1087	1237	menu.add("-");
..	..	@@ -1091,8 +1241,11 @@
1091	1241	loopItem.addActionListener(this);
1092	1242	doubleItem = menu.add(new MenuItem("Fork"));
1093	1243	doubleItem.addActionListener(this);
	1244	+ if (Globals.ADVANCED)
	1245	+ {
1094	1246	tripleItem = menu.add(new MenuItem("Trident"));
1095	1247	tripleItem.addActionListener(this);
	1248	+ }
1096	1249	}
1097	1250
1098	1251	void buildToolsMenu(Menu menu)
..	..	@@ -1106,19 +1259,21 @@
1106	1259	parseverticesItem.addActionListener(this);
1107	1260	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1261	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1263	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1265	reduceMorphItem.addActionListener(this);
1115	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1267	reduce34MorphItem.addActionListener(this);
1117		-
	1268	+ menu.add("-");
1118	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1119	1270	computeAOItem.addActionListener(this);
1120		- menu.add("-");
1121	1271
	1272	+ if (Globals.ADVANCED)
	1273	+ {
	1274	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1275	+ mirrorItem.addActionListener(this);
	1276	+ menu.add("-");
1122	1277	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1278	memoryItem.addActionListener(this);
1124	1279	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1141,6 +1296,7 @@
1141	1296	menu.add("-");
1142	1297	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1298	editScriptItem.addActionListener(this);
	1299	+ }
1144	1300	}
1145	1301
1146	1302	void ScreenFit()
..	..	@@ -1469,9 +1625,9 @@
1469	1625
1470	1626	void Overwrite(int mask)
1471	1627	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1629	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1475	1631
1476	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1633	content = ((cGroup)content).get(0);
..	..	@@ -1642,7 +1798,7 @@
1642	1798	{
1643	1799	makeSomething(new BezierSurface());
1644	1800	} else
1645		- if (source == checkerItem)
	1801	+ if (source == overlayItem)
1646	1802	{
1647	1803	/*
1648	1804	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1776,23 +1932,6 @@
1776	1932	csg.addChild(child);
1777	1933	child.addChild(csg);
1778	1934	} else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795		- } else
1796	1935	if (source == computeAOItem)
1797	1936	{
1798	1937	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1811,7 +1950,7 @@
1811	1950	if (source == invariantsItem)
1812	1951	{
1813	1952	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1815	1954	} else
1816	1955	if (source == memoryItem)
1817	1956	{
..	..	@@ -1829,6 +1968,23 @@
1829	1968	if (source == dumpItem)
1830	1969	{
1831	1970	DumpObject();
	1971	+ } else
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
	1983	+ } else
	1984	+ if (source == oneStepButton)
	1985	+ {
	1986	+ Globals.ONESTEP = true;
	1987	+ cameraView.repaint();
1832	1988	} else
1833	1989	if (source == screenfitButton)
1834	1990	{
..	..	@@ -1879,12 +2035,20 @@
1879	2035	{
1880	2036	loadClipboard(true);
1881	2037	} else
	2038	+ if (source == undoItem)
	2039	+ {
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
1882	2046	if (source == duplicateItem)
1883	2047	{
1884		- Object3D keep = GrafreeD.clipboard;
	2048	+ Object3D keep = Grafreed.clipboard;
1885	2049	loadClipboard(false);
1886	2050	paste(false);
1887		- GrafreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1888	2052	} else
1889	2053	if (source == cloneItem)
1890	2054	{
..	..	@@ -1902,13 +2066,17 @@
1902	2066	{
1903	2067	paste(false);
1904	2068	} else
	2069	+ if (source == pasteIntoItem)
	2070	+ {
	2071	+ pasteInto(true, false);
	2072	+ } else
1905	2073	if (source == pasteLinkItem)
1906	2074	{
1907		- pasteInto(false);
	2075	+ pasteInto(false, false);
1908	2076	} else
1909	2077	if (source == pasteCloneItem)
1910	2078	{
1911		- pasteInto(true);
	2079	+ pasteInto(true, true);
1912	2080	} else
1913	2081	if (source == pasteExpandItem)
1914	2082	{
..	..	@@ -2100,9 +2268,9 @@
2100	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2269	// refreshContents();
2102	2270	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2272	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2106	2274
2107	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2276	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2278,11 @@
2110	2278	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2279	for (int i=0; i<group.selection.size(); i++)
2112	2280	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2281	+ boolean random = CameraPane.SWITCH;
	2282	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2283	group.selection.get(i).linkVerticesThis(content);
2116	2284	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2285	+ CameraPane.SWITCH = random;
2118	2286	}
2119	2287	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2288	refreshContents();
..	..	@@ -2124,20 +2292,20 @@
2124	2292	{
2125	2293	for (int i=0; i<group.selection.size(); i++)
2126	2294	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2295	+ boolean random = CameraPane.SWITCH;
	2296	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2297	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2298	+ CameraPane.SWITCH = random;
2131	2299	}
2132	2300
2133	2301	refreshContents();
2134	2302	} else
2135	2303	if (source == relinkverticesItem)
2136	2304	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2305	+ boolean random = CameraPane.SWITCH;
	2306	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2307	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2308	+ CameraPane.SWITCH = random;
2141	2309
2142	2310	refreshContents();
2143	2311	} else
..	..	@@ -2152,9 +2320,9 @@
2152	2320	} else
2153	2321	if (source == setMasterItem)
2154	2322	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2324	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2158	2326
2159	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2328	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2335,9 @@
2167	2335	{
2168	2336	if (group.selection.size() == 1)
2169	2337	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2171	2339	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2173	2341
2174	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2343	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2354,7 @@
2186	2354	{
2187	2355	RevertMeshes();
2188	2356	} else
2189		- if (source == resetMeshItem)
	2357	+ if (source == resetAllItem)
2190	2358	{
2191	2359	ResetAll();
2192	2360	} else
..	..	@@ -2524,9 +2692,13 @@
2524	2692	{
2525	2693	SmoothMesh();
2526	2694	} else
2527		- if (source == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2528	2696	{
2529	2697	TransformGeometry();
	2698	+ } else
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
2530	2702	} else
2531	2703	if (source == resetTransformItem)
2532	2704	{
..	..	@@ -2534,7 +2706,11 @@
2534	2706	} else
2535	2707	if (source == resetCentroidItem)
2536	2708	{
2537		- ResetCentroid();
	2709	+ ResetCentroid(true);
	2710	+ } else
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
2538	2714	} else
2539	2715	if (source == resetParentItem)
2540	2716	{
..	..	@@ -2890,9 +3066,9 @@
2890	3066	child.CloseUI();
2891	3067	listUI.remove(child);
2892	3068
2893		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2894	3070	}
2895		- objEditor.ctrlPanel.validate();
	3071	+ objEditor.ctrlPanel.FlushUI();
2896	3072	//objEditor.jTree.clearSelection();
2897	3073	//objEditor.ResetSliders();
2898	3074	refreshContents(true);
..	..	@@ -2976,7 +3152,10 @@
2976	3152	frontView.object = group;
2977	3153	sideView.object = group;
2978	3154	}
	3155	+
	3156	+// fix "+" issue
2979	3157	group.editWindow = this;
	3158	+
2980	3159	/*
2981	3160	currentLayout = radio.layout;
2982	3161	if (currentLayout == null)
..	..	@@ -2989,7 +3168,20 @@
2989	3168	//group.attributes = -1;
2990	3169	ResetModel();
2991	3170	refreshContents(true);
2992		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
2993	3185	else
2994	3186	{
2995	3187	//return super.action(event, arg);
..	..	@@ -3050,6 +3242,28 @@
3050	3242	refreshContents();
3051	3243	}
3052	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
3053	3267
3054	3268	void ResetTransform()
3055	3269	{
..	..	@@ -3162,7 +3376,7 @@
3162	3376	refreshContents();
3163	3377	}
3164	3378
3165		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3166	3380	{
3167	3381	Object3D obj;
3168	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3391,16 @@
3177	3391	LA.matIdentity(Object3D.mat);
3178	3392	obj.getBounds(minima, maxima, false);
3179	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3183	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3186	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3248,9 +3466,9 @@
3248	3466	obj = (Object3D)e.nextElement();
3249	3467
3250	3468	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3469	+ Grafreed.AnalyzeObject(obj);
3252	3470	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3471	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3472
3255	3473	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3474	}
..	..	@@ -3464,8 +3682,8 @@
3464	3682
3465	3683	void ParseVertices()
3466	3684	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	3685	+ boolean epsequal = Grafreed.epsequal;
	3686	+ Grafreed.epsequal = true;
3469	3687
3470	3688	for (int i=0; i<group.selection.size(); i++)
3471	3689	{
..	..	@@ -3490,7 +3708,7 @@
3490	3708	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	3709	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	3710
3493		- g.add(GrafreeD.clipboard);
	3711	+ g.add(Grafreed.clipboard);
3494	3712
3495	3713	buffer.add(g);
3496	3714	}
..	..	@@ -3505,7 +3723,7 @@
3505	3723	makeSomething(buffer, i==group.selection.size()-1);
3506	3724	}
3507	3725
3508		- GrafreeD.epsequal = epsequal;
	3726	+ Grafreed.epsequal = epsequal;
3509	3727
3510	3728	refreshContents();
3511	3729	}
..	..	@@ -3523,7 +3741,16 @@
3523	3741	String pigment = Object3D.GetPigment(tex);
3524	3742	//String bump = Object3D.GetBump(tex);
3525	3743
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3744	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3745	+
	3746	+ try
	3747	+ {
	3748	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3749	+ }
	3750	+ catch (Exception e)
	3751	+ {
	3752	+ System.err.println("FAIL: " + node);
	3753	+ }
3527	3754
3528	3755	double s = v.s;
3529	3756
..	..	@@ -3611,11 +3838,11 @@
3611	3838
3612	3839	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	3840
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	3841	+ boolean random = CameraPane.SWITCH;
	3842	+ CameraPane.SWITCH = false; // parse all random nodes
3616	3843	lowres.linkVerticesThis(null);
3617	3844	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	3845	+ CameraPane.SWITCH = random;
3619	3846
3620	3847	System.err.flush();
3621	3848
..	..	@@ -3655,7 +3882,7 @@
3655	3882	return;
3656	3883
3657	3884	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	3885	+ Object3D ref = Grafreed.clipboard.get(0);
3659	3886
3660	3887	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	3888
..	..	@@ -3849,9 +4076,9 @@
3849	4076
3850	4077	void ClipMesh()
3851	4078	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4079	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4080	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4081	+ Object3D content = Grafreed.clipboard.get(0);
3855	4082
3856	4083	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4084	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4087,7 @@
3860	4087	// {
3861	4088	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4089	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4090	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4091	}
3865	4092	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4093	System.out.println("DONE.");
..	..	@@ -3995,7 +4222,7 @@
3995	4222	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4223
3997	4224	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4225	+ if(elem != group \|\| !newWindow)
3999	4226	{
4000	4227	// if (!(elem instanceof Composite))
4001	4228	// newWindow = false;
..	..	@@ -4109,14 +4336,17 @@
4109	4336
4110	4337	objEditor.SetText(); // jan 2014
4111	4338
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4339	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	4340	CameraPane.flash = true;
4114	4341
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4342	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4343	// a camera
4117	4344	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4345	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4346	+ {
	4347	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4348	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4349	+ }
4120	4350	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4351	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4352	}
..	..	@@ -4200,16 +4430,18 @@
4200	4430	{
4201	4431	if (group.selection.isEmpty())
4202	4432	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4433	+
	4434	+ Grafreed.clipboardIsTempGroup = false;
4204	4435	Composite tGroup = null;
4205	4436	if (group.selection.size() > 0) // 1)
4206	4437	{
4207	4438	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4439	+ Grafreed.clipboardIsTempGroup = true;
4209	4440	}
4210	4441
4211	4442	if (cut)
4212	4443	{
	4444	+ Save();
4213	4445	//int indices[] = jList.getSelectedIndices();
4214	4446	//for (int i = indices.length - 1; i >= 0; i--)
4215	4447	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4477,16 @@
4245	4477	//System.out.println("cut " + child);
4246	4478	//System.out.println("parent = " + child.parent);
4247	4479	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4480	+ if (Grafreed.clipboardIsTempGroup)
4249	4481	tGroup.add/Child/(tmp);
4250	4482	else
4251		- GrafreeD.clipboard = tmp;
	4483	+ Grafreed.clipboard = tmp;
4252	4484	}
4253	4485	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4486	+ if (Grafreed.clipboardIsTempGroup)
4255	4487	tGroup.add/Child/(child);
4256	4488	else
4257		- GrafreeD.clipboard = child;
	4489	+ Grafreed.clipboard = child;
4258	4490	}
4259	4491
4260	4492	//ResetModel();
..	..	@@ -4286,21 +4518,23 @@
4286	4518	//System.out.println("cut " + elem);
4287	4519	//System.out.println("parent = " + elem.parent);
4288	4520	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4290	4522	tGroup.add/Child/(tmp);
4291	4523	else
4292		- GrafreeD.clipboard = tmp;
	4524	+ Grafreed.clipboard = tmp;
4293	4525	}
4294	4526	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	4527	+ if (Grafreed.clipboardIsTempGroup)
4296	4528	tGroup.add/Child/(child);
4297	4529	else
4298		- GrafreeD.clipboard = child;
	4530	+ Grafreed.clipboard = child;
4299	4531	}
4300	4532
4301	4533	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	4534	+
	4535	+ if (Grafreed.clipboardIsTempGroup)
	4536	+ Grafreed.clipboard = tGroup;
	4537	+
4304	4538	if (cut)
4305	4539	{
4306	4540	ResetModel();
..	..	@@ -4314,7 +4548,7 @@
4314	4548	// return;
4315	4549	boolean first = true;
4316	4550
4317		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4318	4552	{
4319	4553	Composite temp;
4320	4554
..	..	@@ -4325,7 +4559,7 @@
4325	4559	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	4560	*/
4327	4561	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4562	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	4563	{
4330	4564	Object3D child = (Object3D)e.nextElement();
4331	4565
..	..	@@ -4359,21 +4593,21 @@
4359	4593	//Object3D cb = Applet3D.clipboard;
4360	4594	//temp.addChild(cb);
4361	4595	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4596	+ assert(Grafreed.clipboard.parent == null);
	4597	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4598	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4599	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4600	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	4601	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	4602	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4603	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	4604	}
4371	4605
4372	4606	ResetModel();
4373	4607	refreshContents();
4374	4608	}
4375	4609
4376		- void pasteInto(boolean copyit)
	4610	+ void pasteInto(boolean copyit, boolean clone)
4377	4611	{
4378	4612	// if (GrafreeD.clipboard == null)
4379	4613	// return;
..	..	@@ -4402,15 +4636,22 @@
4402	4636	if (copyit)
4403	4637	{
4404	4638	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	4639	+ if (clone)
	4640	+ {
	4641	+ CloneClipboard(false); // sept 2014
	4642	+ }
	4643	+ else
	4644	+ {
	4645	+ paste(false);
	4646	+ }
4406	4647	}
4407	4648	else
4408	4649	{
4409	4650	boolean first = true;
4410	4651
4411		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4412	4653	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	4654	+ Composite temp = (Composite)Grafreed.clipboard;
4414	4655	Object3D copy;
4415	4656	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	4657	{
..	..	@@ -4420,7 +4661,7 @@
4420	4661	}
4421	4662	} else
4422	4663	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	4664	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	4665	}
4425	4666	}
4426	4667	}
..	..	@@ -4825,21 +5066,6 @@
4825	5066	}
4826	5067	*/
4827	5068
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5069	/*
4844	5070	public void Callback(Object obj)
4845	5071	{
..	..	@@ -4863,26 +5089,9 @@
4863	5089	}
4864	5090	*/
4865	5091
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5092	String GetFile(String dialogName)
4884	5093	{
4885		- if (GrafreeD.standAlone)
	5094	+ if (Grafreed.standAlone)
4886	5095	{
4887	5096	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5097	browser.show();
..	..	@@ -4946,10 +5155,15 @@
4946	5155	cButton flashSelectionButton;
4947	5156	cButton editButton;
4948	5157	cButton uneditButton;
	5158	+ JCheckBox allParamsButton;
4949	5159	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5160	cButton unselectButton;
4952	5161
	5162	+ cButton saveButton;
	5163	+ cButton undoButton;
	5164	+ cButton redoButton;
	5165	+ cButton oneStepButton;
	5166	+
4953	5167	cButton screenfitButton;
4954	5168	cButton screenfitpointButton;
4955	5169	cButton snapobjectButton;
..	..	@@ -4980,6 +5194,8 @@
4980	5194	private MenuItem lookFromItem;
4981	5195	private MenuItem switchItem;
4982	5196	private MenuItem cutItem;
	5197	+ private MenuItem undoItem;
	5198	+ private MenuItem redoItem;
4983	5199	private MenuItem duplicateItem;
4984	5200	private MenuItem cloneItem;
4985	5201	private MenuItem cloneSupportItem;
..	..	@@ -4993,7 +5209,7 @@
4993	5209	private MenuItem linkverticesItem;
4994	5210	private MenuItem relinkverticesItem;
4995	5211	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5212	+ private MenuItem resetAllItem;
4997	5213	private MenuItem stepAllItem;
4998	5214	private MenuItem revertMeshItem;
4999	5215	private MenuItem poseMeshItem;
..	..	@@ -5004,6 +5220,7 @@
5004	5220	private MenuItem mergeGeometriesItem;
5005	5221	private MenuItem copyItem;
5006	5222	private MenuItem pasteItem;
	5223	+ private MenuItem pasteIntoItem;
5007	5224	private MenuItem pasteLinkItem;
5008	5225	private MenuItem pasteCloneItem;
5009	5226	private MenuItem pasteExpandItem;
..	..	@@ -5053,8 +5270,10 @@
5053	5270	private MenuItem panoTexturesItem;
5054	5271
5055	5272	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5273	+ private MenuItem resetCentroidXZItem;
5057	5274	private MenuItem resetTransformItem;
	5275	+ private MenuItem transformGeometryItem;
	5276	+ private MenuItem transformChildrenItem;
5058	5277	private MenuItem hideItem;
5059	5278	private MenuItem grabItem;
5060	5279	private MenuItem backItem;
..	..	@@ -5101,7 +5320,7 @@
5101	5320	private MenuItem blobItem;
5102	5321	private MenuItem latheItem;
5103	5322	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5323	+ private MenuItem overlayItem;
5105	5324	private MenuItem meshItem;
5106	5325	// private MenuItem meshGroupItem;
5107	5326	private MenuItem springItem;
..	..	@@ -5123,11 +5342,6 @@
5123	5342	private MenuItem doubleItem;
5124	5343	private MenuItem tripleItem;
5125	5344
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5345	private MenuItem computeAOItem;
5132	5346	private MenuItem recompileItem;
5133	5347	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5351,8 @@
5137	5351	private MenuItem analyzeItem;
5138	5352	private MenuItem dumpItem;
5139	5353	//boolean freezemodel = false;
	5354	+
	5355	+ Menu cameraMenu;
	5356	+ MenuItem editCameraItem;
	5357	+ MenuItem revertCameraItem;
5140	5358	}