~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,27 +148,18 @@
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);
174	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -206,14 +197,97 @@
206	197	clearAllItem = menu.add(new MenuItem("Clear All"));
207	198	clearAllItem.addActionListener(this);
208	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());
209	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	+
210	288	oe.menuBar.add(menu = new Menu("Setting"));
211	289	if (Globals.ADVANCED)
212	290	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	292	revertMeshItem.addActionListener(this);
219	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -318,8 +392,12 @@
318	392	resetTransformItem.addActionListener(this);
319	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	394	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	401
324	402	oe.menuBar.add(menu = new Menu("Geometry"));
325	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +446,10 @@
368	446	oe.menuBar.add(menu = new Menu("Attributes"));
369	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	453	menu.add("-");
372	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	455	liveleavesItem.addActionListener(this);
..	..	@@ -422,35 +504,23 @@
422	504	sortbysizeItem.addActionListener(this);
423	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	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);
425	512	if (Globals.ADVANCED)
426	513	{
427		- menu.add("-");
	514	+ // Pretty much the same as duplicate and clone.
428	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	516	extractGeometriesItem.addActionListener(this);
430	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	518	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	519	}
437	520
438	521	oe.menuBar.add(menu = new Menu("Insert"));
439	522	buildCreateMenu(menu);
440	523
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	524	oe.menuBar.add(menu = new Menu("Tools"));
455	525	buildToolsMenu(menu);
456	526	}
..	..	@@ -487,11 +557,23 @@
487	557	*/
488	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	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	+
490	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
492	574	liveCB.addItemListener(this);
493	575
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	577	oneStepButton.setToolTipText("Animate one step forward");
496	578	oneStepButton.addActionListener(this);
497	579
..	..	@@ -503,7 +585,7 @@
503	585	trackCB.setToolTipText("Enable tracking");
504	586	trackCB.addItemListener(this);
505	587
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	589	screenfitButton.setToolTipText("Screen fit");
508	590	screenfitButton.addActionListener(this);
509	591
..	..	@@ -512,39 +594,39 @@
512	594
513	595	if (Globals.ADVANCED)
514	596	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	598	snapobjectButton.addActionListener(this);
517	599	snapobjectButton.setToolTipText("Snap Object");
518	600	}
519	601
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	603	flashSelectionButton.setToolTipText("Show selection");
522	604	flashSelectionButton.addActionListener(this);
523	605
524	606	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	607
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	609	twoButton.setToolTipText("Show center view only");
528	610	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	612	fourButton.addActionListener(this);
531	613	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	615	sixButton.setToolTipText("2-column layout left");
534	616	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	618	threeButton.setToolTipText("2-column layout right");
537	619	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	621	sevenButton.setToolTipText("3-column layout");
540	622	sevenButton.addActionListener(this);
541	623	//
542	624
543		- 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);
544	626	rootButton.setToolTipText("Edit selection in new tab");
545	627	rootButton.addActionListener(this);
546	628
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	630	closeButton.setToolTipText("Close tab");
549	631	closeButton.addActionListener(this);
550	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -552,11 +634,11 @@
552	634
553	635	cGridBag commandsPanel = new cGridBag();
554	636
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556	638	editButton.setToolTipText("Edit selection");
557	639	editButton.addActionListener(this);
558	640
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	642	uneditButton.setToolTipText("Unedit selection");
561	643	uneditButton.addActionListener(this);
562	644
..	..	@@ -564,11 +646,11 @@
564	646	allParamsButton.setToolTipText("Edit all params");
565	647	allParamsButton.addActionListener(this);
566	648
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	650	clearPanelButton.setToolTipText("Clear edit panel");
569	651	clearPanelButton.addActionListener(this);
570	652
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	654	unselectButton.setToolTipText("Unselect");
573	655	unselectButton.addActionListener(this);
574	656
..	..	@@ -651,7 +733,7 @@
651	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	734	zoomBoxCB.addItemListener(this);
653	735
654		- if (Globals.ADVANCED)
	736	+ if (true) // Globals.ADVANCED)
