~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,17 @@
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	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
172	162	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	163	duplicateItem.addActionListener(this);
174	164	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -206,14 +196,97 @@
206	196	clearAllItem = menu.add(new MenuItem("Clear All"));
207	197	clearAllItem.addActionListener(this);
208	198	}
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
209	235
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(CameraPane.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
	274	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	275	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	276	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	277	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	278	+ oe.cameraMenu.add("-");
	279	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	280	+ openWindowItem.addActionListener(this);
	281	+ editLeafItem.addActionListener(this);
	282	+ lookAtItem.addActionListener(this);
	283	+ //lookFromItem.addActinoListener(this);
	284	+ //switchItem.addActionListener(this);
	285	+ }
	286	+
210	287	oe.menuBar.add(menu = new Menu("Setting"));
211	288	if (Globals.ADVANCED)
212	289	{
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	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	291	revertMeshItem.addActionListener(this);
219	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -318,8 +391,12 @@
318	391	resetTransformItem.addActionListener(this);
319	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	393	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
323	400
324	401	oe.menuBar.add(menu = new Menu("Geometry"));
325	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +445,10 @@
368	445	oe.menuBar.add(menu = new Menu("Attributes"));
369	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
371	452	menu.add("-");
372	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	454	liveleavesItem.addActionListener(this);
..	..	@@ -422,32 +503,23 @@
422	503	sortbysizeItem.addActionListener(this);
423	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	505	sortbynameItem.addActionListener(this);
	506	+ menu.add("-");
	507	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	508	+ shareGeometriesItem.addActionListener(this);
	509	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	510	+ mergeGeometriesItem.addActionListener(this);
425	511	if (Globals.ADVANCED)
426	512	{
427		- menu.add("-");
	513	+ // Pretty much the same as duplicate and clone.
428	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	515	extractGeometriesItem.addActionListener(this);
430	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	517	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	518	}
437	519
438	520	oe.menuBar.add(menu = new Menu("Insert"));
439	521	buildCreateMenu(menu);
440	522
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	523	oe.menuBar.add(menu = new Menu("Tools"));
452	524	buildToolsMenu(menu);
453	525	}
..	..	@@ -485,10 +557,10 @@
485	557	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	558
487	559	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	560	+ liveCB.setToolTipText("Enable animation");
489	561	liveCB.addItemListener(this);
490	562
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	564	oneStepButton.setToolTipText("Animate one step forward");
493	565	oneStepButton.addActionListener(this);
494	566
..	..	@@ -500,7 +572,7 @@
500	572	trackCB.setToolTipText("Enable tracking");
501	573	trackCB.addItemListener(this);
502	574
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	576	screenfitButton.setToolTipText("Screen fit");
505	577	screenfitButton.addActionListener(this);
506	578
..	..	@@ -509,39 +581,39 @@
509	581
510	582	if (Globals.ADVANCED)
511	583	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	585	snapobjectButton.addActionListener(this);
514	586	snapobjectButton.setToolTipText("Snap Object");
515	587	}
516	588
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518	590	flashSelectionButton.setToolTipText("Show selection");
519	591	flashSelectionButton.addActionListener(this);
520	592
521	593	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522	594
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	596	twoButton.setToolTipText("Show center view only");
525	597	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	599	fourButton.addActionListener(this);
528	600	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	602	sixButton.setToolTipText("2-column layout left");
531	603	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	605	threeButton.setToolTipText("2-column layout right");
534	606	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	608	sevenButton.setToolTipText("3-column layout");
537	609	sevenButton.addActionListener(this);
538	610	//
539	611
540		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	613	rootButton.setToolTipText("Edit selection in new tab");
542	614	rootButton.addActionListener(this);
543	615
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	617	closeButton.setToolTipText("Close tab");
546	618	closeButton.addActionListener(this);
547	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -549,11 +621,11 @@
549	621
550	622	cGridBag commandsPanel = new cGridBag();
551	623
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	625	editButton.setToolTipText("Edit selection");
554	626	editButton.addActionListener(this);
555	627
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	629	uneditButton.setToolTipText("Unedit selection");
558	630	uneditButton.addActionListener(this);
559	631
..	..	@@ -561,11 +633,11 @@
561	633	allParamsButton.setToolTipText("Edit all params");
562	634	allParamsButton.addActionListener(this);
563	635
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	637	clearPanelButton.setToolTipText("Clear edit panel");
566	638	clearPanelButton.addActionListener(this);
567	639
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	641	unselectButton.setToolTipText("Unselect");
570	642	unselectButton.addActionListener(this);
571	643
..	..	@@ -648,7 +720,7 @@
648	720	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	721	zoomBoxCB.addItemListener(this);
650	722
651		- if (Globals.ADVANCED)
	723	+ if (true) // Globals.ADVANCED)
