~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,32 +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		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
447		- importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
449		- import3DSItem.addActionListener(this);
450		-
451	524	oe.menuBar.add(menu = new Menu("Tools"));
452	525	buildToolsMenu(menu);
453	526	}
..	..	@@ -484,11 +557,23 @@
484	557	*/
485	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	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	+
487	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
489	574	liveCB.addItemListener(this);
490	575
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	577	oneStepButton.setToolTipText("Animate one step forward");
493	578	oneStepButton.addActionListener(this);
494	579
..	..	@@ -500,7 +585,7 @@
500	585	trackCB.setToolTipText("Enable tracking");
501	586	trackCB.addItemListener(this);
502	587
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	589	screenfitButton.setToolTipText("Screen fit");
505	590	screenfitButton.addActionListener(this);
506	591
..	..	@@ -509,39 +594,39 @@
509	594
510	595	if (Globals.ADVANCED)
511	596	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	598	snapobjectButton.addActionListener(this);
514	599	snapobjectButton.setToolTipText("Snap Object");
515	600	}
516	601
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518	603	flashSelectionButton.setToolTipText("Show selection");
519	604	flashSelectionButton.addActionListener(this);
520	605
521	606	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522	607
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	609	twoButton.setToolTipText("Show center view only");
525	610	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	612	fourButton.addActionListener(this);
528	613	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	615	sixButton.setToolTipText("2-column layout left");
531	616	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	618	threeButton.setToolTipText("2-column layout right");
534	619	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	621	sevenButton.setToolTipText("3-column layout");
537	622	sevenButton.addActionListener(this);
538	623	//
539	624
540		- 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);
541	626	rootButton.setToolTipText("Edit selection in new tab");
542	627	rootButton.addActionListener(this);
543	628
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	630	closeButton.setToolTipText("Close tab");
546	631	closeButton.addActionListener(this);
547	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -549,11 +634,11 @@
549	634
550	635	cGridBag commandsPanel = new cGridBag();
551	636
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	638	editButton.setToolTipText("Edit selection");
554	639	editButton.addActionListener(this);
555	640
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	642	uneditButton.setToolTipText("Unedit selection");
558	643	uneditButton.addActionListener(this);
559	644
..	..	@@ -561,11 +646,11 @@
561	646	allParamsButton.setToolTipText("Edit all params");
562	647	allParamsButton.addActionListener(this);
563	648
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	650	clearPanelButton.setToolTipText("Clear edit panel");
566	651	clearPanelButton.addActionListener(this);
567	652
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	654	unselectButton.setToolTipText("Unselect");
570	655	unselectButton.addActionListener(this);
571	656
..	..	@@ -648,7 +733,7 @@
648	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	734	zoomBoxCB.addItemListener(this);
650	735
651		- if (Globals.ADVANCED)
	736	+ if (true) // Globals.ADVANCED)
652	737	{
653	738	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	739	supportCB.setToolTipText("Enable rigging");
..	..	@@ -721,6 +806,7 @@
721	806	buttonGroup.add(radioButton);
722	807	radioButton.doClick();
723	808	}
	809	+
