~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,29 +148,28 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
168	153	Menu menu;
169	154	oe.menuBar.add(menu = new Menu("Edit"));
170	155	//editItem = menu.add(new MenuItem("Edit"));
171	156	//editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	164	duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
174	173	cutItem = menu.add(new MenuItem("Cut"));
175	174	cutItem.addActionListener(this);
176	175	copyItem = menu.add(new MenuItem("Copy"));
..	..	@@ -178,10 +177,7 @@
178	177	pasteItem = menu.add(new MenuItem("Paste"));
179	178	pasteItem.addActionListener(this);
180	179	menu.add("-");
181		- cloneItem = menu.add(new MenuItem("Clone"));
182		- cloneItem.addActionListener(this);
183		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
184		- cloneSupportItem.addActionListener(this);
	180	+
185	181	menu.add("-");
186	182	pasteIntoItem = menu.add(new MenuItem("Paste into"));
187	183	pasteIntoItem.addActionListener(this);
..	..	@@ -201,14 +197,97 @@
201	197	clearAllItem = menu.add(new MenuItem("Clear All"));
202	198	clearAllItem.addActionListener(this);
203	199	}
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
204	236
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	276	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	277	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	279	+ oe.cameraMenu.add("-");
	280	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	281	+ openWindowItem.addActionListener(this);
	282	+ editLeafItem.addActionListener(this);
	283	+ lookAtItem.addActionListener(this);
	284	+ //lookFromItem.addActinoListener(this);
	285	+ //switchItem.addActionListener(this);
	286	+ }
	287	+
