~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -14,7 +14,7 @@
14	14
15	15	//import buoy.widget.BFileChooser;
16	16
17		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	17	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	18	ObjectUI,
19	19	Runnable,
20	20	ActionListener,
..	..	@@ -83,7 +83,7 @@
83	83
84	84	void CloneSelection(boolean supports)
85	85	{
86		- // Object3D keep = GraphreeD.clipboard;
	86	+ // Object3D keep = GrafreeD.clipboard;
87	87	//Object3D obj;
88	88	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	89	{
..	..	@@ -97,14 +97,14 @@
97	97
98	98	void CloneClipboard(boolean supports)
99	99	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	100	+ assert(GrafreeD.clipboard.parent == null);
	101	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	102	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	103	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	104	+ makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
105	105	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	106	+ makeSomething(CloneObject(GrafreeD.clipboard, false));
	107	+ GrafreeD.clipboard.get(0).parent = keepparent;
108	108	}
109	109
110	110	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +118,7 @@
118	118	// obj.support = null;
119	119	if (!supports)
120	120	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	121	+ Object3D clone = (Object3D)GrafreeD.clone(obj);
122	122	obj.parent = parent;
123	123	// obj.support = support;
124	124	// clone.support = support; // aout 2013
..	..	@@ -188,8 +188,9 @@
188	188	clearItem.addActionListener(this);
189	189	clearAllItem = menu.add(new MenuItem("Clear All"));
190	190	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
	191	+
	192	+ oe.menuBar.add(menu = new Menu("Setting"));
	193	+ resetMeshItem = menu.add(new MenuItem("Reset All"));
193	194	resetMeshItem.addActionListener(this);
194	195	stepAllItem = menu.add(new MenuItem("Step All"));
195	196	stepAllItem.addActionListener(this);
..	..	@@ -218,18 +219,24 @@
218	219	resetsupportItem.addActionListener(this);
219	220	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	221	linkverticesItem.addActionListener(this);
	222	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	223	+ relinkverticesItem.addActionListener(this);
221	224	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	225	setMasterItem.addActionListener(this);
223	226
224		- oe.menuBar.add(menu = new Menu("Object"));
	227	+ oe.menuBar.add(menu = new Menu("Group"));
225	228	grabItem = menu.add(new MenuItem("Grab"));
226	229	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	230	backItem = menu.add(new MenuItem("Back"));
230	231	backItem.addActionListener(this);
	232	+ frontItem = menu.add(new MenuItem("Front"));
	233	+ frontItem.addActionListener(this);
231	234	compositeItem = menu.add(new MenuItem("Composite"));
232	235	compositeItem.addActionListener(this);
	236	+ hideItem = menu.add(new MenuItem("Hide"));
	237	+ hideItem.addActionListener(this);
	238	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	239	+ ungroupItem.addActionListener(this);
233	240	menu.add("-");
234	241	randomItem = menu.add(new MenuItem("Random"));
235	242	randomItem.addActionListener(this);
..	..	@@ -247,9 +254,12 @@
247	254	scriptNodeItem.addActionListener(this);
248	255	cameraItem = menu.add(new MenuItem("Camera"));
249	256	cameraItem.addActionListener(this);
250		- menu.add("-");
	257	+
	258	+ oe.menuBar.add(menu = new Menu("Object"));
251	259	textureItem = menu.add(new MenuItem("Texture"));
252	260	textureItem.addActionListener(this);
	261	+ billboardItem = menu.add(new MenuItem("Billboard"));
	262	+ billboardItem.addActionListener(this);
253	263	csgItem = menu.add(new MenuItem("CSG"));
254	264	csgItem.addActionListener(this);
255	265	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -267,14 +277,12 @@
267	277	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	278	pointflowItem.addActionListener(this);
269	279	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	280	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	281	resetTransformItem.addActionListener(this);
274	282	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	283	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	284	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	285	+ transformgeometryItem.addActionListener(this);
278	286
279	287	oe.menuBar.add(menu = new Menu("Geometry"));
280	288	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +291,10 @@
283	291	genNormalsORGANItem.addActionListener(this);
284	292	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	293	genNormalsCADItem.addActionListener(this);
	294	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	295	+ genNormalsMESHItem.addActionListener(this);
	296	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	297	+ genNormalsMINEItem.addActionListener(this);
286	298	stripifyItem = menu.add(new MenuItem("Stripify"));
287	299	stripifyItem.addActionListener(this);
288	300	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +304,6 @@
292	304	untrimItem = menu.add(new MenuItem("Untrim"));
293	305	untrimItem.addActionListener(this);
294	306	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	307	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	308	clearColorsItem.addActionListener(this);
299	309	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -310,6 +320,10 @@
310	320	smoothMeshItem.addActionListener(this);
311	321	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	322	clipMeshItem.addActionListener(this);
	323	+
	324	+ oe.menuBar.add(menu = new Menu("Attributes"));
	325	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	326	+ clearMaterialsItem.addActionListener(this);
313	327	menu.add("-");
314	328	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	329	liveleavesItem.addActionListener(this);
..	..	@@ -332,27 +346,18 @@
332	346	flipVItem.addActionListener(this);
333	347	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	348	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	349	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	350	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	351	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	352	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	353	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	354	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	355	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	356	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	357	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	358	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	359	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	360	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	361
357	362	oe.menuBar.add(menu = new Menu("Selection"));
358	363	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +375,31 @@
370	375	sortbysizeItem.addActionListener(this);
371	376	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	377	sortbynameItem.addActionListener(this);
	378	+ menu.add("-");
	379	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	380	+ extractGeometriesItem.addActionListener(this);
	381	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	382	+ cloneGeometriesItem.addActionListener(this);
	383	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
	384	+ shareGeometriesItem.addActionListener(this);
	385	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
	386	+ mergeGeometriesItem.addActionListener(this);
	387	+
373	388	oe.menuBar.add(menu = new Menu("Insert"));
374	389	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	390	+
	391	+
	392	+ oe.menuBar.add(menu = new Menu("Include"));
	393	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
	394	+ importGFDItem.addActionListener(this);
	395	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
	396	+ importVRMLX3DItem.addActionListener(this);
	397	+ importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	398	+ importOBJItem.addActionListener(this);
	399	+ import3DSItem = menu.add(new MenuItem("3DS Object..."));
	400	+ import3DSItem.addActionListener(this);
	401	+
	402	+ oe.menuBar.add(menu = new Menu("Tools"));
376	403	buildToolsMenu(menu);
377	404	}
378	405
..	..	@@ -410,11 +437,17 @@
410	437	oe.aConstraints.gridwidth = 1;
411	438	oe.aConstraints.gridx = 0;
412	439
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	440	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	441	+ liveCB.setToolTipText("Enabled animation");
414	442	liveCB.addItemListener(this);
415	443
416	444	oe.aConstraints.gridx += 1;
	445	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	446	+ fastCB.setToolTipText("Fast mode");
	447	+ fastCB.addItemListener(this);
	448	+ oe.aConstraints.gridx += 1;