724	810	void SetupViews(ObjEditor oe)
725	811	{
726	812	oe.SetupViews();
..	..	@@ -785,6 +871,7 @@
785	871	} else if(e.getSource() == liveCB)
786	872	{
787	873	cameraView.ToggleLive();
	874	+ refreshContents(false);
788	875	}
789	876	else if(e.getSource() == supportCB)
790	877	{
..	..	@@ -937,7 +1024,9 @@
937	1024	// objEditor.DropFile((java.io.File[]) object, true);
938	1025	// return;
939	1026	// }
940		- if (string.charAt(0) == '/')
	1027	+
	1028	+ // File path for Mac and Windows
	1029	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1030	{
942	1031	// file(s)
943	1032	String[] names = string.split("\n");
..	..	@@ -964,7 +1053,7 @@
964	1053
965	1054	flashIt = false;
966	1055	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1056	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1057	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1058
970	1059	if (group.selection.size() == 1)
..	..	@@ -1190,7 +1279,7 @@
1190	1279	memoryItem.addActionListener(this);
1191	1280	menu.add(analyzeItem = new MenuItem("Analyze"));
1192	1281	analyzeItem.addActionListener(this);
1193		- menu.add(dumpItem = new MenuItem("Dump"));
	1282	+ menu.add(dumpItem = new MenuItem("Print"));
1194	1283	dumpItem.addActionListener(this);
1195	1284	// menu.add(pathItem = new MenuItem("From-to path"));
1196	1285	// pathItem.addActionListener(this);
..	..	@@ -1537,9 +1626,9 @@
1537	1626
1538	1627	void Overwrite(int mask)
1539	1628	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1629	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1630	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1631	+ Object3D content = Grafreed.clipboard.get(0);
1543	1632
1544	1633	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1634	content = ((cGroup)content).get(0);
..	..	@@ -1844,23 +1933,6 @@
1844	1933	csg.addChild(child);
1845	1934	child.addChild(csg);
1846	1935	} else
1847		-
1848		- if (source == importGFDItem)
1849		- {
1850		- ImportGFD();
1851		- } else
1852		- if (source == importVRMLX3DItem)
1853		- {
1854		- ImportVRMLX3D();
1855		- } else
1856		- if (source == import3DSItem)
1857		- {
1858		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1859		- } else
1860		- if (source == importOBJItem)
1861		- {
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1863		- } else
1864	1936	if (source == computeAOItem)
1865	1937	{
1866	1938	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1879,7 +1951,7 @@
1879	1951	if (source == invariantsItem)
1880	1952	{
1881	1953	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	1954	+ Grafreed.grafreeD.universe.invariants();
1883	1955	} else
1884	1956	if (source == memoryItem)
1885	1957	{
..	..	@@ -1897,6 +1969,18 @@
1897	1969	if (source == dumpItem)
1898	1970	{
1899	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();
1900	1984	} else
1901	1985	if (source == oneStepButton)
1902	1986	{
..	..	@@ -1952,12 +2036,20 @@
1952	2036	{
1953	2037	loadClipboard(true);
1954	2038	} else
	2039	+ if (source == undoItem)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoItem)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
1955	2047	if (source == duplicateItem)
1956	2048	{
1957		- Object3D keep = GrafreeD.clipboard;
	2049	+ Object3D keep = Grafreed.clipboard;
1958	2050	loadClipboard(false);
1959	2051	paste(false);
1960		- GrafreeD.clipboard = keep;
	2052	+ Grafreed.clipboard = keep;
1961	2053	} else
1962	2054	if (source == cloneItem)
1963	2055	{
..	..	@@ -2177,9 +2269,9 @@
2177	2269	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2270	// refreshContents();
2179	2271	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2272	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2273	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2274	+ Object3D content = Grafreed.clipboard.get(0);
2183	2275
2184	2276	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2277	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2321,9 @@
2229	2321	} else
2230	2322	if (source == setMasterItem)
2231	2323	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2324	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2325	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2326	+ Object3D content = Grafreed.clipboard.get(0);
2235	2327
2236	2328	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2329	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2336,9 @@
2244	2336	{
2245	2337	if (group.selection.size() == 1)
2246	2338	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2339	+ if (Grafreed.clipboard.size() == 1)
2248	2340	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2341	+ Object3D content = Grafreed.clipboard.get(0);
2250	2342
2251	2343	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2344	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2355,7 @@
2263	2355	{
2264	2356	RevertMeshes();
2265	2357	} else
2266		- if (source == resetMeshItem)
	2358	+ if (source == resetAllItem)
2267	2359	{
2268	2360	ResetAll();
2269	2361	} else
..	..	@@ -2451,7 +2543,7 @@
2451	2543	} else
2452	2544	if (source == genNormalsMESHItem)
2453	2545	{
2454		- GenNormals(true); // TODO
	2546	+ GenNormalsMESH();
2455	2547	} else
2456	2548	if (source == genNormalsORGANItem)
2457	2549	{
..	..	@@ -2601,9 +2693,13 @@
2601	2693	{
2602	2694	SmoothMesh();
2603	2695	} else
2604		- if (source == transformgeometryItem)
	2696	+ if (source == transformGeometryItem)
2605	2697	{
2606	2698	TransformGeometry();
	2699	+ } else
	2700	+ if (source == transformChildrenItem)
	2701	+ {
	2702	+ TransformChildren();
2607	2703	} else
2608	2704	if (source == resetTransformItem)
2609	2705	{
..	..	@@ -2611,7 +2707,11 @@
2611	2707	} else
2612	2708	if (source == resetCentroidItem)
2613	2709	{
2614		- ResetCentroid();
	2710	+ ResetCentroid(true);
	2711	+ } else
	2712	+ if (source == resetCentroidXZItem)
	2713	+ {
	2714	+ ResetCentroid(false);
2615	2715	} else
2616	2716	if (source == resetParentItem)
2617	2717	{
..	..	@@ -2967,7 +3067,7 @@
2967	3067	child.CloseUI();
2968	3068	listUI.remove(child);
2969	3069
2970		- child.editWindow = null; // ???????????
	3070	+ //child.editWindow = null; // ???????????
2971	3071	}
2972	3072	objEditor.ctrlPanel.FlushUI();
2973	3073	//objEditor.jTree.clearSelection();
..	..	@@ -3053,7 +3153,10 @@
3053	3153	frontView.object = group;
3054	3154	sideView.object = group;
3055	3155	}
	3156	+
	3157	+// fix "+" issue
3056	3158	group.editWindow = this;
	3159	+
3057	3160	/*
3058	3161	currentLayout = radio.layout;
3059	3162	if (currentLayout == null)
..	..	@@ -3066,7 +3169,20 @@
3066	3169	//group.attributes = -1;
3067	3170	ResetModel();
3068	3171	refreshContents(true);
3069		- }
	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	+ }
3070	3186	else
3071	3187	{
3072	3188	//return super.action(event, arg);
..	..	@@ -3127,6 +3243,28 @@
3127	3243	refreshContents();
3128	3244	}
3129	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	+ }
3130	3268
3131	3269	void ResetTransform()
3132	3270	{
..	..	@@ -3239,7 +3377,7 @@
3239	3377	refreshContents();
3240	3378	}
3241	3379
3242		- void ResetCentroid()
	3380	+ void ResetCentroid(boolean full)
3243	3381	{
3244	3382	Object3D obj;
3245	3383	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3392,16 @@
3254	3392	LA.matIdentity(Object3D.mat);
3255	3393	obj.getBounds(minima, maxima, false);
3256	3394	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3395	+ if (full)
	3396	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3397	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3398	obj.TransformMesh(Object3D.mat);
	3399	+
3260	3400	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3401	+ if (full)
	3402	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3403	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3404	+
3263	3405	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3406	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3407	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3288,7 +3430,8 @@
3288	3430
3289	3431	int size = obj.MemorySize();
3290	3432
3291		- 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)");
3292	3435	}
3293	3436	}
3294	3437	catch (Exception e)
..	..	@@ -3325,9 +3468,9 @@
3325	3468	obj = (Object3D)e.nextElement();
3326	3469
3327	3470	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3471	+ Grafreed.AnalyzeObject(obj);
3329	3472	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3473	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3474
3332	3475	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3476	}
..	..	@@ -3369,6 +3512,13 @@
3369	3512	void GenNormals(boolean crease)
3370	3513	{
3371	3514	group.GenNormalsS(crease);
	3515	+
	3516	+ refreshContents();
	3517	+ }
	3518	+
	3519	+ void GenNormalsMESH()
	3520	+ {
	3521	+ group.GenNormalsMeshS();
3372	3522
3373	3523	refreshContents();
3374	3524	}
..	..	@@ -3541,8 +3691,8 @@
3541	3691
3542	3692	void ParseVertices()
3543	3693	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3694	+ boolean epsequal = Grafreed.epsequal;
	3695	+ Grafreed.epsequal = true;
3546	3696
3547	3697	for (int i=0; i<group.selection.size(); i++)
3548	3698	{
..	..	@@ -3567,7 +3717,7 @@
3567	3717	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	3718	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	3719
3570		- g.add(GrafreeD.clipboard);
	3720	+ g.add(Grafreed.clipboard);
3571	3721
3572	3722	buffer.add(g);
3573	3723	}
..	..	@@ -3582,7 +3732,7 @@
3582	3732	makeSomething(buffer, i==group.selection.size()-1);
3583	3733	}
3584	3734
3585		- GrafreeD.epsequal = epsequal;
	3735	+ Grafreed.epsequal = epsequal;
3586	3736
3587	3737	refreshContents();
3588	3738	}
..	..	@@ -3600,7 +3750,16 @@
3600	3750	String pigment = Object3D.GetPigment(tex);
3601	3751	//String bump = Object3D.GetBump(tex);
3602	3752
3603		- 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	+ }
3604	3763
3605	3764	double s = v.s;
3606	3765
..	..	@@ -3732,7 +3891,7 @@
3732	3891	return;
3733	3892
3734	3893	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	3894	+ Object3D ref = Grafreed.clipboard.get(0);
3736	3895
3737	3896	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	3897
..	..	@@ -3926,9 +4085,9 @@
3926	4085
3927	4086	void ClipMesh()
3928	4087	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4088	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4089	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4090	+ Object3D content = Grafreed.clipboard.get(0);
3932	4091
3933	4092	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4093	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4096,7 @@
3937	4096	// {
3938	4097	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4098	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4099	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4100	}
3942	4101	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4102	System.out.println("DONE.");
..	..	@@ -4072,7 +4231,7 @@
4072	4231	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4232
4074	4233	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4234	+ if(elem != group \|\| !newWindow)
4076	4235	{
4077	4236	// if (!(elem instanceof Composite))
4078	4237	// newWindow = false;
..	..	@@ -4162,7 +4321,6 @@
4162	4321	//case 702: // Event.LIST_DESELECT
4163	4322	group.deselectAll();
4164	4323	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4165		- objEditor.ClearInfo(); // .GetMaterial());
4166	4324	if (tps != null)
4167	4325	{
4168	4326	for (int i=0; i < tps.length; i++)
..	..	@@ -4171,10 +4329,8 @@
4171	4329
4172	4330	//if (child.parent != null)
4173	4331	//child.parent.addSelectee(child);
	4332	+ objEditor.SetMaterial(child);
4174	4333	group.addSelectee(child);
4175		- objEditor.SetMaterial(child); // .GetMaterial());
4176		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4177		- System.err.println("info : " + child.GetPath());
4178	4334	}
4179	4335	}
4180	4336	// else
..	..	@@ -4184,16 +4340,17 @@
4184	4340	// System.err.println("info : " + group.GetPath());
4185	4341	// }
4186	4342
4187		- objEditor.SetText(); // jan 2014
4188		-
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4343	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4344	CameraPane.flash = true;
4191	4345
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4346	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4347	// a camera
4194	4348	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4349	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4350	+ {
	4351	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4352	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4353	+ }
4197	4354	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4355	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4356	}
..	..	@@ -4206,6 +4363,26 @@
4206	4363
4207	4364	freezemodel = false;
4208	4365	}
	4366	+
	4367	+ void refreshContents(boolean cp)
	4368	+ {
	4369	+ if (!Globals.MOUSEDRAGGED)
	4370	+ {
	4371	+ objEditor.ClearInfo(); // .GetMaterial());
	4372	+
	4373	+ for (int i=0; i < group.selection.Size(); i++)
	4374	+ {
	4375	+ Object3D child = (Object3D) group.selection.get(i);
	4376	+
	4377	+ objEditor.AddInfo(child, this, true);
	4378	+ System.err.println("info : " + child.GetPath());
	4379	+ }
	4380	+
	4381	+ objEditor.SetText(); // jan 2014
	4382	+ }
	4383	+
	4384	+ super.refreshContents(cp);
	4385	+ }
4209	4386
4210	4387	void linkSomething(Object3D thing)
4211	4388	{
..	..	@@ -4277,16 +4454,18 @@
4277	4454	{
4278	4455	if (group.selection.isEmpty())
4279	4456	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4457	+
	4458	+ Grafreed.clipboardIsTempGroup = false;
4281	4459	Composite tGroup = null;
4282	4460	if (group.selection.size() > 0) // 1)
4283	4461	{
4284	4462	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4463	+ Grafreed.clipboardIsTempGroup = true;
4286	4464	}
4287	4465
4288	4466	if (cut)
4289	4467	{
	4468	+ Save();
4290	4469	//int indices[] = jList.getSelectedIndices();
4291	4470	//for (int i = indices.length - 1; i >= 0; i--)
4292	4471	//jList.remove(indices[i]);
..	..	@@ -4322,16 +4501,16 @@
4322	4501	//System.out.println("cut " + child);
4323	4502	//System.out.println("parent = " + child.parent);
4324	4503	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4504	+ if (Grafreed.clipboardIsTempGroup)
4326	4505	tGroup.add/Child/(tmp);
4327	4506	else
4328		- GrafreeD.clipboard = tmp;
	4507	+ Grafreed.clipboard = tmp;
4329	4508	}
4330	4509	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4510	+ if (Grafreed.clipboardIsTempGroup)
4332	4511	tGroup.add/Child/(child);
4333	4512	else
4334		- GrafreeD.clipboard = child;
	4513	+ Grafreed.clipboard = child;
4335	4514	}
4336	4515
4337	4516	//ResetModel();
..	..	@@ -4363,21 +4542,23 @@
4363	4542	//System.out.println("cut " + elem);
4364	4543	//System.out.println("parent = " + elem.parent);
4365	4544	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4545	+ if (Grafreed.clipboardIsTempGroup)
4367	4546	tGroup.add/Child/(tmp);
4368	4547	else
4369		- GrafreeD.clipboard = tmp;
	4548	+ Grafreed.clipboard = tmp;
4370	4549	}
4371	4550	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
4373	4552	tGroup.add/Child/(child);
4374	4553	else
4375		- GrafreeD.clipboard = child;
	4554	+ Grafreed.clipboard = child;
4376	4555	}
4377	4556
4378	4557	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4558	+
	4559	+ if (Grafreed.clipboardIsTempGroup)
	4560	+ Grafreed.clipboard = tGroup;
	4561	+
4381	4562	if (cut)
4382	4563	{
4383	4564	ResetModel();
..	..	@@ -4391,7 +4572,7 @@
4391	4572	// return;
4392	4573	boolean first = true;
4393	4574
4394		- if (GrafreeD.clipboardIsTempGroup)
	4575	+ if (Grafreed.clipboardIsTempGroup)
4395	4576	{
4396	4577	Composite temp;
4397	4578
..	..	@@ -4402,7 +4583,7 @@
4402	4583	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4584	*/
4404	4585	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4586	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4587	{
4407	4588	Object3D child = (Object3D)e.nextElement();
4408	4589
..	..	@@ -4436,14 +4617,14 @@
4436	4617	//Object3D cb = Applet3D.clipboard;
4437	4618	//temp.addChild(cb);
4438	4619	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4620	+ assert(Grafreed.clipboard.parent == null);
	4621	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4622	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4623	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4624	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	4625	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4626	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4627	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4628	}
4448	4629
4449	4630	ResetModel();
..	..	@@ -4492,9 +4673,9 @@
4492	4673	{
4493	4674	boolean first = true;
4494	4675
4495		- if (GrafreeD.clipboardIsTempGroup)
	4676	+ if (Grafreed.clipboardIsTempGroup)
4496	4677	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	4678	+ Composite temp = (Composite)Grafreed.clipboard;
4498	4679	Object3D copy;
4499	4680	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	4681	{
..	..	@@ -4504,7 +4685,7 @@
4504	4685	}
4505	4686	} else
4506	4687	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	4688	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	4689	}
4509	4690	}
4510	4691	}
..	..	@@ -4909,21 +5090,6 @@
4909	5090	}
4910	5091	*/
4911	5092
4912		- void ImportGFD()
4913		- {
4914		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4915		- browser.show();
4916		- String filename = browser.getFile();
4917		- if (filename != null && filename.length() > 0)
4918		- {
4919		- String fullname = browser.getDirectory() + filename;
4920		-
4921		- //Object3D readobj =
4922		- objEditor.ReadGFD(fullname, objEditor);
4923		- //makeSomething(readobj);
4924		- }
4925		- }
4926		-
4927	5093	/*
4928	5094	public void Callback(Object obj)
4929	5095	{
..	..	@@ -4947,26 +5113,9 @@
4947	5113	}
4948	5114	*/
4949	5115
4950		- void ImportVRMLX3D()
4951		- {
4952		- if (GrafreeD.standAlone)
4953		- {
4954		- /**/
4955		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4956		- browser.show();
4957		- String filename = browser.getFile();
4958		- if (filename != null && filename.length() > 0)
4959		- {
4960		- String fullname = browser.getDirectory() + filename;
4961		- LoadVRMLX3D(fullname);
4962		- }
4963		- /**/
4964		- }
4965		- }
4966		-
4967	5116	String GetFile(String dialogName)
4968	5117	{
4969		- if (GrafreeD.standAlone)
	5118	+ if (Grafreed.standAlone)
4970	5119	{
4971	5120	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5121	browser.show();
..	..	@@ -5034,6 +5183,9 @@
5034	5183	cButton clearpanelButton;
5035	5184	cButton unselectButton;
5036	5185
	5186	+ cButton saveButton;
	5187	+ cButton undoButton;
	5188	+ cButton redoButton;
5037	5189	cButton oneStepButton;
5038	5190
5039	5191	cButton screenfitButton;
..	..	@@ -5066,6 +5218,8 @@
5066	5218	private MenuItem lookFromItem;
5067	5219	private MenuItem switchItem;
5068	5220	private MenuItem cutItem;
	5221	+ private MenuItem undoItem;
	5222	+ private MenuItem redoItem;
5069	5223	private MenuItem duplicateItem;
5070	5224	private MenuItem cloneItem;
5071	5225	private MenuItem cloneSupportItem;
..	..	@@ -5079,7 +5233,7 @@
5079	5233	private MenuItem linkverticesItem;
5080	5234	private MenuItem relinkverticesItem;
5081	5235	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5236	+ private MenuItem resetAllItem;
5083	5237	private MenuItem stepAllItem;
5084	5238	private MenuItem revertMeshItem;
5085	5239	private MenuItem poseMeshItem;
..	..	@@ -5140,8 +5294,10 @@
5140	5294	private MenuItem panoTexturesItem;
5141	5295
5142	5296	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5297	+ private MenuItem resetCentroidXZItem;
5144	5298	private MenuItem resetTransformItem;
	5299	+ private MenuItem transformGeometryItem;
	5300	+ private MenuItem transformChildrenItem;
5145	5301	private MenuItem hideItem;
5146	5302	private MenuItem grabItem;
5147	5303	private MenuItem backItem;
..	..	@@ -5210,11 +5366,6 @@
5210	5366	private MenuItem doubleItem;
5211	5367	private MenuItem tripleItem;
5212	5368
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5369	private MenuItem computeAOItem;
5219	5370	private MenuItem recompileItem;
5220	5371	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5375,8 @@
5224	5375	private MenuItem analyzeItem;
5225	5376	private MenuItem dumpItem;
5226	5377	//boolean freezemodel = false;
	5378	+
	5379	+ Menu cameraMenu;
	5380	+ MenuItem editCameraItem;
	5381	+ MenuItem revertCameraItem;
5227	5382	}