652	724	{
653	725	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	726	supportCB.setToolTipText("Enable rigging");
..	..	@@ -721,6 +793,7 @@
721	793	buttonGroup.add(radioButton);
722	794	radioButton.doClick();
723	795	}
	796	+
724	797	void SetupViews(ObjEditor oe)
725	798	{
726	799	oe.SetupViews();
..	..	@@ -937,7 +1010,9 @@
937	1010	// objEditor.DropFile((java.io.File[]) object, true);
938	1011	// return;
939	1012	// }
940		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	1016	{
942	1017	// file(s)
943	1018	String[] names = string.split("\n");
..	..	@@ -964,7 +1039,7 @@
964	1039
965	1040	flashIt = false;
966	1041	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	1044
970	1045	if (group.selection.size() == 1)
..	..	@@ -1537,9 +1612,9 @@
1537	1612
1538	1613	void Overwrite(int mask)
1539	1614	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1616	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1543	1618
1544	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1620	content = ((cGroup)content).get(0);
..	..	@@ -1844,23 +1919,6 @@
1844	1919	csg.addChild(child);
1845	1920	child.addChild(csg);
1846	1921	} 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	1922	if (source == computeAOItem)
1865	1923	{
1866	1924	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1879,7 +1937,7 @@
1879	1937	if (source == invariantsItem)
1880	1938	{
1881	1939	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1883	1941	} else
1884	1942	if (source == memoryItem)
1885	1943	{
..	..	@@ -1952,12 +2010,20 @@
1952	2010	{
1953	2011	loadClipboard(true);
1954	2012	} else
	2013	+ if (source == undoItem)
	2014	+ {
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
1955	2021	if (source == duplicateItem)
1956	2022	{
1957		- Object3D keep = GrafreeD.clipboard;
	2023	+ Object3D keep = Grafreed.clipboard;
1958	2024	loadClipboard(false);
1959	2025	paste(false);
1960		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1961	2027	} else
1962	2028	if (source == cloneItem)
1963	2029	{
..	..	@@ -2177,9 +2243,9 @@
2177	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2244	// refreshContents();
2179	2245	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2247	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2183	2249
2184	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2251	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2295,9 @@
2229	2295	} else
2230	2296	if (source == setMasterItem)
2231	2297	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2299	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2235	2301
2236	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2303	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2310,9 @@
2244	2310	{
2245	2311	if (group.selection.size() == 1)
2246	2312	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2248	2314	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2250	2316
2251	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2318	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2329,7 @@
2263	2329	{
2264	2330	RevertMeshes();
2265	2331	} else
2266		- if (source == resetMeshItem)
	2332	+ if (source == resetAllItem)
2267	2333	{
2268	2334	ResetAll();
2269	2335	} else
..	..	@@ -2601,9 +2667,13 @@
2601	2667	{
2602	2668	SmoothMesh();
2603	2669	} else
2604		- if (source == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2605	2671	{
2606	2672	TransformGeometry();
	2673	+ } else
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
2607	2677	} else
2608	2678	if (source == resetTransformItem)
2609	2679	{
..	..	@@ -2611,7 +2681,11 @@
2611	2681	} else
2612	2682	if (source == resetCentroidItem)
2613	2683	{
2614		- ResetCentroid();
	2684	+ ResetCentroid(true);
	2685	+ } else
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
2615	2689	} else
2616	2690	if (source == resetParentItem)
2617	2691	{
..	..	@@ -2967,7 +3041,7 @@
2967	3041	child.CloseUI();
2968	3042	listUI.remove(child);
2969	3043
2970		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2971	3045	}
2972	3046	objEditor.ctrlPanel.FlushUI();
2973	3047	//objEditor.jTree.clearSelection();
..	..	@@ -3053,7 +3127,9 @@
3053	3127	frontView.object = group;
3054	3128	sideView.object = group;
3055	3129	}
3056		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
3057	3133	/*
3058	3134	currentLayout = radio.layout;
3059	3135	if (currentLayout == null)
..	..	@@ -3066,7 +3142,20 @@
3066	3142	//group.attributes = -1;
3067	3143	ResetModel();
3068	3144	refreshContents(true);
3069		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
3070	3159	else
3071	3160	{
3072	3161	//return super.action(event, arg);
..	..	@@ -3127,6 +3216,28 @@
3127	3216	refreshContents();
3128	3217	}
3129	3218
	3219	+ void TransformChildren()
	3220	+ {
	3221	+ Object3D obj;
	3222	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3223	+ {
	3224	+ obj = (Object3D)e.nextElement();
	3225	+ obj.KeepTextureMatrices();
	3226	+ obj.TransformChildren();
	3227	+ obj.RestoreTextureMatrices();
	3228	+
	3229	+// if (obj.parent == null)
	3230	+// {
	3231	+// System.out.println("NULL PARENT!");
	3232	+// new Exception().printStackTrace();
	3233	+// }
	3234	+// else
	3235	+// TouchTransform(obj);
	3236	+// //obj.parent.Touch();
	3237	+ }
	3238	+
	3239	+ refreshContents();
	3240	+ }
3130	3241
3131	3242	void ResetTransform()
3132	3243	{
..	..	@@ -3239,7 +3350,7 @@
3239	3350	refreshContents();
3240	3351	}
3241	3352
3242		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3243	3354	{
3244	3355	Object3D obj;
3245	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3365,16 @@
3254	3365	LA.matIdentity(Object3D.mat);
3255	3366	obj.getBounds(minima, maxima, false);
3256	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3260	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3263	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3325,9 +3440,9 @@
3325	3440	obj = (Object3D)e.nextElement();
3326	3441
3327	3442	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3329	3444	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3446
3332	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3448	}
..	..	@@ -3541,8 +3656,8 @@
3541	3656
3542	3657	void ParseVertices()
3543	3658	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3546	3661
3547	3662	for (int i=0; i<group.selection.size(); i++)
3548	3663	{
..	..	@@ -3567,7 +3682,7 @@
3567	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	3684
3570		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3571	3686
3572	3687	buffer.add(g);
3573	3688	}
..	..	@@ -3582,7 +3697,7 @@
3582	3697	makeSomething(buffer, i==group.selection.size()-1);
3583	3698	}
3584	3699
3585		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3586	3701
3587	3702	refreshContents();
3588	3703	}
..	..	@@ -3600,7 +3715,16 @@
3600	3715	String pigment = Object3D.GetPigment(tex);
3601	3716	//String bump = Object3D.GetBump(tex);
3602	3717
3603		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
3604	3728
3605	3729	double s = v.s;
3606	3730
..	..	@@ -3732,7 +3856,7 @@
3732	3856	return;
3733	3857
3734	3858	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3736	3860
3737	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	3862
..	..	@@ -3926,9 +4050,9 @@
3926	4050
3927	4051	void ClipMesh()
3928	4052	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	4054	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3932	4056
3933	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	4058	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +4061,7 @@
3937	4061	// {
3938	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4063	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4065	}
3942	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4067	System.out.println("DONE.");
..	..	@@ -4072,7 +4196,7 @@
4072	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4073	4197
4074	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
4075		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
4076	4200	{
4077	4201	// if (!(elem instanceof Composite))
4078	4202	// newWindow = false;
..	..	@@ -4186,14 +4310,17 @@
4186	4310
4187	4311	objEditor.SetText(); // jan 2014
4188	4312
4189		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4190	4314	CameraPane.flash = true;
4191	4315
4192		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4193	4317	// a camera
4194	4318	{
4195		- CameraPane.camerachangeframe = 0; // don't refuse it
4196		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
4197	4324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4198	4325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4199	4326	}
..	..	@@ -4277,12 +4404,12 @@
4277	4404	{
4278	4405	if (group.selection.isEmpty())
4279	4406	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4281	4408	Composite tGroup = null;
4282	4409	if (group.selection.size() > 0) // 1)
4283	4410	{
4284	4411	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4286	4413	}
4287	4414
4288	4415	if (cut)
..	..	@@ -4322,16 +4449,16 @@
4322	4449	//System.out.println("cut " + child);
4323	4450	//System.out.println("parent = " + child.parent);
4324	4451	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4326	4453	tGroup.add/Child/(tmp);
4327	4454	else
4328		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4329	4456	}
4330	4457	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4332	4459	tGroup.add/Child/(child);
4333	4460	else
4334		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4335	4462	}
4336	4463
4337	4464	//ResetModel();
..	..	@@ -4363,21 +4490,21 @@
4363	4490	//System.out.println("cut " + elem);
4364	4491	//System.out.println("parent = " + elem.parent);
4365	4492	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4367	4494	tGroup.add/Child/(tmp);
4368	4495	else
4369		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4370	4497	}
4371	4498	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4373	4500	tGroup.add/Child/(child);
4374	4501	else
4375		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4376	4503	}
4377	4504
4378	4505	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4381	4508	if (cut)
4382	4509	{
4383	4510	ResetModel();
..	..	@@ -4391,7 +4518,7 @@
4391	4518	// return;
4392	4519	boolean first = true;
4393	4520
4394		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4395	4522	{
4396	4523	Composite temp;
4397	4524
..	..	@@ -4402,7 +4529,7 @@
4402	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4530	*/
4404	4531	Object3D elem;
4405		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4532	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4406	4533	{
4407	4534	Object3D child = (Object3D)e.nextElement();
4408	4535
..	..	@@ -4436,14 +4563,14 @@
4436	4563	//Object3D cb = Applet3D.clipboard;
4437	4564	//temp.addChild(cb);
4438	4565	//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());
	4566	+ assert(Grafreed.clipboard.parent == null);
	4567	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4568	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4569	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4570	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4444	4571	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4574	}
4448	4575
4449	4576	ResetModel();
..	..	@@ -4492,9 +4619,9 @@
4492	4619	{
4493	4620	boolean first = true;
4494	4621
4495		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4496	4623	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4498	4625	Object3D copy;
4499	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	4627	{
..	..	@@ -4504,7 +4631,7 @@
4504	4631	}
4505	4632	} else
4506	4633	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	4635	}
4509	4636	}
4510	4637	}
..	..	@@ -4909,21 +5036,6 @@
4909	5036	}
4910	5037	*/
4911	5038
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	5039	/*
4928	5040	public void Callback(Object obj)
4929	5041	{
..	..	@@ -4947,26 +5059,9 @@
4947	5059	}
4948	5060	*/
4949	5061
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	5062	String GetFile(String dialogName)
4968	5063	{
4969		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4970	5065	{
4971	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5067	browser.show();
..	..	@@ -5066,6 +5161,8 @@
5066	5161	private MenuItem lookFromItem;
5067	5162	private MenuItem switchItem;
5068	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
5069	5166	private MenuItem duplicateItem;
5070	5167	private MenuItem cloneItem;
5071	5168	private MenuItem cloneSupportItem;
..	..	@@ -5079,7 +5176,7 @@
5079	5176	private MenuItem linkverticesItem;
5080	5177	private MenuItem relinkverticesItem;
5081	5178	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
5083	5180	private MenuItem stepAllItem;
5084	5181	private MenuItem revertMeshItem;
5085	5182	private MenuItem poseMeshItem;
..	..	@@ -5140,8 +5237,10 @@
5140	5237	private MenuItem panoTexturesItem;
5141	5238
5142	5239	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
5144	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
5145	5244	private MenuItem hideItem;
5146	5245	private MenuItem grabItem;
5147	5246	private MenuItem backItem;
..	..	@@ -5210,11 +5309,6 @@
5210	5309	private MenuItem doubleItem;
5211	5310	private MenuItem tripleItem;
5212	5311
5213		- private MenuItem importGFDItem;
5214		- private MenuItem importVRMLX3DItem;
5215		- private MenuItem import3DSItem;
5216		- private MenuItem importOBJItem;
5217		-
5218	5312	private MenuItem computeAOItem;
5219	5313	private MenuItem recompileItem;
5220	5314	private MenuItem editScriptItem;
..	..	@@ -5224,4 +5318,8 @@
5224	5318	private MenuItem analyzeItem;
5225	5319	private MenuItem dumpItem;
5226	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5227	5325	}