~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,29 +148,27 @@
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);
	164	+ cloneItem = menu.add(new MenuItem("Clone"));
	165	+ cloneItem.addActionListener(this);
	166	+ if (Globals.ADVANCED)
	167	+ {
	168	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	169	+ cloneSupportItem.addActionListener(this);
	170	+ }
	171	+ menu.add("-");
174	172	cutItem = menu.add(new MenuItem("Cut"));
175	173	cutItem.addActionListener(this);
176	174	copyItem = menu.add(new MenuItem("Copy"));
..	..	@@ -178,10 +176,7 @@
178	176	pasteItem = menu.add(new MenuItem("Paste"));
179	177	pasteItem.addActionListener(this);
180	178	menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	179	+
185	180	menu.add("-");
186	181	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	182	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +196,97 @@
201	196	clearAllItem = menu.add(new MenuItem("Clear All"));
202	197	clearAllItem.addActionListener(this);
203	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());
204	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	+
205	287	oe.menuBar.add(menu = new Menu("Setting"));
206	288	if (Globals.ADVANCED)
207	289	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	291	revertMeshItem.addActionListener(this);
214	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -272,6 +350,7 @@
272	350
273	351	if (Globals.ADVANCED)
274	352	{
	353	+ menu.add("-");
275	354	physicsItem = menu.add(new MenuItem("Physics"));
276	355	physicsItem.addActionListener(this);
277	356	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..	..	@@ -297,6 +376,7 @@
297	376	shadowZItem.addActionListener(this);
298	377	if (Globals.ADVANCED)
299	378	{
	379	+ menu.add("-");
300	380	linkerItem = menu.add(new MenuItem("Linker"));
301	381	linkerItem.addActionListener(this);
302	382	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +385,18 @@
305	385	templateItem.addActionListener(this);
306	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	387	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	388	}
	389	+ menu.add("-");
310	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	391	resetTransformItem.addActionListener(this);
312	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	393	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- 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);
316	400
317	401	oe.menuBar.add(menu = new Menu("Geometry"));
318	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +445,10 @@
361	445	oe.menuBar.add(menu = new Menu("Attributes"));
362	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	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);
364	452	menu.add("-");
365	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	454	liveleavesItem.addActionListener(this);
..	..	@@ -415,32 +503,23 @@
415	503	sortbysizeItem.addActionListener(this);
416	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	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);
418	511	if (Globals.ADVANCED)
419	512	{
420		- menu.add("-");
	513	+ // Pretty much the same as duplicate and clone.
421	514	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	515	extractGeometriesItem.addActionListener(this);
423	516	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	517	cloneGeometriesItem.addActionListener(this);
425		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
426		- shareGeometriesItem.addActionListener(this);
427		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
428		- mergeGeometriesItem.addActionListener(this);
429	518	}
430	519
431	520	oe.menuBar.add(menu = new Menu("Insert"));
432	521	buildCreateMenu(menu);
433	522
434		- oe.menuBar.add(menu = new Menu("Include"));
435		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
436		- importGFDItem.addActionListener(this);
437		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
438		- importVRMLX3DItem.addActionListener(this);
439		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
440		- importOBJItem.addActionListener(this);
441		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
442		- import3DSItem.addActionListener(this);
443		-
444	523	oe.menuBar.add(menu = new Menu("Tools"));
445	524	buildToolsMenu(menu);
446	525	}
..	..	@@ -478,10 +557,10 @@
478	557	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	558
480	559	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	560	+ liveCB.setToolTipText("Enable animation");
482	561	liveCB.addItemListener(this);
483	562
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	564	oneStepButton.setToolTipText("Animate one step forward");
486	565	oneStepButton.addActionListener(this);
487	566
..	..	@@ -493,7 +572,7 @@
493	572	trackCB.setToolTipText("Enable tracking");
494	573	trackCB.addItemListener(this);
495	574
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	576	screenfitButton.setToolTipText("Screen fit");
498	577	screenfitButton.addActionListener(this);
499	578
..	..	@@ -502,39 +581,39 @@
502	581
503	582	if (Globals.ADVANCED)
504	583	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	585	snapobjectButton.addActionListener(this);
507	586	snapobjectButton.setToolTipText("Snap Object");
508	587	}
509	588
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
511	590	flashSelectionButton.setToolTipText("Show selection");
512	591	flashSelectionButton.addActionListener(this);
513	592
514	593	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515	594
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	596	twoButton.setToolTipText("Show center view only");
518	597	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	599	fourButton.addActionListener(this);
521	600	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	602	sixButton.setToolTipText("2-column layout left");
524	603	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	605	threeButton.setToolTipText("2-column layout right");
527	606	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	608	sevenButton.setToolTipText("3-column layout");
530	609	sevenButton.addActionListener(this);
531	610	//
532	611
533		- 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);
534	613	rootButton.setToolTipText("Edit selection in new tab");
535	614	rootButton.addActionListener(this);
536	615
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	617	closeButton.setToolTipText("Close tab");
539	618	closeButton.addActionListener(this);
540	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -542,11 +621,11 @@
542	621
543	622	cGridBag commandsPanel = new cGridBag();
544	623
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546	625	editButton.setToolTipText("Edit selection");
547	626	editButton.addActionListener(this);
548	627
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550	629	uneditButton.setToolTipText("Unedit selection");
551	630	uneditButton.addActionListener(this);
552	631
..	..	@@ -554,11 +633,11 @@
554	633	allParamsButton.setToolTipText("Edit all params");
555	634	allParamsButton.addActionListener(this);
556	635
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	637	clearPanelButton.setToolTipText("Clear edit panel");
559	638	clearPanelButton.addActionListener(this);
560	639
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	641	unselectButton.setToolTipText("Unselect");
563	642	unselectButton.addActionListener(this);
564	643
..	..	@@ -641,7 +720,7 @@
641	720	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642	721	zoomBoxCB.addItemListener(this);
643	722
644		- if (Globals.ADVANCED)
	723	+ if (true) // Globals.ADVANCED)
