~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,29 +148,28 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
168	153	Menu menu;
169	154	oe.menuBar.add(menu = new Menu("Edit"));
170	155	//editItem = menu.add(new MenuItem("Edit"));
171	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("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	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("-");
174	173	cutItem = menu.add(new MenuItem("Cut"));
175	174	cutItem.addActionListener(this);
176	175	copyItem = menu.add(new MenuItem("Copy"));
..	..	@@ -178,10 +177,7 @@
178	177	pasteItem = menu.add(new MenuItem("Paste"));
179	178	pasteItem.addActionListener(this);
180	179	menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	180	+
185	181	menu.add("-");
186	182	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	183	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +197,97 @@
201	197	clearAllItem = menu.add(new MenuItem("Clear All"));
202	198	clearAllItem.addActionListener(this);
203	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());
204	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	+ {
	275	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	276	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	277	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	279	+ oe.cameraMenu.add("-");
	280	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	281	+ openWindowItem.addActionListener(this);
	282	+ editLeafItem.addActionListener(this);
	283	+ lookAtItem.addActionListener(this);
	284	+ //lookFromItem.addActinoListener(this);
	285	+ //switchItem.addActionListener(this);
	286	+ }
	287	+
205	288	oe.menuBar.add(menu = new Menu("Setting"));
206	289	if (Globals.ADVANCED)
207	290	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	292	revertMeshItem.addActionListener(this);
214	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -272,6 +351,7 @@
272	351
273	352	if (Globals.ADVANCED)
274	353	{
	354	+ menu.add("-");
275	355	physicsItem = menu.add(new MenuItem("Physics"));
276	356	physicsItem.addActionListener(this);
277	357	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..	..	@@ -297,6 +377,7 @@
297	377	shadowZItem.addActionListener(this);
298	378	if (Globals.ADVANCED)
299	379	{
	380	+ menu.add("-");
300	381	linkerItem = menu.add(new MenuItem("Linker"));
301	382	linkerItem.addActionListener(this);
302	383	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +386,18 @@
305	386	templateItem.addActionListener(this);
306	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	388	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	389	}
	390	+ menu.add("-");
310	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	392	resetTransformItem.addActionListener(this);
312	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	394	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	401
317	402	oe.menuBar.add(menu = new Menu("Geometry"));
318	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +446,10 @@
361	446	oe.menuBar.add(menu = new Menu("Attributes"));
362	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	453	menu.add("-");
365	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	455	liveleavesItem.addActionListener(this);
..	..	@@ -415,32 +504,23 @@
415	504	sortbysizeItem.addActionListener(this);
416	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	506	sortbynameItem.addActionListener(this);
	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);
418	512	if (Globals.ADVANCED)
419	513	{
420		- menu.add("-");
	514	+ // Pretty much the same as duplicate and clone.
421	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	516	extractGeometriesItem.addActionListener(this);
423	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	518	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	519	}
430	520
431	521	oe.menuBar.add(menu = new Menu("Insert"));
432	522	buildCreateMenu(menu);
433	523
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	524	oe.menuBar.add(menu = new Menu("Tools"));
445	525	buildToolsMenu(menu);
446	526	}
..	..	@@ -477,11 +557,23 @@
477	557	*/
478	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	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	+
480	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
482	574	liveCB.addItemListener(this);
483	575
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	577	oneStepButton.setToolTipText("Animate one step forward");
486	578	oneStepButton.addActionListener(this);
487	579
..	..	@@ -493,7 +585,7 @@
493	585	trackCB.setToolTipText("Enable tracking");
494	586	trackCB.addItemListener(this);
495	587
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	589	screenfitButton.setToolTipText("Screen fit");
498	590	screenfitButton.addActionListener(this);
499	591
..	..	@@ -502,39 +594,39 @@
502	594
503	595	if (Globals.ADVANCED)
504	596	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	598	snapobjectButton.addActionListener(this);
507	599	snapobjectButton.setToolTipText("Snap Object");
508	600	}
509	601
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
511	603	flashSelectionButton.setToolTipText("Show selection");
512	604	flashSelectionButton.addActionListener(this);
513	605
514	606	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515	607
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	609	twoButton.setToolTipText("Show center view only");
518	610	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	612	fourButton.addActionListener(this);
521	613	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	615	sixButton.setToolTipText("2-column layout left");
524	616	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	618	threeButton.setToolTipText("2-column layout right");
527	619	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	621	sevenButton.setToolTipText("3-column layout");
530	622	sevenButton.addActionListener(this);
531	623	//
532	624
533		- 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);
534	626	rootButton.setToolTipText("Edit selection in new tab");
535	627	rootButton.addActionListener(this);
536	628
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	630	closeButton.setToolTipText("Close tab");
539	631	closeButton.addActionListener(this);
540	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -542,11 +634,11 @@
542	634
543	635	cGridBag commandsPanel = new cGridBag();
544	636
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546	638	editButton.setToolTipText("Edit selection");
547	639	editButton.addActionListener(this);
548	640
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550	642	uneditButton.setToolTipText("Unedit selection");
551	643	uneditButton.addActionListener(this);
552	644
..	..	@@ -554,11 +646,11 @@
554	646	allParamsButton.setToolTipText("Edit all params");
555	647	allParamsButton.addActionListener(this);
556	648
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	650	clearPanelButton.setToolTipText("Clear edit panel");
559	651	clearPanelButton.addActionListener(this);
560	652
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	654	unselectButton.setToolTipText("Unselect");
563	655	unselectButton.addActionListener(this);
564	656
..	..	@@ -641,7 +733,7 @@
641	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642	734	zoomBoxCB.addItemListener(this);
643	735
644		- if (Globals.ADVANCED)
	736	+ if (true) // Globals.ADVANCED)
