~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);
..	..	@@ -148,27 +148,18 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
168	153	Menu menu;
169	154	oe.menuBar.add(menu = new Menu("Edit"));
170	155	//editItem = menu.add(new MenuItem("Edit"));
171	156	//editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
172	163	duplicateItem = menu.add(new MenuItem("Duplicate"));
173	164	duplicateItem.addActionListener(this);
174	165	cloneItem = menu.add(new MenuItem("Clone"));
..	..	@@ -206,14 +197,97 @@
206	197	clearAllItem = menu.add(new MenuItem("Clear All"));
207	198	clearAllItem.addActionListener(this);
208	199	}
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
209	236
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	276	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	277	+ //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	279	+ oe.cameraMenu.add("-");
	280	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	281	+ openWindowItem.addActionListener(this);
	282	+ editLeafItem.addActionListener(this);
	283	+ lookAtItem.addActionListener(this);
	284	+ //lookFromItem.addActinoListener(this);
	285	+ //switchItem.addActionListener(this);
	286	+ }
	287	+
210	288	oe.menuBar.add(menu = new Menu("Setting"));
211	289	if (Globals.ADVANCED)
212	290	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	292	revertMeshItem.addActionListener(this);
219	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -318,8 +392,12 @@
318	392	resetTransformItem.addActionListener(this);
319	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	394	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
323	401
324	402	oe.menuBar.add(menu = new Menu("Geometry"));
325	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +446,10 @@
368	446	oe.menuBar.add(menu = new Menu("Attributes"));
369	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
371	453	menu.add("-");
372	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	455	liveleavesItem.addActionListener(this);
..	..	@@ -422,35 +504,23 @@
422	504	sortbysizeItem.addActionListener(this);
423	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	506	sortbynameItem.addActionListener(this);
	507	+ menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
425	512	if (Globals.ADVANCED)
426	513	{
427		- menu.add("-");
	514	+ // Pretty much the same as duplicate and clone.
428	515	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	516	extractGeometriesItem.addActionListener(this);
430	517	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	518	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	519	}
437	520
438	521	oe.menuBar.add(menu = new Menu("Insert"));
439	522	buildCreateMenu(menu);
440	523
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	524	oe.menuBar.add(menu = new Menu("Tools"));
455	525	buildToolsMenu(menu);
456	526	}
..	..	@@ -487,8 +557,20 @@
487	557	*/
488	558	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	559
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
490	572	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	573	+ liveCB.setToolTipText("Enable animation");
492	574	liveCB.addItemListener(this);
493	575
494	576	oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -651,7 +733,7 @@
651	733	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	734	zoomBoxCB.addItemListener(this);
653	735
654		- if (Globals.ADVANCED)
	736	+ if (true) // Globals.ADVANCED)
655	737	{
656	738	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	739	supportCB.setToolTipText("Enable rigging");
..	..	@@ -724,6 +806,7 @@
724	806	buttonGroup.add(radioButton);
725	807	radioButton.doClick();
726	808	}
	809	+