417	449	oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
	450	+ supportCB.setToolTipText("Enabled rigging");
418	451	supportCB.addItemListener(this);
419	452
420	453	// oe.aConstraints.gridx += 1;
..	..	@@ -422,22 +455,27 @@
422	455	// localCB.addItemListener(this);
423	456
424	457	oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
	458	+ oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
	459	+ crowdCB.setToolTipText("Used for crowds");
426	460	crowdCB.addItemListener(this);
427	461
428	462	oe.aConstraints.gridx += 1;
429	463	oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
	464	+ smoothCB.setToolTipText("Snapping delay");
430	465	smoothCB.addItemListener(this);
431	466
432	467	oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
434		- fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436	468	oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
	469	+ slowCB.setToolTipText("Smooth interpolation");
437	470	slowCB.addItemListener(this);
438	471	oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
	472	+ oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
	473	+ boxCB.setToolTipText("Display bounding boxes");
440	474	boxCB.addItemListener(this);
	475	+ oe.aConstraints.gridx += 1;
	476	+ oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
	477	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	478	+ zoomBoxCB.addItemListener(this);
441	479
442	480	// oe.aConstraints.gridx += 1;
443	481	// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
..	..	@@ -464,19 +502,22 @@
464	502	// debugCB.addItemListener(this);
465	503
466	504	oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
	505	+ oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
468	506	oeilCB.addItemListener(this);
469	507
470	508	oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
	509	+ oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
	510	+ lookAtCB.setToolTipText("Look-at target");
472	511	lookAtCB.addItemListener(this);
473	512
474	513	oe.aConstraints.gridx += 1;
475	514	oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	515	+ trackCB.setToolTipText("Enable tracking");
476	516	trackCB.addItemListener(this);
477	517
478	518	oe.aConstraints.gridx += 1;
479	519	oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	520	+ screenfitButton.setToolTipText("Screen fit");
480	521	screenfitButton.addActionListener(this);
481	522	oe.aConstraints.gridx += 1;
482	523	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
..	..	@@ -484,6 +525,7 @@
484	525	// oe.aConstraints.gridx += 1;
485	526	oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486	527	snapobjectButton.addActionListener(this);
	528	+ snapobjectButton.setToolTipText("Snap Object");
487	529	oe.aConstraints.gridx += 1;
488	530
489	531	//aConstraints.gridx = 0;
..	..	@@ -492,28 +534,39 @@
492	534	oe.aConstraints.gridwidth = 1;
493	535
494	536	oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	537	+ flashSelectionButton.setToolTipText("Show selection");
495	538	flashSelectionButton.addActionListener(this);
	539	+
	540	+ oe.toolbarPanel.add(new cButton(" ", false));
	541	+
496	542	oe.aConstraints.gridx += 1;
497	543	oe.aConstraints.weighty = 0;
498	544	oe.aConstraints.gridwidth = 1;
499	545
500	546	//
501	547	oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	548	+ twoButton.setToolTipText("Show center view only");
502	549	twoButton.addActionListener(this);
503	550	oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
504	551	fourButton.addActionListener(this);
	552	+ fourButton.setToolTipText("Show left panel only");
505	553	oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	554	+ sixButton.setToolTipText("2-column layout left");
506	555	sixButton.addActionListener(this);
507	556	oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	557	+ threeButton.setToolTipText("2-column layout right");
508	558	threeButton.addActionListener(this);
509	559	oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	560	+ sevenButton.setToolTipText("3-column layout");
510	561	sevenButton.addActionListener(this);
511	562	//
512	563
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	564	+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
	565	+ rootButton.setToolTipText("Edit object in new tab");
514	566	rootButton.addActionListener(this);
515	567	oe.aConstraints.gridx += 1;
516	568	oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	569	+ closeButton.setToolTipText("Close tab");
517	570	closeButton.addActionListener(this);
518	571	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	572	//clearButton.addActionListener(this);
..	..	@@ -619,14 +672,14 @@
619	672
620	673	void EditObject(Object3D obj)
621	674	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	675	+ cRadio radioButton = new cRadio(obj.name);
	676	+ radioButton.SetObject(obj);
	677	+ radioButton.layout = sevenButton;
	678	+ radioButton.SetCamera(cameraView.renderCamera, false);
	679	+ radioButton.addActionListener(this);
	680	+ radioPanel.add(radioButton);
	681	+ buttonGroup.add(radioButton);
	682	+ radioButton.doClick();