645	724	{
646	725	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	726	supportCB.setToolTipText("Enable rigging");
..	..	@@ -714,6 +793,7 @@
714	793	buttonGroup.add(radioButton);
715	794	radioButton.doClick();
716	795	}
	796	+
717	797	void SetupViews(ObjEditor oe)
718	798	{
719	799	oe.SetupViews();
..	..	@@ -930,7 +1010,9 @@
930	1010	// objEditor.DropFile((java.io.File[]) object, true);
931	1011	// return;
932	1012	// }
933		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1016	{
935	1017	// file(s)
936	1018	String[] names = string.split("\n");
..	..	@@ -957,7 +1039,7 @@
957	1039
958	1040	flashIt = false;
959	1041	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1044
963	1045	if (group.selection.size() == 1)
..	..	@@ -1164,13 +1246,13 @@
1164	1246	parseverticesItem.addActionListener(this);
1165	1247	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1248	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1250	alignItem.addActionListener(this);
1169	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1252	reduceMorphItem.addActionListener(this);
1171	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1254	reduce34MorphItem.addActionListener(this);
1173		-
	1255	+ menu.add("-");
1174	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1257	computeAOItem.addActionListener(this);
1176	1258
..	..	@@ -1530,9 +1612,9 @@
1530	1612
1531	1613	void Overwrite(int mask)
1532	1614	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1616	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1536	1618
1537	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1620	content = ((cGroup)content).get(0);
..	..	@@ -1837,23 +1919,6 @@
1837	1919	csg.addChild(child);
1838	1920	child.addChild(csg);
1839	1921	} else
1840		-
1841		- if (source == importGFDItem)
1842		- {
1843		- ImportGFD();
1844		- } else
1845		- if (source == importVRMLX3DItem)
1846		- {
1847		- ImportVRMLX3D();
1848		- } else
1849		- if (source == import3DSItem)
1850		- {
1851		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1852		- } else
1853		- if (source == importOBJItem)
1854		- {
1855		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1856		- } else
1857	1922	if (source == computeAOItem)
1858	1923	{
1859	1924	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +1937,7 @@
1872	1937	if (source == invariantsItem)
1873	1938	{
1874	1939	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1876	1941	} else
1877	1942	if (source == memoryItem)
1878	1943	{
..	..	@@ -1945,12 +2010,20 @@
1945	2010	{
1946	2011	loadClipboard(true);
1947	2012	} else
	2013	+ if (source == undoItem)
	2014	+ {
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
1948	2021	if (source == duplicateItem)
1949	2022	{
1950		- Object3D keep = GrafreeD.clipboard;
	2023	+ Object3D keep = Grafreed.clipboard;
1951	2024	loadClipboard(false);
1952	2025	paste(false);
1953		- GrafreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1954	2027	} else
1955	2028	if (source == cloneItem)
1956	2029	{
..	..	@@ -2170,9 +2243,9 @@
2170	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2244	// refreshContents();
2172	2245	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2247	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2176	2249
2177	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2251	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2295,9 @@
2222	2295	} else
2223	2296	if (source == setMasterItem)
2224	2297	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2299	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2228	2301
2229	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2303	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2310,9 @@
2237	2310	{
2238	2311	if (group.selection.size() == 1)
2239	2312	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2241	2314	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2243	2316
2244	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2318	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2329,7 @@
2256	2329	{
2257	2330	RevertMeshes();
2258	2331	} else
2259		- if (source == resetMeshItem)
	2332	+ if (source == resetAllItem)
2260	2333	{
2261	2334	ResetAll();
2262	2335	} else
..	..	@@ -2594,9 +2667,13 @@
2594	2667	{
2595	2668	SmoothMesh();
2596	2669	} else
2597		- if (source == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2598	2671	{
2599	2672	TransformGeometry();
	2673	+ } else
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
2600	2677	} else
2601	2678	if (source == resetTransformItem)
2602	2679	{
..	..	@@ -2604,7 +2681,11 @@
2604	2681	} else
2605	2682	if (source == resetCentroidItem)
2606	2683	{
2607		- ResetCentroid();
	2684	+ ResetCentroid(true);
	2685	+ } else
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
2608	2689	} else
2609	2690	if (source == resetParentItem)
2610	2691	{
..	..	@@ -2960,7 +3041,7 @@
2960	3041	child.CloseUI();
2961	3042	listUI.remove(child);
2962	3043
2963		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2964	3045	}
2965	3046	objEditor.ctrlPanel.FlushUI();
2966	3047	//objEditor.jTree.clearSelection();
..	..	@@ -3046,7 +3127,9 @@
3046	3127	frontView.object = group;
3047	3128	sideView.object = group;
3048	3129	}
3049		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
3050	3133	/*
3051	3134	currentLayout = radio.layout;
3052	3135	if (currentLayout == null)
..	..	@@ -3059,7 +3142,20 @@
3059	3142	//group.attributes = -1;
3060	3143	ResetModel();
3061	3144	refreshContents(true);
3062		- }
	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	+ }
3063	3159	else
3064	3160	{
3065	3161	//return super.action(event, arg);
..	..	@@ -3120,6 +3216,28 @@
3120	3216	refreshContents();
3121	3217	}
3122	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	+ }
3123	3241
3124	3242	void ResetTransform()
3125	3243	{
..	..	@@ -3232,7 +3350,7 @@
3232	3350	refreshContents();
3233	3351	}
3234	3352
3235		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
3236	3354	{
3237	3355	Object3D obj;
3238	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3365,16 @@
3247	3365	LA.matIdentity(Object3D.mat);
3248	3366	obj.getBounds(minima, maxima, false);
3249	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3253	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3256	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3318,9 +3440,9 @@
3318	3440	obj = (Object3D)e.nextElement();
3319	3441
3320	3442	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3322	3444	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3446
3325	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3448	}
..	..	@@ -3534,8 +3656,8 @@
3534	3656
3535	3657	void ParseVertices()
3536	3658	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3539	3661
3540	3662	for (int i=0; i<group.selection.size(); i++)
3541	3663	{
..	..	@@ -3560,7 +3682,7 @@
3560	3682	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	3683	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	3684
3563		- g.add(GrafreeD.clipboard);
	3685	+ g.add(Grafreed.clipboard);
3564	3686
3565	3687	buffer.add(g);
3566	3688	}
..	..	@@ -3575,7 +3697,7 @@
3575	3697	makeSomething(buffer, i==group.selection.size()-1);
3576	3698	}
3577	3699
3578		- GrafreeD.epsequal = epsequal;
	3700	+ Grafreed.epsequal = epsequal;
3579	3701
3580	3702	refreshContents();
3581	3703	}
..	..	@@ -3593,7 +3715,16 @@
3593	3715	String pigment = Object3D.GetPigment(tex);
3594	3716	//String bump = Object3D.GetBump(tex);
3595	3717
3596		- 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	+ }
3597	3728
3598	3729	double s = v.s;
3599	3730
..	..	@@ -3725,7 +3856,7 @@
3725	3856	return;
3726	3857
3727	3858	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3729	3860
3730	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	3862
..	..	@@ -3919,9 +4050,9 @@
3919	4050
3920	4051	void ClipMesh()
3921	4052	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4054	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3925	4056
3926	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4058	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4061,7 @@
3930	4061	// {
3931	4062	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4063	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4065	}
3935	4066	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4067	System.out.println("DONE.");
..	..	@@ -4065,7 +4196,7 @@
4065	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4197
4067	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
4069	4200	{
4070	4201	// if (!(elem instanceof Composite))
4071	4202	// newWindow = false;
..	..	@@ -4179,14 +4310,17 @@
4179	4310
4180	4311	objEditor.SetText(); // jan 2014
4181	4312
4182		- 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))
4183	4314	CameraPane.flash = true;
4184	4315
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4317	// a camera
4187	4318	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- 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	+ }
4190	4324	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4325	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4326	}
..	..	@@ -4270,12 +4404,12 @@
4270	4404	{
4271	4405	if (group.selection.isEmpty())
4272	4406	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
4274	4408	Composite tGroup = null;
4275	4409	if (group.selection.size() > 0) // 1)
4276	4410	{
4277	4411	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
4279	4413	}
4280	4414
4281	4415	if (cut)
..	..	@@ -4315,16 +4449,16 @@
4315	4449	//System.out.println("cut " + child);
4316	4450	//System.out.println("parent = " + child.parent);
4317	4451	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
4319	4453	tGroup.add/Child/(tmp);
4320	4454	else
4321		- GrafreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
4322	4456	}
4323	4457	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4325	4459	tGroup.add/Child/(child);
4326	4460	else
4327		- GrafreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
4328	4462	}
4329	4463
4330	4464	//ResetModel();
..	..	@@ -4356,21 +4490,21 @@
4356	4490	//System.out.println("cut " + elem);
4357	4491	//System.out.println("parent = " + elem.parent);
4358	4492	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
4360	4494	tGroup.add/Child/(tmp);
4361	4495	else
4362		- GrafreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
4363	4497	}
4364	4498	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
4366	4500	tGroup.add/Child/(child);
4367	4501	else
4368		- GrafreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
4369	4503	}
4370	4504
4371	4505	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
4374	4508	if (cut)
4375	4509	{
4376	4510	ResetModel();
..	..	@@ -4384,7 +4518,7 @@
4384	4518	// return;
4385	4519	boolean first = true;
4386	4520
4387		- if (GrafreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
4388	4522	{
4389	4523	Composite temp;
4390	4524
..	..	@@ -4395,7 +4529,7 @@
4395	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4530	*/
4397	4531	Object3D elem;
4398		- 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))
4399	4533	{
4400	4534	Object3D child = (Object3D)e.nextElement();
4401	4535
..	..	@@ -4429,14 +4563,14 @@
4429	4563	//Object3D cb = Applet3D.clipboard;
4430	4564	//temp.addChild(cb);
4431	4565	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4432		- assert(GrafreeD.clipboard.parent == null);
4433		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4434		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4435		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4436		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4437	4571	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4574	}
4441	4575
4442	4576	ResetModel();
..	..	@@ -4485,9 +4619,9 @@
4485	4619	{
4486	4620	boolean first = true;
4487	4621
4488		- if (GrafreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4489	4623	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4491	4625	Object3D copy;
4492	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	4627	{
..	..	@@ -4497,7 +4631,7 @@
4497	4631	}
4498	4632	} else
4499	4633	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	4635	}
4502	4636	}
4503	4637	}
..	..	@@ -4902,21 +5036,6 @@
4902	5036	}
4903	5037	*/
4904	5038
4905		- void ImportGFD()
4906		- {
4907		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4908		- browser.show();
4909		- String filename = browser.getFile();
4910		- if (filename != null && filename.length() > 0)
4911		- {
4912		- String fullname = browser.getDirectory() + filename;
4913		-
4914		- //Object3D readobj =
4915		- objEditor.ReadGFD(fullname, objEditor);
4916		- //makeSomething(readobj);
4917		- }
4918		- }
4919		-
4920	5039	/*
4921	5040	public void Callback(Object obj)
4922	5041	{
..	..	@@ -4940,26 +5059,9 @@
4940	5059	}
4941	5060	*/
4942	5061
4943		- void ImportVRMLX3D()
4944		- {
4945		- if (GrafreeD.standAlone)
4946		- {
4947		- /**/
4948		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4949		- browser.show();
4950		- String filename = browser.getFile();
4951		- if (filename != null && filename.length() > 0)
4952		- {
4953		- String fullname = browser.getDirectory() + filename;
4954		- LoadVRMLX3D(fullname);
4955		- }
4956		- /**/
4957		- }
4958		- }
4959		-
4960	5062	String GetFile(String dialogName)
4961	5063	{
4962		- if (GrafreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4963	5065	{
4964	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5067	browser.show();
..	..	@@ -5059,6 +5161,8 @@
5059	5161	private MenuItem lookFromItem;
5060	5162	private MenuItem switchItem;
5061	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
5062	5166	private MenuItem duplicateItem;
5063	5167	private MenuItem cloneItem;
5064	5168	private MenuItem cloneSupportItem;
..	..	@@ -5072,7 +5176,7 @@
5072	5176	private MenuItem linkverticesItem;
5073	5177	private MenuItem relinkverticesItem;
5074	5178	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
5076	5180	private MenuItem stepAllItem;
5077	5181	private MenuItem revertMeshItem;
5078	5182	private MenuItem poseMeshItem;
..	..	@@ -5133,8 +5237,10 @@
5133	5237	private MenuItem panoTexturesItem;
5134	5238
5135	5239	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
5137	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
5138	5244	private MenuItem hideItem;
5139	5245	private MenuItem grabItem;
5140	5246	private MenuItem backItem;
..	..	@@ -5203,11 +5309,6 @@
5203	5309	private MenuItem doubleItem;
5204	5310	private MenuItem tripleItem;
5205	5311
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5312	private MenuItem computeAOItem;
5212	5313	private MenuItem recompileItem;
5213	5314	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5318,8 @@
5217	5318	private MenuItem analyzeItem;
5218	5319	private MenuItem dumpItem;
5219	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
5220	5325	}