727	810	void SetupViews(ObjEditor oe)
728	811	{
729	812	oe.SetupViews();
..	..	@@ -1849,31 +1932,6 @@
1849	1932	csg.addChild(child);
1850	1933	child.addChild(csg);
1851	1934	} else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876		- } else
1877	1935	if (source == computeAOItem)
1878	1936	{
1879	1937	Globals.drawMode = CameraPane.OCCLUSION;
..	..	@@ -1910,6 +1968,18 @@
1910	1968	if (source == dumpItem)
1911	1969	{
1912	1970	DumpObject();
	1971	+ } else
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
1913	1983	} else
1914	1984	if (source == oneStepButton)
1915	1985	{
..	..	@@ -1964,6 +2034,14 @@
1964	2034	if (source == cutItem \|\| source == clearButton)
1965	2035	{
1966	2036	loadClipboard(true);
	2037	+ } else
	2038	+ if (source == undoItem)
	2039	+ {
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
1967	2045	} else
1968	2046	if (source == duplicateItem)
1969	2047	{
..	..	@@ -2276,7 +2354,7 @@
2276	2354	{
2277	2355	RevertMeshes();
2278	2356	} else
2279		- if (source == resetMeshItem)
	2357	+ if (source == resetAllItem)
2280	2358	{
2281	2359	ResetAll();
2282	2360	} else
..	..	@@ -2614,9 +2692,13 @@
2614	2692	{
2615	2693	SmoothMesh();
2616	2694	} else
2617		- if (source == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2618	2696	{
2619	2697	TransformGeometry();
	2698	+ } else
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
2620	2702	} else
2621	2703	if (source == resetTransformItem)
2622	2704	{
..	..	@@ -2624,7 +2706,11 @@
2624	2706	} else
2625	2707	if (source == resetCentroidItem)
2626	2708	{
2627		- ResetCentroid();
	2709	+ ResetCentroid(true);
	2710	+ } else
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
2628	2714	} else
2629	2715	if (source == resetParentItem)
2630	2716	{
..	..	@@ -2980,7 +3066,7 @@
2980	3066	child.CloseUI();
2981	3067	listUI.remove(child);
2982	3068
2983		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2984	3070	}
2985	3071	objEditor.ctrlPanel.FlushUI();
2986	3072	//objEditor.jTree.clearSelection();
..	..	@@ -3066,7 +3152,10 @@
3066	3152	frontView.object = group;
3067	3153	sideView.object = group;
3068	3154	}
	3155	+
	3156	+// fix "+" issue
3069	3157	group.editWindow = this;
	3158	+
