~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
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));
	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));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(GrafreeD.clipboard, false));
	108	+ GrafreeD.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)GrafreeD.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -188,8 +189,9 @@
188	189	clearItem.addActionListener(this);
189	190	clearAllItem = menu.add(new MenuItem("Clear All"));
190	191	clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
	192	+
	193	+ oe.menuBar.add(menu = new Menu("Setting"));
	194	+ resetMeshItem = menu.add(new MenuItem("Reset All"));
193	195	resetMeshItem.addActionListener(this);
194	196	stepAllItem = menu.add(new MenuItem("Step All"));
195	197	stepAllItem.addActionListener(this);
..	..	@@ -218,18 +220,24 @@
218	220	resetsupportItem.addActionListener(this);
219	221	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	222	linkverticesItem.addActionListener(this);
	223	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	224	+ relinkverticesItem.addActionListener(this);
221	225	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	226	setMasterItem.addActionListener(this);
223	227
224		- oe.menuBar.add(menu = new Menu("Object"));
	228	+ oe.menuBar.add(menu = new Menu("Group"));
225	229	grabItem = menu.add(new MenuItem("Grab"));
226	230	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	231	backItem = menu.add(new MenuItem("Back"));
230	232	backItem.addActionListener(this);
	233	+ frontItem = menu.add(new MenuItem("Front"));
	234	+ frontItem.addActionListener(this);
231	235	compositeItem = menu.add(new MenuItem("Composite"));
232	236	compositeItem.addActionListener(this);
	237	+ hideItem = menu.add(new MenuItem("Hide"));
	238	+ hideItem.addActionListener(this);
	239	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	240	+ ungroupItem.addActionListener(this);
233	241	menu.add("-");
234	242	randomItem = menu.add(new MenuItem("Random"));
235	243	randomItem.addActionListener(this);
..	..	@@ -247,9 +255,12 @@
247	255	scriptNodeItem.addActionListener(this);
248	256	cameraItem = menu.add(new MenuItem("Camera"));
249	257	cameraItem.addActionListener(this);
250		- menu.add("-");
	258	+
	259	+ oe.menuBar.add(menu = new Menu("Object"));
251	260	textureItem = menu.add(new MenuItem("Texture"));
252	261	textureItem.addActionListener(this);
	262	+ billboardItem = menu.add(new MenuItem("Billboard"));
	263	+ billboardItem.addActionListener(this);
253	264	csgItem = menu.add(new MenuItem("CSG"));
254	265	csgItem.addActionListener(this);
255	266	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -267,14 +278,12 @@
267	278	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	279	pointflowItem.addActionListener(this);
269	280	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	281	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	282	resetTransformItem.addActionListener(this);
274	283	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	284	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	285	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	286	+ transformgeometryItem.addActionListener(this);
278	287
279	288	oe.menuBar.add(menu = new Menu("Geometry"));
280	289	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +292,10 @@
283	292	genNormalsORGANItem.addActionListener(this);
284	293	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	294	genNormalsCADItem.addActionListener(this);
	295	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	296	+ genNormalsMESHItem.addActionListener(this);
	297	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	298	+ genNormalsMINEItem.addActionListener(this);
286	299	stripifyItem = menu.add(new MenuItem("Stripify"));
287	300	stripifyItem.addActionListener(this);
288	301	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +305,6 @@
292	305	untrimItem = menu.add(new MenuItem("Untrim"));
293	306	untrimItem.addActionListener(this);
294	307	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	308	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	309	clearColorsItem.addActionListener(this);
299	310	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -310,6 +321,10 @@
310	321	smoothMeshItem.addActionListener(this);
311	322	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	323	clipMeshItem.addActionListener(this);
	324	+
	325	+ oe.menuBar.add(menu = new Menu("Attributes"));
	326	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	327	+ clearMaterialsItem.addActionListener(this);
313	328	menu.add("-");
314	329	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	330	liveleavesItem.addActionListener(this);
..	..	@@ -332,27 +347,18 @@
332	347	flipVItem.addActionListener(this);
333	348	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	349	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	350	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	351	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	352	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	353	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	354	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	355	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	356	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	357	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	358	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	359	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	360	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	361	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	362
357	363	oe.menuBar.add(menu = new Menu("Selection"));
358	364	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +376,31 @@
370	376	sortbysizeItem.addActionListener(this);
371	377	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	378	sortbynameItem.addActionListener(this);
	379	+ menu.add("-");
	380	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	381	+ extractGeometriesItem.addActionListener(this);
	382	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	383	+ cloneGeometriesItem.addActionListener(this);
	384	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
	385	+ shareGeometriesItem.addActionListener(this);
	386	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
	387	+ mergeGeometriesItem.addActionListener(this);
	388	+
373	389	oe.menuBar.add(menu = new Menu("Insert"));
374	390	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	391	+
	392	+
	393	+ oe.menuBar.add(menu = new Menu("Include"));
	394	+ importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
	395	+ importGFDItem.addActionListener(this);
	396	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
	397	+ importVRMLX3DItem.addActionListener(this);
	398	+ importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	399	+ importOBJItem.addActionListener(this);
	400	+ import3DSItem = menu.add(new MenuItem("3DS Object..."));
	401	+ import3DSItem.addActionListener(this);
	402	+
	403	+ oe.menuBar.add(menu = new Menu("Tools"));
376	404	buildToolsMenu(menu);
377	405	}
378	406
..	..	@@ -406,84 +434,30 @@
406	434	oe.radioPanel.add(dummyButton);
407	435	oe.buttonGroup.add(dummyButton);
408	436	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	437	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	438
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	439	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	440	+ liveCB.setToolTipText("Enabled animation");
414	441	liveCB.addItemListener(this);
415	442
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	443	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	444	+ fastCB.setToolTipText("Fast mode");
434	445	fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
441		-
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	446	+
	447	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	448	+ trackCB.setToolTipText("Enable tracking");
476	449	trackCB.addItemListener(this);
477	450
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	451	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	452	+ screenfitButton.setToolTipText("Screen fit");
480	453	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	454	+
482	455	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	456	// screenfitpointButton.addActionListener(this);
484	457	// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
	458	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
486	459	snapobjectButton.addActionListener(this);
	460	+ snapobjectButton.setToolTipText("Snap Object");
487	461	oe.aConstraints.gridx += 1;
488	462
489	463	//aConstraints.gridx = 0;
..	..	@@ -491,65 +465,66 @@
491	465	oe.aConstraints.weighty = 0;
492	466	oe.aConstraints.gridwidth = 1;
493	467
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	468	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	469	+ flashSelectionButton.setToolTipText("Show selection");
495	470	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	471
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	472	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	473	+
	474	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	475	+ twoButton.setToolTipText("Show center view only");
502	476	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	477	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504	478	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	479	+ fourButton.setToolTipText("Show left panel only");
	480	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	481	+ sixButton.setToolTipText("2-column layout left");
506	482	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	483	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	484	+ threeButton.setToolTipText("2-column layout right");
508	485	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	486	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	487	+ sevenButton.setToolTipText("3-column layout");
510	488	sevenButton.addActionListener(this);
511	489	//
512	490
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	491	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ rootButton.setToolTipText("Edit selection in new tab");
514	493	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	494	+
	495	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	496	+ closeButton.setToolTipText("Close tab");
517	497	closeButton.addActionListener(this);
518	498	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	499	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	500
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	501	+ cGridBag commandsPanel = new cGridBag();
	502	+
	503	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ editButton.setToolTipText("Edit selection");
524	505	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	506
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	507	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	508	+ uneditButton.setToolTipText("Unedit selection");
530	509	uneditButton.addActionListener(this);
531	510
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
	511	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	512	+ clearPanelButton.setToolTipText("Clear edit panel");
537	513	clearPanelButton.addActionListener(this);
538	514
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	515	+ commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ allParamsButton.setToolTipText("All params??");
544	517	allParamsButton.addActionListener(this);
545	518
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	519	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	520	+ unselectButton.setToolTipText("Unselect");
551	521	unselectButton.addActionListener(this);
552	522
	523	+ commandsPanel.preferredHeight = 1;
	524	+
	525	+ oe.treePanel.add(commandsPanel);
	526	+ oe.treePanel.Return();
	527	+
553	528	// oe.aConstraints.gridx += 1;
554	529	// oe.aConstraints.weighty = 0;
555	530	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +536,37 @@
561	536	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	537	// gcButton.addActionListener(this);
563	538
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	539	+ cGridBag jSPPanel = new cGridBag();
	540	+
	541	+ JScrollPane jSP;
575	542	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	543	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	544	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	545	+
	546	+ oe.treePanel.add(jSPPanel);
	547	+ oe.treePanel.Return();
582	548
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	549	+ cGridBag copyOptionsPanel = new cGridBag();
	550	+
	551	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	552	+ colorCB.setToolTipText("Copy color when dropped");
587	553	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	554	+
	555	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	556	+ materialCB.setToolTipText("Copy material when dropped");
590	557	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	558	+
	559	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	560	+ textureCB.setToolTipText("Copy texture when dropped");
593	561	textureCB.addItemListener(this);
594	562
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	563	+ copyOptionsPanel.preferredHeight = 1;
	564	+ oe.treePanel.add(copyOptionsPanel);
	565	+ oe.treePanel.Return();
597	566
	567	+// mainPanel.setDividerLocation(0.5); //1.0);
	568	+// mainPanel.setResizeWeight(0.5);
	569	+