630	683	}
631	684	void SetupViews(ObjEditor oe)
632	685	{
..	..	@@ -646,6 +699,7 @@
646	699	JCheckBox fastCB;
647	700	JCheckBox slowCB;
648	701	JCheckBox boxCB;
	702	+ JCheckBox zoomBoxCB;
649	703	JCheckBox trackCB;
650	704	JCheckBox smoothfocusCB;
651	705	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +742,7 @@
688	742	dropAttributes \|= Object3D.TEXTURE;
689	743	else
690	744	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	745	+ } else if(e.getSource() == liveCB)
693	746	{
694	747	cameraView.ToggleLive();
695	748	}
..	..	@@ -726,6 +779,10 @@
726	779	Recompile();
727	780	cameraView.repaint();
728	781	// refreshContents();
	782	+ }
	783	+ else if(e.getSource() == zoomBoxCB)
	784	+ {
	785	+ cameraView.ToggleZoomBoxMode();
729	786	}
730	787	else if(e.getSource() == smoothfocusCB)
731	788	{
..	..	@@ -1002,6 +1059,8 @@
1002	1059
1003	1060	void buildCreateMenu(Menu menu)
1004	1061	{
	1062	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1063	+ //heightFieldItem.addActionListener(this);
1005	1064	gridItem = menu.add(new MenuItem("Grid"));
1006	1065	gridItem.addActionListener(this);
1007	1066	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1073,8 @@
1014	1073	torusItem.addActionListener(this);
1015	1074	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1075	superItem.addActionListener(this);
	1076	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1077	+ kleinItem.addActionListener(this);
1017	1078	particleItem = menu.add(new MenuItem("Particle system"));
1018	1079	particleItem.addActionListener(this);
1019	1080	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,15 +1109,6 @@
1048	1109	doubleItem.addActionListener(this);
1049	1110	tripleItem = menu.add(new MenuItem("Trident"));
1050	1111	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
1060	1112	}
1061	1113
1062	1114	void buildToolsMenu(Menu menu)
..	..	@@ -1068,6 +1120,8 @@
1068	1120	menu.add("-");
1069	1121	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1122	parseverticesItem.addActionListener(this);
	1123	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1124	+ textureFieldItem.addActionListener(this);
1071	1125	alignItem = menu.add(new MenuItem("Align"));
1072	1126	alignItem.addActionListener(this);
1073	1127	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1094,6 +1148,8 @@
1094	1148	resetParentItem.addActionListener(this);
1095	1149	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1150	repairParentItem.addActionListener(this);
	1151	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1152	+ repairShadowItem.addActionListener(this);
1097	1153	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1154	invariantsItem.addActionListener(this);
1099	1155	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1429,9 +1485,9 @@
1429	1485
1430	1486	void Overwrite(int mask)
1431	1487	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1488	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1489	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1490	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1491
1436	1492	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1493	content = ((cGroup)content).get(0);
..	..	@@ -1521,6 +1577,46 @@
1521	1577	makeSomething(ragdoll);
1522	1578	//makeSomething(new VehicleDemo());
1523	1579	} else
	1580	+ /*
	1581	+ */
	1582	+ if (event.getSource() == heightFieldItem)
	1583	+ {
	1584	+ Object3D obj = new Object3D();
	1585	+
	1586	+ obj.CreateMaterial();
	1587	+ obj.bRep = new BoundaryRep();
	1588	+
	1589	+ obj.bRep.CreateMesh(new iHeightField()
	1590	+ {
	1591	+ public double f(double x, double y)
	1592	+ {
	1593	+ // The Mandelbrot set is represented by coloring
	1594	+ // each point (x,y) according to the number of
	1595	+ // iterations it takes before the while loop in
	1596	+ // this method ends. For points that are actually
	1597	+ // in the Mandelbrot set, or very close to it, the
	1598	+ // count will reach the maximum value, 80. These
	1599	+ // points will be colored purple. All other colors
	1600	+ // represent points that are definitely NOT in the set.
	1601	+ x -= 600;
	1602	+ y -= 500;
	1603	+ x /= 200;
	1604	+ y /= 200;
	1605	+ int count = 0;
	1606	+ double zx = x;
	1607	+ double zy = y;
	1608	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1609	+ double new_zx = zxzx - zyzy + x;
	1610	+ zy = 2zxzy + y;
	1611	+ zx = new_zx;
	1612	+ count++;
	1613	+ }
	1614	+ return count; // Math.sqrt(count);
	1615	+ }
	1616	+ }, 1000,1000);
	1617	+
	1618	+ makeSomething(obj);
	1619	+ } else
1524	1620	if (event.getSource() == gridItem)
1525	1621	{
1526	1622	makeSomething(new Grid());
..	..	@@ -1540,6 +1636,10 @@
1540	1636	if (event.getSource() == superItem)
1541	1637	{
1542	1638	makeSomething(new Superellipsoid());
	1639	+ } else
	1640	+ if (event.getSource() == kleinItem)
	1641	+ {
	1642	+ makeSomething(new Klein());
1543	1643	} else
1544	1644	if (event.getSource() == blobItem)
1545	1645	{
..	..	@@ -1570,7 +1670,7 @@
1570	1670	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1671	LA.matInvert(obj.toParent, obj.fromParent);
1572	1672	*/
1573		- makeSomething(new CheckerIG());
	1673	+ makeSomething(new Checker());
1574	1674	} else
1575	1675	if (event.getSource() == meshItem)
1576	1676	{
..	..	@@ -1710,8 +1810,8 @@
1710	1810	} else
1711	1811	if (event.getSource() == computeAOItem)
1712	1812	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1813	+ Globals.drawMode = CameraPane.OCCLUSION;
	1814	+ Globals.theRenderer.repaint();
1715	1815	} else
1716	1816	if (event.getSource() == recompileItem)
1717	1817	{
..	..	@@ -1726,7 +1826,7 @@
1726	1826	if (event.getSource() == invariantsItem)
1727	1827	{
1728	1828	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1829	+ GrafreeD.grafreeD.universe.invariants();
1730	1830	} else
1731	1831	if (event.getSource() == memoryItem)
1732	1832	{
..	..	@@ -1796,10 +1896,10 @@
1796	1896	} else
1797	1897	if (event.getSource() == duplicateItem)
1798	1898	{
1799		- Object3D keep = GraphreeD.clipboard;
	1899	+ Object3D keep = GrafreeD.clipboard;
1800	1900	loadClipboard(false);
1801	1901	paste(false);
1802		- GraphreeD.clipboard = keep;
	1902	+ GrafreeD.clipboard = keep;
1803	1903	} else
1804	1904	if (event.getSource() == cloneItem)
1805	1905	{
..	..	@@ -1843,8 +1943,9 @@
1843	1943	} else
1844	1944	if (event.getSource() == overwriteMatItem)
1845	1945	{
	1946	+ /* july 2015
1846	1947	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1948	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1949	else
1849	1950	{
1850	1951	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1957,16 @@
1856	1957	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1958	}
1858	1959	}
	1960	+ */
	1961	+
	1962	+ Overwrite(dropAttributes);
1859	1963	}
1860	1964	if (event.getSource() == overwriteGeoItem)
1861	1965	{
1862	1966	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1967	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1968	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1969	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1970	//
1867	1971	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1972	// content = ((cGroup)content).get(0);
..	..	@@ -1945,23 +2049,28 @@
1945	2049	if (group.selection.size() == 1)
1946	2050	one = true;
1947	2051
	2052	+ Object3D merge = null;
	2053	+
1948	2054	Object3D content = new cGroup();
1949	2055
1950	2056	for (int i=0; i<group.selection.size(); i++)
1951	2057	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2058	+ merge = new Merge(group.selection.get(i));
1953	2059
1954	2060	if (one)
1955		- makeSomething(sel, false);
	2061	+ makeSomething(merge, false);
1956	2062	else
1957		- content.addChild(sel);
	2063	+ content.addChild(merge);
1958	2064	}
1959	2065
1960	2066	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2067	+ makeSomething(content, true);
	2068	+ else
	2069	+ {
	2070	+ ResetModel();
	2071	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2072	+ refreshContents();
	2073	+ }
1965	2074	} else
1966	2075	if (event.getSource() == mergeGeometriesItem)
1967	2076	{
..	..	@@ -1995,9 +2104,9 @@
1995	2104	} else
1996	2105	if (event.getSource() == linkverticesItem)
1997	2106	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2107	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2108	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2109	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2110	//
2002	2111	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2112	// content = ((cGroup)content).get(0);
..	..	@@ -2006,14 +2115,14 @@
2006	2115	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2116	// refreshContents();
2008	2117	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2118	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2119	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2120	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2121
2013	2122	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2123	content = ((cGroup)content).get(0);
2015	2124
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2125	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2126	for (int i=0; i<group.selection.size(); i++)
2018	2127	{
2019	2128	boolean random = CameraPane.RANDOM;
..	..	@@ -2022,7 +2131,7 @@
2022	2131	// group.selection.get(i).setMasterThis(content); // should be identity
2023	2132	CameraPane.RANDOM = random;
2024	2133	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2134	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2135	refreshContents();
2027	2136	}
2028	2137	} else
..	..	@@ -2038,6 +2147,15 @@
2038	2147
2039	2148	refreshContents();
2040	2149	} else
	2150	+ if (event.getSource() == relinkverticesItem)
	2151	+ {
	2152	+ boolean random = CameraPane.RANDOM;
	2153	+ CameraPane.RANDOM = false; // parse all random nodes
	2154	+ group.selection.RelinkToSupport();
	2155	+ CameraPane.RANDOM = random;
	2156	+
	2157	+ refreshContents();
	2158	+ } else
