~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,31 +426,35 @@
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"));
439	444	buildCreateMenu(menu);
440	445
441	446	oe.menuBar.add(menu = new Menu("Include"));
442		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
443		- importGFDItem.addActionListener(this);
444		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
445		- importVRMLX3DItem.addActionListener(this);
446		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
447	448	importOBJItem.addActionListener(this);
448		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
449	451	import3DSItem.addActionListener(this);
	452	+ menu.add("-");
	453	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	454	+ importVRMLX3DItem.addActionListener(this);
	455	+ menu.add("-");
	456	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	457	+ importGFDItem.addActionListener(this);
450	458
451	459	oe.menuBar.add(menu = new Menu("Tools"));
452	460	buildToolsMenu(menu);
..	..	@@ -485,10 +493,10 @@
485	493	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
486	494
487	495	oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
488		- liveCB.setToolTipText("Enabled animation");
	496	+ liveCB.setToolTipText("Enable animation");
489	497	liveCB.addItemListener(this);
490	498
491		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	500	oneStepButton.setToolTipText("Animate one step forward");
493	501	oneStepButton.addActionListener(this);
494	502
..	..	@@ -500,7 +508,7 @@
500	508	trackCB.setToolTipText("Enable tracking");
501	509	trackCB.addItemListener(this);
502	510
503		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	512	screenfitButton.setToolTipText("Screen fit");
505	513	screenfitButton.addActionListener(this);
506	514
..	..	@@ -509,39 +517,39 @@
509	517
510	518	if (Globals.ADVANCED)
511	519	{
512		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
513	521	snapobjectButton.addActionListener(this);
514	522	snapobjectButton.setToolTipText("Snap Object");
515	523	}
516	524
517		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
518	526	flashSelectionButton.setToolTipText("Show selection");
519	527	flashSelectionButton.addActionListener(this);
520	528
521	529	oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
522	530
523		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
524	532	twoButton.setToolTipText("Show center view only");
525	533	twoButton.addActionListener(this);
526		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	535	fourButton.addActionListener(this);
528	536	fourButton.setToolTipText("Show left panel only");
529		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
530	538	sixButton.setToolTipText("2-column layout left");
531	539	sixButton.addActionListener(this);
532		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	541	threeButton.setToolTipText("2-column layout right");
534	542	threeButton.addActionListener(this);
535		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	544	sevenButton.setToolTipText("3-column layout");
537	545	sevenButton.addActionListener(this);
538	546	//
539	547
540		- 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);
541	549	rootButton.setToolTipText("Edit selection in new tab");
542	550	rootButton.addActionListener(this);
543	551
544		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
545	553	closeButton.setToolTipText("Close tab");
546	554	closeButton.addActionListener(this);
547	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -549,11 +557,11 @@
549	557
550	558	cGridBag commandsPanel = new cGridBag();
551	559
552		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	561	editButton.setToolTipText("Edit selection");
554	562	editButton.addActionListener(this);
555	563
556		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	565	uneditButton.setToolTipText("Unedit selection");
558	566	uneditButton.addActionListener(this);
559	567
..	..	@@ -561,11 +569,11 @@
561	569	allParamsButton.setToolTipText("Edit all params");
562	570	allParamsButton.addActionListener(this);
563	571
564		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	572	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	573	clearPanelButton.setToolTipText("Clear edit panel");
566	574	clearPanelButton.addActionListener(this);
567	575
568		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	576	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	577	unselectButton.setToolTipText("Unselect");
570	578	unselectButton.addActionListener(this);
571	579
..	..	@@ -648,7 +656,7 @@
648	656	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
649	657	zoomBoxCB.addItemListener(this);
650	658
651		- if (Globals.ADVANCED)
	659	+ if (true) // Globals.ADVANCED)