598	570	//jList.addListSelectionListener(this);
599	571	oe.jTree.addTreeSelectionListener(this);
600	572	//jTree.setRootVisible(false);
..	..	@@ -616,17 +588,85 @@
616	588	radio.layout = sevenButton;
617	589	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	590	}
	591	+
	592	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	593	+ {
	594	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	595	+ supportCB.setToolTipText("Enabled rigging");
	596	+ supportCB.addItemListener(this);
	597	+
	598	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	599	+ // localCB.addItemListener(this);
	600	+
	601	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	602	+ crowdCB.setToolTipText("Used for crowds");
	603	+ crowdCB.addItemListener(this);
	604	+
	605	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	606	+ smoothCB.setToolTipText("Snapping delay");
	607	+ smoothCB.addItemListener(this);
	608	+
	609	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	610	+ slowCB.setToolTipText("Smooth interpolation");
	611	+ slowCB.addItemListener(this);
	612	+
	613	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	614	+ boxCB.setToolTipText("Display bounding boxes");
	615	+ boxCB.addItemListener(this);
	616	+
	617	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	618	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	619	+ zoomBoxCB.addItemListener(this);
	620	+
	621	+// constraints.gridy += 1;
	622	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	623	+// speakerMocapCB.addItemListener(this);
	624	+
	625	+ if (false)
	626	+ {
	627	+ // handled in scripts
	628	+ //constraints.gridy += 1;
	629	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	630	+ speakerCameraCB.addItemListener(this);
	631	+
	632	+ //constraints.gridy += 1;
	633	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	634	+ speakerFocusCB.addItemListener(this);
	635	+
	636	+ //constraints.gridy += 1;
	637	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	638	+ smoothfocusCB.addItemListener(this);
	639	+ }
	640	+
	641	+//constraints.gridx += 1;
	642	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	643	+// debugCB.addItemListener(this);
	644	+
	645	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	646	+ oeilCB.addItemListener(this);
	647	+
	648	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	649	+ lookAtCB.setToolTipText("Look-at target");
	650	+ lookAtCB.addItemListener(this);
	651	+
	652	+ cGridBag fill = new cGridBag();
	653	+
	654	+ fill.preferredHeight = 200;
	655	+
	656	+ panel.add(fill);
	657	+
	658	+ }
619	659
620	660	void EditObject(Object3D obj)
621	661	{
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();
	662	+ cRadio radioButton = new cRadio(obj.name);
	663	+ radioButton.SetObject(obj);
	664	+ radioButton.layout = sevenButton;
	665	+ radioButton.SetCamera(cameraView.renderCamera, false);
	666	+ radioButton.addActionListener(this);
	667	+ radioPanel.add(radioButton);
	668	+ buttonGroup.add(radioButton);
	669	+ radioButton.doClick();
630	670	}
631	671	void SetupViews(ObjEditor oe)
632	672	{
..	..	@@ -646,6 +686,7 @@
646	686	JCheckBox fastCB;
647	687	JCheckBox slowCB;
648	688	JCheckBox boxCB;
	689	+ JCheckBox zoomBoxCB;
649	690	JCheckBox trackCB;
650	691	JCheckBox smoothfocusCB;
651	692	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +729,7 @@
688	729	dropAttributes \|= Object3D.TEXTURE;
689	730	else
690	731	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	732	+ } else if(e.getSource() == liveCB)
693	733	{
694	734	cameraView.ToggleLive();
695	735	}
..	..	@@ -726,6 +766,10 @@
726	766	Recompile();
727	767	cameraView.repaint();
728	768	// refreshContents();
	769	+ }
	770	+ else if(e.getSource() == zoomBoxCB)
	771	+ {
	772	+ cameraView.ToggleZoomBoxMode();
729	773	}
730	774	else if(e.getSource() == smoothfocusCB)
731	775	{
..	..	@@ -1002,6 +1046,8 @@
1002	1046
1003	1047	void buildCreateMenu(Menu menu)
1004	1048	{
	1049	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1050	+ //heightFieldItem.addActionListener(this);
1005	1051	gridItem = menu.add(new MenuItem("Grid"));
1006	1052	gridItem.addActionListener(this);
1007	1053	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,6 +1060,8 @@
1014	1060	torusItem.addActionListener(this);
1015	1061	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1062	superItem.addActionListener(this);
	1063	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1064	+ kleinItem.addActionListener(this);
1017	1065	particleItem = menu.add(new MenuItem("Particle system"));
1018	1066	particleItem.addActionListener(this);
1019	1067	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1048,26 +1096,19 @@
1048	1096	doubleItem.addActionListener(this);
1049	1097	tripleItem = menu.add(new MenuItem("Trident"));
1050	1098	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	1099	}
1061	1100
1062	1101	void buildToolsMenu(Menu menu)
1063	1102	{
1064	1103	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1104	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1105	+ animationItem.setState(Globals.ANIMATION);
1067	1106
1068	1107	menu.add("-");
1069	1108	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1109	parseverticesItem.addActionListener(this);
	1110	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1111	+ textureFieldItem.addActionListener(this);
1071	1112	alignItem = menu.add(new MenuItem("Align"));
1072	1113	alignItem.addActionListener(this);
1073	1114	mirrorItem = menu.add(new MenuItem("Mirror Poses"));
..	..	@@ -1094,6 +1135,8 @@
1094	1135	resetParentItem.addActionListener(this);
1095	1136	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1137	repairParentItem.addActionListener(this);
	1138	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1139	+ repairShadowItem.addActionListener(this);
1097	1140	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1141	invariantsItem.addActionListener(this);
1099	1142	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1429,9 +1472,9 @@
1429	1472
1430	1473	void Overwrite(int mask)
1431	1474	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1475	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1433	1476	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1477	+ Object3D content = GrafreeD.clipboard.get(0);
1435	1478
1436	1479	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1480	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1497,7 @@
1454	1497	//
1455	1498	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1499	{
	1500	+ Object source = event.getSource();
1457	1501	/*
1458	1502	if (event.getSource() == nameField)
1459	1503	{
..	..	@@ -1465,11 +1509,11 @@
1465	1509	}
1466	1510	else
1467	1511	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1512	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1513	{
1470	1514	ScreenFit();
1471	1515	} else
1472		- if (event.getSource() == switchItem)
	1516	+ if (source == switchItem)
1473	1517	{
1474	1518	cVector v1 = new cVector();
1475	1519	cVector v2 = new cVector();
..	..	@@ -1478,11 +1522,11 @@
1478	1522	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1523	objEditor.cameraView.repaint();
1480	1524	} else
1481		- if (event.getSource() == rectoidItem)
	1525	+ if (source == rectoidItem)
1482	1526	{
1483	1527	makeSomething(new Box());
1484	1528	} else
1485		- if (event.getSource() == particleItem)
	1529	+ if (source == particleItem)
1486	1530	{
1487	1531	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1532	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1547,9 @@
1503	1547	applyExample(particleGeom, "SMOKE");
1504	1548	makeSomething(particleGeom);
1505	1549	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1550	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1551	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1552	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1553
1510	1554	ragdoll.toParent = LA.newMatrix();
1511	1555	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1565,71 @@
1521	1565	makeSomething(ragdoll);
1522	1566	//makeSomething(new VehicleDemo());
1523	1567	} else
1524		- if (event.getSource() == gridItem)
	1568	+ /*
	1569	+ */
	1570	+ if (source == heightFieldItem)
	1571	+ {
	1572	+ Object3D obj = new Object3D();
	1573	+
	1574	+ obj.CreateMaterial();
	1575	+ obj.bRep = new BoundaryRep();
	1576	+
	1577	+ obj.bRep.CreateMesh(new iHeightField()
	1578	+ {
	1579	+ public double f(double x, double y)
	1580	+ {
	1581	+ // The Mandelbrot set is represented by coloring
	1582	+ // each point (x,y) according to the number of
	1583	+ // iterations it takes before the while loop in
	1584	+ // this method ends. For points that are actually
	1585	+ // in the Mandelbrot set, or very close to it, the
	1586	+ // count will reach the maximum value, 80. These
	1587	+ // points will be colored purple. All other colors
	1588	+ // represent points that are definitely NOT in the set.
	1589	+ x -= 600;
	1590	+ y -= 500;
	1591	+ x /= 200;
	1592	+ y /= 200;
	1593	+ int count = 0;
	1594	+ double zx = x;
	1595	+ double zy = y;
	1596	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1597	+ double new_zx = zxzx - zyzy + x;
	1598	+ zy = 2zxzy + y;
	1599	+ zx = new_zx;
	1600	+ count++;
	1601	+ }
	1602	+ return count; // Math.sqrt(count);
	1603	+ }
	1604	+ }, 1000,1000);
	1605	+
	1606	+ makeSomething(obj);
	1607	+ } else
	1608	+ if (source == gridItem)
1525	1609	{
1526	1610	makeSomething(new Grid());
1527	1611	} else
1528		- if (event.getSource() == ellipsoidItem)
	1612	+ if (source == ellipsoidItem)
1529	1613	{
1530	1614	makeSomething(new Sphere());
1531	1615	} else
1532		- if (event.getSource() == coneItem)
	1616	+ if (source == coneItem)
1533	1617	{
1534	1618	makeSomething(new Cone());
1535	1619	} else
1536		- if (event.getSource() == torusItem)
	1620	+ if (source == torusItem)
1537	1621	{
1538	1622	makeSomething(new Torus());
1539	1623	} else
1540		- if (event.getSource() == superItem)
	1624	+ if (source == superItem)
1541	1625	{
1542	1626	makeSomething(new Superellipsoid());
1543	1627	} else
1544		- if (event.getSource() == blobItem)
	1628	+ if (source == kleinItem)
	1629	+ {
	1630	+ makeSomething(new Klein());
	1631	+ } else
	1632	+ if (source == blobItem)
1545	1633	{
1546	1634	Blob blob = new Blob();
1547	1635	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1637,15 @@
1549	1637	//blob.retile();
1550	1638	makeSomething(blob);
1551	1639	} else
1552		- if (event.getSource() == latheItem)
	1640	+ if (source == latheItem)
1553	1641	{
1554	1642	makeSomething(new Lathe());
1555	1643	} else
1556		- if (event.getSource() == bezierItem)
	1644	+ if (source == bezierItem)
1557	1645	{
1558	1646	makeSomething(new BezierSurface());
1559	1647	} else
1560		- if (event.getSource() == checkerItem)
	1648	+ if (source == checkerItem)
1561	1649	{
1562	1650	/*
1563	1651	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1658,9 @@
1570	1658	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1659	LA.matInvert(obj.toParent, obj.fromParent);
1572	1660	*/
1573		- makeSomething(new CheckerIG());
	1661	+ makeSomething(new Checker());
1574	1662	} else
1575		- if (event.getSource() == meshItem)
	1663	+ if (source == meshItem)
1576	1664	{
1577	1665	Object3D itemtomake = new Object3D();
1578	1666	Object3D child;
..	..	@@ -1593,35 +1681,35 @@
1593	1681	makeSomething(child);
1594	1682	}
1595	1683	} else
1596		- if (event.getSource() == springItem)
	1684	+ if (source == springItem)
1597	1685	{
1598	1686	cSpring s = new cSpring();
1599	1687	s.setup();
1600	1688	makeSomething(s);
1601	1689	} else
1602		- if (event.getSource() == flagItem)
	1690	+ if (source == flagItem)
1603	1691	{
1604	1692	cSpring s = new cFlag();
1605	1693	s.setup();
1606	1694	makeSomething(s);
1607	1695	} else
1608		- if (event.getSource() == lightItem)
	1696	+ if (source == lightItem)
1609	1697	{
1610	1698	makeSomething(new Light());
1611	1699	} else
1612		- if (event.getSource() == csgItem)
	1700	+ if (source == csgItem)
1613	1701	{
1614	1702	group(new CSG());
1615	1703	} else
1616		- if (event.getSource() == templateItem)
	1704	+ if (source == templateItem)
1617	1705	{
1618	1706	group(new cTemplate());
1619	1707	} else
1620		- if (event.getSource() == attributeItem)
	1708	+ if (source == attributeItem)
1621	1709	{
1622	1710	makeSomething(new Attribute());
1623	1711	} else
1624		- if (event.getSource() == pointflowItem)
	1712	+ if (source == pointflowItem)
1625	1713	{
1626	1714	makeSomething(new PointFlow());
1627	1715	} else
..	..	@@ -1633,7 +1721,7 @@
1633	1721	} else
1634	1722	*/
1635	1723
1636		- if (event.getSource() == superLoopItem)
	1724	+ if (source == superLoopItem)