3070	3159	/*
3071	3160	currentLayout = radio.layout;
3072	3161	if (currentLayout == null)
..	..	@@ -3079,7 +3168,20 @@
3079	3168	//group.attributes = -1;
3080	3169	ResetModel();
3081	3170	refreshContents(true);
3082		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
3083	3185	else
3084	3186	{
3085	3187	//return super.action(event, arg);
..	..	@@ -3140,6 +3242,28 @@
3140	3242	refreshContents();
3141	3243	}
3142	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
3143	3267
3144	3268	void ResetTransform()
3145	3269	{
..	..	@@ -3252,7 +3376,7 @@
3252	3376	refreshContents();
3253	3377	}
3254	3378
3255		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
3256	3380	{
3257	3381	Object3D obj;
3258	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3391,16 @@
3267	3391	LA.matIdentity(Object3D.mat);
3268	3392	obj.getBounds(minima, maxima, false);
3269	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3273	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3276	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3429,8 @@
3301	3429
3302	3430	int size = obj.MemorySize();
3303	3431
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3432	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3433	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3434	}
3306	3435	}
3307	3436	catch (Exception e)
..	..	@@ -3613,7 +3742,16 @@
3613	3742	String pigment = Object3D.GetPigment(tex);
3614	3743	//String bump = Object3D.GetBump(tex);
3615	3744
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3745	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3746	+
	3747	+ try
	3748	+ {
	3749	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3750	+ }
	3751	+ catch (Exception e)
	3752	+ {
	3753	+ System.err.println("FAIL: " + node);
	3754	+ }
3617	3755
3618	3756	double s = v.s;
3619	3757
..	..	@@ -4085,7 +4223,7 @@
4085	4223	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4224
4087	4225	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4226	+ if(elem != group \|\| !newWindow)
4089	4227	{
4090	4228	// if (!(elem instanceof Composite))
4091	4229	// newWindow = false;
..	..	@@ -4199,14 +4337,17 @@
4199	4337
4200	4338	objEditor.SetText(); // jan 2014
4201	4339
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4340	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4341	CameraPane.flash = true;
4204	4342
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4343	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4344	// a camera
4207	4345	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4346	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4347	+ {
	4348	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4349	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4350	+ }
4210	4351	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4352	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4353	}
..	..	@@ -4290,6 +4431,7 @@
4290	4431	{
4291	4432	if (group.selection.isEmpty())
4292	4433	return;
	4434	+
4293	4435	Grafreed.clipboardIsTempGroup = false;
4294	4436	Composite tGroup = null;
4295	4437	if (group.selection.size() > 0) // 1)
..	..	@@ -4300,6 +4442,7 @@
4300	4442
4301	4443	if (cut)
4302	4444	{
	4445	+ Save();
4303	4446	//int indices[] = jList.getSelectedIndices();
4304	4447	//for (int i = indices.length - 1; i >= 0; i--)
4305	4448	//jList.remove(indices[i]);
..	..	@@ -4389,8 +4532,10 @@
4389	4532	}
4390	4533
4391	4534	}
	4535	+
4392	4536	if (Grafreed.clipboardIsTempGroup)
4393	4537	Grafreed.clipboard = tGroup;
	4538	+
4394	4539	if (cut)
4395	4540	{
4396	4541	ResetModel();
..	..	@@ -4922,21 +5067,6 @@
4922	5067	}
4923	5068	*/
4924	5069
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5070	/*
4941	5071	public void Callback(Object obj)
4942	5072	{
..	..	@@ -4960,23 +5090,6 @@
4960	5090	}
4961	5091	*/
4962	5092
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (Grafreed.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5093	String GetFile(String dialogName)
4981	5094	{
4982	5095	if (Grafreed.standAlone)
..	..	@@ -5047,6 +5160,9 @@
5047	5160	cButton clearpanelButton;
5048	5161	cButton unselectButton;
5049	5162
	5163	+ cButton saveButton;
	5164	+ cButton undoButton;
	5165	+ cButton redoButton;
5050	5166	cButton oneStepButton;
5051	5167
5052	5168	cButton screenfitButton;
..	..	@@ -5079,6 +5195,8 @@
5079	5195	private MenuItem lookFromItem;
5080	5196	private MenuItem switchItem;
5081	5197	private MenuItem cutItem;
	5198	+ private MenuItem undoItem;
	5199	+ private MenuItem redoItem;
5082	5200	private MenuItem duplicateItem;
5083	5201	private MenuItem cloneItem;
5084	5202	private MenuItem cloneSupportItem;
..	..	@@ -5092,7 +5210,7 @@
5092	5210	private MenuItem linkverticesItem;
5093	5211	private MenuItem relinkverticesItem;
5094	5212	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5213	+ private MenuItem resetAllItem;
5096	5214	private MenuItem stepAllItem;
5097	5215	private MenuItem revertMeshItem;
5098	5216	private MenuItem poseMeshItem;
..	..	@@ -5153,8 +5271,10 @@
5153	5271	private MenuItem panoTexturesItem;
5154	5272
5155	5273	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5274	+ private MenuItem resetCentroidXZItem;
5157	5275	private MenuItem resetTransformItem;
	5276	+ private MenuItem transformGeometryItem;
	5277	+ private MenuItem transformChildrenItem;
5158	5278	private MenuItem hideItem;
5159	5279	private MenuItem grabItem;
5160	5280	private MenuItem backItem;
..	..	@@ -5223,11 +5343,6 @@
5223	5343	private MenuItem doubleItem;
5224	5344	private MenuItem tripleItem;
5225	5345
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5346	private MenuItem computeAOItem;
5232	5347	private MenuItem recompileItem;
5233	5348	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5352,8 @@
5237	5352	private MenuItem analyzeItem;
5238	5353	private MenuItem dumpItem;
5239	5354	//boolean freezemodel = false;
	5355	+
	5356	+ Menu cameraMenu;
	5357	+ MenuItem editCameraItem;
	5358	+ MenuItem revertCameraItem;
5240	5359	}