652	660	{
653	661	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
654	662	supportCB.setToolTipText("Enable rigging");
..	..	@@ -937,7 +945,9 @@
937	945	// objEditor.DropFile((java.io.File[]) object, true);
938	946	// return;
939	947	// }
940		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
941	951	{
942	952	// file(s)
943	953	String[] names = string.split("\n");
..	..	@@ -964,7 +974,7 @@
964	974
965	975	flashIt = false;
966	976	CameraPane pane = (CameraPane) target;
967		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
968	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
969	979
970	980	if (group.selection.size() == 1)
..	..	@@ -1537,9 +1547,9 @@
1537	1547
1538	1548	void Overwrite(int mask)
1539	1549	{
1540		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1541	1551	{
1542		- Object3D content = GrafreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1543	1553
1544	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1545	1555	content = ((cGroup)content).get(0);
..	..	@@ -1859,7 +1869,15 @@
1859	1869	} else
1860	1870	if (source == importOBJItem)
1861	1871	{
1862		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1872	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1874	+ browser.setVisible(true);
	1875	+ String filename = browser.getFile();
	1876	+ if (filename != null && filename.length() > 0)
	1877	+ {
	1878	+ String fullname = browser.getDirectory() + filename;
	1879	+ makeSomething(ReadOBJ(fullname), true);
	1880	+ }
1863	1881	} else
1864	1882	if (source == computeAOItem)
1865	1883	{
..	..	@@ -1879,7 +1897,7 @@
1879	1897	if (source == invariantsItem)
1880	1898	{
1881	1899	System.out.println("Invariants:");
1882		- GrafreeD.grafreeD.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1883	1901	} else
1884	1902	if (source == memoryItem)
1885	1903	{
..	..	@@ -1954,10 +1972,10 @@
1954	1972	} else
1955	1973	if (source == duplicateItem)
1956	1974	{
1957		- Object3D keep = GrafreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1958	1976	loadClipboard(false);
1959	1977	paste(false);
1960		- GrafreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1961	1979	} else
1962	1980	if (source == cloneItem)
1963	1981	{
..	..	@@ -2177,9 +2195,9 @@
2177	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2178	2196	// refreshContents();
2179	2197	// }
2180		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2181	2199	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2183	2201
2184	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2203	content = ((cGroup)content).get(0);
..	..	@@ -2229,9 +2247,9 @@
2229	2247	} else
2230	2248	if (source == setMasterItem)
2231	2249	{
2232		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2233	2251	{
2234		- Object3D content = GrafreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2235	2253
2236	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2237	2255	content = ((cGroup)content).get(0);
..	..	@@ -2244,9 +2262,9 @@
2244	2262	{
2245	2263	if (group.selection.size() == 1)
2246	2264	{
2247		- if (GrafreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2248	2266	{
2249		- Object3D content = GrafreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2250	2268
2251	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2252	2270	content = ((cGroup)content).get(0);
..	..	@@ -2263,7 +2281,7 @@
2263	2281	{
2264	2282	RevertMeshes();
2265	2283	} else
2266		- if (source == resetMeshItem)
	2284	+ if (source == resetAllItem)
2267	2285	{
2268	2286	ResetAll();
2269	2287	} else
..	..	@@ -2601,9 +2619,13 @@
2601	2619	{
2602	2620	SmoothMesh();
2603	2621	} else
2604		- if (source == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2605	2623	{
2606	2624	TransformGeometry();
	2625	+ } else
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
2607	2629	} else
2608	2630	if (source == resetTransformItem)
2609	2631	{
..	..	@@ -2611,7 +2633,11 @@
2611	2633	} else
2612	2634	if (source == resetCentroidItem)
2613	2635	{
2614		- ResetCentroid();
	2636	+ ResetCentroid(true);
	2637	+ } else
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
2615	2641	} else
2616	2642	if (source == resetParentItem)
2617	2643	{
..	..	@@ -3127,6 +3153,28 @@
3127	3153	refreshContents();
3128	3154	}
3129	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	+ }
3130	3178
3131	3179	void ResetTransform()
3132	3180	{
..	..	@@ -3239,7 +3287,7 @@
3239	3287	refreshContents();
3240	3288	}
3241	3289
3242		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3243	3291	{
3244	3292	Object3D obj;
3245	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3254,12 +3302,16 @@
3254	3302	LA.matIdentity(Object3D.mat);
3255	3303	obj.getBounds(minima, maxima, false);
3256	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3257		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3258	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3259	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3260	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3261		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3262	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3263	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3264	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3265	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3325,9 +3377,9 @@
3325	3377	obj = (Object3D)e.nextElement();
3326	3378
3327	3379	System.out.println("Object is: " + obj);
3328		- GrafreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3329	3381	System.out.println("Boundary rep: " + obj.bRep);
3330		- GrafreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3331	3383
3332	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3333	3385	}
..	..	@@ -3541,8 +3593,8 @@
3541	3593
3542	3594	void ParseVertices()
3543	3595	{
3544		- boolean epsequal = GrafreeD.epsequal;
3545		- GrafreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3546	3598
3547	3599	for (int i=0; i<group.selection.size(); i++)
3548	3600	{
..	..	@@ -3567,7 +3619,7 @@
3567	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3568	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3569	3621
3570		- g.add(GrafreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3571	3623
3572	3624	buffer.add(g);
3573	3625	}
..	..	@@ -3582,7 +3634,7 @@
3582	3634	makeSomething(buffer, i==group.selection.size()-1);
3583	3635	}
3584	3636
3585		- GrafreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3586	3638
3587	3639	refreshContents();
3588	3640	}
..	..	@@ -3600,7 +3652,16 @@
3600	3652	String pigment = Object3D.GetPigment(tex);
3601	3653	//String bump = Object3D.GetBump(tex);
3602	3654
3603		- 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	+ }
3604	3665
3605	3666	double s = v.s;
3606	3667
..	..	@@ -3732,7 +3793,7 @@
3732	3793	return;
3733	3794
3734	3795	Object3D poses = group.selection.get(0);
3735		- Object3D ref = GrafreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3736	3797
3737	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3738	3799
..	..	@@ -3926,9 +3987,9 @@
3926	3987
3927	3988	void ClipMesh()
3928	3989	{
3929		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3930	3991	{
3931		- Object3D content = GrafreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3932	3993
3933	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3934	3995	content = ((cGroup)content).get(0);
..	..	@@ -3937,7 +3998,7 @@
3937	3998	// {
3938	3999	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3939	4000	// }
3940		- group.selection.ClipMesh(GrafreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3941	4002	}
3942	4003	// group.selection.ClipMesh(GrafreeD.clipboard);
3943	4004	System.out.println("DONE.");
..	..	@@ -4277,12 +4338,12 @@
4277	4338	{
4278	4339	if (group.selection.isEmpty())
4279	4340	return;
4280		- GrafreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4281	4342	Composite tGroup = null;
4282	4343	if (group.selection.size() > 0) // 1)
4283	4344	{
4284	4345	tGroup = new cGroup();
4285		- GrafreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4286	4347	}
4287	4348
4288	4349	if (cut)
..	..	@@ -4322,16 +4383,16 @@
4322	4383	//System.out.println("cut " + child);
4323	4384	//System.out.println("parent = " + child.parent);
4324	4385	// tmp.addChild(child);
4325		- if (GrafreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4326	4387	tGroup.add/Child/(tmp);
4327	4388	else
4328		- GrafreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4329	4390	}
4330	4391	else
4331		- if (GrafreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4332	4393	tGroup.add/Child/(child);
4333	4394	else
4334		- GrafreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4335	4396	}
4336	4397
4337	4398	//ResetModel();
..	..	@@ -4363,21 +4424,21 @@
4363	4424	//System.out.println("cut " + elem);
4364	4425	//System.out.println("parent = " + elem.parent);
4365	4426	// tmp.addChild(elem);
4366		- if (GrafreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4367	4428	tGroup.add/Child/(tmp);
4368	4429	else
4369		- GrafreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4370	4431	}
4371	4432	else
4372		- if (GrafreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4373	4434	tGroup.add/Child/(child);
4374	4435	else
4375		- GrafreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4376	4437	}
4377	4438
4378	4439	}
4379		- if (GrafreeD.clipboardIsTempGroup)
4380		- GrafreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4381	4442	if (cut)
4382	4443	{
4383	4444	ResetModel();
..	..	@@ -4391,7 +4452,7 @@
4391	4452	// return;
4392	4453	boolean first = true;
4393	4454
4394		- if (GrafreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4395	4456	{
4396	4457	Composite temp;
4397	4458
..	..	@@ -4402,7 +4463,7 @@
4402	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4403	4464	*/
4404	4465	Object3D elem;
4405		- 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))
4406	4467	{
4407	4468	Object3D child = (Object3D)e.nextElement();
4408	4469
..	..	@@ -4436,14 +4497,14 @@
4436	4497	//Object3D cb = Applet3D.clipboard;
4437	4498	//temp.addChild(cb);
4438	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4439		- assert(GrafreeD.clipboard.parent == null);
4440		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4441		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4442		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4443		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	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());
4444	4505	else
4445		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4446		- GrafreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4447	4508	}
4448	4509
4449	4510	ResetModel();
..	..	@@ -4492,9 +4553,9 @@
4492	4553	{
4493	4554	boolean first = true;
4494	4555
4495		- if (GrafreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4496	4557	{
4497		- Composite temp = (Composite)GrafreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4498	4559	Object3D copy;
4499	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4500	4561	{
..	..	@@ -4504,7 +4565,7 @@
4504	4565	}
4505	4566	} else
4506	4567	{
4507		- linkSomething(GrafreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4508	4569	}
4509	4570	}
4510	4571	}
..	..	@@ -4949,7 +5010,7 @@
4949	5010
4950	5011	void ImportVRMLX3D()
4951	5012	{
4952		- if (GrafreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4953	5014	{
4954	5015	/**/
4955	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4966,7 +5027,7 @@
4966	5027
4967	5028	String GetFile(String dialogName)
4968	5029	{
4969		- if (GrafreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4970	5031	{
4971	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4972	5033	browser.show();
..	..	@@ -5079,7 +5140,7 @@
5079	5140	private MenuItem linkverticesItem;
5080	5141	private MenuItem relinkverticesItem;
5081	5142	private MenuItem setMasterItem;
5082		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
5083	5144	private MenuItem stepAllItem;
5084	5145	private MenuItem revertMeshItem;
5085	5146	private MenuItem poseMeshItem;
..	..	@@ -5140,8 +5201,10 @@
5140	5201	private MenuItem panoTexturesItem;
5141	5202
5142	5203	private MenuItem resetCentroidItem;
5143		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
5144	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
5145	5208	private MenuItem hideItem;
5146	5209	private MenuItem grabItem;
5147	5210	private MenuItem backItem;