205	288	oe.menuBar.add(menu = new Menu("Setting"));
206	289	if (Globals.ADVANCED)
207	290	{
208		- resetMeshItem = menu.add(new MenuItem("Reset All"));
209		- resetMeshItem.addActionListener(this);
210		- stepAllItem = menu.add(new MenuItem("Step All"));
211		- stepAllItem.addActionListener(this);
212	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
213	292	revertMeshItem.addActionListener(this);
214	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -272,6 +351,7 @@
272	351
273	352	if (Globals.ADVANCED)
274	353	{
	354	+ menu.add("-");
275	355	physicsItem = menu.add(new MenuItem("Physics"));
276	356	physicsItem.addActionListener(this);
277	357	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
..	..	@@ -297,6 +377,7 @@
297	377	shadowZItem.addActionListener(this);
298	378	if (Globals.ADVANCED)
299	379	{
	380	+ menu.add("-");
300	381	linkerItem = menu.add(new MenuItem("Linker"));
301	382	linkerItem.addActionListener(this);
302	383	attributeItem = menu.add(new MenuItem("Attribute"));
..	..	@@ -305,14 +386,18 @@
305	386	templateItem.addActionListener(this);
306	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
307	388	pointflowItem.addActionListener(this);
308		- menu.add("-");
309	389	}
	390	+ menu.add("-");
310	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
311	392	resetTransformItem.addActionListener(this);
312	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
313	394	resetCentroidItem.addActionListener(this);
314		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
315		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
316	401
317	402	oe.menuBar.add(menu = new Menu("Geometry"));
318	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -361,6 +446,10 @@
361	446	oe.menuBar.add(menu = new Menu("Attributes"));
362	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
363	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
364	453	menu.add("-");
365	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
366	455	liveleavesItem.addActionListener(this);
..	..	@@ -381,6 +470,14 @@
381	470	markleavesItem.addActionListener(this);
382	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
383	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
384	481	menu.add("-");
385	482	flipVItem = menu.add(new MenuItem("Flip V"));
386	483	flipVItem.addActionListener(this);
..	..	@@ -415,32 +512,23 @@
415	512	sortbysizeItem.addActionListener(this);
416	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
417	514	sortbynameItem.addActionListener(this);
	515	+ menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
418	520	if (Globals.ADVANCED)
419	521	{
420		- menu.add("-");
	522	+ // Pretty much the same as duplicate and clone.
421	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
422	524	extractGeometriesItem.addActionListener(this);
423	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
424	526	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	527	}
430	528
431	529	oe.menuBar.add(menu = new Menu("Insert"));
432	530	buildCreateMenu(menu);
433	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
445	533	buildToolsMenu(menu);
446	534	}
..	..	@@ -477,11 +565,23 @@
477	565	*/
478	566	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
479	567
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
480	580	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
481		- liveCB.setToolTipText("Enabled animation");
	581	+ liveCB.setToolTipText("Enable animation");
482	582	liveCB.addItemListener(this);
483	583
484		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	585	oneStepButton.setToolTipText("Animate one step forward");
486	586	oneStepButton.addActionListener(this);
487	587
..	..	@@ -493,7 +593,7 @@
493	593	trackCB.setToolTipText("Enable tracking");
494	594	trackCB.addItemListener(this);
495	595
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
497	597	screenfitButton.setToolTipText("Screen fit");
498	598	screenfitButton.addActionListener(this);
499	599
..	..	@@ -502,39 +602,39 @@
502	602
503	603	if (Globals.ADVANCED)
504	604	{
505		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
506	606	snapobjectButton.addActionListener(this);
507	607	snapobjectButton.setToolTipText("Snap Object");
508	608	}
509	609
510		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
511	611	flashSelectionButton.setToolTipText("Show selection");
512	612	flashSelectionButton.addActionListener(this);
513	613
514	614	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
515	615
516		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	617	twoButton.setToolTipText("Show center view only");
518	618	twoButton.addActionListener(this);
519		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	620	fourButton.addActionListener(this);
521	621	fourButton.setToolTipText("Show left panel only");
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	623	sixButton.setToolTipText("2-column layout left");
524	624	sixButton.addActionListener(this);
525		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526	626	threeButton.setToolTipText("2-column layout right");
527	627	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
529	629	sevenButton.setToolTipText("3-column layout");
530	630	sevenButton.addActionListener(this);
531	631	//
532	632
533		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	634	rootButton.setToolTipText("Edit selection in new tab");
535	635	rootButton.addActionListener(this);
536	636
537		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	638	closeButton.setToolTipText("Close tab");
539	639	closeButton.addActionListener(this);
540	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -542,11 +642,11 @@
542	642
543	643	cGridBag commandsPanel = new cGridBag();
544	644
545		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
546	646	editButton.setToolTipText("Edit selection");
547	647	editButton.addActionListener(this);
548	648
549		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
550	650	uneditButton.setToolTipText("Unedit selection");
551	651	uneditButton.addActionListener(this);
552	652
..	..	@@ -554,11 +654,11 @@
554	654	allParamsButton.setToolTipText("Edit all params");
555	655	allParamsButton.addActionListener(this);
556	656
557		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
558	658	clearPanelButton.setToolTipText("Clear edit panel");
559	659	clearPanelButton.addActionListener(this);
560	660
561		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
562	662	unselectButton.setToolTipText("Unselect");
563	663	unselectButton.addActionListener(this);
564	664
..	..	@@ -641,7 +741,7 @@
641	741	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
642	742	zoomBoxCB.addItemListener(this);
643	743
644		- if (Globals.ADVANCED)
	744	+ if (true) // Globals.ADVANCED)
645	745	{
646	746	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
647	747	supportCB.setToolTipText("Enable rigging");
..	..	@@ -714,6 +814,7 @@
714	814	buttonGroup.add(radioButton);
715	815	radioButton.doClick();
716	816	}
	817	+
717	818	void SetupViews(ObjEditor oe)
718	819	{
719	820	oe.SetupViews();
..	..	@@ -778,6 +879,7 @@
778	879	} else if(e.getSource() == liveCB)
779	880	{
780	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
781	883	}
782	884	else if(e.getSource() == supportCB)
783	885	{
..	..	@@ -930,7 +1032,9 @@
930	1032	// objEditor.DropFile((java.io.File[]) object, true);
931	1033	// return;
932	1034	// }
933		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
934	1038	{
935	1039	// file(s)
936	1040	String[] names = string.split("\n");
..	..	@@ -957,7 +1061,7 @@
957	1061
958	1062	flashIt = false;
959	1063	CameraPane pane = (CameraPane) target;
960		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
961	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
962	1066
963	1067	if (group.selection.size() == 1)
..	..	@@ -1164,13 +1268,13 @@
1164	1268	parseverticesItem.addActionListener(this);
1165	1269	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1166	1270	textureFieldItem.addActionListener(this);
1167		- alignItem = menu.add(new MenuItem("Align Object"));
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1168	1272	alignItem.addActionListener(this);
1169	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1170	1274	reduceMorphItem.addActionListener(this);
1171	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1172	1276	reduce34MorphItem.addActionListener(this);
1173		-
	1277	+ menu.add("-");
1174	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1175	1279	computeAOItem.addActionListener(this);
1176	1280
..	..	@@ -1183,7 +1287,7 @@
1183	1287	memoryItem.addActionListener(this);
1184	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1185	1289	analyzeItem.addActionListener(this);
1186		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1187	1291	dumpItem.addActionListener(this);
1188	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1189	1293	// pathItem.addActionListener(this);
..	..	@@ -1530,9 +1634,9 @@
1530	1634
1531	1635	void Overwrite(int mask)
1532	1636	{
1533		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1534	1638	{
1535		- Object3D content = GrafreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1536	1640
1537	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1538	1642	content = ((cGroup)content).get(0);
..	..	@@ -1837,23 +1941,6 @@
1837	1941	csg.addChild(child);
1838	1942	child.addChild(csg);
1839	1943	} 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	1944	if (source == computeAOItem)
1858	1945	{
1859	1946	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1872,7 +1959,7 @@
1872	1959	if (source == invariantsItem)
1873	1960	{
1874	1961	System.out.println("Invariants:");
1875		- GrafreeD.grafreeD.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1876	1963	} else
1877	1964	if (source == memoryItem)
1878	1965	{
..	..	@@ -1890,6 +1977,18 @@
1890	1977	if (source == dumpItem)
1891	1978	{
1892	1979	DumpObject();
	1980	+ } else
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
1893	1992	} else
1894	1993	if (source == oneStepButton)
1895	1994	{
..	..	@@ -1945,12 +2044,20 @@
1945	2044	{
1946	2045	loadClipboard(true);
1947	2046	} else
	2047	+ if (source == undoItem)
	2048	+ {
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
1948	2055	if (source == duplicateItem)
1949	2056	{
1950		- Object3D keep = GrafreeD.clipboard;
	2057	+ Object3D keep = Grafreed.clipboard;
1951	2058	loadClipboard(false);
1952	2059	paste(false);
1953		- GrafreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1954	2061	} else
1955	2062	if (source == cloneItem)
1956	2063	{
..	..	@@ -2170,9 +2277,9 @@
2170	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2171	2278	// refreshContents();
2172	2279	// }
2173		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2174	2281	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2176	2283
2177	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2285	content = ((cGroup)content).get(0);
..	..	@@ -2222,9 +2329,9 @@
2222	2329	} else
2223	2330	if (source == setMasterItem)
2224	2331	{
2225		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2226	2333	{
2227		- Object3D content = GrafreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2228	2335
2229	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2230	2337	content = ((cGroup)content).get(0);
..	..	@@ -2237,9 +2344,9 @@
2237	2344	{
2238	2345	if (group.selection.size() == 1)
2239	2346	{
2240		- if (GrafreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2241	2348	{
2242		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2243	2350
2244	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2245	2352	content = ((cGroup)content).get(0);
..	..	@@ -2256,7 +2363,7 @@
2256	2363	{
2257	2364	RevertMeshes();
2258	2365	} else
2259		- if (source == resetMeshItem)
	2366	+ if (source == resetAllItem)
2260	2367	{
2261	2368	ResetAll();
2262	2369	} else
..	..	@@ -2444,7 +2551,7 @@
2444	2551	} else
2445	2552	if (source == genNormalsMESHItem)
2446	2553	{
2447		- GenNormals(true); // TODO
	2554	+ GenNormalsMESH();
2448	2555	} else
2449	2556	if (source == genNormalsORGANItem)
2450	2557	{
..	..	@@ -2509,6 +2616,22 @@
2509	2616	if (source == unmarkleavesItem)
2510	2617	{
2511	2618	MarkLeaves(false);
	2619	+ } else
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
2512	2635	} else
2513	2636	if (source == flipVItem)
2514	2637	{
..	..	@@ -2594,9 +2717,13 @@
2594	2717	{
2595	2718	SmoothMesh();
2596	2719	} else
2597		- if (source == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2598	2721	{
2599	2722	TransformGeometry();
	2723	+ } else
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
2600	2727	} else
2601	2728	if (source == resetTransformItem)
2602	2729	{
..	..	@@ -2604,7 +2731,11 @@
2604	2731	} else
2605	2732	if (source == resetCentroidItem)
2606	2733	{
2607		- ResetCentroid();
	2734	+ ResetCentroid(true);
	2735	+ } else
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
2608	2739	} else
2609	2740	if (source == resetParentItem)
2610	2741	{
..	..	@@ -2960,7 +3091,7 @@
2960	3091	child.CloseUI();
2961	3092	listUI.remove(child);
2962	3093
2963		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2964	3095	}
2965	3096	objEditor.ctrlPanel.FlushUI();
2966	3097	//objEditor.jTree.clearSelection();
..	..	@@ -3046,7 +3177,10 @@
3046	3177	frontView.object = group;
3047	3178	sideView.object = group;
3048	3179	}
	3180	+
	3181	+// fix "+" issue
3049	3182	group.editWindow = this;
	3183	+
3050	3184	/*
3051	3185	currentLayout = radio.layout;
3052	3186	if (currentLayout == null)
..	..	@@ -3059,7 +3193,20 @@
3059	3193	//group.attributes = -1;
3060	3194	ResetModel();
3061	3195	refreshContents(true);
3062		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
3063	3210	else
3064	3211	{
3065	3212	//return super.action(event, arg);
..	..	@@ -3120,6 +3267,28 @@
3120	3267	refreshContents();
3121	3268	}
3122	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
3123	3292
3124	3293	void ResetTransform()
3125	3294	{
..	..	@@ -3232,7 +3401,7 @@
3232	3401	refreshContents();
3233	3402	}
3234	3403
3235		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
3236	3405	{
3237	3406	Object3D obj;
3238	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3247,12 +3416,16 @@
3247	3416	LA.matIdentity(Object3D.mat);
3248	3417	obj.getBounds(minima, maxima, false);
3249	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3250		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3251	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3252	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3253	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3254		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3255	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3256	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3257	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3258	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3281,7 +3454,8 @@
3281	3454
3282	3455	int size = obj.MemorySize();
3283	3456
3284		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3285	3459	}
3286	3460	}
3287	3461	catch (Exception e)
..	..	@@ -3318,9 +3492,9 @@
3318	3492	obj = (Object3D)e.nextElement();
3319	3493
3320	3494	System.out.println("Object is: " + obj);
3321		- GrafreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3322	3496	System.out.println("Boundary rep: " + obj.bRep);
3323		- GrafreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3324	3498
3325	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3326	3500	}
..	..	@@ -3362,6 +3536,13 @@
3362	3536	void GenNormals(boolean crease)
3363	3537	{
3364	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
3365	3546
3366	3547	refreshContents();
3367	3548	}
..	..	@@ -3534,8 +3715,8 @@
3534	3715
3535	3716	void ParseVertices()
3536	3717	{
3537		- boolean epsequal = GrafreeD.epsequal;
3538		- GrafreeD.epsequal = true;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3539	3720
3540	3721	for (int i=0; i<group.selection.size(); i++)
3541	3722	{
..	..	@@ -3560,7 +3741,7 @@
3560	3741	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3561	3742	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3562	3743
3563		- g.add(GrafreeD.clipboard);
	3744	+ g.add(Grafreed.clipboard);
3564	3745
3565	3746	buffer.add(g);
3566	3747	}
..	..	@@ -3575,7 +3756,7 @@
3575	3756	makeSomething(buffer, i==group.selection.size()-1);
3576	3757	}
3577	3758
3578		- GrafreeD.epsequal = epsequal;
	3759	+ Grafreed.epsequal = epsequal;
3579	3760
3580	3761	refreshContents();
3581	3762	}
..	..	@@ -3593,7 +3774,16 @@
3593	3774	String pigment = Object3D.GetPigment(tex);
3594	3775	//String bump = Object3D.GetBump(tex);
3595	3776
3596		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
3597	3787
3598	3788	double s = v.s;
3599	3789
..	..	@@ -3725,7 +3915,7 @@
3725	3915	return;
3726	3916
3727	3917	Object3D poses = group.selection.get(0);
3728		- Object3D ref = GrafreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3729	3919
3730	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3731	3921
..	..	@@ -3919,9 +4109,9 @@
3919	4109
3920	4110	void ClipMesh()
3921	4111	{
3922		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3923	4113	{
3924		- Object3D content = GrafreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3925	4115
3926	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3927	4117	content = ((cGroup)content).get(0);
..	..	@@ -3930,7 +4120,7 @@
3930	4120	// {
3931	4121	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3932	4122	// }
3933		- group.selection.ClipMesh(GrafreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3934	4124	}
3935	4125	// group.selection.ClipMesh(GrafreeD.clipboard);
3936	4126	System.out.println("DONE.");
..	..	@@ -3977,6 +4167,18 @@
3977	4167	void MarkLeaves(boolean hide)
3978	4168	{
3979	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3980	4182	refreshContents();
3981	4183	}
3982	4184
..	..	@@ -4065,7 +4267,7 @@
4065	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4066	4268
4067	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
4068		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
4069	4271	{
4070	4272	// if (!(elem instanceof Composite))
4071	4273	// newWindow = false;
..	..	@@ -4155,7 +4357,6 @@
4155	4357	//case 702: // Event.LIST_DESELECT
4156	4358	group.deselectAll();
4157	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4158		- objEditor.ClearInfo(); // .GetMaterial());
4159	4360	if (tps != null)
4160	4361	{
4161	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -4164,10 +4365,8 @@
4164	4365
4165	4366	//if (child.parent != null)
4166	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
4167	4369	group.addSelectee(child);
4168		- objEditor.SetMaterial(child); // .GetMaterial());
4169		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4170		- System.err.println("info : " + child.GetPath());
4171	4370	}
4172	4371	}
4173	4372	// else
..	..	@@ -4177,16 +4376,17 @@
4177	4376	// System.err.println("info : " + group.GetPath());
4178	4377	// }
4179	4378
4180		- objEditor.SetText(); // jan 2014
4181		-
4182		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4183	4380	CameraPane.flash = true;
4184	4381
4185		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4186	4383	// a camera
4187	4384	{
4188		- CameraPane.camerachangeframe = 0; // don't refuse it
4189		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
4190	4390	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4191	4391	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4192	4392	}
..	..	@@ -4199,6 +4399,26 @@
4199	4399
4200	4400	freezemodel = false;
4201	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
4202	4422
4203	4423	void linkSomething(Object3D thing)
4204	4424	{
..	..	@@ -4270,16 +4490,18 @@
4270	4490	{
4271	4491	if (group.selection.isEmpty())
4272	4492	return;
4273		- GrafreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
4274	4495	Composite tGroup = null;
4275	4496	if (group.selection.size() > 0) // 1)
4276	4497	{
4277	4498	tGroup = new cGroup();
4278		- GrafreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
4279	4500	}
4280	4501
4281	4502	if (cut)
4282	4503	{
	4504	+ Save();
4283	4505	//int indices[] = jList.getSelectedIndices();
4284	4506	//for (int i = indices.length - 1; i >= 0; i--)
4285	4507	//jList.remove(indices[i]);
..	..	@@ -4315,16 +4537,16 @@
4315	4537	//System.out.println("cut " + child);
4316	4538	//System.out.println("parent = " + child.parent);
4317	4539	// tmp.addChild(child);
4318		- if (GrafreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
4319	4541	tGroup.add/Child/(tmp);
4320	4542	else
4321		- GrafreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
4322	4544	}
4323	4545	else
4324		- if (GrafreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
4325	4547	tGroup.add/Child/(child);
4326	4548	else
4327		- GrafreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
4328	4550	}
4329	4551
4330	4552	//ResetModel();
..	..	@@ -4356,21 +4578,23 @@
4356	4578	//System.out.println("cut " + elem);
4357	4579	//System.out.println("parent = " + elem.parent);
4358	4580	// tmp.addChild(elem);
4359		- if (GrafreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
4360	4582	tGroup.add/Child/(tmp);
4361	4583	else
4362		- GrafreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
4363	4585	}
4364	4586	else
4365		- if (GrafreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
4366	4588	tGroup.add/Child/(child);
4367	4589	else
4368		- GrafreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
4369	4591	}
4370	4592
4371	4593	}
4372		- if (GrafreeD.clipboardIsTempGroup)
4373		- GrafreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
4374	4598	if (cut)
4375	4599	{
4376	4600	ResetModel();
..	..	@@ -4384,7 +4608,7 @@
4384	4608	// return;
4385	4609	boolean first = true;
4386	4610
4387		- if (GrafreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
4388	4612	{
4389	4613	Composite temp;
4390	4614
..	..	@@ -4395,7 +4619,7 @@
4395	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
4396	4620	*/
4397	4621	Object3D elem;
4398		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4399	4623	{
4400	4624	Object3D child = (Object3D)e.nextElement();
4401	4625
..	..	@@ -4429,14 +4653,14 @@
4429	4653	//Object3D cb = Applet3D.clipboard;
4430	4654	//temp.addChild(cb);
4431	4655	//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());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4437	4661	else
4438		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4439		- GrafreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4440	4664	}
4441	4665
4442	4666	ResetModel();
..	..	@@ -4485,9 +4709,9 @@
4485	4709	{
4486	4710	boolean first = true;
4487	4711
4488		- if (GrafreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4489	4713	{
4490		- Composite temp = (Composite)GrafreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4491	4715	Object3D copy;
4492	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4493	4717	{
..	..	@@ -4497,7 +4721,7 @@
4497	4721	}
4498	4722	} else
4499	4723	{
4500		- linkSomething(GrafreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4501	4725	}
4502	4726	}
4503	4727	}
..	..	@@ -4902,21 +5126,6 @@
4902	5126	}
4903	5127	*/
4904	5128
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	5129	/*
4921	5130	public void Callback(Object obj)
4922	5131	{
..	..	@@ -4940,26 +5149,9 @@
4940	5149	}
4941	5150	*/
4942	5151
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	5152	String GetFile(String dialogName)
4961	5153	{
4962		- if (GrafreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4963	5155	{
4964	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4965	5157	browser.show();
..	..	@@ -5027,6 +5219,9 @@
5027	5219	cButton clearpanelButton;
5028	5220	cButton unselectButton;
5029	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
5030	5225	cButton oneStepButton;
5031	5226
5032	5227	cButton screenfitButton;
..	..	@@ -5059,6 +5254,8 @@
5059	5254	private MenuItem lookFromItem;
5060	5255	private MenuItem switchItem;
5061	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
5062	5259	private MenuItem duplicateItem;
5063	5260	private MenuItem cloneItem;
5064	5261	private MenuItem cloneSupportItem;
..	..	@@ -5072,7 +5269,7 @@
5072	5269	private MenuItem linkverticesItem;
5073	5270	private MenuItem relinkverticesItem;
5074	5271	private MenuItem setMasterItem;
5075		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
5076	5273	private MenuItem stepAllItem;
5077	5274	private MenuItem revertMeshItem;
5078	5275	private MenuItem poseMeshItem;
..	..	@@ -5122,6 +5319,10 @@
5122	5319	private MenuItem showleavesItem;
5123	5320	private MenuItem markleavesItem;
5124	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
5125	5326
5126	5327	private MenuItem flipVItem;
5127	5328	private MenuItem unflipVItem;
..	..	@@ -5133,8 +5334,10 @@
5133	5334	private MenuItem panoTexturesItem;
5134	5335
5135	5336	private MenuItem resetCentroidItem;
5136		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
5137	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
5138	5341	private MenuItem hideItem;
5139	5342	private MenuItem grabItem;
5140	5343	private MenuItem backItem;
..	..	@@ -5203,11 +5406,6 @@
5203	5406	private MenuItem doubleItem;
5204	5407	private MenuItem tripleItem;
5205	5408
5206		- private MenuItem importGFDItem;
5207		- private MenuItem importVRMLX3DItem;
5208		- private MenuItem import3DSItem;
5209		- private MenuItem importOBJItem;
5210		-
5211	5409	private MenuItem computeAOItem;
5212	5410	private MenuItem recompileItem;
5213	5411	private MenuItem editScriptItem;
..	..	@@ -5217,4 +5415,8 @@
5217	5415	private MenuItem analyzeItem;
5218	5416	private MenuItem dumpItem;
5219	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
5220	5422	}