1637	1725	{
1638	1726	Composite g = new cGroup();
1639	1727	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1743,7 @@
1655	1743
1656	1744	group(g);
1657	1745	} else
1658		- if (event.getSource() == loopItem)
	1746	+ if (source == loopItem)
1659	1747	{
1660	1748	Composite csg = new GroupLeaf();
1661	1749	csg.count = 5;
..	..	@@ -1664,7 +1752,7 @@
1664	1752	csg.addChild(child);
1665	1753	child.addChild(csg);
1666	1754	} else
1667		- if (event.getSource() == doubleItem)
	1755	+ if (source == doubleItem)
1668	1756	{
1669	1757	Composite csg = new GroupLeaf();
1670	1758	csg.count = 5;
..	..	@@ -1676,7 +1764,7 @@
1676	1764	csg.addChild(child);
1677	1765	child.addChild(csg);
1678	1766	} else
1679		- if (event.getSource() == tripleItem)
	1767	+ if (source == tripleItem)
1680	1768	{
1681	1769	Composite csg = new GroupLeaf();
1682	1770	csg.count = 4;
..	..	@@ -1692,70 +1780,70 @@
1692	1780	child.addChild(csg);
1693	1781	} else
1694	1782
1695		- if (event.getSource() == importGFDItem)
	1783	+ if (source == importGFDItem)
1696	1784	{
1697	1785	ImportGFD();
1698	1786	} else
1699		- if (event.getSource() == importVRMLX3DItem)
	1787	+ if (source == importVRMLX3DItem)
1700	1788	{
1701	1789	ImportVRMLX3D();
1702	1790	} else
1703		- if (event.getSource() == import3DSItem)
	1791	+ if (source == import3DSItem)
1704	1792	{
1705	1793	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706	1794	} else
1707		- if (event.getSource() == importOBJItem)
	1795	+ if (source == importOBJItem)
1708	1796	{
1709	1797	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710	1798	} else
1711		- if (event.getSource() == computeAOItem)
	1799	+ if (source == computeAOItem)
1712	1800	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1801	+ Globals.drawMode = CameraPane.OCCLUSION;
	1802	+ Globals.theRenderer.repaint();
1715	1803	} else
1716		- if (event.getSource() == recompileItem)
	1804	+ if (source == recompileItem)
1717	1805	{
1718	1806	Recompile();
1719	1807	refreshContents();
1720	1808	} else
1721		- if (event.getSource() == editScriptItem)
	1809	+ if (source == editScriptItem)
1722	1810	{
1723	1811	OpenDialog();
1724	1812	refreshContents();
1725	1813	} else
1726		- if (event.getSource() == invariantsItem)
	1814	+ if (source == invariantsItem)
1727	1815	{
1728	1816	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1817	+ GrafreeD.grafreeD.universe.invariants();
1730	1818	} else
1731		- if (event.getSource() == memoryItem)
	1819	+ if (source == memoryItem)
1732	1820	{
1733	1821	//System.out.println("Invariants:");
1734	1822	PrintMemory();
1735	1823	} else
1736		- if (event.getSource() == pathItem)
	1824	+ if (source == pathItem)
1737	1825	{
1738	1826	PrintPath();
1739	1827	} else
1740		- if (event.getSource() == analyzeItem)
	1828	+ if (source == analyzeItem)
1741	1829	{
1742	1830	AnalyzeObject();
1743	1831	} else
1744		- if (event.getSource() == dumpItem)
	1832	+ if (source == dumpItem)
1745	1833	{
1746	1834	DumpObject();
1747	1835	} else
1748		- if (event.getSource() == screenfitButton)
	1836	+ if (source == screenfitButton)
1749	1837	{
1750	1838	//Reload(lastConverter, lastFilename, true);
1751	1839	ScreenFit();
1752	1840	} else
1753		- if (event.getSource() == screenfitpointButton)
	1841	+ if (source == screenfitpointButton)
1754	1842	{
1755	1843	//Reload(lastConverter, lastFilename, true);
1756	1844	ScreenFitPoint();
1757	1845	} else
1758		- if (event.getSource() == snapobjectButton)
	1846	+ if (source == snapobjectButton)
1759	1847	{
1760	1848	//Reload(lastConverter, lastFilename, true);
1761	1849	SnapObject();
..	..	@@ -1766,13 +1854,13 @@
1766	1854	// Recompile();
1767	1855	// refreshContents();
1768	1856	// } else
1769		- if (event.getSource() == gcButton)
	1857	+ if (source == gcButton)
1770	1858	{
1771	1859	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1860	System.gc();
1773	1861	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1862	} else
1775		- if (event.getSource() == editLeafItem)
	1863	+ if (source == editLeafItem)
1776	1864	{
1777	1865	Object3D obj;
1778	1866	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +1874,66 @@
1786	1874	}
1787	1875	refreshContents(true);
1788	1876	} else
1789		- if (event.getSource() == openWindowItem)
	1877	+ if (source == openWindowItem)
