~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -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
..	..	@@ -210,10 +210,6 @@
210	210	oe.menuBar.add(menu = new Menu("Setting"));
211	211	if (Globals.ADVANCED)
212	212	{
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	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	214	revertMeshItem.addActionListener(this);
219	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -318,8 +314,12 @@
318	314	resetTransformItem.addActionListener(this);
319	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	316	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- transformgeometryItem.addActionListener(this);
	317	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	318	+ resetCentroidXZItem.addActionListener(this);
	319	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	320	+ transformGeometryItem.addActionListener(this);
	321	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	322	+ transformChildrenItem.addActionListener(this);
323	323
324	324	oe.menuBar.add(menu = new Menu("Geometry"));
325	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +368,10 @@
368	368	oe.menuBar.add(menu = new Menu("Attributes"));
369	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	370	clearMaterialsItem.addActionListener(this);
	371	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	372	+ resetAllItem.addActionListener(this);
	373	+ stepAllItem = menu.add(new MenuItem("Step All"));
	374	+ stepAllItem.addActionListener(this);
371	375	menu.add("-");
372	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	377	liveleavesItem.addActionListener(this);
..	..	@@ -422,17 +426,18 @@
422	426	sortbysizeItem.addActionListener(this);
423	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	428	sortbynameItem.addActionListener(this);
	429	+ menu.add("-");
	430	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	431	+ shareGeometriesItem.addActionListener(this);
	432	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	433	+ mergeGeometriesItem.addActionListener(this);
425	434	if (Globals.ADVANCED)
426	435	{
427		- menu.add("-");
	436	+ // Pretty much the same as duplicate and clone.
428	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	438	extractGeometriesItem.addActionListener(this);
430	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	440	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	441	}
437	442
438	443	oe.menuBar.add(menu = new Menu("Insert"));
..	..	@@ -488,10 +493,10 @@
488	493	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	494
490	495	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- liveCB.setToolTipText("Enabled animation");
	496	+ liveCB.setToolTipText("Enable animation");
492	497	liveCB.addItemListener(this);
493	498
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	500	oneStepButton.setToolTipText("Animate one step forward");
496	501	oneStepButton.addActionListener(this);
497	502
..	..	@@ -503,7 +508,7 @@
503	508	trackCB.setToolTipText("Enable tracking");
504	509	trackCB.addItemListener(this);
505	510
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
507	512	screenfitButton.setToolTipText("Screen fit");
508	513	screenfitButton.addActionListener(this);
509	514
..	..	@@ -512,39 +517,39 @@
512	517
513	518	if (Globals.ADVANCED)
514	519	{
515		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
516	521	snapobjectButton.addActionListener(this);
517	522	snapobjectButton.setToolTipText("Snap Object");
518	523	}
519	524
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	526	flashSelectionButton.setToolTipText("Show selection");
522	527	flashSelectionButton.addActionListener(this);
523	528
524	529	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	530
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	532	twoButton.setToolTipText("Show center view only");
528	533	twoButton.addActionListener(this);
529		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	535	fourButton.addActionListener(this);
531	536	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	538	sixButton.setToolTipText("2-column layout left");
534	539	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	541	threeButton.setToolTipText("2-column layout right");
537	542	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	544	sevenButton.setToolTipText("3-column layout");
540	545	sevenButton.addActionListener(this);
541	546	//
542	547
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	549	rootButton.setToolTipText("Edit selection in new tab");
545	550	rootButton.addActionListener(this);
546	551
547		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	553	closeButton.setToolTipText("Close tab");
549	554	closeButton.addActionListener(this);
550	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -552,11 +557,11 @@
552	557
553	558	cGridBag commandsPanel = new cGridBag();
554	559
555		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556	561	editButton.setToolTipText("Edit selection");
557	562	editButton.addActionListener(this);
558	563
559		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	565	uneditButton.setToolTipText("Unedit selection");
561	566	uneditButton.addActionListener(this);
562	567
..	..	@@ -564,11 +569,11 @@
564	569	allParamsButton.setToolTipText("Edit all params");
565	570	allParamsButton.addActionListener(this);
566	571
567		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	572	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	573	clearPanelButton.setToolTipText("Clear edit panel");
569	574	clearPanelButton.addActionListener(this);
570	575
571		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	576	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	577	unselectButton.setToolTipText("Unselect");
573	578	unselectButton.addActionListener(this);
574	579
..	..	@@ -651,7 +656,7 @@
651	656	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
652	657	zoomBoxCB.addItemListener(this);
653	658
654		- if (Globals.ADVANCED)
	659	+ if (true) // Globals.ADVANCED)
655	660	{
656	661	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	662	supportCB.setToolTipText("Enable rigging");
..	..	@@ -940,7 +945,9 @@
940	945	// objEditor.DropFile((java.io.File[]) object, true);
941	946	// return;
942	947	// }
943		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
944	951	{
945	952	// file(s)
946	953	String[] names = string.split("\n");
..	..	@@ -967,7 +974,7 @@
967	974
968	975	flashIt = false;
969	976	CameraPane pane = (CameraPane) target;
970		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
971	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
972	979
973	980	if (group.selection.size() == 1)
..	..	@@ -1540,9 +1547,9 @@
1540	1547
1541	1548	void Overwrite(int mask)
1542	1549	{
1543		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1544	1551	{
1545		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1546	1553
1547	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1548	1555	content = ((cGroup)content).get(0);
..	..	@@ -1890,7 +1897,7 @@
1890	1897	if (source == invariantsItem)
1891	1898	{
1892	1899	System.out.println("Invariants:");
1893		- GrafreeD.grafreeD.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1894	1901	} else
1895	1902	if (source == memoryItem)
1896	1903	{
..	..	@@ -1965,10 +1972,10 @@
1965	1972	} else
1966	1973	if (source == duplicateItem)
1967	1974	{
1968		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1969	1976	loadClipboard(false);
1970	1977	paste(false);
1971		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1972	1979	} else
1973	1980	if (source == cloneItem)
1974	1981	{
..	..	@@ -2188,9 +2195,9 @@
2188	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2189	2196	// refreshContents();
2190	2197	// }
2191		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2192	2199	{
2193		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2194	2201
2195	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2196	2203	content = ((cGroup)content).get(0);
..	..	@@ -2240,9 +2247,9 @@
2240	2247	} else
2241	2248	if (source == setMasterItem)
2242	2249	{
2243		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2244	2251	{
2245		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2246	2253
2247	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2248	2255	content = ((cGroup)content).get(0);
..	..	@@ -2255,9 +2262,9 @@
2255	2262	{
2256	2263	if (group.selection.size() == 1)
2257	2264	{
2258		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2259	2266	{
2260		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2261	2268
2262	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2263	2270	content = ((cGroup)content).get(0);
..	..	@@ -2274,7 +2281,7 @@
2274	2281	{
2275	2282	RevertMeshes();
2276	2283	} else
2277		- if (source == resetMeshItem)
	2284	+ if (source == resetAllItem)
2278	2285	{
2279	2286	ResetAll();
2280	2287	} else
..	..	@@ -2612,9 +2619,13 @@
2612	2619	{
2613	2620	SmoothMesh();
2614	2621	} else
2615		- if (source == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2616	2623	{
2617	2624	TransformGeometry();
	2625	+ } else
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
2618	2629	} else
2619	2630	if (source == resetTransformItem)
2620	2631	{
..	..	@@ -2622,7 +2633,11 @@
2622	2633	} else
2623	2634	if (source == resetCentroidItem)
2624	2635	{
2625		- ResetCentroid();
	2636	+ ResetCentroid(true);
	2637	+ } else
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
2626	2641	} else
2627	2642	if (source == resetParentItem)
2628	2643	{
..	..	@@ -3138,6 +3153,28 @@
3138	3153	refreshContents();
3139	3154	}
3140	3155
	3156	+ void TransformChildren()
	3157	+ {
	3158	+ Object3D obj;
	3159	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3160	+ {
	3161	+ obj = (Object3D)e.nextElement();
	3162	+ obj.KeepTextureMatrices();
	3163	+ obj.TransformChildren();
	3164	+ obj.RestoreTextureMatrices();
	3165	+
	3166	+// if (obj.parent == null)
	3167	+// {
	3168	+// System.out.println("NULL PARENT!");
	3169	+// new Exception().printStackTrace();
	3170	+// }
	3171	+// else
	3172	+// TouchTransform(obj);
	3173	+// //obj.parent.Touch();
	3174	+ }
	3175	+
	3176	+ refreshContents();
	3177	+ }
3141	3178
3142	3179	void ResetTransform()
3143	3180	{
..	..	@@ -3250,7 +3287,7 @@
3250	3287	refreshContents();
3251	3288	}
3252	3289
3253		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3254	3291	{
3255	3292	Object3D obj;
3256	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3265,12 +3302,16 @@
3265	3302	LA.matIdentity(Object3D.mat);
3266	3303	obj.getBounds(minima, maxima, false);
3267	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3268		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3269	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3270	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3271	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3272		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3273	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3274	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3275	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3276	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3336,9 +3377,9 @@
3336	3377	obj = (Object3D)e.nextElement();
3337	3378
3338	3379	System.out.println("Object is: " + obj);
3339		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3340	3381	System.out.println("Boundary rep: " + obj.bRep);
3341		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3342	3383
3343	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3344	3385	}
..	..	@@ -3552,8 +3593,8 @@
3552	3593
3553	3594	void ParseVertices()
3554	3595	{
3555		- boolean epsequal = GrafreeD.epsequal;
3556		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3557	3598
3558	3599	for (int i=0; i<group.selection.size(); i++)
3559	3600	{
..	..	@@ -3578,7 +3619,7 @@
3578	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3579	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3580	3621
3581		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3582	3623
3583	3624	buffer.add(g);
3584	3625	}
..	..	@@ -3593,7 +3634,7 @@
3593	3634	makeSomething(buffer, i==group.selection.size()-1);
3594	3635	}
3595	3636
3596		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3597	3638
3598	3639	refreshContents();
3599	3640	}
..	..	@@ -3611,7 +3652,16 @@
3611	3652	String pigment = Object3D.GetPigment(tex);
3612	3653	//String bump = Object3D.GetBump(tex);
3613	3654
3614		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3656	+
	3657	+ try
	3658	+ {
	3659	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3660	+ }
	3661	+ catch (Exception e)
	3662	+ {
	3663	+ System.err.println("FAIL: " + node);
	3664	+ }
3615	3665
3616	3666	double s = v.s;
3617	3667
..	..	@@ -3743,7 +3793,7 @@
3743	3793	return;
3744	3794
3745	3795	Object3D poses = group.selection.get(0);
3746		- Object3D ref = GrafreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3747	3797
3748	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3749	3799
..	..	@@ -3937,9 +3987,9 @@
3937	3987
3938	3988	void ClipMesh()
3939	3989	{
3940		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3941	3991	{
3942		- Object3D content = GrafreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3943	3993
3944	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3945	3995	content = ((cGroup)content).get(0);
..	..	@@ -3948,7 +3998,7 @@
3948	3998	// {
3949	3999	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3950	4000	// }
3951		- group.selection.ClipMesh(GrafreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3952	4002	}
3953	4003	// group.selection.ClipMesh(GrafreeD.clipboard);
3954	4004	System.out.println("DONE.");
..	..	@@ -4288,12 +4338,12 @@
4288	4338	{
4289	4339	if (group.selection.isEmpty())
4290	4340	return;
4291		- GrafreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4292	4342	Composite tGroup = null;
4293	4343	if (group.selection.size() > 0) // 1)
4294	4344	{
4295	4345	tGroup = new cGroup();
4296		- GrafreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4297	4347	}
4298	4348
4299	4349	if (cut)
..	..	@@ -4333,16 +4383,16 @@
4333	4383	//System.out.println("cut " + child);
4334	4384	//System.out.println("parent = " + child.parent);
4335	4385	// tmp.addChild(child);
4336		- if (GrafreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4337	4387	tGroup.add/Child/(tmp);
4338	4388	else
4339		- GrafreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4340	4390	}
4341	4391	else
4342		- if (GrafreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4343	4393	tGroup.add/Child/(child);
4344	4394	else
4345		- GrafreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4346	4396	}
4347	4397
4348	4398	//ResetModel();
..	..	@@ -4374,21 +4424,21 @@
4374	4424	//System.out.println("cut " + elem);
4375	4425	//System.out.println("parent = " + elem.parent);
4376	4426	// tmp.addChild(elem);
4377		- if (GrafreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4378	4428	tGroup.add/Child/(tmp);
4379	4429	else
4380		- GrafreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4381	4431	}
4382	4432	else
4383		- if (GrafreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4384	4434	tGroup.add/Child/(child);
4385	4435	else
4386		- GrafreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4387	4437	}
4388	4438
4389	4439	}
4390		- if (GrafreeD.clipboardIsTempGroup)
4391		- GrafreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4392	4442	if (cut)
4393	4443	{
4394	4444	ResetModel();
..	..	@@ -4402,7 +4452,7 @@
4402	4452	// return;
4403	4453	boolean first = true;
4404	4454
4405		- if (GrafreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4406	4456	{
4407	4457	Composite temp;
4408	4458
..	..	@@ -4413,7 +4463,7 @@
4413	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4414	4464	*/
4415	4465	Object3D elem;
4416		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4466	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4417	4467	{
4418	4468	Object3D child = (Object3D)e.nextElement();
4419	4469
..	..	@@ -4447,14 +4497,14 @@
4447	4497	//Object3D cb = Applet3D.clipboard;
4448	4498	//temp.addChild(cb);
4449	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4450		- assert(GrafreeD.clipboard.parent == null);
4451		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4452		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4453		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4454		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4500	+ assert(Grafreed.clipboard.parent == null);
	4501	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4502	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4503	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4504	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4455	4505	else
4456		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4457		- GrafreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4458	4508	}
4459	4509
4460	4510	ResetModel();
..	..	@@ -4503,9 +4553,9 @@
4503	4553	{
4504	4554	boolean first = true;
4505	4555
4506		- if (GrafreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4507	4557	{
4508		- Composite temp = (Composite)GrafreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4509	4559	Object3D copy;
4510	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4511	4561	{
..	..	@@ -4515,7 +4565,7 @@
4515	4565	}
4516	4566	} else
4517	4567	{
4518		- linkSomething(GrafreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4519	4569	}
4520	4570	}
4521	4571	}
..	..	@@ -4960,7 +5010,7 @@
4960	5010
4961	5011	void ImportVRMLX3D()
4962	5012	{
4963		- if (GrafreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4964	5014	{
4965	5015	/**/
4966	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4977,7 +5027,7 @@
4977	5027
4978	5028	String GetFile(String dialogName)
4979	5029	{
4980		- if (GrafreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4981	5031	{
4982	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4983	5033	browser.show();
..	..	@@ -5090,7 +5140,7 @@
5090	5140	private MenuItem linkverticesItem;
5091	5141	private MenuItem relinkverticesItem;
5092	5142	private MenuItem setMasterItem;
5093		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
5094	5144	private MenuItem stepAllItem;
5095	5145	private MenuItem revertMeshItem;
5096	5146	private MenuItem poseMeshItem;
..	..	@@ -5151,8 +5201,10 @@
5151	5201	private MenuItem panoTexturesItem;
5152	5202
5153	5203	private MenuItem resetCentroidItem;
5154		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
5155	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
5156	5208	private MenuItem hideItem;
5157	5209	private MenuItem grabItem;
5158	5210	private MenuItem backItem;