2041	2159	if (event.getSource() == resetreferencesItem)
2042	2160	{
2043	2161	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2049,9 +2167,9 @@
2049	2167	} else
2050	2168	if (event.getSource() == setMasterItem)
2051	2169	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2170	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2171	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2172	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2173
2056	2174	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2175	content = ((cGroup)content).get(0);
..	..	@@ -2064,9 +2182,9 @@
2064	2182	{
2065	2183	if (group.selection.size() == 1)
2066	2184	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2185	+ if (GrafreeD.clipboard.size() == 1)
2068	2186	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2187	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2188
2071	2189	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2190	content = ((cGroup)content).get(0);
..	..	@@ -2106,6 +2224,10 @@
2106	2224	if (event.getSource() == grabItem)
2107	2225	{
2108	2226	group(new cGroup(), true);
	2227	+ } else
	2228	+ if (event.getSource() == hideItem)
	2229	+ {
	2230	+ group(new HiddenObject());
2109	2231	} else
2110	2232	if (event.getSource() == frontItem)
2111	2233	{
..	..	@@ -2229,6 +2351,10 @@
2229	2351	{
2230	2352	group(new TextureNode());
2231	2353	} else
	2354	+ if (event.getSource() == billboardItem)
	2355	+ {
	2356	+ group(new BillboardNode());
	2357	+ } else
2232	2358	if (event.getSource() == shadowXItem)
2233	2359	{
2234	2360	CastShadow(0);
..	..	@@ -2243,7 +2369,15 @@
2243	2369	} else
2244	2370	if (event.getSource() == ungroupItem)
2245	2371	{
2246		- ungroup();
	2372	+ //ungroup();
	2373	+ for (int i=0; i<group.selection.size(); i++)
	2374	+ {
	2375	+ Ungroup(group.selection.get(i));
	2376	+ }
	2377	+
	2378	+ ClearSelection(false);
	2379	+
	2380	+ refreshContents();
2247	2381	} else
2248	2382	if (event.getSource() == genUVItem)
2249	2383	{
..	..	@@ -2253,9 +2387,17 @@
2253	2387	{
2254	2388	GenNormals(true);
2255	2389	} else
	2390	+ if (event.getSource() == genNormalsMESHItem)
	2391	+ {
	2392	+ GenNormals(true); // TODO
	2393	+ } else
2256	2394	if (event.getSource() == genNormalsORGANItem)
2257	2395	{
2258	2396	GenNormals(false);
	2397	+ } else
	2398	+ if (event.getSource() == genNormalsMINEItem)
	2399	+ {
	2400	+ GenNormalsMINE();
2259	2401	} else
2260	2402	if (event.getSource() == stripifyItem)
2261	2403	{
..	..	@@ -2353,6 +2495,10 @@
2353	2495	{
2354	2496	ParseVertices();
2355	2497	} else
	2498	+ if (event.getSource() == textureFieldItem)
	2499	+ {
	2500	+ TextureVertices();
	2501	+ } else
2356	2502	if (event.getSource() == alignItem)
2357	2503	{
2358	2504	Align();
..	..	@@ -2421,6 +2567,20 @@
2421	2567	{
2422	2568	Object3D obj = (Object3D)e.nextElement();
2423	2569	obj.RepairParent();
	2570	+// for (int i=0; i<obj.size(); i++)
	2571	+// {
	2572	+// obj.get(i).parent = obj;
	2573	+// }
	2574	+ }
	2575	+
	2576	+ refreshContents();
	2577	+ } else
	2578	+ if (event.getSource() == repairShadowItem)
	2579	+ {
	2580	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2581	+ {
	2582	+ Object3D obj = (Object3D)e.nextElement();
	2583	+ obj.RepairShadow();
2424	2584	// for (int i=0; i<obj.size(); i++)
2425	2585	// {
2426	2586	// obj.get(i).parent = obj;
..	..	@@ -2524,8 +2684,8 @@
2524	2684	// bug
2525	2685	//gridPanel.setDividerLocation(1.0);
2526	2686	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
	2687	+ bigThree.remove(scenePanel);
	2688	+ bigThree.remove(centralPanel);
2529	2689	bigThree.remove(XYZPanel);
2530	2690	aWindowConstraints.gridx = 0;
2531	2691	aWindowConstraints.gridy = 0;
..	..	@@ -2540,7 +2700,7 @@
2540	2700	// aConstraints.gridheight = 3;
2541	2701	aWindowConstraints.gridx = 1;
2542	2702	aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
	2703	+ bigThree.add(centralPanel, aWindowConstraints);
2544	2704	aWindowConstraints.weightx = 0;
2545	2705	aWindowConstraints.gridx = 4;
2546	2706	aWindowConstraints.gridwidth = 1;
..	..	@@ -2552,8 +2712,8 @@
2552	2712	if (event.getSource() == threeButton)
2553	2713	{
2554	2714	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
	2715	+ bigThree.remove(scenePanel);
	2716	+ bigThree.remove(centralPanel);
2557	2717	bigThree.remove(XYZPanel);
2558	2718	aWindowConstraints.gridx = 0;
2559	2719	aWindowConstraints.gridy = 0;
..	..	@@ -2568,7 +2728,7 @@
2568	2728	// aConstraints.gridheight = 3;
2569	2729	aWindowConstraints.gridx = 1;
2570	2730	aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
	2731	+ bigThree.add(centralPanel, aWindowConstraints);
2572	2732	aWindowConstraints.weightx = 0;
2573	2733	aWindowConstraints.gridx = 4;
2574	2734	aWindowConstraints.gridwidth = 1;
..	..	@@ -2580,8 +2740,8 @@
2580	2740	if (event.getSource() == fourButton)
2581	2741	{
2582	2742	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
	2743	+ bigThree.remove(scenePanel);
	2744	+ bigThree.remove(centralPanel);
2585	2745	bigThree.remove(XYZPanel);
2586	2746	aWindowConstraints.gridx = 0;
2587	2747	aWindowConstraints.gridy = 0;
..	..	@@ -2590,7 +2750,7 @@
2590	2750	aWindowConstraints.fill = GridBagConstraints.BOTH;
2591	2751	aWindowConstraints.weightx = 1;
2592	2752	aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
	2753	+ bigThree.add(scenePanel, aWindowConstraints);
2594	2754	aWindowConstraints.weightx = 1;
2595	2755	aWindowConstraints.gridwidth = 3;
2596	2756	// aConstraints.gridheight = 3;
..	..	@@ -2608,8 +2768,8 @@
2608	2768	if (event.getSource() == sixButton)
2609	2769	{
2610	2770	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
	2771	+ bigThree.remove(scenePanel);
	2772	+ bigThree.remove(centralPanel);
2613	2773	bigThree.remove(XYZPanel);
2614	2774	aWindowConstraints.gridx = 0;
2615	2775	aWindowConstraints.gridy = 0;
..	..	@@ -2618,13 +2778,13 @@
2618	2778	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619	2779	aWindowConstraints.weightx = 0;
2620	2780	aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
	2781	+ bigThree.add(scenePanel, aWindowConstraints);
2622	2782	aWindowConstraints.weightx = 1;
2623	2783	aWindowConstraints.gridwidth = 3;
2624	2784	// aWindowConstraints.gridheight = 3;
2625	2785	aWindowConstraints.gridx = 1;
2626	2786	aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
	2787	+ bigThree.add(centralPanel, aWindowConstraints);
2628	2788	aWindowConstraints.weightx = 0;
2629	2789	aWindowConstraints.gridx = 4;
2630	2790	aWindowConstraints.gridwidth = 1;
..	..	@@ -2636,8 +2796,8 @@
2636	2796	if (event.getSource() == sevenButton)
2637	2797	{
2638	2798	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
	2799	+ bigThree.remove(scenePanel);
	2800	+ bigThree.remove(centralPanel);
2641	2801	bigThree.remove(XYZPanel);
2642	2802	aWindowConstraints.gridx = 0;
2643	2803	aWindowConstraints.gridy = 0;
..	..	@@ -2646,13 +2806,13 @@
2646	2806	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647	2807	aWindowConstraints.weightx = 0;
2648	2808	aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
	2809	+ bigThree.add(scenePanel, aWindowConstraints);
2650	2810	aWindowConstraints.weightx = 1;
2651	2811	aWindowConstraints.gridwidth = 3;
2652	2812	// aWindowConstraints.gridheight = 3;
2653	2813	aWindowConstraints.gridx = 1;
2654	2814	aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
	2815	+ bigThree.add(centralPanel, aWindowConstraints);
2656	2816	aWindowConstraints.weightx = 0;
2657	2817	aWindowConstraints.gridx = 4;
2658	2818	aWindowConstraints.gridwidth = 1;
..	..	@@ -2750,7 +2910,7 @@
2750	2910	if (event.getSource() == unselectButton)
2751	2911	{
2752	2912	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2913	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2914	objEditor.ResetSliders();
2755	2915	refreshContents(true);
2756	2916	} else
..	..	@@ -2779,7 +2939,7 @@
2779	2939	}
2780	2940
2781	2941	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	2942	+ //Globals.theRenderer.object = group;
2783	2943	if(!useclient)
2784	2944	{
2785	2945	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +2948,8 @@
2788	2948	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	2949	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	2950	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	2951	+ //cameraView.lighttouched = true;
	2952	+ Globals.lighttouched = true;
2792	2953	topView.object = group;
2793	2954	frontView.object = group;
2794	2955	sideView.object = group;
..	..	@@ -2824,7 +2985,7 @@
2824	2985	if (useclient)
2825	2986	{
2826	2987	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	2988	+ Globals.lighttouched = true;
2828	2989	//topView.object = client;
2829	2990	//frontView.object = client;
2830	2991	//sideView.object = client;
..	..	@@ -2832,7 +2993,7 @@
2832	2993	else
2833	2994	{
2834	2995	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	2996	+ Globals.lighttouched = true;
2836	2997	//topView.object = group;
2837	2998	//frontView.object = group;
2838	2999	//sideView.object = group;
..	..	@@ -3065,9 +3226,9 @@
3065	3226	obj = (Object3D)e.nextElement();
3066	3227
3067	3228	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3229	+ GrafreeD.AnalyzeObject(obj);
3069	3230	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3231	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3232
3072	3233	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3234	}
..	..	@@ -3109,6 +3270,13 @@
3109	3270	void GenNormals(boolean crease)
3110	3271	{
3111	3272	group.GenNormalsS(crease);
	3273	+
	3274	+ refreshContents();
	3275	+ }
	3276	+
	3277	+ void GenNormalsMINE()
	3278	+ {
	3279	+ group.selection.GenNormalsMINE();
3112	3280
3113	3281	refreshContents();
3114	3282	}
..	..	@@ -3157,104 +3325,250 @@
3157	3325
3158	3326	//Object3D buffer;
3159	3327	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	3328	+// BoundaryRep temprep;
	3329	+// Object3D nodes;
	3330	+// Vector<Vertex> vertices;
	3331	+//
	3332	+// cGroup buffer;
	3333	+//
	3334	+// public void Vertex(Object3D node, Vertex v)
	3335	+// {
	3336	+//// vertices.add(v);
	3337	+//// nodes.addElement(node);
	3338	+////
	3339	+//// if (temprep.GetCache(v) != null)
	3340	+//// {
	3341	+//// temprep.Remove(v);
	3342	+//// } else
	3343	+//// {
	3344	+//// temprep.Remember(v);
	3345	+//// }
	3346	+//
	3347	+// //Object3D node = nodes.get(index);
	3348	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3349	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3350	+//
	3351	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3352	+//
	3353	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3354	+//
	3355	+// cGroup g = new cGroup();
	3356	+//
	3357	+// if (g.toParent == null)
	3358	+// {
	3359	+// g.toParent = LA.newMatrix();
	3360	+// g.fromParent = LA.newMatrix();
	3361	+// }
	3362	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3363	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3364	+//
	3365	+// g.add(GrafreeD.clipboard);
	3366	+//
	3367	+// buffer.add(g);
	3368	+// }
	3369	+//
	3370	+// public void Face(Object3D node, Face f)
	3371	+// {
	3372	+//
	3373	+// }
	3374	+//
	3375	+// void ParseVerticesOld() // ??
	3376	+// {
	3377	+// //if (group.selection.size() != 1)
	3378	+// // return;
	3379	+//
	3380	+// temprep = new BoundaryRep();
	3381	+// nodes = new Object3D();
	3382	+// vertices = new Vector<Vertex>();
	3383	+//
	3384	+// boolean epsequal = GrafreeD.epsequal;
	3385	+// GrafreeD.epsequal = true;
	3386	+//
	3387	+// for (int i=0; i<group.selection.size(); i++)
	3388	+// {
	3389	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3390	+//
	3391	+// group.selection.get(i).Parse(
	3392	+//this );
	3393	+//
	3394	+// int repsize = temprep.VertexCount();
	3395	+// int tablesize = temprep.vertextable.size();
	3396	+// int nodesize = nodes.size();
	3397	+//
	3398	+// assert(vertices.size() == nodes.size());
	3399	+//
	3400	+// temprep.vertextable.elements();
	3401	+//
	3402	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3403	+//
	3404	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3405	+// {
	3406	+// cGroup g = new cGroup();
	3407	+//
	3408	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3409	+//
	3410	+// Object3D node = nodes.get(index);
	3411	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3412	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3413	+//
	3414	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3415	+//
	3416	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3417	+//
	3418	+// if (g.toParent == null)
	3419	+// {
	3420	+// g.toParent = LA.newMatrix();
	3421	+// g.fromParent = LA.newMatrix();
	3422	+// }
	3423	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3424	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3425	+//
	3426	+// g.add(GrafreeD.clipboard);
	3427	+//
	3428	+// buffer.add(g);
	3429	+// }
	3430	+//
	3431	+// makeSomething(buffer, i==group.selection.size()-1);
	3432	+// }
	3433	+//
	3434	+// GrafreeD.epsequal = epsequal;
	3435	+//
	3436	+// //buffer = null;
	3437	+// temprep = null;
	3438	+// nodes = null;
	3439	+//
	3440	+// refreshContents();
	3441	+// }
	3442	+
3184	3443	void ParseVertices()
3185	3444	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	3445	+ boolean epsequal = GrafreeD.epsequal;
	3446	+ GrafreeD.epsequal = true;
3195	3447
3196	3448	for (int i=0; i<group.selection.size(); i++)
3197	3449	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3450	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3451
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3452	+ group.selection.get(i).Parse(
	3453	+
	3454	+ new iParse()
	3455	+ {
	3456	+ public void Vertex(Object3D node, Vertex v)
	3457	+ {
	3458	+ temp.set(v);
	3459	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3460
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3461	+ cGroup g = new cGroup();
3211	3462
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3463	+ if (g.toParent == null)
	3464	+ {
	3465	+ g.toParent = LA.newMatrix();
	3466	+ g.fromParent = LA.newMatrix();
	3467	+ }
	3468	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3469	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3470
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3471	+ g.add(GrafreeD.clipboard);
3220	3472
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3473	+ buffer.add(g);
	3474	+ }
3232	3475
3233		- g.add(GraphreeD.clipboard);
	3476	+ public void Face(Object3D node, Face f)
	3477	+ {
3234	3478
3235		- buffer.add(g);
3236		- }
	3479	+ }
	3480	+ }
	3481	+ );
3237	3482
3238	3483	makeSomething(buffer, i==group.selection.size()-1);
3239	3484	}
3240	3485
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3486	+ GrafreeD.epsequal = epsequal;
3246	3487
3247	3488	refreshContents();
3248	3489	}
3249		-
	3490	+
	3491	+ void TextureVertices()
	3492	+ {
	3493	+ for (int i=0; i<group.selection.size(); i++)
	3494	+ {
	3495	+ group.selection.get(i).Parse(
	3496	+ new iParse()
	3497	+ {
	3498	+ public void Vertex(Object3D node, Vertex v)
	3499	+ {
	3500	+ cTexture tex = node.GetTextures();
	3501	+ String pigment = Object3D.GetPigment(tex);
	3502	+ //String bump = Object3D.GetBump(tex);
	3503	+
	3504	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3505	+
	3506	+ double s = v.s;
	3507	+
	3508	+ if (s == 1)
	3509	+ s = 0;
	3510	+
	3511	+ double t = v.t;
	3512	+
	3513	+ if (t == 1)
	3514	+ t = 0;
	3515	+
	3516	+ int indexs = (int) (texturedata.getWidth() * s);
	3517	+ int indext = (int) (texturedata.getHeight() * t);
	3518	+
	3519	+ int index = indext * texturedata.getWidth() + indexs;
	3520	+
	3521	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3522	+
	3523	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3524	+
	3525	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3526	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3527	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3528	+ scale /= 3;
	3529	+
	3530	+ scale /= 0xFF;
	3531	+ // c'est quoi ca? scale /= 4;
	3532	+
	3533	+ //v.AO = scale;
	3534	+
	3535	+ v.x += v.norm.x * scale;
	3536	+ v.y += v.norm.y * scale;
	3537	+ v.z += v.norm.z * scale;
	3538	+ }
	3539	+
	3540	+ public void Face(Object3D node, Face f)
	3541	+ {
	3542	+ }
	3543	+ }
	3544	+ );
	3545	+ }
	3546	+
	3547	+ refreshContents();
	3548	+ }
	3549	+
3250	3550	void Align()
3251	3551	{
	3552	+ if (group.selection.size() == 0)
	3553	+ return;
	3554	+
	3555	+ cVector bbmin = new cVector();
	3556	+ cVector bbmax = new cVector();
	3557	+
	3558	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3559	+
	3560	+ double dx = bbmax.x - bbmin.x;
	3561	+ double dy = bbmax.y - bbmin.y;
	3562	+ double dz = bbmax.z - bbmin.z;
	3563	+
	3564	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3565	+
3252	3566	for (int i=0; i<group.selection.size(); i++)
3253	3567	{
3254	3568	Object3D obj = group.selection.get(i);
3255	3569
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3570	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3571	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3572	}
3259	3573
3260	3574	refreshContents();
..	..	@@ -3267,7 +3581,7 @@
3267	3581	// ref.SaveSupports();
3268	3582	// Object3D par = ref.parent;
3269	3583	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3584	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3585	// ref.parent = par;
3272	3586	// ref.RestoreSupports();
3273	3587
..	..	@@ -3297,7 +3611,7 @@
3297	3611	// lowres.SaveSupports();
3298	3612	// par = lowres.parent;
3299	3613	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3614	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3615	Object3D newlow = CloneObject(lowres, false);
3302	3616	newlow.name = sn.switchobject.get(i).name;
3303	3617	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3633,7 @@
3319	3633	return;
3320	3634
3321	3635	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3636	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3637
3324	3638	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3639
..	..	@@ -3488,7 +3802,7 @@
3488	3802	group.selection.RelinkToSupport(); // july 2014
3489	3803	System.out.println("DONE.");
3490	3804	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3805	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3806	}
3493	3807
3494	3808	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3827,20 @@
3513	3827
3514	3828	void ClipMesh()
3515	3829	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3830	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3831	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3832	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3833
3520	3834	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3835	content = ((cGroup)content).get(0);
3522	3836
3523	3837	// for (int i=0; i<group.selection.size(); i++)
3524	3838	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3839	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3840	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3841	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3842	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3843	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3844	System.out.println("DONE.");
3531	3845	refreshContents();
3532	3846	}
..	..	@@ -3773,16 +4087,16 @@
3773	4087
3774	4088	objEditor.SetText(); // jan 2014
3775	4089
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4090	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4091	CameraPane.flash = true;
3778	4092
3779	4093	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4094	// a camera
3781	4095	{
3782	4096	CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4097	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4098	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4099	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4100	}
3787	4101
3788	4102	refreshContents();
..	..	@@ -3864,12 +4178,12 @@
3864	4178	{
3865	4179	if (group.selection.isEmpty())
3866	4180	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4181	+ GrafreeD.clipboardIsTempGroup = false;
3868	4182	Composite tGroup = null;
3869	4183	if (group.selection.size() > 0) // 1)
3870	4184	{
3871	4185	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4186	+ GrafreeD.clipboardIsTempGroup = true;
3873	4187	}
3874	4188
3875	4189	if (cut)
..	..	@@ -3909,16 +4223,16 @@
3909	4223	//System.out.println("cut " + child);
3910	4224	//System.out.println("parent = " + child.parent);
3911	4225	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4226	+ if (GrafreeD.clipboardIsTempGroup)
3913	4227	tGroup.add/Child/(tmp);
3914	4228	else
3915		- GraphreeD.clipboard = tmp;
	4229	+ GrafreeD.clipboard = tmp;
3916	4230	}
3917	4231	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4232	+ if (GrafreeD.clipboardIsTempGroup)
3919	4233	tGroup.add/Child/(child);
3920	4234	else
3921		- GraphreeD.clipboard = child;
	4235	+ GrafreeD.clipboard = child;
3922	4236	}
3923	4237
3924	4238	//ResetModel();
..	..	@@ -3950,21 +4264,21 @@
3950	4264	//System.out.println("cut " + elem);
3951	4265	//System.out.println("parent = " + elem.parent);
3952	4266	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4267	+ if (GrafreeD.clipboardIsTempGroup)
3954	4268	tGroup.add/Child/(tmp);
3955	4269	else
3956		- GraphreeD.clipboard = tmp;
	4270	+ GrafreeD.clipboard = tmp;
3957	4271	}
3958	4272	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4273	+ if (GrafreeD.clipboardIsTempGroup)
3960	4274	tGroup.add/Child/(child);
3961	4275	else
3962		- GraphreeD.clipboard = child;
	4276	+ GrafreeD.clipboard = child;
3963	4277	}
3964	4278
3965	4279	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4280	+ if (GrafreeD.clipboardIsTempGroup)
	4281	+ GrafreeD.clipboard = tGroup;
3968	4282	if (cut)
3969	4283	{
3970	4284	ResetModel();
..	..	@@ -3974,11 +4288,11 @@
3974	4288
3975	4289	void paste(boolean expand)
3976	4290	{
3977		- // if (GraphreeD.clipboard == null)
	4291	+ // if (GrafreeD.clipboard == null)
3978	4292	// return;
3979	4293	boolean first = true;
3980	4294
3981		- if (GraphreeD.clipboardIsTempGroup)
	4295	+ if (GrafreeD.clipboardIsTempGroup)
3982	4296	{
3983	4297	Composite temp;
3984	4298
..	..	@@ -3989,7 +4303,7 @@
3989	4303	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4304	*/
3991	4305	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4306	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4307	{
3994	4308	Object3D child = (Object3D)e.nextElement();
3995	4309
..	..	@@ -4003,7 +4317,7 @@
4003	4317	else
4004	4318	elem = child.deepCopy(); // ?
4005	4319	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4320	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4321	// elem = elem.get(0);
4008	4322	makeSomething(elem, true); // ?? first);
4009	4323	//group.addChild(elem);
..	..	@@ -4023,14 +4337,14 @@
4023	4337	//Object3D cb = Applet3D.clipboard;
4024	4338	//temp.addChild(cb);
4025	4339	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4340	+ assert(GrafreeD.clipboard.parent == null);
	4341	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4342	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4343	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4344	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4345	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4346	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4347	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4348	}
4035	4349
4036	4350	ResetModel();
..	..	@@ -4039,7 +4353,7 @@
4039	4353
4040	4354	void pasteInto(boolean copyit)
4041	4355	{
4042		-// if (GraphreeD.clipboard == null)
	4356	+// if (GrafreeD.clipboard == null)
4043	4357	// return;
4044	4358
4045	4359	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4386,9 @@
4072	4386	{
4073	4387	boolean first = true;
4074	4388
4075		- if (GraphreeD.clipboardIsTempGroup)
	4389	+ if (GrafreeD.clipboardIsTempGroup)
4076	4390	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4391	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4392	Object3D copy;
4079	4393	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4394	{
..	..	@@ -4084,7 +4398,7 @@
4084	4398	}
4085	4399	} else
4086	4400	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4401	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4402	}
4089	4403	}
4090	4404	}
..	..	@@ -4276,6 +4590,26 @@
4276	4590	makeSomething(csg);
4277	4591	}
4278	4592
	4593	+ void Ungroup(Object3D g)
	4594	+ {
	4595	+ if (g instanceof HiddenObject)
	4596	+ {
	4597	+ HiddenObject h = (HiddenObject) g;
	4598	+
	4599	+ for (int i=0; i<h.ActualSize(); i++)
	4600	+ {
	4601	+ objEditor.makeSomething(h.get(i), false);
	4602	+ }
	4603	+ }
	4604	+ else
	4605	+ {
	4606	+ for (int i=0; i<g.Size(); i++)
	4607	+ {
	4608	+ objEditor.makeSomething(g.get(i), false);
	4609	+ }
	4610	+ }
	4611	+ }
	4612	+
4279	4613	void ungroup()
4280	4614	{
4281	4615	/*
..	..	@@ -4471,7 +4805,7 @@
4471	4805
4472	4806	void ImportGFD()
4473	4807	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4808	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4809	browser.show();
4476	4810	String filename = browser.getFile();
4477	4811	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4843,7 @@
4509	4843
4510	4844	void ImportVRMLX3D()
4511	4845	{
4512		- if (GraphreeD.standAlone)
	4846	+ if (GrafreeD.standAlone)
4513	4847	{
4514	4848	/**/
4515	4849	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4860,7 @@
4526	4860
4527	4861	String GetFile(String dialogName)
4528	4862	{
4529		- if (GraphreeD.standAlone)
	4863	+ if (GrafreeD.standAlone)
4530	4864	{
4531	4865	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4866	browser.show();
..	..	@@ -4635,6 +4969,7 @@
4635	4969	private MenuItem resetsupportItem;
4636	4970	private MenuItem resetreferencesItem;
4637	4971	private MenuItem linkverticesItem;
	4972	+ private MenuItem relinkverticesItem;
4638	4973	private MenuItem setMasterItem;
4639	4974	private MenuItem resetMeshItem;
4640	4975	private MenuItem stepAllItem;
..	..	@@ -4653,8 +4988,10 @@
4653	4988	private MenuItem clearItem;
4654	4989	private MenuItem clearAllItem;
4655	4990	private MenuItem genUVItem;
	4991	+ private MenuItem genNormalsMESHItem;
4656	4992	private MenuItem genNormalsCADItem;
4657	4993	private MenuItem genNormalsORGANItem;
	4994	+ private MenuItem genNormalsMINEItem;
4658	4995	private MenuItem stripifyItem;
4659	4996	private MenuItem unstripifyItem;
4660	4997	private MenuItem trimItem;
..	..	@@ -4696,6 +5033,7 @@
4696	5033	private MenuItem resetCentroidItem;
4697	5034	private MenuItem transformgeometryItem;
4698	5035	private MenuItem resetTransformItem;
	5036	+ private MenuItem hideItem;
4699	5037	private MenuItem grabItem;
4700	5038	private MenuItem backItem;
4701	5039	private MenuItem frontItem;
..	..	@@ -4716,6 +5054,7 @@
4716	5054
4717	5055	private MenuItem resetParentItem;
4718	5056	private MenuItem repairParentItem;
	5057	+ private MenuItem repairShadowItem;
4719	5058	private MenuItem sortbysizeItem;
4720	5059	private MenuItem sortbynameItem;
4721	5060
..	..	@@ -4728,12 +5067,15 @@
4728	5067	private MenuItem particleItem;
4729	5068	private MenuItem ragdollItem;
4730	5069	private MenuItem ragdoll2Item;
	5070	+ private MenuItem heightFieldItem;
	5071	+ private MenuItem textureFieldItem;
4731	5072	private MenuItem gridItem;
4732	5073	private MenuItem rectoidItem;
4733	5074	private MenuItem ellipsoidItem;
4734	5075	private MenuItem coneItem;
4735	5076	private MenuItem torusItem;
4736	5077	private MenuItem superItem;
	5078	+ private MenuItem kleinItem;
4737	5079	private MenuItem blobItem;
4738	5080	private MenuItem latheItem;
4739	5081	private MenuItem bezierItem;
..	..	@@ -4746,6 +5088,7 @@
4746	5088	private MenuItem csgItem;
4747	5089	private MenuItem templateItem;
4748	5090	private MenuItem textureItem;
	5091	+ private MenuItem billboardItem;
4749	5092	private MenuItem shadowXItem;
4750	5093	private MenuItem shadowYItem;
4751	5094	private MenuItem shadowZItem;