1790	1878	{
1791	1879	EditSelection(true);
1792	1880	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1881	+ if (source == cutItem \|\| source == clearButton)
1794	1882	{
1795	1883	loadClipboard(true);
1796	1884	} else
1797		- if (event.getSource() == duplicateItem)
	1885	+ if (source == duplicateItem)
1798	1886	{
1799		- Object3D keep = GraphreeD.clipboard;
	1887	+ Object3D keep = GrafreeD.clipboard;
1800	1888	loadClipboard(false);
1801	1889	paste(false);
1802		- GraphreeD.clipboard = keep;
	1890	+ GrafreeD.clipboard = keep;
1803	1891	} else
1804		- if (event.getSource() == cloneItem)
	1892	+ if (source == cloneItem)
1805	1893	{
1806	1894	CloneSelection(false);
1807	1895	} else
1808		- if (event.getSource() == cloneSupportItem)
	1896	+ if (source == cloneSupportItem)
1809	1897	{
1810	1898	CloneSelection(true);
1811	1899	} else
1812		- if (event.getSource() == copyItem)
	1900	+ if (source == copyItem)
1813	1901	{
1814	1902	loadClipboard(false);
1815	1903	} else
1816		- if (event.getSource() == pasteItem)
	1904	+ if (source == pasteItem)
1817	1905	{
1818	1906	paste(false);
1819	1907	} else
1820		- if (event.getSource() == pasteLinkItem)
	1908	+ if (source == pasteLinkItem)
1821	1909	{
1822	1910	pasteInto(false);
1823	1911	} else
1824		- if (event.getSource() == pasteCloneItem)
	1912	+ if (source == pasteCloneItem)
1825	1913	{
1826	1914	pasteInto(true);
1827	1915	} else
1828		- if (event.getSource() == pasteExpandItem)
	1916	+ if (source == pasteExpandItem)
1829	1917	{
1830	1918	paste(true);
1831	1919	} else
1832		- if (event.getSource() == synchronizeItem)
	1920	+ if (source == synchronizeItem)
1833	1921	{
1834	1922	Overwrite(Object3D.TRANSFORM);
1835	1923	} else
1836		- if (event.getSource() == overwriteNameItem)
	1924	+ if (source == overwriteNameItem)
1837	1925	{
1838	1926	Overwrite(Object3D.NAME);
1839	1927	} else
1840		- if (event.getSource() == overwriteUVItem)
	1928	+ if (source == overwriteUVItem)
1841	1929	{
1842	1930	Overwrite(Object3D.UV);
1843	1931	} else
1844		- if (event.getSource() == overwriteMatItem)
	1932	+ if (source == overwriteMatItem)
1845	1933	{
	1934	+ /* july 2015
1846	1935	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	1936	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	1937	else
1849	1938	{
1850	1939	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +1945,16 @@
1856	1945	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	1946	}
1858	1947	}
	1948	+ */
	1949	+
	1950	+ Overwrite(dropAttributes);
1859	1951	}
1860		- if (event.getSource() == overwriteGeoItem)
	1952	+ if (source == overwriteGeoItem)
1861	1953	{
1862	1954	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1955	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	1956	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	1957	+// Object3D content = GrafreeD.clipboard.get(0);
1866	1958	//
1867	1959	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	1960	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +1966,7 @@
1874	1966	// refreshContents();
1875	1967	// }
1876	1968	} else
1877		- if (event.getSource() == generateMeshItem)
	1969	+ if (source == generateMeshItem)
1878	1970	{
1879	1971	//if (group.selection.size() == 1)
1880	1972	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +1977,7 @@
1885	1977	ResetModel();
1886	1978	refreshContents();
1887	1979	} else
1888		- if (event.getSource() == extractGeometriesItem)
	1980	+ if (source == extractGeometriesItem)
1889	1981	{
1890	1982	boolean one = false;
1891	1983
..	..	@@ -1912,7 +2004,7 @@
1912	2004	ResetModel();
1913	2005	refreshContents();
1914	2006	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2007	+ if (source == cloneGeometriesItem)
1916	2008	{
1917	2009	boolean one = false;
1918	2010
..	..	@@ -1938,32 +2030,37 @@
1938	2030	ResetModel();
1939	2031	refreshContents();
1940	2032	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2033	+ if (source == shareGeometriesItem)
1942	2034	{
1943	2035	boolean one = false;
1944	2036
1945	2037	if (group.selection.size() == 1)
1946	2038	one = true;
1947	2039
	2040	+ Object3D merge = null;
	2041	+
1948	2042	Object3D content = new cGroup();
1949	2043
1950	2044	for (int i=0; i<group.selection.size(); i++)
1951	2045	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2046	+ merge = new Merge(group.selection.get(i));
1953	2047
1954	2048	if (one)
1955		- makeSomething(sel, false);
	2049	+ makeSomething(merge, false);
1956	2050	else
1957		- content.addChild(sel);
	2051	+ content.addChild(merge);
1958	2052	}
1959	2053
1960	2054	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2055	+ makeSomething(content, true);
	2056	+ else
	2057	+ {
	2058	+ ResetModel();
	2059	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2060	+ refreshContents();
	2061	+ }
1965	2062	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2063	+ if (source == mergeGeometriesItem)
1967	2064	{
1968	2065	boolean one = false;
1969	2066
..	..	@@ -1993,11 +2090,11 @@
1993	2090	ResetModel();
1994	2091	refreshContents();
1995	2092	} else
1996		- if (event.getSource() == linkverticesItem)
	2093	+ if (source == linkverticesItem)
1997	2094	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2095	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2096	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2097	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2098	//
2002	2099	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2100	// content = ((cGroup)content).get(0);
..	..	@@ -2006,14 +2103,14 @@
2006	2103	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2104	// refreshContents();
2008	2105	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2106	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
2010	2107	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2108	+ Object3D content = GrafreeD.clipboard.get(0);
2012	2109
2013	2110	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2111	content = ((cGroup)content).get(0);
2015	2112
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2113	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2114	for (int i=0; i<group.selection.size(); i++)
2018	2115	{
2019	2116	boolean random = CameraPane.RANDOM;
..	..	@@ -2022,11 +2119,11 @@
2022	2119	// group.selection.get(i).setMasterThis(content); // should be identity
2023	2120	CameraPane.RANDOM = random;
2024	2121	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2122	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2123	refreshContents();
2027	2124	}
2028	2125	} else
2029		- if (event.getSource() == resetsupportItem)
	2126	+ if (source == resetsupportItem)
2030	2127	{
2031	2128	for (int i=0; i<group.selection.size(); i++)
2032	2129	{
..	..	@@ -2038,7 +2135,16 @@
2038	2135
2039	2136	refreshContents();
2040	2137	} else
2041		- if (event.getSource() == resetreferencesItem)
	2138	+ if (source == relinkverticesItem)
	2139	+ {
	2140	+ boolean random = CameraPane.RANDOM;
	2141	+ CameraPane.RANDOM = false; // parse all random nodes
	2142	+ group.selection.RelinkToSupport();
	2143	+ CameraPane.RANDOM = random;
	2144	+
	2145	+ refreshContents();
	2146	+ } else
	2147	+ if (source == resetreferencesItem)
2042	2148	{
2043	2149	for (int i=0; i<group.selection.size(); i++)
2044	2150	{
..	..	@@ -2047,11 +2153,11 @@
2047	2153
2048	2154	refreshContents();
2049	2155	} else
2050		- if (event.getSource() == setMasterItem)
	2156	+ if (source == setMasterItem)
2051	2157	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2158	+ if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2053	2159	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2160	+ Object3D content = GrafreeD.clipboard.get(0);
2055	2161
2056	2162	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2163	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2166,13 @@
2060	2166	refreshContents();
2061	2167	}
2062	2168	} else
2063		- if (event.getSource() == poseMeshItem)
	2169	+ if (source == poseMeshItem)
2064	2170	{
2065	2171	if (group.selection.size() == 1)
2066	2172	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2173	+ if (GrafreeD.clipboard.size() == 1)
2068	2174	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2175	+ Object3D content = GrafreeD.clipboard.get(0);
2070	2176
2071	2177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2178	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2185,19 @@
2079	2185	}
2080	2186
2081	2187	} else
2082		- if (event.getSource() == revertMeshItem)
	2188	+ if (source == revertMeshItem)
2083	2189	{
2084	2190	RevertMeshes();
2085	2191	} else
2086		- if (event.getSource() == resetMeshItem)
	2192	+ if (source == resetMeshItem)
2087	2193	{
2088	2194	ResetAll();
2089	2195	} else
2090		- if (event.getSource() == stepAllItem)
	2196	+ if (source == stepAllItem)
2091	2197	{
2092	2198	StepAll();
2093	2199	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2200	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2201	{
2096	2202	//int indices[] = jList.getSelectedIndices();
2097	2203	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2205,46 @@
2099	2205
2100	2206	ClearSelection(false);
2101	2207	} else
2102		- if (event.getSource() == clearAllItem)
	2208	+ if (source == clearAllItem)
2103	2209	{
2104	2210	ClearSelection(true);
2105	2211	} else
2106		- if (event.getSource() == grabItem)
	2212	+ if (source == grabItem)
2107	2213	{
2108	2214	group(new cGroup(), true);
2109	2215	} else
2110		- if (event.getSource() == frontItem)
	2216	+ if (source == hideItem)
	2217	+ {
	2218	+ group(new HiddenObject());
	2219	+ } else
	2220	+ if (source == frontItem)
2111	2221	{
2112	2222	front();
2113	2223	} else
2114		- if (event.getSource() == backItem)
	2224	+ if (source == backItem)
2115	2225	{
2116	2226	back();
2117	2227	} else
2118		- if (event.getSource() == cameraItem)
	2228	+ if (source == cameraItem)
2119	2229	{
2120	2230	makeSomething(new Camera());
2121	2231	} else
2122		- if (event.getSource() == compositeItem)
	2232	+ if (source == compositeItem)
2123	2233	{
2124	2234	group(new Composite());
2125	2235	} else
2126		- if (event.getSource() == randomItem)
	2236	+ if (source == randomItem)
2127	2237	{
2128	2238	RandomNode random = new RandomNode();
2129	2239	group(random);
2130	2240	if (random.size() > 0)
2131	2241	random.name = random.get(0).name + "Rnd";
2132	2242	} else
2133		- if (event.getSource() == physicsItem)
	2243	+ if (source == physicsItem)
2134	2244	{
2135	2245	group(new PhysicsNode());
2136	2246	} else
2137		- if (event.getSource() == frameselectorItem)
	2247	+ if (source == frameselectorItem)
2138	2248	{
2139	2249	for (int i=0; i<group.selection.size(); i++)
2140	2250	{
..	..	@@ -2146,7 +2256,7 @@
2146	2256	ResetModel();
2147	2257	refreshContents();
2148	2258	} else
2149		- if (event.getSource() == switchGeoItem)
	2259	+ if (source == switchGeoItem)
2150	2260	{
2151	2261	for (int i=0; i<group.selection.size(); i++)
2152	2262	{
..	..	@@ -2158,7 +2268,7 @@
2158	2268	ResetModel();
2159	2269	refreshContents();
2160	2270	} else
2161		- if (event.getSource() == switchTransfoItem)
	2271	+ if (source == switchTransfoItem)
2162	2272	{
2163	2273	for (int i=0; i<group.selection.size(); i++)
2164	2274	{
..	..	@@ -2170,7 +2280,7 @@
2170	2280	ResetModel();
2171	2281	refreshContents();
2172	2282	} else
2173		- if (event.getSource() == morphItem)
	2283	+ if (source == morphItem)
2174	2284	{
2175	2285	for (int i=0; i<group.selection.size(); i++)
2176	2286	{
..	..	@@ -2182,7 +2292,7 @@
2182	2292	ResetModel();
2183	2293	refreshContents();
2184	2294	} else
2185		- if (event.getSource() == scriptNodeItem)
	2295	+ if (source == scriptNodeItem)
2186	2296	{
2187	2297	boolean atleastone = false;
2188	2298
..	..	@@ -2221,191 +2331,215 @@
2221	2331	}
2222	2332	}
2223	2333	} else
2224		- if (event.getSource() == linkerItem)
	2334	+ if (source == linkerItem)
2225	2335	{
2226	2336	group(new cLinker());
2227	2337	} else
2228		- if (event.getSource() == textureItem)
	2338	+ if (source == textureItem)
2229	2339	{
2230	2340	group(new TextureNode());
2231	2341	} else
2232		- if (event.getSource() == shadowXItem)
	2342	+ if (source == billboardItem)
	2343	+ {
	2344	+ group(new BillboardNode());
	2345	+ } else
	2346	+ if (source == shadowXItem)
2233	2347	{
2234	2348	CastShadow(0);
2235	2349	} else
2236		- if (event.getSource() == shadowYItem)
	2350	+ if (source == shadowYItem)
2237	2351	{
2238	2352	CastShadow(1);
2239	2353	} else
2240		- if (event.getSource() == shadowZItem)
	2354	+ if (source == shadowZItem)
2241	2355	{
2242	2356	CastShadow(2);
2243	2357	} else
2244		- if (event.getSource() == ungroupItem)
	2358	+ if (source == ungroupItem)
2245	2359	{
2246		- ungroup();
	2360	+ //ungroup();
	2361	+ for (int i=0; i<group.selection.size(); i++)
	2362	+ {
	2363	+ Ungroup(group.selection.get(i));
	2364	+ }
	2365	+
	2366	+ ClearSelection(false);
	2367	+
	2368	+ refreshContents();
2247	2369	} else
2248		- if (event.getSource() == genUVItem)
	2370	+ if (source == genUVItem)
2249	2371	{
2250	2372	GenUV();
2251	2373	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2374	+ if (source == genNormalsCADItem)
2253	2375	{
2254	2376	GenNormals(true);
2255	2377	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2378	+ if (source == genNormalsMESHItem)
	2379	+ {
	2380	+ GenNormals(true); // TODO
	2381	+ } else
	2382	+ if (source == genNormalsORGANItem)
2257	2383	{
2258	2384	GenNormals(false);
2259	2385	} else
2260		- if (event.getSource() == stripifyItem)
	2386	+ if (source == genNormalsMINEItem)
	2387	+ {
	2388	+ GenNormalsMINE();
	2389	+ } else
	2390	+ if (source == stripifyItem)
2261	2391	{
2262	2392	Stripify();
2263	2393	} else
2264		- if (event.getSource() == unstripifyItem)
	2394	+ if (source == unstripifyItem)
2265	2395	{
2266	2396	Unstripify();
2267	2397	} else
2268		- if (event.getSource() == trimItem)
	2398	+ if (source == trimItem)
2269	2399	{
2270	2400	Trim();
2271	2401	} else
2272		- if (event.getSource() == untrimItem)
	2402	+ if (source == untrimItem)
2273	2403	{
2274	2404	Untrim();
2275	2405	} else
2276		- if (event.getSource() == clearColorsItem)
	2406	+ if (source == clearColorsItem)
2277	2407	{
2278	2408	ClearColors();
2279	2409	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2410	+ if (source == clearMaterialsItem)
2281	2411	{
2282	2412	ClearMaterials();
2283	2413	} else
2284		- if (event.getSource() == liveleavesItem)
	2414	+ if (source == liveleavesItem)
2285	2415	{
2286	2416	LiveLeaves(true);
2287	2417	} else
2288		- if (event.getSource() == unliveleavesItem)
	2418	+ if (source == unliveleavesItem)
2289	2419	{
2290	2420	LiveLeaves(false);
2291	2421	} else
2292		- if (event.getSource() == supportleavesItem)
	2422	+ if (source == supportleavesItem)
2293	2423	{
2294	2424	SupportLeaves(true);
2295	2425	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2426	+ if (source == unsupportleavesItem)
2297	2427	{
2298	2428	SupportLeaves(false);
2299	2429	} else
2300		- if (event.getSource() == hideleavesItem)
	2430	+ if (source == hideleavesItem)
2301	2431	{
2302	2432	HideLeaves(true);
2303	2433	} else
2304		- if (event.getSource() == showleavesItem)
	2434	+ if (source == showleavesItem)
2305	2435	{
2306	2436	HideLeaves(false);
2307	2437	} else
2308		- if (event.getSource() == markleavesItem)
	2438	+ if (source == markleavesItem)
2309	2439	{
2310	2440	MarkLeaves(true);
2311	2441	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2442	+ if (source == unmarkleavesItem)
2313	2443	{
2314	2444	MarkLeaves(false);
2315	2445	} else
2316		- if (event.getSource() == flipVItem)
	2446	+ if (source == flipVItem)
2317	2447	{
2318	2448	FlipV(true);
2319	2449	} else
2320		- if (event.getSource() == unflipVItem)
	2450	+ if (source == unflipVItem)
2321	2451	{
2322	2452	FlipV(false);
2323	2453	} else
2324		- if (event.getSource() == lowTexturesItem)
	2454	+ if (source == lowTexturesItem)
2325	2455	{
2326	2456	SetTexRes(0);
2327	2457	} else
2328		- if (event.getSource() == normalTexturesItem)
	2458	+ if (source == normalTexturesItem)
2329	2459	{
2330	2460	SetTexRes(1);
2331	2461	} else
2332		- if (event.getSource() == highTexturesItem)
	2462	+ if (source == highTexturesItem)
2333	2463	{
2334	2464	SetTexRes(2);
2335	2465	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2466	+ if (source == veryhighTexturesItem)
2337	2467	{
2338	2468	SetTexRes(3);
2339	2469	} else
2340		- if (event.getSource() == maxTexturesItem)
	2470	+ if (source == maxTexturesItem)
2341	2471	{
2342	2472	SetTexRes(4);
2343	2473	} else
2344		- if (event.getSource() == panoTexturesItem)
	2474	+ if (source == panoTexturesItem)
2345	2475	{
2346	2476	SetTexRes(5);
2347	2477	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2478	+ if (source == reverseNormalsItem)
2349	2479	{
2350	2480	ReverseNormals();
2351	2481	} else
2352		- if (event.getSource() == parseverticesItem)
	2482	+ if (source == parseverticesItem)
2353	2483	{
2354	2484	ParseVertices();
2355	2485	} else
2356		- if (event.getSource() == alignItem)
	2486	+ if (source == textureFieldItem)
	2487	+ {
	2488	+ TextureVertices();
	2489	+ } else
	2490	+ if (source == alignItem)
2357	2491	{
2358	2492	Align();
2359	2493	} else
2360		- if (event.getSource() == mirrorItem)
	2494	+ if (source == mirrorItem)
2361	2495	{
2362	2496	MirrorPoses();
2363	2497	} else
2364		- if (event.getSource() == reduceMorphItem)
	2498	+ if (source == reduceMorphItem)
2365	2499	{
2366	2500	MeshReduction(false);
2367	2501	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2502	+ if (source == reduce34MorphItem)
2369	2503	{
2370	2504	MeshReduction(true);
2371	2505	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2506	+ if (source == reverseTrianglesItem)
2373	2507	{
2374	2508	ReverseTriangles();
2375	2509	} else
2376		- if (event.getSource() == reduceMeshItem)
	2510	+ if (source == reduceMeshItem)
2377	2511	{
2378	2512	ReduceMesh(false);
2379	2513	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2514	+ if (source == reduce34MeshItem)
2381	2515	{
2382	2516	ReduceMesh(true);
2383	2517	} else
2384		- if (event.getSource() == increaseMeshItem)
	2518	+ if (source == increaseMeshItem)
2385	2519	{
2386	2520	IncreaseMesh();
2387	2521	} else
2388		- if (event.getSource() == clipMeshItem)
	2522	+ if (source == clipMeshItem)
2389	2523	{
2390	2524	ClipMesh();
2391	2525	} else
2392		- if (event.getSource() == smoothMeshItem)
	2526	+ if (source == smoothMeshItem)
2393	2527	{
2394	2528	SmoothMesh();
2395	2529	} else
2396		- if (event.getSource() == transformgeometryItem)
	2530	+ if (source == transformgeometryItem)
2397	2531	{
2398	2532	TransformGeometry();
2399	2533	} else
2400		- if (event.getSource() == resetTransformItem)
	2534	+ if (source == resetTransformItem)
2401	2535	{
2402	2536	ResetTransform();
2403	2537	} else
2404		- if (event.getSource() == resetCentroidItem)
	2538	+ if (source == resetCentroidItem)
2405	2539	{
2406	2540	ResetCentroid();
2407	2541	} else
2408		- if (event.getSource() == resetParentItem)
	2542	+ if (source == resetParentItem)
2409	2543	{
2410	2544	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2545	{
..	..	@@ -2415,7 +2549,7 @@
2415	2549
2416	2550	refreshContents();
2417	2551	} else
2418		- if (event.getSource() == repairParentItem)
	2552	+ if (source == repairParentItem)
2419	2553	{
2420	2554	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2555	{
..	..	@@ -2429,7 +2563,21 @@
2429	2563
2430	2564	refreshContents();
2431	2565	} else
2432		- if (event.getSource() == sortbysizeItem)
	2566	+ if (source == repairShadowItem)
	2567	+ {
	2568	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2569	+ {
	2570	+ Object3D obj = (Object3D)e.nextElement();
	2571	+ obj.RepairShadow();
	2572	+// for (int i=0; i<obj.size(); i++)
	2573	+// {
	2574	+// obj.get(i).parent = obj;
	2575	+// }
	2576	+ }
	2577	+
	2578	+ refreshContents();
	2579	+ } else
	2580	+ if (source == sortbysizeItem)
2433	2581	{
2434	2582	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2583	{
..	..	@@ -2441,7 +2589,7 @@
2441	2589	ResetModel();
2442	2590	refreshContents();
2443	2591	} else
2444		- if (event.getSource() == sortbynameItem)
	2592	+ if (source == sortbynameItem)
2445	2593	{
2446	2594	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2595	{
..	..	@@ -2453,7 +2601,7 @@
2453	2601	ResetModel();
2454	2602	refreshContents();
2455	2603	} else
2456		- if (event.getSource() == attachPigmentItem)
	2604	+ if (source == attachPigmentItem)
2457	2605	{
2458	2606	String texture = GetFile("Attach pigment");
2459	2607	Object3D obj;
..	..	@@ -2465,7 +2613,7 @@
2465	2613
2466	2614	refreshContents();
2467	2615	} else
2468		- if (event.getSource() == detachPigmentItem)
	2616	+ if (source == detachPigmentItem)
2469	2617	{
2470	2618	Object3D obj;
2471	2619	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2624,7 @@
2476	2624
2477	2625	refreshContents();
2478	2626	} else
2479		- if (event.getSource() == attachBumpItem)
	2627	+ if (source == attachBumpItem)
2480	2628	{
2481	2629	String texture = GetFile("Attach bump");
2482	2630	Object3D obj;
..	..	@@ -2488,7 +2636,7 @@
2488	2636
2489	2637	refreshContents();
2490	2638	} else
2491		- if (event.getSource() == detachBumpItem)
	2639	+ if (source == detachBumpItem)
2492	2640	{
2493	2641	Object3D obj;
2494	2642	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2647,7 @@
2499	2647
2500	2648	refreshContents();
2501	2649	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2650	+ if (source == pigmentBumpItem)
2503	2651	{
2504	2652	Object3D obj;
2505	2653	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2658,195 @@
2510	2658
2511	2659	refreshContents();
2512	2660	} else
2513		- if (event.getSource() == flashSelectionButton)
	2661	+ if (source == flashSelectionButton)
2514	2662	{
2515	2663	CameraPane.flash = true;
2516	2664	refreshContents();
2517	2665	} else
2518		- if (event.getSource() == oneButton)
	2666	+ if (source == oneButton)
2519	2667	{
2520	2668	} else
2521		- if (event.getSource() == twoButton)
	2669	+ if (source == twoButton)
2522	2670	{
2523	2671	radio.layout = twoButton;
2524	2672	// bug
2525	2673	//gridPanel.setDividerLocation(1.0);
2526	2674	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	2675	+// bigThree.remove(scenePanel);
	2676	+// bigThree.remove(centralPanel);
	2677	+// bigThree.remove(XYZPanel);
	2678	+// aWindowConstraints.gridx = 0;
	2679	+// aWindowConstraints.gridy = 0;
	2680	+// aWindowConstraints.gridwidth = 1;
	2681	+// // aConstraints.gridheight = 3;
	2682	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2683	+// aWindowConstraints.weightx = 0;
	2684	+// aWindowConstraints.weighty = 1;
	2685	+// //bigThree.add(jtp, aWindowConstraints);
	2686	+// aWindowConstraints.weightx = 1;
	2687	+// aWindowConstraints.gridwidth = 3;
	2688	+// // aConstraints.gridheight = 3;
	2689	+// aWindowConstraints.gridx = 1;
	2690	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2691	+// bigThree.add(centralPanel, aWindowConstraints);
	2692	+// aWindowConstraints.weightx = 0;
	2693	+// aWindowConstraints.gridx = 4;
	2694	+// aWindowConstraints.gridwidth = 1;
	2695	+// // aConstraints.gridheight = 3;
	2696	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2697	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2698	+// scenePanel.setVisible(false);
	2699	+// centralPanel.setVisible(true);
	2700	+// XYZPanel.setVisible(false);
	2701	+ bigThree.ClearUI();
	2702	+ bigThree.add(centralPanel);
	2703	+ bigThree.FlushUI();
2551	2704	} else
2552		- if (event.getSource() == threeButton)
	2705	+ if (source == threeButton)
2553	2706	{
2554	2707	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	2708	+
	2709	+// bigThree.remove(scenePanel);
	2710	+// bigThree.remove(centralPanel);
	2711	+// bigThree.remove(XYZPanel);
	2712	+// aWindowConstraints.gridx = 0;
	2713	+// aWindowConstraints.gridy = 0;
	2714	+// aWindowConstraints.gridwidth = 1;
	2715	+// // aConstraints.gridheight = 3;
	2716	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2717	+// aWindowConstraints.weightx = 0;
	2718	+// aWindowConstraints.weighty = 1;
	2719	+// //bigThree.add(jtp, aWindowConstraints);
	2720	+// aWindowConstraints.weightx = 1;
	2721	+// aWindowConstraints.gridwidth = 3;
	2722	+// // aConstraints.gridheight = 3;
	2723	+// aWindowConstraints.gridx = 1;
	2724	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2725	+// bigThree.add(centralPanel, aWindowConstraints);
	2726	+// aWindowConstraints.weightx = 0;
	2727	+// aWindowConstraints.gridx = 4;
	2728	+// aWindowConstraints.gridwidth = 1;
	2729	+// // aConstraints.gridheight = 3;
	2730	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2731	+// bigThree.add(XYZPanel, aWindowConstraints);
	2732	+// bigThree.validate();
	2733	+// scenePanel.setVisible(false);
	2734	+// centralPanel.setVisible(true);
	2735	+// XYZPanel.setVisible(true);
	2736	+ bigThree.ClearUI();
	2737	+ bigThree.add(centralPanel);
	2738	+ bigThree.add(XYZPanel);
	2739	+ bigThree.FlushUI();
2579	2740	} else
2580		- if (event.getSource() == fourButton)
	2741	+ if (source == fourButton)
2581	2742	{
2582	2743	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
2592		- aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- //bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2744	+
	2745	+// bigThree.remove(scenePanel);
	2746	+// bigThree.remove(centralPanel);
	2747	+// bigThree.remove(XYZPanel);
	2748	+// aWindowConstraints.gridx = 0;
	2749	+// aWindowConstraints.gridy = 0;
	2750	+// aWindowConstraints.gridwidth = 1;
	2751	+// // aWindowConstraints.gridheight = 3;
	2752	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.weighty = 1;
	2755	+// bigThree.add(scenePanel, aWindowConstraints);
	2756	+// aWindowConstraints.weightx = 1;
	2757	+// aWindowConstraints.gridwidth = 3;
	2758	+// // aConstraints.gridheight = 3;
	2759	+// aWindowConstraints.gridx = 1;
	2760	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2761	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2762	+// aWindowConstraints.weightx = 0;
	2763	+// aWindowConstraints.gridx = 4;
	2764	+// aWindowConstraints.gridwidth = 1;
	2765	+// // aWindowConstraints.gridheight = 3;
	2766	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2767	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2768	+// bigThree.validate();
	2769	+// scenePanel.setVisible(true);
	2770	+// centralPanel.setVisible(false);
	2771	+// XYZPanel.setVisible(false);
	2772	+ bigThree.ClearUI();
	2773	+ bigThree.add(scenePanel);
	2774	+ bigThree.FlushUI();
2607	2775	} else
2608		- if (event.getSource() == sixButton)
	2776	+ if (source == sixButton)
2609	2777	{
2610	2778	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aWindowConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	2779	+
	2780	+// bigThree.remove(scenePanel);
	2781	+// bigThree.remove(centralPanel);
	2782	+// bigThree.remove(XYZPanel);
	2783	+// aWindowConstraints.gridx = 0;
	2784	+// aWindowConstraints.gridy = 0;
	2785	+// aWindowConstraints.gridwidth = 1;
	2786	+// // aConstraints.gridheight = 3;
	2787	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2788	+// aWindowConstraints.weightx = 0;
	2789	+// aWindowConstraints.weighty = 1;
	2790	+// bigThree.add(scenePanel, aWindowConstraints);
	2791	+// aWindowConstraints.weightx = 1;
	2792	+// aWindowConstraints.gridwidth = 3;
	2793	+// // aWindowConstraints.gridheight = 3;
	2794	+// aWindowConstraints.gridx = 1;
	2795	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2796	+// bigThree.add(centralPanel, aWindowConstraints);
	2797	+// aWindowConstraints.weightx = 0;
	2798	+// aWindowConstraints.gridx = 4;
	2799	+// aWindowConstraints.gridwidth = 1;
	2800	+// // aWindowConstraints.gridheight = 3;
	2801	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2802	+// //bigThree.add(XYZPanel, aConstraints);
	2803	+// bigThree.validate();
	2804	+// scenePanel.setVisible(true);
	2805	+// centralPanel.setVisible(true);
	2806	+// XYZPanel.setVisible(false);
	2807	+ bigThree.ClearUI();
	2808	+ bigThree.add(scenePanel);
	2809	+ bigThree.add(centralPanel);
	2810	+ bigThree.FlushUI();
2635	2811	} else
2636		- if (event.getSource() == sevenButton)
	2812	+ if (source == sevenButton)
2637	2813	{
2638	2814	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2815	+
	2816	+// bigThree.remove(scenePanel);
	2817	+// bigThree.remove(centralPanel);
	2818	+// bigThree.remove(XYZPanel);
	2819	+// aWindowConstraints.gridx = 0;
	2820	+// aWindowConstraints.gridy = 0;
	2821	+// aWindowConstraints.gridwidth = 1;
	2822	+// // aWindowConstraints.gridheight = 3;
	2823	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2824	+// aWindowConstraints.weightx = 0;
	2825	+// aWindowConstraints.weighty = 1;
	2826	+// bigThree.add(scenePanel, aWindowConstraints);
	2827	+// aWindowConstraints.weightx = 1;
	2828	+// aWindowConstraints.gridwidth = 3;
	2829	+// // aWindowConstraints.gridheight = 3;
	2830	+// aWindowConstraints.gridx = 1;
	2831	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2832	+// bigThree.add(centralPanel, aWindowConstraints);
	2833	+// aWindowConstraints.weightx = 0;
	2834	+// aWindowConstraints.gridx = 4;
	2835	+// aWindowConstraints.gridwidth = 1;
	2836	+// // aConstraints.gridheight = 3;
	2837	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2838	+// bigThree.add(XYZPanel, aWindowConstraints);
	2839	+// bigThree.validate();
	2840	+// scenePanel.setVisible(true);
	2841	+// centralPanel.setVisible(true);
	2842	+// XYZPanel.setVisible(true);
	2843	+ bigThree.ClearUI();
	2844	+ bigThree.add(scenePanel);
	2845	+ bigThree.add(centralPanel);
	2846	+ bigThree.add(XYZPanel);
	2847	+ bigThree.FlushUI();
2663	2848	} else
2664		- if (event.getSource() == rootButton)
	2849	+ if (source == rootButton)
2665	2850	{
2666	2851	Object3D obj;
2667	2852	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +2858,7 @@
2673	2858
2674	2859	refreshContents(true);
2675	2860	} else
2676		- if (event.getSource() == closeButton)
	2861	+ if (source == closeButton)
2677	2862	{
2678	2863	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	2864	cRadio ab;
..	..	@@ -2694,11 +2879,11 @@
2694	2879	}
2695	2880	refreshContents(true);
2696	2881	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2882	+ if (source == editItem \|\| source == editButton)
2698	2883	{
2699	2884	EditSelection(false);
2700	2885	} else
2701		- if (event.getSource() == uneditButton)
	2886	+ if (source == uneditButton)
2702	2887	{
2703	2888	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	2889	{
..	..	@@ -2710,12 +2895,12 @@
2710	2895
2711	2896	child.editWindow = null; // ???????????
2712	2897	}
2713		- objEditor.ctrlPanel.revalidate();
	2898	+ objEditor.ctrlPanel.validate();
2714	2899	//objEditor.jTree.clearSelection();
2715	2900	//objEditor.ResetSliders();
2716	2901	refreshContents(true);
2717	2902	} else
2718		- if (event.getSource() == clearPanelButton)
	2903	+ if (source == clearPanelButton)
2719	2904	{
2720	2905	assert(copy == group);
2721	2906	//copy.ClearUI();
..	..	@@ -2726,7 +2911,7 @@
2726	2911	listUI.clear();
2727	2912	refreshContents(true);
2728	2913	} else
2729		- if (event.getSource() == allParamsButton)
	2914	+ if (source == allParamsButton)
2730	2915	{
2731	2916	assert(copy == group);
2732	2917
..	..	@@ -2747,19 +2932,19 @@
2747	2932
2748	2933	refreshContents(true);
2749	2934	} else
2750		- if (event.getSource() == unselectButton)
	2935	+ if (source == unselectButton)
2751	2936	{
2752	2937	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	2938	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	2939	objEditor.ResetSliders();
2755	2940	refreshContents(true);
2756	2941	} else
2757		- if(event.getSource() instanceof cRadio)
	2942	+ if(source instanceof cRadio)
2758	2943	{
2759	2944	group.parent = keepparent;
2760	2945	group.attributes = 0;
2761	2946	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	2947	+ /cRadio/ radio = (cRadio)source;
2763	2948	Object3D obj = radio.GetObject();
2764	2949	System.out.println("Edit " + obj);
2765	2950	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +2964,7 @@
2779	2964	}
2780	2965
2781	2966	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	2967	+ //Globals.theRenderer.object = group;
2783	2968	if(!useclient)
2784	2969	{
2785	2970	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +2973,8 @@
2788	2973	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	2974	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	2975	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	2976	+ //cameraView.lighttouched = true;
	2977	+ Globals.lighttouched = true;
2792	2978	topView.object = group;
2793	2979	frontView.object = group;
2794	2980	sideView.object = group;
..	..	@@ -2824,7 +3010,7 @@
2824	3010	if (useclient)
2825	3011	{
2826	3012	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3013	+ Globals.lighttouched = true;
2828	3014	//topView.object = client;
2829	3015	//frontView.object = client;
2830	3016	//sideView.object = client;
..	..	@@ -2832,7 +3018,7 @@
2832	3018	else
2833	3019	{
2834	3020	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3021	+ Globals.lighttouched = true;
2836	3022	//topView.object = group;
2837	3023	//frontView.object = group;
2838	3024	//sideView.object = group;
..	..	@@ -3065,9 +3251,9 @@
3065	3251	obj = (Object3D)e.nextElement();
3066	3252
3067	3253	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3254	+ GrafreeD.AnalyzeObject(obj);
3069	3255	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3256	+ GrafreeD.AnalyzeObject(obj.bRep);
3071	3257
3072	3258	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3259	}
..	..	@@ -3109,6 +3295,13 @@
3109	3295	void GenNormals(boolean crease)
3110	3296	{
3111	3297	group.GenNormalsS(crease);
	3298	+
	3299	+ refreshContents();
	3300	+ }
	3301	+
	3302	+ void GenNormalsMINE()
	3303	+ {
	3304	+ group.selection.GenNormalsMINE();
3112	3305
3113	3306	refreshContents();
3114	3307	}
..	..	@@ -3157,104 +3350,250 @@
3157	3350
3158	3351	//Object3D buffer;
3159	3352	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		-
	3353	+// BoundaryRep temprep;
	3354	+// Object3D nodes;
	3355	+// Vector<Vertex> vertices;
	3356	+//
	3357	+// cGroup buffer;
	3358	+//
	3359	+// public void Vertex(Object3D node, Vertex v)
	3360	+// {
	3361	+//// vertices.add(v);
	3362	+//// nodes.addElement(node);
	3363	+////
	3364	+//// if (temprep.GetCache(v) != null)
	3365	+//// {
	3366	+//// temprep.Remove(v);
	3367	+//// } else
	3368	+//// {
	3369	+//// temprep.Remember(v);
	3370	+//// }
	3371	+//
	3372	+// //Object3D node = nodes.get(index);
	3373	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3374	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3375	+//
	3376	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3377	+//
	3378	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3379	+//
	3380	+// cGroup g = new cGroup();
	3381	+//
	3382	+// if (g.toParent == null)
	3383	+// {
	3384	+// g.toParent = LA.newMatrix();
	3385	+// g.fromParent = LA.newMatrix();
	3386	+// }
	3387	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3388	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3389	+//
	3390	+// g.add(GrafreeD.clipboard);
	3391	+//
	3392	+// buffer.add(g);
	3393	+// }
	3394	+//
	3395	+// public void Face(Object3D node, Face f)
	3396	+// {
	3397	+//
	3398	+// }
	3399	+//
	3400	+// void ParseVerticesOld() // ??
	3401	+// {
	3402	+// //if (group.selection.size() != 1)
	3403	+// // return;
	3404	+//
	3405	+// temprep = new BoundaryRep();
	3406	+// nodes = new Object3D();
	3407	+// vertices = new Vector<Vertex>();
	3408	+//
	3409	+// boolean epsequal = GrafreeD.epsequal;
	3410	+// GrafreeD.epsequal = true;
	3411	+//
	3412	+// for (int i=0; i<group.selection.size(); i++)
	3413	+// {
	3414	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3415	+//
	3416	+// group.selection.get(i).Parse(
	3417	+//this );
	3418	+//
	3419	+// int repsize = temprep.VertexCount();
	3420	+// int tablesize = temprep.vertextable.size();
	3421	+// int nodesize = nodes.size();
	3422	+//
	3423	+// assert(vertices.size() == nodes.size());
	3424	+//
	3425	+// temprep.vertextable.elements();
	3426	+//
	3427	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3428	+//
	3429	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3430	+// {
	3431	+// cGroup g = new cGroup();
	3432	+//
	3433	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3434	+//
	3435	+// Object3D node = nodes.get(index);
	3436	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3437	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3438	+//
	3439	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3440	+//
	3441	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3442	+//
	3443	+// if (g.toParent == null)
	3444	+// {
	3445	+// g.toParent = LA.newMatrix();
	3446	+// g.fromParent = LA.newMatrix();
	3447	+// }
	3448	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3449	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3450	+//
	3451	+// g.add(GrafreeD.clipboard);
	3452	+//
	3453	+// buffer.add(g);
	3454	+// }
	3455	+//
	3456	+// makeSomething(buffer, i==group.selection.size()-1);
	3457	+// }
	3458	+//
	3459	+// GrafreeD.epsequal = epsequal;
	3460	+//
	3461	+// //buffer = null;
	3462	+// temprep = null;
	3463	+// nodes = null;
	3464	+//
	3465	+// refreshContents();
	3466	+// }
	3467	+
3184	3468	void ParseVertices()
3185	3469	{
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;
	3470	+ boolean epsequal = GrafreeD.epsequal;
	3471	+ GrafreeD.epsequal = true;
3195	3472
3196	3473	for (int i=0; i<group.selection.size(); i++)
3197	3474	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3475	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3476
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3477	+ group.selection.get(i).Parse(
	3478	+
	3479	+ new iParse()
	3480	+ {
	3481	+ public void Vertex(Object3D node, Vertex v)
	3482	+ {
	3483	+ temp.set(v);
	3484	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3485
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();
	3486	+ cGroup g = new cGroup();
3211	3487
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3488	+ if (g.toParent == null)
	3489	+ {
	3490	+ g.toParent = LA.newMatrix();
	3491	+ g.fromParent = LA.newMatrix();
	3492	+ }
	3493	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3494	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3495
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);
	3496	+ g.add(GrafreeD.clipboard);
3220	3497
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);
	3498	+ buffer.add(g);
	3499	+ }
3232	3500
3233		- g.add(GraphreeD.clipboard);
	3501	+ public void Face(Object3D node, Face f)
	3502	+ {
3234	3503
3235		- buffer.add(g);
3236		- }
	3504	+ }
	3505	+ }
	3506	+ );
3237	3507
3238	3508	makeSomething(buffer, i==group.selection.size()-1);
3239	3509	}
3240	3510
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3511	+ GrafreeD.epsequal = epsequal;
3246	3512
3247	3513	refreshContents();
3248	3514	}
3249		-
	3515	+
	3516	+ void TextureVertices()
	3517	+ {
	3518	+ for (int i=0; i<group.selection.size(); i++)
	3519	+ {
	3520	+ group.selection.get(i).Parse(
	3521	+ new iParse()
	3522	+ {
	3523	+ public void Vertex(Object3D node, Vertex v)
	3524	+ {
	3525	+ cTexture tex = node.GetTextures();
	3526	+ String pigment = Object3D.GetPigment(tex);
	3527	+ //String bump = Object3D.GetBump(tex);
	3528	+
	3529	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3530	+
	3531	+ double s = v.s;
	3532	+
	3533	+ if (s == 1)
	3534	+ s = 0;
	3535	+
	3536	+ double t = v.t;
	3537	+
	3538	+ if (t == 1)
	3539	+ t = 0;
	3540	+
	3541	+ int indexs = (int) (texturedata.getWidth() * s);
	3542	+ int indext = (int) (texturedata.getHeight() * t);
	3543	+
	3544	+ int index = indext * texturedata.getWidth() + indexs;
	3545	+
	3546	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3547	+
	3548	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3549	+
	3550	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3551	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3552	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3553	+ scale /= 3;
	3554	+
	3555	+ scale /= 0xFF;
	3556	+ // c'est quoi ca? scale /= 4;
	3557	+
	3558	+ //v.AO = scale;
	3559	+
	3560	+ v.x += v.norm.x * scale;
	3561	+ v.y += v.norm.y * scale;
	3562	+ v.z += v.norm.z * scale;
	3563	+ }
	3564	+
	3565	+ public void Face(Object3D node, Face f)
	3566	+ {
	3567	+ }
	3568	+ }
	3569	+ );
	3570	+ }
	3571	+
	3572	+ refreshContents();
	3573	+ }
	3574	+
3250	3575	void Align()
3251	3576	{
	3577	+ if (group.selection.size() == 0)
	3578	+ return;
	3579	+
	3580	+ cVector bbmin = new cVector();
	3581	+ cVector bbmax = new cVector();
	3582	+
	3583	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3584	+
	3585	+ double dx = bbmax.x - bbmin.x;
	3586	+ double dy = bbmax.y - bbmin.y;
	3587	+ double dz = bbmax.z - bbmin.z;
	3588	+
	3589	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3590	+
3252	3591	for (int i=0; i<group.selection.size(); i++)
3253	3592	{
3254	3593	Object3D obj = group.selection.get(i);
3255	3594
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3595	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3596	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3597	}
3259	3598
3260	3599	refreshContents();
..	..	@@ -3267,7 +3606,7 @@
3267	3606	// ref.SaveSupports();
3268	3607	// Object3D par = ref.parent;
3269	3608	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3609	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3610	// ref.parent = par;
3272	3611	// ref.RestoreSupports();
3273	3612
..	..	@@ -3297,7 +3636,7 @@
3297	3636	// lowres.SaveSupports();
3298	3637	// par = lowres.parent;
3299	3638	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3639	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3640	Object3D newlow = CloneObject(lowres, false);
3302	3641	newlow.name = sn.switchobject.get(i).name;
3303	3642	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3658,7 @@
3319	3658	return;
3320	3659
3321	3660	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3661	+ Object3D ref = GrafreeD.clipboard.get(0);
3323	3662
3324	3663	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3664
..	..	@@ -3488,7 +3827,7 @@
3488	3827	group.selection.RelinkToSupport(); // july 2014
3489	3828	System.out.println("DONE.");
3490	3829	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3830	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3831	}
3493	3832
3494	3833	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3852,20 @@
3513	3852
3514	3853	void ClipMesh()
3515	3854	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3855	+ if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
3517	3856	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3857	+ Object3D content = GrafreeD.clipboard.get(0);
3519	3858
3520	3859	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3860	content = ((cGroup)content).get(0);
3522	3861
3523	3862	// for (int i=0; i<group.selection.size(); i++)
3524	3863	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3864	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	3865	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	3866	+ group.selection.ClipMesh(GrafreeD.clipboard);
3528	3867	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	3868	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	3869	System.out.println("DONE.");
3531	3870	refreshContents();
3532	3871	}
..	..	@@ -3764,25 +4103,25 @@
3764	4103	System.err.println("info : " + child.GetPath());
3765	4104	}
3766	4105	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4106	+// else
	4107	+// {
	4108	+// objEditor.SetMaterial(group); // .GetMaterial());
	4109	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4110	+// System.err.println("info : " + group.GetPath());
	4111	+// }
3773	4112
3774	4113	objEditor.SetText(); // jan 2014
3775	4114
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4115	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4116	CameraPane.flash = true;
3778	4117
3779	4118	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4119	// a camera
3781	4120	{
3782	4121	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;
	4122	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4123	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4124	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4125	}
3787	4126
3788	4127	refreshContents();
..	..	@@ -3864,12 +4203,12 @@
3864	4203	{
3865	4204	if (group.selection.isEmpty())
3866	4205	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4206	+ GrafreeD.clipboardIsTempGroup = false;
3868	4207	Composite tGroup = null;
3869	4208	if (group.selection.size() > 0) // 1)
3870	4209	{
3871	4210	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4211	+ GrafreeD.clipboardIsTempGroup = true;
3873	4212	}
3874	4213
3875	4214	if (cut)
..	..	@@ -3909,16 +4248,16 @@
3909	4248	//System.out.println("cut " + child);
3910	4249	//System.out.println("parent = " + child.parent);
3911	4250	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4251	+ if (GrafreeD.clipboardIsTempGroup)
3913	4252	tGroup.add/Child/(tmp);
3914	4253	else
3915		- GraphreeD.clipboard = tmp;
	4254	+ GrafreeD.clipboard = tmp;
3916	4255	}
3917	4256	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4257	+ if (GrafreeD.clipboardIsTempGroup)
3919	4258	tGroup.add/Child/(child);
3920	4259	else
3921		- GraphreeD.clipboard = child;
	4260	+ GrafreeD.clipboard = child;
3922	4261	}
3923	4262
3924	4263	//ResetModel();
..	..	@@ -3950,21 +4289,21 @@
3950	4289	//System.out.println("cut " + elem);
3951	4290	//System.out.println("parent = " + elem.parent);
3952	4291	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4292	+ if (GrafreeD.clipboardIsTempGroup)
3954	4293	tGroup.add/Child/(tmp);
3955	4294	else
3956		- GraphreeD.clipboard = tmp;
	4295	+ GrafreeD.clipboard = tmp;
3957	4296	}
3958	4297	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4298	+ if (GrafreeD.clipboardIsTempGroup)
3960	4299	tGroup.add/Child/(child);
3961	4300	else
3962		- GraphreeD.clipboard = child;
	4301	+ GrafreeD.clipboard = child;
3963	4302	}
3964	4303
3965	4304	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4305	+ if (GrafreeD.clipboardIsTempGroup)
	4306	+ GrafreeD.clipboard = tGroup;
3968	4307	if (cut)
3969	4308	{
3970	4309	ResetModel();
..	..	@@ -3974,11 +4313,11 @@
3974	4313
3975	4314	void paste(boolean expand)
3976	4315	{
3977		- // if (GraphreeD.clipboard == null)
	4316	+ // if (GrafreeD.clipboard == null)
3978	4317	// return;
3979	4318	boolean first = true;
3980	4319
3981		- if (GraphreeD.clipboardIsTempGroup)
	4320	+ if (GrafreeD.clipboardIsTempGroup)
3982	4321	{
3983	4322	Composite temp;
3984	4323
..	..	@@ -3989,7 +4328,7 @@
3989	4328	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4329	*/
3991	4330	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4331	+ for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4332	{
3994	4333	Object3D child = (Object3D)e.nextElement();
3995	4334
..	..	@@ -4003,7 +4342,7 @@
4003	4342	else
4004	4343	elem = child.deepCopy(); // ?
4005	4344	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4345	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4346	// elem = elem.get(0);
4008	4347	makeSomething(elem, true); // ?? first);
4009	4348	//group.addChild(elem);
..	..	@@ -4023,14 +4362,14 @@
4023	4362	//Object3D cb = Applet3D.clipboard;
4024	4363	//temp.addChild(cb);
4025	4364	//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());
	4365	+ assert(GrafreeD.clipboard.parent == null);
	4366	+ Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
	4367	+ GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
	4368	+ if (LA.isIdentity(GrafreeD.clipboard.toParent))
	4369	+ makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
4031	4370	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4371	+ makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
	4372	+ GrafreeD.clipboard.get(0).parent = keepparent;
4034	4373	}
4035	4374
4036	4375	ResetModel();
..	..	@@ -4039,7 +4378,7 @@
4039	4378
4040	4379	void pasteInto(boolean copyit)
4041	4380	{
4042		-// if (GraphreeD.clipboard == null)
	4381	+// if (GrafreeD.clipboard == null)
4043	4382	// return;
4044	4383
4045	4384	if (group.selection.size() != 1)
..	..	@@ -4072,9 +4411,9 @@
4072	4411	{
4073	4412	boolean first = true;
4074	4413
4075		- if (GraphreeD.clipboardIsTempGroup)
	4414	+ if (GrafreeD.clipboardIsTempGroup)
4076	4415	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4416	+ Composite temp = (Composite)GrafreeD.clipboard;
4078	4417	Object3D copy;
4079	4418	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4419	{
..	..	@@ -4084,7 +4423,7 @@
4084	4423	}
4085	4424	} else
4086	4425	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4426	+ linkSomething(GrafreeD.clipboard); //.get(0));
4088	4427	}
4089	4428	}
4090	4429	}
..	..	@@ -4276,6 +4615,26 @@
4276	4615	makeSomething(csg);
4277	4616	}
4278	4617
	4618	+ void Ungroup(Object3D g)
	4619	+ {
	4620	+ if (g instanceof HiddenObject)
	4621	+ {
	4622	+ HiddenObject h = (HiddenObject) g;
	4623	+
	4624	+ for (int i=0; i<h.ActualSize(); i++)
	4625	+ {
	4626	+ objEditor.makeSomething(h.get(i), false);
	4627	+ }
	4628	+ }
	4629	+ else
	4630	+ {
	4631	+ for (int i=0; i<g.Size(); i++)
	4632	+ {
	4633	+ objEditor.makeSomething(g.get(i), false);
	4634	+ }
	4635	+ }
	4636	+ }
	4637	+
4279	4638	void ungroup()
4280	4639	{
4281	4640	/*
..	..	@@ -4471,7 +4830,7 @@
4471	4830
4472	4831	void ImportGFD()
4473	4832	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4833	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4834	browser.show();
4476	4835	String filename = browser.getFile();
4477	4836	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +4868,7 @@
4509	4868
4510	4869	void ImportVRMLX3D()
4511	4870	{
4512		- if (GraphreeD.standAlone)
	4871	+ if (GrafreeD.standAlone)
4513	4872	{
4514	4873	/**/
4515	4874	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +4885,7 @@
4526	4885
4527	4886	String GetFile(String dialogName)
4528	4887	{
4529		- if (GraphreeD.standAlone)
	4888	+ if (GrafreeD.standAlone)
4530	4889	{
4531	4890	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	4891	browser.show();
..	..	@@ -4635,6 +4994,7 @@
4635	4994	private MenuItem resetsupportItem;
4636	4995	private MenuItem resetreferencesItem;
4637	4996	private MenuItem linkverticesItem;
	4997	+ private MenuItem relinkverticesItem;
4638	4998	private MenuItem setMasterItem;
4639	4999	private MenuItem resetMeshItem;
4640	5000	private MenuItem stepAllItem;
..	..	@@ -4653,8 +5013,10 @@
4653	5013	private MenuItem clearItem;
4654	5014	private MenuItem clearAllItem;
4655	5015	private MenuItem genUVItem;
	5016	+ private MenuItem genNormalsMESHItem;
4656	5017	private MenuItem genNormalsCADItem;
4657	5018	private MenuItem genNormalsORGANItem;
	5019	+ private MenuItem genNormalsMINEItem;
4658	5020	private MenuItem stripifyItem;
4659	5021	private MenuItem unstripifyItem;
4660	5022	private MenuItem trimItem;
..	..	@@ -4696,6 +5058,7 @@
4696	5058	private MenuItem resetCentroidItem;
4697	5059	private MenuItem transformgeometryItem;
4698	5060	private MenuItem resetTransformItem;
	5061	+ private MenuItem hideItem;
4699	5062	private MenuItem grabItem;
4700	5063	private MenuItem backItem;
4701	5064	private MenuItem frontItem;
..	..	@@ -4716,6 +5079,7 @@
4716	5079
4717	5080	private MenuItem resetParentItem;
4718	5081	private MenuItem repairParentItem;
	5082	+ private MenuItem repairShadowItem;
4719	5083	private MenuItem sortbysizeItem;
4720	5084	private MenuItem sortbynameItem;
4721	5085
..	..	@@ -4728,12 +5092,15 @@
4728	5092	private MenuItem particleItem;
4729	5093	private MenuItem ragdollItem;
4730	5094	private MenuItem ragdoll2Item;
	5095	+ private MenuItem heightFieldItem;
	5096	+ private MenuItem textureFieldItem;
4731	5097	private MenuItem gridItem;
4732	5098	private MenuItem rectoidItem;
4733	5099	private MenuItem ellipsoidItem;
4734	5100	private MenuItem coneItem;
4735	5101	private MenuItem torusItem;
4736	5102	private MenuItem superItem;
	5103	+ private MenuItem kleinItem;
4737	5104	private MenuItem blobItem;
4738	5105	private MenuItem latheItem;
4739	5106	private MenuItem bezierItem;
..	..	@@ -4746,6 +5113,7 @@
4746	5113	private MenuItem csgItem;
4747	5114	private MenuItem templateItem;
4748	5115	private MenuItem textureItem;
	5116	+ private MenuItem billboardItem;
4749	5117	private MenuItem shadowXItem;
4750	5118	private MenuItem shadowYItem;
4751	5119	private MenuItem shadowZItem;