645	737	{
646	738	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	739	supportCB.setToolTipText("Enable rigging");
..	..	@@ -714,6 +806,7 @@
714	806	buttonGroup.add(radioButton);
715	807	radioButton.doClick();
716	808	}
	809	+
717	810	void SetupViews(ObjEditor oe)
718	811	{
719	812	oe.SetupViews();
..	..	@@ -930,7 +1023,9 @@
930	1023	// objEditor.DropFile((java.io.File[]) object, true);
931	1024	// return;
932	1025	// }
933		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1029	{
935	1030	// file(s)
936	1031	String[] names = string.split("\n");
..	..	@@ -957,7 +1052,7 @@
957	1052
958	1053	flashIt = false;
959	1054	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1057
963	1058	if (group.selection.size() == 1)
..	..	@@ -1164,13 +1259,13 @@
1164	1259	parseverticesItem.addActionListener(this);
1165	1260	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1261	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1263	alignItem.addActionListener(this);
1169	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1265	reduceMorphItem.addActionListener(this);
1171	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1267	reduce34MorphItem.addActionListener(this);
1173		-
	1268	+ menu.add("-");
1174	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1270	computeAOItem.addActionListener(this);
1176	1271
..	..	@@ -1530,9 +1625,9 @@
1530	1625
1531	1626	void Overwrite(int mask)
1532	1627	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1629	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1536	1631
1537	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1633	content = ((cGroup)content).get(0);
..	..	@@ -1837,23 +1932,6 @@
1837	1932	csg.addChild(child);
1838	1933	child.addChild(csg);
1839	1934	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	1935	if (source == computeAOItem)
1858	1936	{
1859	1937	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +1950,7 @@
1872	1950	if (source == invariantsItem)
1873	1951	{
1874	1952	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1876	1954	} else
1877	1955	if (source == memoryItem)
1878	1956	{
..	..	@@ -1890,6 +1968,18 @@
1890	1968	if (source == dumpItem)
1891	1969	{
1892	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();
1893	1983	} else
1894	1984	if (source == oneStepButton)
1895	1985	{
..	..	@@ -1945,12 +2035,20 @@
1945	2035	{
1946	2036	loadClipboard(true);
1947	2037	} else
	2038	+ if (source == undoItem)
	2039	+ {
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
1948	2046	if (source == duplicateItem)
1949	2047	{
1950		- Object3D keep = GrafreeD.clipboard;
	2048	+ Object3D keep = Grafreed.clipboard;
1951	2049	loadClipboard(false);
1952	2050	paste(false);
1953		- GrafreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1954	2052	} else
1955	2053	if (source == cloneItem)
1956	2054	{
..	..	@@ -2170,9 +2268,9 @@
2170	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2269	// refreshContents();
2172	2270	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2272	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2176	2274
2177	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2276	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2320,9 @@
2222	2320	} else
2223	2321	if (source == setMasterItem)
2224	2322	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2324	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2228	2326
2229	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2328	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2335,9 @@
2237	2335	{
2238	2336	if (group.selection.size() == 1)
2239	2337	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2241	2339	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2243	2341
2244	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2343	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2354,7 @@
2256	2354	{
2257	2355	RevertMeshes();
2258	2356	} else
2259		- if (source == resetMeshItem)
	2357	+ if (source == resetAllItem)
2260	2358	{
2261	2359	ResetAll();
2262	2360	} else
..	..	@@ -2444,7 +2542,7 @@
2444	2542	} else
2445	2543	if (source == genNormalsMESHItem)
2446	2544	{
2447		- GenNormals(true); // TODO
	2545	+ GenNormalsMESH();
2448	2546	} else
2449	2547	if (source == genNormalsORGANItem)
2450	2548	{
..	..	@@ -2594,9 +2692,13 @@
2594	2692	{
2595	2693	SmoothMesh();
2596	2694	} else
2597		- if (source == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2598	2696	{
2599	2697	TransformGeometry();
	2698	+ } else
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
2600	2702	} else
2601	2703	if (source == resetTransformItem)
2602	2704	{
..	..	@@ -2604,7 +2706,11 @@
2604	2706	} else
2605	2707	if (source == resetCentroidItem)
2606	2708	{
2607		- ResetCentroid();
	2709	+ ResetCentroid(true);
	2710	+ } else
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
2608	2714	} else
2609	2715	if (source == resetParentItem)
2610	2716	{
..	..	@@ -2960,7 +3066,7 @@
2960	3066	child.CloseUI();
2961	3067	listUI.remove(child);
2962	3068
2963		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2964	3070	}
2965	3071	objEditor.ctrlPanel.FlushUI();
2966	3072	//objEditor.jTree.clearSelection();
..	..	@@ -3046,7 +3152,10 @@
3046	3152	frontView.object = group;
3047	3153	sideView.object = group;
3048	3154	}
	3155	+
	3156	+// fix "+" issue
3049	3157	group.editWindow = this;
	3158	+
3050	3159	/*
3051	3160	currentLayout = radio.layout;
3052	3161	if (currentLayout == null)
..	..	@@ -3059,7 +3168,20 @@
3059	3168	//group.attributes = -1;
3060	3169	ResetModel();
3061	3170	refreshContents(true);
3062		- }
	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	+ }
3063	3185	else
3064	3186	{
3065	3187	//return super.action(event, arg);
..	..	@@ -3120,6 +3242,28 @@
3120	3242	refreshContents();
3121	3243	}
3122	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	+ }
3123	3267
3124	3268	void ResetTransform()
3125	3269	{
..	..	@@ -3232,7 +3376,7 @@
3232	3376	refreshContents();
3233	3377	}
3234	3378
3235		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3236	3380	{
3237	3381	Object3D obj;
3238	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3391,16 @@
3247	3391	LA.matIdentity(Object3D.mat);
3248	3392	obj.getBounds(minima, maxima, false);
3249	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3253	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3256	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3429,8 @@
3281	3429
3282	3430	int size = obj.MemorySize();
3283	3431
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3434	}
3286	3435	}
3287	3436	catch (Exception e)
..	..	@@ -3318,9 +3467,9 @@
3318	3467	obj = (Object3D)e.nextElement();
3319	3468
3320	3469	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3470	+ Grafreed.AnalyzeObject(obj);
3322	3471	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3472	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3473
3325	3474	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3475	}
..	..	@@ -3362,6 +3511,13 @@
3362	3511	void GenNormals(boolean crease)
3363	3512	{
3364	3513	group.GenNormalsS(crease);
	3514	+
	3515	+ refreshContents();
	3516	+ }
	3517	+
	3518	+ void GenNormalsMESH()
	3519	+ {
	3520	+ group.GenNormalsMeshS();
3365	3521
3366	3522	refreshContents();
3367	3523	}
..	..	@@ -3534,8 +3690,8 @@
3534	3690
3535	3691	void ParseVertices()
3536	3692	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	3693	+ boolean epsequal = Grafreed.epsequal;
	3694	+ Grafreed.epsequal = true;
3539	3695
3540	3696	for (int i=0; i<group.selection.size(); i++)
3541	3697	{
..	..	@@ -3560,7 +3716,7 @@
3560	3716	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	3717	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	3718
3563		- g.add(GrafreeD.clipboard);
	3719	+ g.add(Grafreed.clipboard);
3564	3720
3565	3721	buffer.add(g);
3566	3722	}
..	..	@@ -3575,7 +3731,7 @@
3575	3731	makeSomething(buffer, i==group.selection.size()-1);
3576	3732	}
3577	3733
3578		- GrafreeD.epsequal = epsequal;
	3734	+ Grafreed.epsequal = epsequal;
3579	3735
3580	3736	refreshContents();
3581	3737	}
..	..	@@ -3593,7 +3749,16 @@
3593	3749	String pigment = Object3D.GetPigment(tex);
3594	3750	//String bump = Object3D.GetBump(tex);
3595	3751
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3752	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3753	+
	3754	+ try
	3755	+ {
	3756	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3757	+ }
	3758	+ catch (Exception e)
	3759	+ {
	3760	+ System.err.println("FAIL: " + node);
	3761	+ }
3597	3762
3598	3763	double s = v.s;
3599	3764
..	..	@@ -3725,7 +3890,7 @@
3725	3890	return;
3726	3891
3727	3892	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	3893	+ Object3D ref = Grafreed.clipboard.get(0);
3729	3894
3730	3895	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	3896
..	..	@@ -3919,9 +4084,9 @@
3919	4084
3920	4085	void ClipMesh()
3921	4086	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4087	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4088	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4089	+ Object3D content = Grafreed.clipboard.get(0);
3925	4090
3926	4091	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4092	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4095,7 @@
3930	4095	// {
3931	4096	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4097	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4098	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4099	}
3935	4100	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4101	System.out.println("DONE.");
..	..	@@ -4065,7 +4230,7 @@
4065	4230	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4231
4067	4232	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4233	+ if(elem != group \|\| !newWindow)
4069	4234	{
4070	4235	// if (!(elem instanceof Composite))
4071	4236	// newWindow = false;
..	..	@@ -4179,14 +4344,17 @@
4179	4344
4180	4345	objEditor.SetText(); // jan 2014
4181	4346
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4347	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4348	CameraPane.flash = true;
4184	4349
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4350	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4351	// a camera
4187	4352	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4354	+ {
	4355	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4356	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4357	+ }
4190	4358	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4359	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4360	}
..	..	@@ -4270,16 +4438,18 @@
4270	4438	{
4271	4439	if (group.selection.isEmpty())
4272	4440	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4441	+
	4442	+ Grafreed.clipboardIsTempGroup = false;
4274	4443	Composite tGroup = null;
4275	4444	if (group.selection.size() > 0) // 1)
4276	4445	{
4277	4446	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4447	+ Grafreed.clipboardIsTempGroup = true;
4279	4448	}
4280	4449
4281	4450	if (cut)
4282	4451	{
	4452	+ Save();
4283	4453	//int indices[] = jList.getSelectedIndices();
4284	4454	//for (int i = indices.length - 1; i >= 0; i--)
4285	4455	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4485,16 @@
4315	4485	//System.out.println("cut " + child);
4316	4486	//System.out.println("parent = " + child.parent);
4317	4487	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4488	+ if (Grafreed.clipboardIsTempGroup)
4319	4489	tGroup.add/Child/(tmp);
4320	4490	else
4321		- GrafreeD.clipboard = tmp;
	4491	+ Grafreed.clipboard = tmp;
4322	4492	}
4323	4493	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4494	+ if (Grafreed.clipboardIsTempGroup)
4325	4495	tGroup.add/Child/(child);
4326	4496	else
4327		- GrafreeD.clipboard = child;
	4497	+ Grafreed.clipboard = child;
4328	4498	}
4329	4499
4330	4500	//ResetModel();
..	..	@@ -4356,21 +4526,23 @@
4356	4526	//System.out.println("cut " + elem);
4357	4527	//System.out.println("parent = " + elem.parent);
4358	4528	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4529	+ if (Grafreed.clipboardIsTempGroup)
4360	4530	tGroup.add/Child/(tmp);
4361	4531	else
4362		- GrafreeD.clipboard = tmp;
	4532	+ Grafreed.clipboard = tmp;
4363	4533	}
4364	4534	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4535	+ if (Grafreed.clipboardIsTempGroup)
4366	4536	tGroup.add/Child/(child);
4367	4537	else
4368		- GrafreeD.clipboard = child;
	4538	+ Grafreed.clipboard = child;
4369	4539	}
4370	4540
4371	4541	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4542	+
	4543	+ if (Grafreed.clipboardIsTempGroup)
	4544	+ Grafreed.clipboard = tGroup;
	4545	+
4374	4546	if (cut)
4375	4547	{
4376	4548	ResetModel();
..	..	@@ -4384,7 +4556,7 @@
4384	4556	// return;
4385	4557	boolean first = true;
4386	4558
4387		- if (GrafreeD.clipboardIsTempGroup)
	4559	+ if (Grafreed.clipboardIsTempGroup)
4388	4560	{
4389	4561	Composite temp;
4390	4562
..	..	@@ -4395,7 +4567,7 @@
4395	4567	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4568	*/
4397	4569	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4570	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4571	{
4400	4572	Object3D child = (Object3D)e.nextElement();
4401	4573
..	..	@@ -4429,14 +4601,14 @@
4429	4601	//Object3D cb = Applet3D.clipboard;
4430	4602	//temp.addChild(cb);
4431	4603	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4604	+ assert(Grafreed.clipboard.parent == null);
	4605	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4606	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4607	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4608	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4609	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4610	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4611	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4612	}
4441	4613
4442	4614	ResetModel();
..	..	@@ -4485,9 +4657,9 @@
4485	4657	{
4486	4658	boolean first = true;
4487	4659
4488		- if (GrafreeD.clipboardIsTempGroup)
	4660	+ if (Grafreed.clipboardIsTempGroup)
4489	4661	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	4662	+ Composite temp = (Composite)Grafreed.clipboard;
4491	4663	Object3D copy;
4492	4664	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	4665	{
..	..	@@ -4497,7 +4669,7 @@
4497	4669	}
4498	4670	} else
4499	4671	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	4672	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	4673	}
4502	4674	}
4503	4675	}
..	..	@@ -4902,21 +5074,6 @@
4902	5074	}
4903	5075	*/
4904	5076
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5077	/*
4921	5078	public void Callback(Object obj)
4922	5079	{
..	..	@@ -4940,26 +5097,9 @@
4940	5097	}
4941	5098	*/
4942	5099
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5100	String GetFile(String dialogName)
4961	5101	{
4962		- if (GrafreeD.standAlone)
	5102	+ if (Grafreed.standAlone)
4963	5103	{
4964	5104	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5105	browser.show();
..	..	@@ -5027,6 +5167,9 @@
5027	5167	cButton clearpanelButton;
5028	5168	cButton unselectButton;
5029	5169
	5170	+ cButton saveButton;
	5171	+ cButton undoButton;
	5172	+ cButton redoButton;
5030	5173	cButton oneStepButton;
5031	5174
5032	5175	cButton screenfitButton;
..	..	@@ -5059,6 +5202,8 @@
5059	5202	private MenuItem lookFromItem;
5060	5203	private MenuItem switchItem;
5061	5204	private MenuItem cutItem;
	5205	+ private MenuItem undoItem;
	5206	+ private MenuItem redoItem;
5062	5207	private MenuItem duplicateItem;
5063	5208	private MenuItem cloneItem;
5064	5209	private MenuItem cloneSupportItem;
..	..	@@ -5072,7 +5217,7 @@
5072	5217	private MenuItem linkverticesItem;
5073	5218	private MenuItem relinkverticesItem;
5074	5219	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5220	+ private MenuItem resetAllItem;
5076	5221	private MenuItem stepAllItem;
5077	5222	private MenuItem revertMeshItem;
5078	5223	private MenuItem poseMeshItem;
..	..	@@ -5133,8 +5278,10 @@
5133	5278	private MenuItem panoTexturesItem;
5134	5279
5135	5280	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5281	+ private MenuItem resetCentroidXZItem;
5137	5282	private MenuItem resetTransformItem;
	5283	+ private MenuItem transformGeometryItem;
	5284	+ private MenuItem transformChildrenItem;
5138	5285	private MenuItem hideItem;
5139	5286	private MenuItem grabItem;
5140	5287	private MenuItem backItem;
..	..	@@ -5203,11 +5350,6 @@
5203	5350	private MenuItem doubleItem;
5204	5351	private MenuItem tripleItem;
5205	5352
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5353	private MenuItem computeAOItem;
5212	5354	private MenuItem recompileItem;
5213	5355	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5359,8 @@
5217	5359	private MenuItem analyzeItem;
5218	5360	private MenuItem dumpItem;
5219	5361	//boolean freezemodel = false;
	5362	+
	5363	+ Menu cameraMenu;
	5364	+ MenuItem editCameraItem;
	5365	+ MenuItem revertCameraItem;
5220	5366	}