655	737	{
656	738	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	739	supportCB.setToolTipText("Enable rigging");
..	..	@@ -724,6 +806,7 @@
724	806	buttonGroup.add(radioButton);
725	807	radioButton.doClick();
726	808	}
	809	+
727	810	void SetupViews(ObjEditor oe)
728	811	{
729	812	oe.SetupViews();
..	..	@@ -788,6 +871,7 @@
788	871	} else if(e.getSource() == liveCB)
789	872	{
790	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
791	875	}
792	876	else if(e.getSource() == supportCB)
793	877	{
..	..	@@ -940,7 +1024,9 @@
940	1024	// objEditor.DropFile((java.io.File[]) object, true);
941	1025	// return;
942	1026	// }
943		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	1030	{
945	1031	// file(s)
946	1032	String[] names = string.split("\n");
..	..	@@ -967,7 +1053,7 @@
967	1053
968	1054	flashIt = false;
969	1055	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	1058
973	1059	if (group.selection.size() == 1)
..	..	@@ -1193,7 +1279,7 @@
1193	1279	memoryItem.addActionListener(this);
1194	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1195	1281	analyzeItem.addActionListener(this);
1196		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1197	1283	dumpItem.addActionListener(this);
1198	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1199	1285	// pathItem.addActionListener(this);
..	..	@@ -1540,9 +1626,9 @@
1540	1626
1541	1627	void Overwrite(int mask)
1542	1628	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1630	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1546	1632
1547	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1634	content = ((cGroup)content).get(0);
..	..	@@ -1847,31 +1933,6 @@
1847	1933	csg.addChild(child);
1848	1934	child.addChild(csg);
1849	1935	} else
1850		-
1851		- if (source == importGFDItem)
1852		- {
1853		- ImportGFD();
1854		- } else
1855		- if (source == importVRMLX3DItem)
1856		- {
1857		- ImportVRMLX3D();
1858		- } else
1859		- if (source == import3DSItem)
1860		- {
1861		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1862		- } else
1863		- if (source == importOBJItem)
1864		- {
1865		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1866		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1867		- browser.setVisible(true);
1868		- String filename = browser.getFile();
1869		- if (filename != null && filename.length() > 0)
1870		- {
1871		- String fullname = browser.getDirectory() + filename;
1872		- makeSomething(ReadOBJ(fullname), true);
1873		- }
1874		- } else
1875	1936	if (source == computeAOItem)
1876	1937	{
1877	1938	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1890,7 +1951,7 @@
1890	1951	if (source == invariantsItem)
1891	1952	{
1892	1953	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1894	1955	} else
1895	1956	if (source == memoryItem)
1896	1957	{
..	..	@@ -1908,6 +1969,18 @@
1908	1969	if (source == dumpItem)
1909	1970	{
1910	1971	DumpObject();
	1972	+ } else
	1973	+ if (source == undoButton)
	1974	+ {
	1975	+ Undo();
	1976	+ } else
	1977	+ if (source == redoButton)
	1978	+ {
	1979	+ Redo();
	1980	+ } else
	1981	+ if (source == saveButton)
	1982	+ {
	1983	+ Save();
1911	1984	} else
1912	1985	if (source == oneStepButton)
1913	1986	{
..	..	@@ -1963,12 +2036,20 @@
1963	2036	{
1964	2037	loadClipboard(true);
1965	2038	} else
	2039	+ if (source == undoItem)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
1966	2047	if (source == duplicateItem)
1967	2048	{
1968		- Object3D keep = GrafreeD.clipboard;
	2049	+ Object3D keep = Grafreed.clipboard;
1969	2050	loadClipboard(false);
1970	2051	paste(false);
1971		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1972	2053	} else
1973	2054	if (source == cloneItem)
1974	2055	{
..	..	@@ -2188,9 +2269,9 @@
2188	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2270	// refreshContents();
2190	2271	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2273	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2194	2275
2195	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2277	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2321,9 @@
2240	2321	} else
2241	2322	if (source == setMasterItem)
2242	2323	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2325	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2246	2327
2247	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2329	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2336,9 @@
2255	2336	{
2256	2337	if (group.selection.size() == 1)
2257	2338	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2259	2340	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2261	2342
2262	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2344	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2355,7 @@
2274	2355	{
2275	2356	RevertMeshes();
2276	2357	} else
2277		- if (source == resetMeshItem)
	2358	+ if (source == resetAllItem)
2278	2359	{
2279	2360	ResetAll();
2280	2361	} else
..	..	@@ -2462,7 +2543,7 @@
2462	2543	} else
2463	2544	if (source == genNormalsMESHItem)
2464	2545	{
2465		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2466	2547	} else
2467	2548	if (source == genNormalsORGANItem)
2468	2549	{
..	..	@@ -2612,9 +2693,13 @@
2612	2693	{
2613	2694	SmoothMesh();
2614	2695	} else
2615		- if (source == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2616	2697	{
2617	2698	TransformGeometry();
	2699	+ } else
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
2618	2703	} else
2619	2704	if (source == resetTransformItem)
2620	2705	{
..	..	@@ -2622,7 +2707,11 @@
2622	2707	} else
2623	2708	if (source == resetCentroidItem)
2624	2709	{
2625		- ResetCentroid();
	2710	+ ResetCentroid(true);
	2711	+ } else
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
2626	2715	} else
2627	2716	if (source == resetParentItem)
2628	2717	{
..	..	@@ -2978,7 +3067,7 @@
2978	3067	child.CloseUI();
2979	3068	listUI.remove(child);
2980	3069
2981		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2982	3071	}
2983	3072	objEditor.ctrlPanel.FlushUI();
2984	3073	//objEditor.jTree.clearSelection();
..	..	@@ -3064,7 +3153,10 @@
3064	3153	frontView.object = group;
3065	3154	sideView.object = group;
3066	3155	}
	3156	+
	3157	+// fix "+" issue
3067	3158	group.editWindow = this;
	3159	+
3068	3160	/*
3069	3161	currentLayout = radio.layout;
3070	3162	if (currentLayout == null)
..	..	@@ -3077,7 +3169,20 @@
3077	3169	//group.attributes = -1;
3078	3170	ResetModel();
3079	3171	refreshContents(true);
3080		- }
	3172	+ } else if (event.getSource() == editCameraItem)
	3173	+ {
	3174	+ cameraView.ProtectCamera();
	3175	+ cameraView.repaint();
	3176	+ return;
	3177	+ } else if (event.getSource() == revertCameraItem)
	3178	+ {
	3179	+ cameraView.RevertCamera();
	3180	+ cameraView.repaint();
	3181	+ return;
	3182	+ // } else if (event.getSource() == textureButton)
	3183	+ // {
	3184	+ // return; // true;
	3185	+ }
3081	3186	else
3082	3187	{
3083	3188	//return super.action(event, arg);
..	..	@@ -3138,6 +3243,28 @@
3138	3243	refreshContents();
3139	3244	}
3140	3245
	3246	+ void TransformChildren()
	3247	+ {
	3248	+ Object3D obj;
	3249	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3250	+ {
	3251	+ obj = (Object3D)e.nextElement();
	3252	+ obj.KeepTextureMatrices();
	3253	+ obj.TransformChildren();
	3254	+ obj.RestoreTextureMatrices();
	3255	+
	3256	+// if (obj.parent == null)
	3257	+// {
	3258	+// System.out.println("NULL PARENT!");
	3259	+// new Exception().printStackTrace();
	3260	+// }
	3261	+// else
	3262	+// TouchTransform(obj);
	3263	+// //obj.parent.Touch();
	3264	+ }
	3265	+
	3266	+ refreshContents();
	3267	+ }
3141	3268
3142	3269	void ResetTransform()
3143	3270	{
..	..	@@ -3250,7 +3377,7 @@
3250	3377	refreshContents();
3251	3378	}
3252	3379
3253		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3254	3381	{
3255	3382	Object3D obj;
3256	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3392,16 @@
3265	3392	LA.matIdentity(Object3D.mat);
3266	3393	obj.getBounds(minima, maxima, false);
3267	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3271	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3274	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3299,7 +3430,8 @@
3299	3430
3300	3431	int size = obj.MemorySize();
3301	3432
3302		- System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3434	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3303	3435	}
3304	3436	}
3305	3437	catch (Exception e)
..	..	@@ -3336,9 +3468,9 @@
3336	3468	obj = (Object3D)e.nextElement();
3337	3469
3338	3470	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3340	3472	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3474
3343	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3476	}
..	..	@@ -3380,6 +3512,13 @@
3380	3512	void GenNormals(boolean crease)
3381	3513	{
3382	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3383	3522
3384	3523	refreshContents();
3385	3524	}
..	..	@@ -3552,8 +3691,8 @@
3552	3691
3553	3692	void ParseVertices()
3554	3693	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3557	3696
3558	3697	for (int i=0; i<group.selection.size(); i++)
3559	3698	{
..	..	@@ -3578,7 +3717,7 @@
3578	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	3719
3581		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3582	3721
3583	3722	buffer.add(g);
3584	3723	}
..	..	@@ -3593,7 +3732,7 @@
3593	3732	makeSomething(buffer, i==group.selection.size()-1);
3594	3733	}
3595	3734
3596		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3597	3736
3598	3737	refreshContents();
3599	3738	}
..	..	@@ -3611,7 +3750,16 @@
3611	3750	String pigment = Object3D.GetPigment(tex);
3612	3751	//String bump = Object3D.GetBump(tex);
3613	3752
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3753	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3754	+
	3755	+ try
	3756	+ {
	3757	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3758	+ }
	3759	+ catch (Exception e)
	3760	+ {
	3761	+ System.err.println("FAIL: " + node);
	3762	+ }
3615	3763
3616	3764	double s = v.s;
3617	3765
..	..	@@ -3743,7 +3891,7 @@
3743	3891	return;
3744	3892
3745	3893	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3747	3895
3748	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	3897
..	..	@@ -3937,9 +4085,9 @@
3937	4085
3938	4086	void ClipMesh()
3939	4087	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	4089	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3943	4091
3944	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	4093	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +4096,7 @@
3948	4096	// {
3949	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4098	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4100	}
3953	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4102	System.out.println("DONE.");
..	..	@@ -4083,7 +4231,7 @@
4083	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4084	4232
4085	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
4086		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
4087	4235	{
4088	4236	// if (!(elem instanceof Composite))
4089	4237	// newWindow = false;
..	..	@@ -4173,7 +4321,6 @@
4173	4321	//case 702: // Event.LIST_DESELECT
4174	4322	group.deselectAll();
4175	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4176		- objEditor.ClearInfo(); // .GetMaterial());
4177	4324	if (tps != null)
4178	4325	{
4179	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4183,9 +4330,6 @@
4183	4330	//if (child.parent != null)
4184	4331	//child.parent.addSelectee(child);
4185	4332	group.addSelectee(child);
4186		- objEditor.SetMaterial(child); // .GetMaterial());
4187		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4188		- System.err.println("info : " + child.GetPath());
4189	4333	}
4190	4334	}
4191	4335	// else
..	..	@@ -4195,16 +4339,17 @@
4195	4339	// System.err.println("info : " + group.GetPath());
4196	4340	// }
4197	4341
4198		- objEditor.SetText(); // jan 2014
4199		-
4200		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4342	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4201	4343	CameraPane.flash = true;
4202	4344
4203		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4345	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4204	4346	// a camera
4205	4347	{
4206		- CameraPane.camerachangeframe = 0; // don't refuse it
4207		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4348	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4349	+ {
	4350	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4351	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4352	+ }
4208	4353	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4209	4354	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4210	4355	}
..	..	@@ -4217,6 +4362,29 @@
4217	4362
4218	4363	freezemodel = false;
4219	4364	}
	4365	+
	4366	+ void refreshContents(boolean cp)
	4367	+ {
	4368	+ if (!Globals.MOUSEDRAGGED)
	4369	+ {
	4370	+ objEditor.ClearInfo(); // .GetMaterial());
	4371	+
	4372	+ for (int i=0; i < group.selection.size(); i++)
	4373	+ {
	4374	+ Object3D child = (Object3D) group.selection.reserve(i);
	4375	+
	4376	+ objEditor.SetMaterial(child);
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+
	4380	+ group.selection.release(i);
	4381	+ }
	4382	+
	4383	+ objEditor.SetText(); // jan 2014
	4384	+ }
	4385	+
	4386	+ super.refreshContents(cp);
	4387	+ }
4220	4388
4221	4389	void linkSomething(Object3D thing)
4222	4390	{
..	..	@@ -4288,16 +4456,18 @@
4288	4456	{
4289	4457	if (group.selection.isEmpty())
4290	4458	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4459	+
	4460	+ Grafreed.clipboardIsTempGroup = false;
4292	4461	Composite tGroup = null;
4293	4462	if (group.selection.size() > 0) // 1)
4294	4463	{
4295	4464	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4465	+ Grafreed.clipboardIsTempGroup = true;
4297	4466	}
4298	4467
4299	4468	if (cut)
4300	4469	{
	4470	+ Save();
4301	4471	//int indices[] = jList.getSelectedIndices();
4302	4472	//for (int i = indices.length - 1; i >= 0; i--)
4303	4473	//jList.remove(indices[i]);
..	..	@@ -4333,16 +4503,16 @@
4333	4503	//System.out.println("cut " + child);
4334	4504	//System.out.println("parent = " + child.parent);
4335	4505	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4506	+ if (Grafreed.clipboardIsTempGroup)
4337	4507	tGroup.add/Child/(tmp);
4338	4508	else
4339		- GrafreeD.clipboard = tmp;
	4509	+ Grafreed.clipboard = tmp;
4340	4510	}
4341	4511	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4512	+ if (Grafreed.clipboardIsTempGroup)
4343	4513	tGroup.add/Child/(child);
4344	4514	else
4345		- GrafreeD.clipboard = child;
	4515	+ Grafreed.clipboard = child;
4346	4516	}
4347	4517
4348	4518	//ResetModel();
..	..	@@ -4374,21 +4544,23 @@
4374	4544	//System.out.println("cut " + elem);
4375	4545	//System.out.println("parent = " + elem.parent);
4376	4546	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4547	+ if (Grafreed.clipboardIsTempGroup)
4378	4548	tGroup.add/Child/(tmp);
4379	4549	else
4380		- GrafreeD.clipboard = tmp;
	4550	+ Grafreed.clipboard = tmp;
4381	4551	}
4382	4552	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4553	+ if (Grafreed.clipboardIsTempGroup)
4384	4554	tGroup.add/Child/(child);
4385	4555	else
4386		- GrafreeD.clipboard = child;
	4556	+ Grafreed.clipboard = child;
4387	4557	}
4388	4558
4389	4559	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4560	+
	4561	+ if (Grafreed.clipboardIsTempGroup)
	4562	+ Grafreed.clipboard = tGroup;
	4563	+
4392	4564	if (cut)
4393	4565	{
4394	4566	ResetModel();
..	..	@@ -4402,7 +4574,7 @@
4402	4574	// return;
4403	4575	boolean first = true;
4404	4576
4405		- if (GrafreeD.clipboardIsTempGroup)
	4577	+ if (Grafreed.clipboardIsTempGroup)
4406	4578	{
4407	4579	Composite temp;
4408	4580
..	..	@@ -4413,7 +4585,7 @@
4413	4585	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4586	*/
4415	4587	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4588	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	4589	{
4418	4590	Object3D child = (Object3D)e.nextElement();
4419	4591
..	..	@@ -4447,14 +4619,14 @@
4447	4619	//Object3D cb = Applet3D.clipboard;
4448	4620	//temp.addChild(cb);
4449	4621	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4622	+ assert(Grafreed.clipboard.parent == null);
	4623	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4624	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4625	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4626	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	4627	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4628	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4629	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4630	}
4459	4631
4460	4632	ResetModel();
..	..	@@ -4503,9 +4675,9 @@
4503	4675	{
4504	4676	boolean first = true;
4505	4677
4506		- if (GrafreeD.clipboardIsTempGroup)
	4678	+ if (Grafreed.clipboardIsTempGroup)
4507	4679	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	4680	+ Composite temp = (Composite)Grafreed.clipboard;
4509	4681	Object3D copy;
4510	4682	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	4683	{
..	..	@@ -4515,7 +4687,7 @@
4515	4687	}
4516	4688	} else
4517	4689	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	4690	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	4691	}
4520	4692	}
4521	4693	}
..	..	@@ -4920,21 +5092,6 @@
4920	5092	}
4921	5093	*/
4922	5094
4923		- void ImportGFD()
4924		- {
4925		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4926		- browser.show();
4927		- String filename = browser.getFile();
4928		- if (filename != null && filename.length() > 0)
4929		- {
4930		- String fullname = browser.getDirectory() + filename;
4931		-
4932		- //Object3D readobj =
4933		- objEditor.ReadGFD(fullname, objEditor);
4934		- //makeSomething(readobj);
4935		- }
4936		- }
4937		-
4938	5095	/*
4939	5096	public void Callback(Object obj)
4940	5097	{
..	..	@@ -4958,26 +5115,9 @@
4958	5115	}
4959	5116	*/
4960	5117
4961		- void ImportVRMLX3D()
4962		- {
4963		- if (GrafreeD.standAlone)
4964		- {
4965		- /**/
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		- LoadVRMLX3D(fullname);
4973		- }
4974		- /**/
4975		- }
4976		- }
4977		-
4978	5118	String GetFile(String dialogName)
4979	5119	{
4980		- if (GrafreeD.standAlone)
	5120	+ if (Grafreed.standAlone)
4981	5121	{
4982	5122	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5123	browser.show();
..	..	@@ -5045,6 +5185,9 @@
5045	5185	cButton clearpanelButton;
5046	5186	cButton unselectButton;
5047	5187
	5188	+ cButton saveButton;
	5189	+ cButton undoButton;
	5190	+ cButton redoButton;
5048	5191	cButton oneStepButton;
5049	5192
5050	5193	cButton screenfitButton;
..	..	@@ -5077,6 +5220,8 @@
5077	5220	private MenuItem lookFromItem;
5078	5221	private MenuItem switchItem;
5079	5222	private MenuItem cutItem;
	5223	+ private MenuItem undoItem;
	5224	+ private MenuItem redoItem;
5080	5225	private MenuItem duplicateItem;
5081	5226	private MenuItem cloneItem;
5082	5227	private MenuItem cloneSupportItem;
..	..	@@ -5090,7 +5235,7 @@
5090	5235	private MenuItem linkverticesItem;
5091	5236	private MenuItem relinkverticesItem;
5092	5237	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5238	+ private MenuItem resetAllItem;
5094	5239	private MenuItem stepAllItem;
5095	5240	private MenuItem revertMeshItem;
5096	5241	private MenuItem poseMeshItem;
..	..	@@ -5151,8 +5296,10 @@
5151	5296	private MenuItem panoTexturesItem;
5152	5297
5153	5298	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5299	+ private MenuItem resetCentroidXZItem;
5155	5300	private MenuItem resetTransformItem;
	5301	+ private MenuItem transformGeometryItem;
	5302	+ private MenuItem transformChildrenItem;
5156	5303	private MenuItem hideItem;
5157	5304	private MenuItem grabItem;
5158	5305	private MenuItem backItem;
..	..	@@ -5221,11 +5368,6 @@
5221	5368	private MenuItem doubleItem;
5222	5369	private MenuItem tripleItem;
5223	5370
5224		- private MenuItem importGFDItem;
5225		- private MenuItem importVRMLX3DItem;
5226		- private MenuItem import3DSItem;
5227		- private MenuItem importOBJItem;
5228		-
5229	5371	private MenuItem computeAOItem;
5230	5372	private MenuItem recompileItem;
5231	5373	private MenuItem editScriptItem;
..	..	@@ -5235,4 +5377,8 @@
5235	5377	private MenuItem analyzeItem;
5236	5378	private MenuItem dumpItem;
5237	5379	//boolean freezemodel = false;
	5380	+
	5381	+ Menu cameraMenu;
	5382	+ MenuItem editCameraItem;
	5383	+ MenuItem revertCameraItem;
5238	5384	}