~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
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	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -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
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,17 +163,21 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	174	cloneItem = menu.add(new MenuItem("Clone"));
171	175	cloneItem.addActionListener(this);
	176	+ if (Globals.ADVANCED)
	177	+ {
172	178	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	179	cloneSupportItem.addActionListener(this);
	180	+ }
174	181	menu.add("-");
175	182	cutItem = menu.add(new MenuItem("Cut"));
176	183	cutItem.addActionListener(this);
..	..	@@ -178,27 +185,37 @@
178	185	copyItem.addActionListener(this);
179	186	pasteItem = menu.add(new MenuItem("Paste"));
180	187	pasteItem.addActionListener(this);
	188	+ menu.add("-");
	189	+
	190	+ menu.add("-");
	191	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	192	+ pasteIntoItem.addActionListener(this);
181	193	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	194	pasteLinkItem.addActionListener(this);
183	195	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	196	pasteCloneItem.addActionListener(this);
185	197	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	198	// pasteExpandItem.addActionListener(this);
	199	+ menu.add("-");
187	200	clearItem = menu.add(new MenuItem("Clear"));
188	201	clearItem.addActionListener(this);
	202	+
	203	+ if (Globals.ADVANCED)
	204	+ {
	205	+ // Deletes the cameras...
189	206	clearAllItem = menu.add(new MenuItem("Clear All"));
190	207	clearAllItem.addActionListener(this);
	208	+ }
191	209
192	210	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	211	+ if (Globals.ADVANCED)
	212	+ {
197	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	214	revertMeshItem.addActionListener(this);
199	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	216	resetreferencesItem.addActionListener(this);
201	217	menu.add("-");
	218	+ }
202	219	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	220	overwriteGeoItem.addActionListener(this);
204	221	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,48 +227,68 @@
210	227	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	228	overwriteUVItem.addActionListener(this);
212	229	menu.add("-");
	230	+ if (Globals.ADVANCED)
	231	+ {
213	232	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	233	generateMeshItem.addActionListener(this);
215	234	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	235	poseMeshItem.addActionListener(this);
217	236	menu.add("-");
	237	+ }
218	238	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	239	resetsupportItem.addActionListener(this);
220	240	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	241	linkverticesItem.addActionListener(this);
	242	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	243	+ relinkverticesItem.addActionListener(this);
	244	+
	245	+ if (Globals.ADVANCED)
	246	+ {
222	247	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	248	setMasterItem.addActionListener(this);
	249	+ }
224	250
225	251	oe.menuBar.add(menu = new Menu("Group"));
226	252	grabItem = menu.add(new MenuItem("Grab"));
227	253	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	254	backItem = menu.add(new MenuItem("Back"));
231	255	backItem.addActionListener(this);
	256	+ frontItem = menu.add(new MenuItem("Front"));
	257	+ frontItem.addActionListener(this);
232	258	compositeItem = menu.add(new MenuItem("Composite"));
233	259	compositeItem.addActionListener(this);
	260	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	261	+ hideItem.addActionListener(this);
	262	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	263	+ ungroupItem.addActionListener(this);
234	264	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	265	+ randomItem = menu.add(new MenuItem("Switch node"));
236	266	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	267	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	268	switchGeoItem.addActionListener(this);
243	269	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	270	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	271	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	272	morphItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ menu.add("-");
	277	+ physicsItem = menu.add(new MenuItem("Physics"));
	278	+ physicsItem.addActionListener(this);
	279	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	280	+ frameselectorItem.addActionListener(this);
247	281	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	282	scriptNodeItem.addActionListener(this);
249	283	cameraItem = menu.add(new MenuItem("Camera"));
250	284	cameraItem.addActionListener(this);
	285	+ }
251	286
252	287	oe.menuBar.add(menu = new Menu("Object"));
253	288	textureItem = menu.add(new MenuItem("Texture"));
254	289	textureItem.addActionListener(this);
	290	+ billboardItem = menu.add(new MenuItem("Billboard"));
	291	+ billboardItem.addActionListener(this);
255	292	csgItem = menu.add(new MenuItem("CSG"));
256	293	csgItem.addActionListener(this);
257	294	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +297,29 @@
260	297	shadowYItem.addActionListener(this);
261	298	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	299	shadowZItem.addActionListener(this);
	300	+ if (Globals.ADVANCED)
	301	+ {
	302	+ menu.add("-");
263	303	linkerItem = menu.add(new MenuItem("Linker"));
264	304	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	305	attributeItem = menu.add(new MenuItem("Attribute"));
268	306	attributeItem.addActionListener(this);
	307	+ templateItem = menu.add(new MenuItem("Template"));
	308	+ templateItem.addActionListener(this);
269	309	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	310	pointflowItem.addActionListener(this);
	311	+ }
271	312	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	313	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	314	resetTransformItem.addActionListener(this);
276	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	316	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	317	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	318	+ resetCentroidXZItem.addActionListener(this);
	319	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	320	+ transformGeometryItem.addActionListener(this);
	321	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	322	+ transformChildrenItem.addActionListener(this);
280	323
281	324	oe.menuBar.add(menu = new Menu("Geometry"));
282	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +328,13 @@
285	328	genNormalsORGANItem.addActionListener(this);
286	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	330	genNormalsCADItem.addActionListener(this);
	331	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	332	+ genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
288	338	stripifyItem = menu.add(new MenuItem("Stripify"));
289	339	stripifyItem.addActionListener(this);
290	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +356,34 @@
306	356	reduce34MeshItem.addActionListener(this);
307	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	358	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
313	367
314	368	oe.menuBar.add(menu = new Menu("Attributes"));
315	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	370	clearMaterialsItem.addActionListener(this);
	371	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	372	+ resetAllItem.addActionListener(this);
	373	+ stepAllItem = menu.add(new MenuItem("Step All"));
	374	+ stepAllItem.addActionListener(this);
317	375	menu.add("-");
318	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	377	liveleavesItem.addActionListener(this);
320	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
322	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	383	supportleavesItem.addActionListener(this);
324	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	385	unsupportleavesItem.addActionListener(this);
	386	+ }
326	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	388	hideleavesItem.addActionListener(this);
328	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -366,28 +427,34 @@
366	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	428	sortbynameItem.addActionListener(this);
368	429	menu.add("-");
	430	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	431	+ shareGeometriesItem.addActionListener(this);
	432	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	433	+ mergeGeometriesItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ // Pretty much the same as duplicate and clone.
369	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	438	extractGeometriesItem.addActionListener(this);
371	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	440	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	441	+ }
377	442
378	443	oe.menuBar.add(menu = new Menu("Insert"));
379	444	buildCreateMenu(menu);
380	445
381		-
382	446	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
388	448	importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
390	451	import3DSItem.addActionListener(this);
	452	+ menu.add("-");
	453	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	454	+ importVRMLX3DItem.addActionListener(this);
	455	+ menu.add("-");
	456	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	457	+ importGFDItem.addActionListener(this);
391	458
392	459	oe.menuBar.add(menu = new Menu("Tools"));
393	460	buildToolsMenu(menu);
..	..	@@ -423,150 +490,98 @@
423	490	oe.radioPanel.add(dummyButton);
424	491	oe.buttonGroup.add(dummyButton);
425	492	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	494
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
431	497	liveCB.addItemListener(this);
432	498
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	504	+ fastCB.setToolTipText("Fast mode");
451	505	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	508	+ trackCB.setToolTipText("Enable tracking");
493	509	trackCB.addItemListener(this);
494	510
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
497	513	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	514	+
499	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	516	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	517
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	518	+ if (Globals.ADVANCED)
	519	+ {
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	521	+ snapobjectButton.addActionListener(this);
	522	+ snapobjectButton.setToolTipText("Snap Object");
	523	+ }
	524	+
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	526	+ flashSelectionButton.setToolTipText("Show selection");
512	527	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	528
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	530	+
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	532	+ twoButton.setToolTipText("Show center view only");
519	533	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	535	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	536	+ fourButton.setToolTipText("Show left panel only");
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	538	+ sixButton.setToolTipText("2-column layout left");
523	539	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	541	+ threeButton.setToolTipText("2-column layout right");
525	542	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	544	+ sevenButton.setToolTipText("3-column layout");
527	545	sevenButton.addActionListener(this);
528	546	//
529	547
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	549	+ rootButton.setToolTipText("Edit selection in new tab");
531	550	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	553	+ closeButton.setToolTipText("Close tab");
534	554	closeButton.addActionListener(this);
535	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	556	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	557
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	558	+ cGridBag commandsPanel = new cGridBag();
	559	+
	560	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ editButton.setToolTipText("Edit selection");
541	562	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	563
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
547	566	uneditButton.addActionListener(this);
548	567
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	568	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	569	+ allParamsButton.setToolTipText("Edit all params");
561	570	allParamsButton.addActionListener(this);
562	571
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	572	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ clearPanelButton.setToolTipText("Clear edit panel");
	574	+ clearPanelButton.addActionListener(this);
	575	+
	576	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ unselectButton.setToolTipText("Unselect");
568	578	unselectButton.addActionListener(this);
569	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
570	585	// oe.aConstraints.gridx += 1;
571	586	// oe.aConstraints.weighty = 0;
572	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +593,37 @@
578	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	594	// gcButton.addActionListener(this);
580	595
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
592	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	600	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	601	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
599	605
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	606	+ cGridBag copyOptionsPanel = new cGridBag();
	607	+
	608	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	609	+ colorCB.setToolTipText("Copy color when dropped");
604	610	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	611	+
	612	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	613	+ materialCB.setToolTipText("Copy material when dropped");
607	614	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	615	+
	616	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	617	+ textureCB.setToolTipText("Copy texture when dropped");
610	618	textureCB.addItemListener(this);
611	619
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
614	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
615	627	//jList.addListSelectionListener(this);
616	628	oe.jTree.addTreeSelectionListener(this);
617	629	//jTree.setRootVisible(false);
..	..	@@ -633,17 +645,89 @@
633	645	radio.layout = sevenButton;
634	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	647	}
	648	+
	649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	650	+ {
	651	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	652	+ boxCB.setToolTipText("Display bounding boxes");
	653	+ boxCB.addItemListener(this);
	654	+
	655	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	656	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	657	+ zoomBoxCB.addItemListener(this);
	658	+
	659	+ if (true) // Globals.ADVANCED)
	660	+ {
	661	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	662	+ supportCB.setToolTipText("Enable rigging");
	663	+ supportCB.addItemListener(this);
	664	+
	665	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	666	+ // localCB.addItemListener(this);
	667	+
	668	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	669	+ crowdCB.setToolTipText("Used for crowds");
	670	+ crowdCB.addItemListener(this);
	671	+
	672	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	673	+ smoothCB.setToolTipText("Snapping delay");
	674	+ smoothCB.addItemListener(this);
	675	+
	676	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	677	+ slowCB.setToolTipText("Smooth interpolation");
	678	+ slowCB.addItemListener(this);
	679	+
	680	+// constraints.gridy += 1;
	681	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	682	+// speakerMocapCB.addItemListener(this);
	683	+
	684	+ if (false)
	685	+ {
	686	+ // handled in scripts
	687	+ //constraints.gridy += 1;
	688	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	689	+ speakerCameraCB.addItemListener(this);
	690	+
	691	+ //constraints.gridy += 1;
	692	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	693	+ speakerFocusCB.addItemListener(this);
	694	+
	695	+ //constraints.gridy += 1;
	696	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	697	+ smoothfocusCB.addItemListener(this);
	698	+ }
	699	+
	700	+//constraints.gridx += 1;
	701	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	702	+// debugCB.addItemListener(this);
	703	+
	704	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	705	+ oeilCB.addItemListener(this);
	706	+
	707	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	708	+ lookAtCB.setToolTipText("Look-at target");
	709	+ lookAtCB.addItemListener(this);
	710	+
	711	+ }
	712	+
	713	+ cGridBag fill = new cGridBag();
	714	+
	715	+ fill.preferredHeight = 200;
	716	+
	717	+ panel.add(fill);
	718	+
	719	+ }
636	720
637	721	void EditObject(Object3D obj)
638	722	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	723	+ cRadio radioButton = new cRadio(obj.name);
	724	+ radioButton.SetObject(obj);
	725	+ radioButton.layout = sevenButton;
	726	+ radioButton.SetCamera(cameraView.renderCamera, false);
	727	+ radioButton.addActionListener(this);
	728	+ radioPanel.add(radioButton);
	729	+ buttonGroup.add(radioButton);
	730	+ radioButton.doClick();
647	731	}
648	732	void SetupViews(ObjEditor oe)
649	733	{
..	..	@@ -663,6 +747,7 @@
663	747	JCheckBox fastCB;
664	748	JCheckBox slowCB;
665	749	JCheckBox boxCB;
	750	+ JCheckBox zoomBoxCB;
666	751	JCheckBox trackCB;
667	752	JCheckBox smoothfocusCB;
668	753	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +790,7 @@
705	790	dropAttributes \|= Object3D.TEXTURE;
706	791	else
707	792	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	793	+ } else if(e.getSource() == liveCB)
710	794	{
711	795	cameraView.ToggleLive();
712	796	}
..	..	@@ -743,6 +827,10 @@
743	827	Recompile();
744	828	cameraView.repaint();
745	829	// refreshContents();
	830	+ }
	831	+ else if(e.getSource() == zoomBoxCB)
	832	+ {
	833	+ cameraView.ToggleZoomBoxMode();
746	834	}
747	835	else if(e.getSource() == smoothfocusCB)
748	836	{
..	..	@@ -857,7 +945,9 @@
857	945	// objEditor.DropFile((java.io.File[]) object, true);
858	946	// return;
859	947	// }
860		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	951	{
862	952	// file(s)
863	953	String[] names = string.split("\n");
..	..	@@ -884,7 +974,7 @@
884	974
885	975	flashIt = false;
886	976	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	979
890	980	if (group.selection.size() == 1)
..	..	@@ -911,11 +1001,11 @@
911	1001	{
912	1002	loadClipboard(true);
913	1003	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1004	+ pasteInto(false, false);
915	1005	} else {
916	1006	loadClipboard(false);
917	1007	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
919	1009	}
920	1010	}
921	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1123,37 @@
1033	1123	torusItem.addActionListener(this);
1034	1124	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1125	superItem.addActionListener(this);
	1126	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1127	+ kleinItem.addActionListener(this);
1036	1128	particleItem = menu.add(new MenuItem("Particle system"));
1037	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1038	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1133	ragdollItem.addActionListener(this);
1040	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1042	1137	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1139	meshItem.addActionListener(this);
1045	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1047	1144	springItem = menu.add(new MenuItem("Spring"));
1048	1145	springItem.addActionListener(this);
1049	1146	flagItem = menu.add(new MenuItem("Flag"));
1050	1147	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1148	blobItem = menu.add(new MenuItem("Blob"));
1056	1149	blobItem.addActionListener(this);
1057	1150	latheItem = menu.add(new MenuItem("Lathe"));
1058	1151	latheItem.addActionListener(this);
	1152	+ }
	1153	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1154	+ bezierItem.addActionListener(this);
	1155	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1156	+ overlayItem.addActionListener(this);
1059	1157	lightItem = menu.add(new MenuItem("Light"));
1060	1158	lightItem.addActionListener(this);
1061	1159	menu.add("-");
..	..	@@ -1065,34 +1163,39 @@
1065	1163	loopItem.addActionListener(this);
1066	1164	doubleItem = menu.add(new MenuItem("Fork"));
1067	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1068	1168	tripleItem = menu.add(new MenuItem("Trident"));
1069	1169	tripleItem.addActionListener(this);
	1170	+ }
1070	1171	}
1071	1172
1072	1173	void buildToolsMenu(Menu menu)
1073	1174	{
1074	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1176	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1077	1178
1078	1179	menu.add("-");
1079	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1181	parseverticesItem.addActionListener(this);
1081	1182	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1183	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1185	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1187	reduceMorphItem.addActionListener(this);
1089	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1189	reduce34MorphItem.addActionListener(this);
1091		-
	1190	+ menu.add("-");
1092	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1192	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1096	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1200	memoryItem.addActionListener(this);
1098	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1209,8 @@
1106	1209	resetParentItem.addActionListener(this);
1107	1210	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1211	repairParentItem.addActionListener(this);
	1212	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1213	+ repairShadowItem.addActionListener(this);
1109	1214	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1215	invariantsItem.addActionListener(this);
1111	1216	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1218,7 @@
1113	1218	menu.add("-");
1114	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1220	editScriptItem.addActionListener(this);
	1221	+ }
1116	1222	}
1117	1223
1118	1224	void ScreenFit()
..	..	@@ -1441,9 +1547,9 @@
1441	1547
1442	1548	void Overwrite(int mask)
1443	1549	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1551	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1447	1553
1448	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1555	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1572,7 @@
1466	1572	//
1467	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1574	{
	1575	+ Object source = event.getSource();
1469	1576	/*
1470	1577	if (event.getSource() == nameField)
1471	1578	{
..	..	@@ -1477,11 +1584,11 @@
1477	1584	}
1478	1585	else
1479	1586	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1588	{
1482	1589	ScreenFit();
1483	1590	} else
1484		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1485	1592	{
1486	1593	cVector v1 = new cVector();
1487	1594	cVector v2 = new cVector();
..	..	@@ -1490,11 +1597,11 @@
1490	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1598	objEditor.cameraView.repaint();
1492	1599	} else
1493		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1494	1601	{
1495	1602	makeSomething(new Box());
1496	1603	} else
1497		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1498	1605	{
1499	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1622,9 @@
1515	1622	applyExample(particleGeom, "SMOKE");
1516	1623	makeSomething(particleGeom);
1517	1624	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1626	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1628
1522	1629	ragdoll.toParent = LA.newMatrix();
1523	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1642,7 @@
1535	1642	} else
1536	1643	/*
1537	1644	*/
1538		- if (event.getSource() == heightFieldItem)
	1645	+ if (source == heightFieldItem)
1539	1646	{
1540	1647	Object3D obj = new Object3D();
1541	1648
..	..	@@ -1573,27 +1680,31 @@
1573	1680
1574	1681	makeSomething(obj);
1575	1682	} else
1576		- if (event.getSource() == gridItem)
	1683	+ if (source == gridItem)
1577	1684	{
1578	1685	makeSomething(new Grid());
1579	1686	} else
1580		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1581	1688	{
1582	1689	makeSomething(new Sphere());
1583	1690	} else
1584		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1585	1692	{
1586	1693	makeSomething(new Cone());
1587	1694	} else
1588		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1589	1696	{
1590	1697	makeSomething(new Torus());
1591	1698	} else
1592		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1593	1700	{
1594	1701	makeSomething(new Superellipsoid());
1595	1702	} else
1596		- if (event.getSource() == blobItem)
	1703	+ if (source == kleinItem)
	1704	+ {
	1705	+ makeSomething(new Klein());
	1706	+ } else
	1707	+ if (source == blobItem)
1597	1708	{
1598	1709	Blob blob = new Blob();
1599	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1712,15 @@
1601	1712	//blob.retile();
1602	1713	makeSomething(blob);
1603	1714	} else
1604		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1605	1716	{
1606	1717	makeSomething(new Lathe());
1607	1718	} else
1608		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1609	1720	{
1610	1721	makeSomething(new BezierSurface());
1611	1722	} else
1612		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1613	1724	{
1614	1725	/*
1615	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1735,7 @@
1624	1735	*/
1625	1736	makeSomething(new Checker());
1626	1737	} else
1627		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1628	1739	{
1629	1740	Object3D itemtomake = new Object3D();
1630	1741	Object3D child;
..	..	@@ -1645,35 +1756,35 @@
1645	1756	makeSomething(child);
1646	1757	}
1647	1758	} else
1648		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1649	1760	{
1650	1761	cSpring s = new cSpring();
1651	1762	s.setup();
1652	1763	makeSomething(s);
1653	1764	} else
1654		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1655	1766	{
1656	1767	cSpring s = new cFlag();
1657	1768	s.setup();
1658	1769	makeSomething(s);
1659	1770	} else
1660		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1661	1772	{
1662	1773	makeSomething(new Light());
1663	1774	} else
1664		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1665	1776	{
1666	1777	group(new CSG());
1667	1778	} else
1668		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1669	1780	{
1670	1781	group(new cTemplate());
1671	1782	} else
1672		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1673	1784	{
1674	1785	makeSomething(new Attribute());
1675	1786	} else
1676		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1677	1788	{
1678	1789	makeSomething(new PointFlow());
1679	1790	} else
..	..	@@ -1685,7 +1796,7 @@
1685	1796	} else
1686	1797	*/
1687	1798
1688		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1689	1800	{
1690	1801	Composite g = new cGroup();
1691	1802	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1818,7 @@
1707	1818
1708	1819	group(g);
1709	1820	} else
1710		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1711	1822	{
1712	1823	Composite csg = new GroupLeaf();
1713	1824	csg.count = 5;
..	..	@@ -1716,7 +1827,7 @@
1716	1827	csg.addChild(child);
1717	1828	child.addChild(csg);
1718	1829	} else
1719		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1720	1831	{
1721	1832	Composite csg = new GroupLeaf();
1722	1833	csg.count = 5;
..	..	@@ -1728,7 +1839,7 @@
1728	1839	csg.addChild(child);
1729	1840	child.addChild(csg);
1730	1841	} else
1731		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1732	1843	{
1733	1844	Composite csg = new GroupLeaf();
1734	1845	csg.count = 4;
..	..	@@ -1744,70 +1855,83 @@
1744	1855	child.addChild(csg);
1745	1856	} else
1746	1857
1747		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1748	1859	{
1749	1860	ImportGFD();
1750	1861	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1752	1863	{
1753	1864	ImportVRMLX3D();
1754	1865	} else
1755		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1756	1867	{
1757	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1869	} else
1759		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1760	1871	{
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1872	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1874	+ browser.setVisible(true);
	1875	+ String filename = browser.getFile();
	1876	+ if (filename != null && filename.length() > 0)
	1877	+ {
	1878	+ String fullname = browser.getDirectory() + filename;
	1879	+ makeSomething(ReadOBJ(fullname), true);
	1880	+ }
1762	1881	} else
1763		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1764	1883	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1884	+ Globals.drawMode = CameraPane.OCCLUSION;
	1885	+ Globals.theRenderer.repaint();
1767	1886	} else
1768		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1769	1888	{
1770	1889	Recompile();
1771	1890	refreshContents();
1772	1891	} else
1773		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1774	1893	{
1775	1894	OpenDialog();
1776	1895	refreshContents();
1777	1896	} else
1778		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1779	1898	{
1780	1899	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1782	1901	} else
1783		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1784	1903	{
1785	1904	//System.out.println("Invariants:");
1786	1905	PrintMemory();
1787	1906	} else
1788		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1789	1908	{
1790	1909	PrintPath();
1791	1910	} else
1792		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1793	1912	{
1794	1913	AnalyzeObject();
1795	1914	} else
1796		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1797	1916	{
1798	1917	DumpObject();
1799	1918	} else
1800		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1801	1925	{
1802	1926	//Reload(lastConverter, lastFilename, true);
1803	1927	ScreenFit();
1804	1928	} else
1805		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1806	1930	{
1807	1931	//Reload(lastConverter, lastFilename, true);
1808	1932	ScreenFitPoint();
1809	1933	} else
1810		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1811	1935	{
1812	1936	//Reload(lastConverter, lastFilename, true);
1813	1937	SnapObject();
..	..	@@ -1818,13 +1942,13 @@
1818	1942	// Recompile();
1819	1943	// refreshContents();
1820	1944	// } else
1821		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1822	1946	{
1823	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1948	System.gc();
1825	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1950	} else
1827		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1828	1952	{
1829	1953	Object3D obj;
1830	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +1962,70 @@
1838	1962	}
1839	1963	refreshContents(true);
1840	1964	} else
1841		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1842	1966	{
1843	1967	EditSelection(true);
1844	1968	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1846	1970	{
1847	1971	loadClipboard(true);
1848	1972	} else
1849		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1850	1974	{
1851		- Object3D keep = GraphreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1852	1976	loadClipboard(false);
1853	1977	paste(false);
1854		- GraphreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1855	1979	} else
1856		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1857	1981	{
1858	1982	CloneSelection(false);
1859	1983	} else
1860		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1861	1985	{
1862	1986	CloneSelection(true);
1863	1987	} else
1864		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1865	1989	{
1866	1990	loadClipboard(false);
1867	1991	} else
1868		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1869	1993	{
1870	1994	paste(false);
1871	1995	} else
1872		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1873	1997	{
1874		- pasteInto(false);
	1998	+ pasteInto(true, false);
1875	1999	} else
1876		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1877	2001	{
1878		- pasteInto(true);
	2002	+ pasteInto(false, false);
1879	2003	} else
1880		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1881	2009	{
1882	2010	paste(true);
1883	2011	} else
1884		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1885	2013	{
1886	2014	Overwrite(Object3D.TRANSFORM);
1887	2015	} else
1888		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1889	2017	{
1890	2018	Overwrite(Object3D.NAME);
1891	2019	} else
1892		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1893	2021	{
1894	2022	Overwrite(Object3D.UV);
1895	2023	} else
1896		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1897	2025	{
	2026	+ /* july 2015
1898	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2028	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2029	else
1901	2030	{
1902	2031	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2037,16 @@
1908	2037	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2038	}
1910	2039	}
	2040	+ */
	2041	+
	2042	+ Overwrite(dropAttributes);
1911	2043	}
1912		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1913	2045	{
1914	2046	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2047	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2048	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2049	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2050	//
1919	2051	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2052	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2058,7 @@
1926	2058	// refreshContents();
1927	2059	// }
1928	2060	} else
1929		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1930	2062	{
1931	2063	//if (group.selection.size() == 1)
1932	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2069,7 @@
1937	2069	ResetModel();
1938	2070	refreshContents();
1939	2071	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
1941	2073	{
1942	2074	boolean one = false;
1943	2075
..	..	@@ -1964,7 +2096,7 @@
1964	2096	ResetModel();
1965	2097	refreshContents();
1966	2098	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
1968	2100	{
1969	2101	boolean one = false;
1970	2102
..	..	@@ -1990,32 +2122,37 @@
1990	2122	ResetModel();
1991	2123	refreshContents();
1992	2124	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
1994	2126	{
1995	2127	boolean one = false;
1996	2128
1997	2129	if (group.selection.size() == 1)
1998	2130	one = true;
1999	2131
	2132	+ Object3D merge = null;
	2133	+
2000	2134	Object3D content = new cGroup();
2001	2135
2002	2136	for (int i=0; i<group.selection.size(); i++)
2003	2137	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2138	+ merge = new Merge(group.selection.get(i));
2005	2139
2006	2140	if (one)
2007		- makeSomething(sel, false);
	2141	+ makeSomething(merge, false);
2008	2142	else
2009		- content.addChild(sel);
	2143	+ content.addChild(merge);
2010	2144	}
2011	2145
2012	2146	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2147	+ makeSomething(content, true);
	2148	+ else
	2149	+ {
	2150	+ ResetModel();
	2151	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2152	+ refreshContents();
	2153	+ }
2017	2154	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
2019	2156	{
2020	2157	boolean one = false;
2021	2158
..	..	@@ -2045,11 +2182,11 @@
2045	2182	ResetModel();
2046	2183	refreshContents();
2047	2184	} else
2048		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
2049	2186	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2187	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2188	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2189	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2190	//
2054	2191	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2192	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2195,48 @@
2058	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2196	// refreshContents();
2060	2197	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2199	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2064	2201
2065	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2203	content = ((cGroup)content).get(0);
2067	2204
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2205	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2206	for (int i=0; i<group.selection.size(); i++)
2070	2207	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2210	group.selection.get(i).linkVerticesThis(content);
2074	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2076	2213	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2214	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2215	refreshContents();
2079	2216	}
2080	2217	} else
2081		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2082	2219	{
2083	2220	for (int i=0; i<group.selection.size(); i++)
2084	2221	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2224	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2089	2226	}
2090	2227
2091	2228	refreshContents();
2092	2229	} else
2093		- if (event.getSource() == resetreferencesItem)
	2230	+ if (source == relinkverticesItem)
	2231	+ {
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
	2234	+ group.selection.RelinkToSupport();
	2235	+ CameraPane.SWITCH = random;
	2236	+
	2237	+ refreshContents();
	2238	+ } else
	2239	+ if (source == resetreferencesItem)
2094	2240	{
2095	2241	for (int i=0; i<group.selection.size(); i++)
2096	2242	{
..	..	@@ -2099,11 +2245,11 @@
2099	2245
2100	2246	refreshContents();
2101	2247	} else
2102		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2103	2249	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2251	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2107	2253
2108	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2255	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2258,13 @@
2112	2258	refreshContents();
2113	2259	}
2114	2260	} else
2115		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2116	2262	{
2117	2263	if (group.selection.size() == 1)
2118	2264	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2120	2266	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2122	2268
2123	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2270	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2277,19 @@
2131	2277	}
2132	2278
2133	2279	} else
2134		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2135	2281	{
2136	2282	RevertMeshes();
2137	2283	} else
2138		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetAllItem)
2139	2285	{
2140	2286	ResetAll();
2141	2287	} else
2142		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2143	2289	{
2144	2290	StepAll();
2145	2291	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2293	{
2148	2294	//int indices[] = jList.getSelectedIndices();
2149	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2297,46 @@
2151	2297
2152	2298	ClearSelection(false);
2153	2299	} else
2154		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2155	2301	{
2156	2302	ClearSelection(true);
2157	2303	} else
2158		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2159	2305	{
2160	2306	group(new cGroup(), true);
2161	2307	} else
2162		- if (event.getSource() == frontItem)
	2308	+ if (source == hideItem)
	2309	+ {
	2310	+ group(new HiddenObject());
	2311	+ } else
	2312	+ if (source == frontItem)
2163	2313	{
2164	2314	front();
2165	2315	} else
2166		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2167	2317	{
2168	2318	back();
2169	2319	} else
2170		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2171	2321	{
2172	2322	makeSomething(new Camera());
2173	2323	} else
2174		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2175	2325	{
2176	2326	group(new Composite());
2177	2327	} else
2178		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2179	2329	{
2180	2330	RandomNode random = new RandomNode();
2181	2331	group(random);
2182	2332	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2184	2334	} else
2185		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2186	2336	{
2187	2337	group(new PhysicsNode());
2188	2338	} else
2189		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2190	2340	{
2191	2341	for (int i=0; i<group.selection.size(); i++)
2192	2342	{
..	..	@@ -2198,7 +2348,7 @@
2198	2348	ResetModel();
2199	2349	refreshContents();
2200	2350	} else
2201		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2202	2352	{
2203	2353	for (int i=0; i<group.selection.size(); i++)
2204	2354	{
..	..	@@ -2210,7 +2360,7 @@
2210	2360	ResetModel();
2211	2361	refreshContents();
2212	2362	} else
2213		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2214	2364	{
2215	2365	for (int i=0; i<group.selection.size(); i++)
2216	2366	{
..	..	@@ -2222,7 +2372,7 @@
2222	2372	ResetModel();
2223	2373	refreshContents();
2224	2374	} else
2225		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2226	2376	{
2227	2377	for (int i=0; i<group.selection.size(); i++)
2228	2378	{
..	..	@@ -2234,7 +2384,7 @@
2234	2384	ResetModel();
2235	2385	refreshContents();
2236	2386	} else
2237		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2238	2388	{
2239	2389	boolean atleastone = false;
2240	2390
..	..	@@ -2273,195 +2423,223 @@
2273	2423	}
2274	2424	}
2275	2425	} else
2276		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2277	2427	{
2278	2428	group(new cLinker());
2279	2429	} else
2280		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2281	2431	{
2282	2432	group(new TextureNode());
2283	2433	} else
2284		- if (event.getSource() == shadowXItem)
	2434	+ if (source == billboardItem)
	2435	+ {
	2436	+ group(new BillboardNode());
	2437	+ } else
	2438	+ if (source == shadowXItem)
2285	2439	{
2286	2440	CastShadow(0);
2287	2441	} else
2288		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2289	2443	{
2290	2444	CastShadow(1);
2291	2445	} else
2292		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2293	2447	{
2294	2448	CastShadow(2);
2295	2449	} else
2296		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2297	2451	{
2298		- ungroup();
	2452	+ //ungroup();
	2453	+ for (int i=0; i<group.selection.size(); i++)
	2454	+ {
	2455	+ Ungroup(group.selection.get(i));
	2456	+ }
	2457	+
	2458	+ ClearSelection(false);
	2459	+
	2460	+ refreshContents();
2299	2461	} else
2300		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2301	2463	{
2302	2464	GenUV();
2303	2465	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2305	2467	{
2306	2468	GenNormals(true);
2307	2469	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2470	+ if (source == genNormalsMESHItem)
	2471	+ {
	2472	+ GenNormals(true); // TODO
	2473	+ } else
	2474	+ if (source == genNormalsORGANItem)
2309	2475	{
2310	2476	GenNormals(false);
2311	2477	} else
2312		- if (event.getSource() == stripifyItem)
	2478	+ if (source == genNormalsMINEItem)
	2479	+ {
	2480	+ GenNormalsMINE();
	2481	+ } else
	2482	+ if (source == stripifyItem)
2313	2483	{
2314	2484	Stripify();
2315	2485	} else
2316		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2317	2487	{
2318	2488	Unstripify();
2319	2489	} else
2320		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2321	2491	{
2322	2492	Trim();
2323	2493	} else
2324		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2325	2495	{
2326	2496	Untrim();
2327	2497	} else
2328		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2329	2499	{
2330	2500	ClearColors();
2331	2501	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2333	2503	{
2334	2504	ClearMaterials();
2335	2505	} else
2336		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2337	2507	{
2338	2508	LiveLeaves(true);
2339	2509	} else
2340		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2341	2511	{
2342	2512	LiveLeaves(false);
2343	2513	} else
2344		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2345	2515	{
2346	2516	SupportLeaves(true);
2347	2517	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2349	2519	{
2350	2520	SupportLeaves(false);
2351	2521	} else
2352		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2353	2523	{
2354	2524	HideLeaves(true);
2355	2525	} else
2356		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2357	2527	{
2358	2528	HideLeaves(false);
2359	2529	} else
2360		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2361	2531	{
2362	2532	MarkLeaves(true);
2363	2533	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2365	2535	{
2366	2536	MarkLeaves(false);
2367	2537	} else
2368		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2369	2539	{
2370	2540	FlipV(true);
2371	2541	} else
2372		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2373	2543	{
2374	2544	FlipV(false);
2375	2545	} else
2376		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2377	2547	{
2378	2548	SetTexRes(0);
2379	2549	} else
2380		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2381	2551	{
2382	2552	SetTexRes(1);
2383	2553	} else
2384		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2385	2555	{
2386	2556	SetTexRes(2);
2387	2557	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2389	2559	{
2390	2560	SetTexRes(3);
2391	2561	} else
2392		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2393	2563	{
2394	2564	SetTexRes(4);
2395	2565	} else
2396		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2397	2567	{
2398	2568	SetTexRes(5);
2399	2569	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2401	2571	{
2402	2572	ReverseNormals();
2403	2573	} else
2404		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2405	2575	{
2406	2576	ParseVertices();
2407	2577	} else
2408		- if (event.getSource() == textureFieldItem)
	2578	+ if (source == textureFieldItem)
2409	2579	{
2410	2580	TextureVertices();
2411	2581	} else
2412		- if (event.getSource() == alignItem)
	2582	+ if (source == alignItem)
2413	2583	{
2414	2584	Align();
2415	2585	} else
2416		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2417	2587	{
2418	2588	MirrorPoses();
2419	2589	} else
2420		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2421	2591	{
2422	2592	MeshReduction(false);
2423	2593	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2425	2595	{
2426	2596	MeshReduction(true);
2427	2597	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2429	2599	{
2430	2600	ReverseTriangles();
2431	2601	} else
2432		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2433	2603	{
2434	2604	ReduceMesh(false);
2435	2605	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2437	2607	{
2438	2608	ReduceMesh(true);
2439	2609	} else
2440		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2441	2611	{
2442	2612	IncreaseMesh();
2443	2613	} else
2444		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2445	2615	{
2446	2616	ClipMesh();
2447	2617	} else
2448		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2449	2619	{
2450	2620	SmoothMesh();
2451	2621	} else
2452		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2453	2623	{
2454	2624	TransformGeometry();
2455	2625	} else
2456		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2457	2631	{
2458	2632	ResetTransform();
2459	2633	} else
2460		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2461	2635	{
2462		- ResetCentroid();
	2636	+ ResetCentroid(true);
2463	2637	} else
2464		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2465	2643	{
2466	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2645	{
..	..	@@ -2471,7 +2649,7 @@
2471	2649
2472	2650	refreshContents();
2473	2651	} else
2474		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2475	2653	{
2476	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2655	{
..	..	@@ -2485,7 +2663,21 @@
2485	2663
2486	2664	refreshContents();
2487	2665	} else
2488		- if (event.getSource() == sortbysizeItem)
	2666	+ if (source == repairShadowItem)
	2667	+ {
	2668	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2669	+ {
	2670	+ Object3D obj = (Object3D)e.nextElement();
	2671	+ obj.RepairShadow();
	2672	+// for (int i=0; i<obj.size(); i++)
	2673	+// {
	2674	+// obj.get(i).parent = obj;
	2675	+// }
	2676	+ }
	2677	+
	2678	+ refreshContents();
	2679	+ } else
	2680	+ if (source == sortbysizeItem)
2489	2681	{
2490	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2683	{
..	..	@@ -2497,7 +2689,7 @@
2497	2689	ResetModel();
2498	2690	refreshContents();
2499	2691	} else
2500		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2501	2693	{
2502	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2695	{
..	..	@@ -2509,7 +2701,7 @@
2509	2701	ResetModel();
2510	2702	refreshContents();
2511	2703	} else
2512		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2513	2705	{
2514	2706	String texture = GetFile("Attach pigment");
2515	2707	Object3D obj;
..	..	@@ -2521,7 +2713,7 @@
2521	2713
2522	2714	refreshContents();
2523	2715	} else
2524		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2525	2717	{
2526	2718	Object3D obj;
2527	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2724,7 @@
2532	2724
2533	2725	refreshContents();
2534	2726	} else
2535		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2536	2728	{
2537	2729	String texture = GetFile("Attach bump");
2538	2730	Object3D obj;
..	..	@@ -2544,7 +2736,7 @@
2544	2736
2545	2737	refreshContents();
2546	2738	} else
2547		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2548	2740	{
2549	2741	Object3D obj;
2550	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2747,7 @@
2555	2747
2556	2748	refreshContents();
2557	2749	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2559	2751	{
2560	2752	Object3D obj;
2561	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2758,195 @@
2566	2758
2567	2759	refreshContents();
2568	2760	} else
2569		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2570	2762	{
2571	2763	CameraPane.flash = true;
2572	2764	refreshContents();
2573	2765	} else
2574		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2575	2767	{
2576	2768	} else
2577		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2578	2770	{
2579	2771	radio.layout = twoButton;
2580	2772	// bug
2581	2773	//gridPanel.setDividerLocation(1.0);
2582	2774	//bigPanel.setDividerLocation(0.0);
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		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
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		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2775	+// bigThree.remove(scenePanel);
	2776	+// bigThree.remove(centralPanel);
	2777	+// bigThree.remove(XYZPanel);
	2778	+// aWindowConstraints.gridx = 0;
	2779	+// aWindowConstraints.gridy = 0;
	2780	+// aWindowConstraints.gridwidth = 1;
	2781	+// // aConstraints.gridheight = 3;
	2782	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2783	+// aWindowConstraints.weightx = 0;
	2784	+// aWindowConstraints.weighty = 1;
	2785	+// //bigThree.add(jtp, aWindowConstraints);
	2786	+// aWindowConstraints.weightx = 1;
	2787	+// aWindowConstraints.gridwidth = 3;
	2788	+// // aConstraints.gridheight = 3;
	2789	+// aWindowConstraints.gridx = 1;
	2790	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2791	+// bigThree.add(centralPanel, aWindowConstraints);
	2792	+// aWindowConstraints.weightx = 0;
	2793	+// aWindowConstraints.gridx = 4;
	2794	+// aWindowConstraints.gridwidth = 1;
	2795	+// // aConstraints.gridheight = 3;
	2796	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2797	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2798	+// scenePanel.setVisible(false);
	2799	+// centralPanel.setVisible(true);
	2800	+// XYZPanel.setVisible(false);
	2801	+ bigThree.ClearUI();
	2802	+ bigThree.add(centralPanel);
	2803	+ bigThree.FlushUI();
2607	2804	} else
2608		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2609	2806	{
2610	2807	radio.layout = threeButton;
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		- // aConstraints.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		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	2808	+
	2809	+// bigThree.remove(scenePanel);
	2810	+// bigThree.remove(centralPanel);
	2811	+// bigThree.remove(XYZPanel);
	2812	+// aWindowConstraints.gridx = 0;
	2813	+// aWindowConstraints.gridy = 0;
	2814	+// aWindowConstraints.gridwidth = 1;
	2815	+// // aConstraints.gridheight = 3;
	2816	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2817	+// aWindowConstraints.weightx = 0;
	2818	+// aWindowConstraints.weighty = 1;
	2819	+// //bigThree.add(jtp, aWindowConstraints);
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.gridwidth = 3;
	2822	+// // aConstraints.gridheight = 3;
	2823	+// aWindowConstraints.gridx = 1;
	2824	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2825	+// bigThree.add(centralPanel, aWindowConstraints);
	2826	+// aWindowConstraints.weightx = 0;
	2827	+// aWindowConstraints.gridx = 4;
	2828	+// aWindowConstraints.gridwidth = 1;
	2829	+// // aConstraints.gridheight = 3;
	2830	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2831	+// bigThree.add(XYZPanel, aWindowConstraints);
	2832	+// bigThree.validate();
	2833	+// scenePanel.setVisible(false);
	2834	+// centralPanel.setVisible(true);
	2835	+// XYZPanel.setVisible(true);
	2836	+ bigThree.ClearUI();
	2837	+ bigThree.add(centralPanel);
	2838	+ bigThree.add(XYZPanel);
	2839	+ bigThree.FlushUI();
2635	2840	} else
2636		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2637	2842	{
2638	2843	radio.layout = fourButton;
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.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.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		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2844	+
	2845	+// bigThree.remove(scenePanel);
	2846	+// bigThree.remove(centralPanel);
	2847	+// bigThree.remove(XYZPanel);
	2848	+// aWindowConstraints.gridx = 0;
	2849	+// aWindowConstraints.gridy = 0;
	2850	+// aWindowConstraints.gridwidth = 1;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2853	+// aWindowConstraints.weightx = 1;
	2854	+// aWindowConstraints.weighty = 1;
	2855	+// bigThree.add(scenePanel, aWindowConstraints);
	2856	+// aWindowConstraints.weightx = 1;
	2857	+// aWindowConstraints.gridwidth = 3;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.gridx = 1;
	2860	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2861	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2862	+// aWindowConstraints.weightx = 0;
	2863	+// aWindowConstraints.gridx = 4;
	2864	+// aWindowConstraints.gridwidth = 1;
	2865	+// // aWindowConstraints.gridheight = 3;
	2866	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2867	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2868	+// bigThree.validate();
	2869	+// scenePanel.setVisible(true);
	2870	+// centralPanel.setVisible(false);
	2871	+// XYZPanel.setVisible(false);
	2872	+ bigThree.ClearUI();
	2873	+ bigThree.add(scenePanel);
	2874	+ bigThree.FlushUI();
2663	2875	} else
2664		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2665	2877	{
2666	2878	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	2879	+
	2880	+// bigThree.remove(scenePanel);
	2881	+// bigThree.remove(centralPanel);
	2882	+// bigThree.remove(XYZPanel);
	2883	+// aWindowConstraints.gridx = 0;
	2884	+// aWindowConstraints.gridy = 0;
	2885	+// aWindowConstraints.gridwidth = 1;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2888	+// aWindowConstraints.weightx = 0;
	2889	+// aWindowConstraints.weighty = 1;
	2890	+// bigThree.add(scenePanel, aWindowConstraints);
	2891	+// aWindowConstraints.weightx = 1;
	2892	+// aWindowConstraints.gridwidth = 3;
	2893	+// // aWindowConstraints.gridheight = 3;
	2894	+// aWindowConstraints.gridx = 1;
	2895	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2896	+// bigThree.add(centralPanel, aWindowConstraints);
	2897	+// aWindowConstraints.weightx = 0;
	2898	+// aWindowConstraints.gridx = 4;
	2899	+// aWindowConstraints.gridwidth = 1;
	2900	+// // aWindowConstraints.gridheight = 3;
	2901	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2902	+// //bigThree.add(XYZPanel, aConstraints);
	2903	+// bigThree.validate();
	2904	+// scenePanel.setVisible(true);
	2905	+// centralPanel.setVisible(true);
	2906	+// XYZPanel.setVisible(false);
	2907	+ bigThree.ClearUI();
	2908	+ bigThree.add(scenePanel);
	2909	+ bigThree.add(centralPanel);
	2910	+ bigThree.FlushUI();
2691	2911	} else
2692		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2693	2913	{
2694	2914	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2915	+
	2916	+// bigThree.remove(scenePanel);
	2917	+// bigThree.remove(centralPanel);
	2918	+// bigThree.remove(XYZPanel);
	2919	+// aWindowConstraints.gridx = 0;
	2920	+// aWindowConstraints.gridy = 0;
	2921	+// aWindowConstraints.gridwidth = 1;
	2922	+// // aWindowConstraints.gridheight = 3;
	2923	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.weighty = 1;
	2926	+// bigThree.add(scenePanel, aWindowConstraints);
	2927	+// aWindowConstraints.weightx = 1;
	2928	+// aWindowConstraints.gridwidth = 3;
	2929	+// // aWindowConstraints.gridheight = 3;
	2930	+// aWindowConstraints.gridx = 1;
	2931	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2932	+// bigThree.add(centralPanel, aWindowConstraints);
	2933	+// aWindowConstraints.weightx = 0;
	2934	+// aWindowConstraints.gridx = 4;
	2935	+// aWindowConstraints.gridwidth = 1;
	2936	+// // aConstraints.gridheight = 3;
	2937	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2938	+// bigThree.add(XYZPanel, aWindowConstraints);
	2939	+// bigThree.validate();
	2940	+// scenePanel.setVisible(true);
	2941	+// centralPanel.setVisible(true);
	2942	+// XYZPanel.setVisible(true);
	2943	+ bigThree.ClearUI();
	2944	+ bigThree.add(scenePanel);
	2945	+ bigThree.add(centralPanel);
	2946	+ bigThree.add(XYZPanel);
	2947	+ bigThree.FlushUI();
2719	2948	} else
2720		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2721	2950	{
2722	2951	Object3D obj;
2723	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +2958,7 @@
2729	2958
2730	2959	refreshContents(true);
2731	2960	} else
2732		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2733	2962	{
2734	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	2964	cRadio ab;
..	..	@@ -2750,11 +2979,11 @@
2750	2979	}
2751	2980	refreshContents(true);
2752	2981	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2754	2983	{
2755	2984	EditSelection(false);
2756	2985	} else
2757		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2758	2987	{
2759	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	2989	{
..	..	@@ -2766,12 +2995,12 @@
2766	2995
2767	2996	child.editWindow = null; // ???????????
2768	2997	}
2769		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2770	2999	//objEditor.jTree.clearSelection();
2771	3000	//objEditor.ResetSliders();
2772	3001	refreshContents(true);
2773	3002	} else
2774		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2775	3004	{
2776	3005	assert(copy == group);
2777	3006	//copy.ClearUI();
..	..	@@ -2782,7 +3011,7 @@
2782	3011	listUI.clear();
2783	3012	refreshContents(true);
2784	3013	} else
2785		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2786	3015	{
2787	3016	assert(copy == group);
2788	3017
..	..	@@ -2803,19 +3032,19 @@
2803	3032
2804	3033	refreshContents(true);
2805	3034	} else
2806		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2807	3036	{
2808	3037	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3038	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3039	objEditor.ResetSliders();
2811	3040	refreshContents(true);
2812	3041	} else
2813		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2814	3043	{
2815	3044	group.parent = keepparent;
2816	3045	group.attributes = 0;
2817	3046	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2819	3048	Object3D obj = radio.GetObject();
2820	3049	System.out.println("Edit " + obj);
2821	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3064,7 @@
2835	3064	}
2836	3065
2837	3066	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3067	+ //Globals.theRenderer.object = group;
2839	3068	if(!useclient)
2840	3069	{
2841	3070	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,7 +3073,8 @@
2844	3073	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3074	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3075	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3076	+ //cameraView.lighttouched = true;
	3077	+ Globals.lighttouched = true;
2848	3078	topView.object = group;
2849	3079	frontView.object = group;
2850	3080	sideView.object = group;
..	..	@@ -2880,7 +3110,7 @@
2880	3110	if (useclient)
2881	3111	{
2882	3112	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3113	+ Globals.lighttouched = true;
2884	3114	//topView.object = client;
2885	3115	//frontView.object = client;
2886	3116	//sideView.object = client;
..	..	@@ -2888,7 +3118,7 @@
2888	3118	else
2889	3119	{
2890	3120	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3121	+ Globals.lighttouched = true;
2892	3122	//topView.object = group;
2893	3123	//frontView.object = group;
2894	3124	//sideView.object = group;
..	..	@@ -2923,6 +3153,28 @@
2923	3153	refreshContents();
2924	3154	}
2925	3155
	3156	+ void TransformChildren()
	3157	+ {
	3158	+ Object3D obj;
	3159	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3160	+ {
	3161	+ obj = (Object3D)e.nextElement();
	3162	+ obj.KeepTextureMatrices();
	3163	+ obj.TransformChildren();
	3164	+ obj.RestoreTextureMatrices();
	3165	+
	3166	+// if (obj.parent == null)
	3167	+// {
	3168	+// System.out.println("NULL PARENT!");
	3169	+// new Exception().printStackTrace();
	3170	+// }
	3171	+// else
	3172	+// TouchTransform(obj);
	3173	+// //obj.parent.Touch();
	3174	+ }
	3175	+
	3176	+ refreshContents();
	3177	+ }
2926	3178
2927	3179	void ResetTransform()
2928	3180	{
..	..	@@ -3035,7 +3287,7 @@
3035	3287	refreshContents();
3036	3288	}
3037	3289
3038		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
3039	3291	{
3040	3292	Object3D obj;
3041	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3302,16 @@
3050	3302	LA.matIdentity(Object3D.mat);
3051	3303	obj.getBounds(minima, maxima, false);
3052	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3056	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3059	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3121,9 +3377,9 @@
3121	3377	obj = (Object3D)e.nextElement();
3122	3378
3123	3379	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3125	3381	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3383
3128	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3385	}
..	..	@@ -3165,6 +3421,13 @@
3165	3421	void GenNormals(boolean crease)
3166	3422	{
3167	3423	group.GenNormalsS(crease);
	3424	+
	3425	+ refreshContents();
	3426	+ }
	3427	+
	3428	+ void GenNormalsMINE()
	3429	+ {
	3430	+ group.selection.GenNormalsMINE();
3168	3431
3169	3432	refreshContents();
3170	3433	}
..	..	@@ -3250,7 +3513,7 @@
3250	3513	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3514	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3515	//
3253		-// g.add(GraphreeD.clipboard);
	3516	+// g.add(GrafreeD.clipboard);
3254	3517	//
3255	3518	// buffer.add(g);
3256	3519	// }
..	..	@@ -3269,8 +3532,8 @@
3269	3532	// nodes = new Object3D();
3270	3533	// vertices = new Vector<Vertex>();
3271	3534	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3535	+// boolean epsequal = GrafreeD.epsequal;
	3536	+// GrafreeD.epsequal = true;
3274	3537	//
3275	3538	// for (int i=0; i<group.selection.size(); i++)
3276	3539	// {
..	..	@@ -3311,7 +3574,7 @@
3311	3574	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3575	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3576	//
3314		-// g.add(GraphreeD.clipboard);
	3577	+// g.add(GrafreeD.clipboard);
3315	3578	//
3316	3579	// buffer.add(g);
3317	3580	// }
..	..	@@ -3319,7 +3582,7 @@
3319	3582	// makeSomething(buffer, i==group.selection.size()-1);
3320	3583	// }
3321	3584	//
3322		-// GraphreeD.epsequal = epsequal;
	3585	+// GrafreeD.epsequal = epsequal;
3323	3586	//
3324	3587	// //buffer = null;
3325	3588	// temprep = null;
..	..	@@ -3330,8 +3593,8 @@
3330	3593
3331	3594	void ParseVertices()
3332	3595	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3335	3598
3336	3599	for (int i=0; i<group.selection.size(); i++)
3337	3600	{
..	..	@@ -3356,7 +3619,7 @@
3356	3619	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3620	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3621
3359		- g.add(GraphreeD.clipboard);
	3622	+ g.add(Grafreed.clipboard);
3360	3623
3361	3624	buffer.add(g);
3362	3625	}
..	..	@@ -3371,7 +3634,7 @@
3371	3634	makeSomething(buffer, i==group.selection.size()-1);
3372	3635	}
3373	3636
3374		- GraphreeD.epsequal = epsequal;
	3637	+ Grafreed.epsequal = epsequal;
3375	3638
3376	3639	refreshContents();
3377	3640	}
..	..	@@ -3389,7 +3652,16 @@
3389	3652	String pigment = Object3D.GetPigment(tex);
3390	3653	//String bump = Object3D.GetBump(tex);
3391	3654
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3656	+
	3657	+ try
	3658	+ {
	3659	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3660	+ }
	3661	+ catch (Exception e)
	3662	+ {
	3663	+ System.err.println("FAIL: " + node);
	3664	+ }
3393	3665
3394	3666	double s = v.s;
3395	3667
..	..	@@ -3416,7 +3688,7 @@
3416	3688	scale /= 3;
3417	3689
3418	3690	scale /= 0xFF;
3419		- scale /= 4;
	3691	+ // c'est quoi ca? scale /= 4;
3420	3692
3421	3693	//v.AO = scale;
3422	3694
..	..	@@ -3437,12 +3709,26 @@
3437	3709
3438	3710	void Align()
3439	3711	{
	3712	+ if (group.selection.size() == 0)
	3713	+ return;
	3714	+
	3715	+ cVector bbmin = new cVector();
	3716	+ cVector bbmax = new cVector();
	3717	+
	3718	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3719	+
	3720	+ double dx = bbmax.x - bbmin.x;
	3721	+ double dy = bbmax.y - bbmin.y;
	3722	+ double dz = bbmax.z - bbmin.z;
	3723	+
	3724	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3725	+
3440	3726	for (int i=0; i<group.selection.size(); i++)
3441	3727	{
3442	3728	Object3D obj = group.selection.get(i);
3443	3729
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3730	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3731	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3732	}
3447	3733
3448	3734	refreshContents();
..	..	@@ -3455,7 +3741,7 @@
3455	3741	// ref.SaveSupports();
3456	3742	// Object3D par = ref.parent;
3457	3743	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3744	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3745	// ref.parent = par;
3460	3746	// ref.RestoreSupports();
3461	3747
..	..	@@ -3463,11 +3749,11 @@
3463	3749
3464	3750	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3751
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3752	+ boolean random = CameraPane.SWITCH;
	3753	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3754	lowres.linkVerticesThis(null);
3469	3755	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3756	+ CameraPane.SWITCH = random;
3471	3757
3472	3758	System.err.flush();
3473	3759
..	..	@@ -3485,7 +3771,7 @@
3485	3771	// lowres.SaveSupports();
3486	3772	// par = lowres.parent;
3487	3773	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3774	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3775	Object3D newlow = CloneObject(lowres, false);
3490	3776	newlow.name = sn.switchobject.get(i).name;
3491	3777	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3793,7 @@
3507	3793	return;
3508	3794
3509	3795	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3511	3797
3512	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3799
..	..	@@ -3676,7 +3962,7 @@
3676	3962	group.selection.RelinkToSupport(); // july 2014
3677	3963	System.out.println("DONE.");
3678	3964	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3965	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3966	}
3681	3967
3682	3968	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3987,20 @@
3701	3987
3702	3988	void ClipMesh()
3703	3989	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	3991	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3707	3993
3708	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3995	content = ((cGroup)content).get(0);
3710	3996
3711	3997	// for (int i=0; i<group.selection.size(); i++)
3712	3998	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3999	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4000	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4002	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4003	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4004	System.out.println("DONE.");
3719	4005	refreshContents();
3720	4006	}
..	..	@@ -3952,25 +4238,25 @@
3952	4238	System.err.println("info : " + child.GetPath());
3953	4239	}
3954	4240	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4241	+// else
	4242	+// {
	4243	+// objEditor.SetMaterial(group); // .GetMaterial());
	4244	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4245	+// System.err.println("info : " + group.GetPath());
	4246	+// }
3961	4247
3962	4248	objEditor.SetText(); // jan 2014
3963	4249
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4250	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4251	CameraPane.flash = true;
3966	4252
3967	4253	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4254	// a camera
3969	4255	{
3970	4256	CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4257	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4258	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4259	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4260	}
3975	4261
3976	4262	refreshContents();
..	..	@@ -4052,12 +4338,12 @@
4052	4338	{
4053	4339	if (group.selection.isEmpty())
4054	4340	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
4056	4342	Composite tGroup = null;
4057	4343	if (group.selection.size() > 0) // 1)
4058	4344	{
4059	4345	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
4061	4347	}
4062	4348
4063	4349	if (cut)
..	..	@@ -4097,16 +4383,16 @@
4097	4383	//System.out.println("cut " + child);
4098	4384	//System.out.println("parent = " + child.parent);
4099	4385	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
4101	4387	tGroup.add/Child/(tmp);
4102	4388	else
4103		- GraphreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
4104	4390	}
4105	4391	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
4107	4393	tGroup.add/Child/(child);
4108	4394	else
4109		- GraphreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
4110	4396	}
4111	4397
4112	4398	//ResetModel();
..	..	@@ -4138,21 +4424,21 @@
4138	4424	//System.out.println("cut " + elem);
4139	4425	//System.out.println("parent = " + elem.parent);
4140	4426	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
4142	4428	tGroup.add/Child/(tmp);
4143	4429	else
4144		- GraphreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
4145	4431	}
4146	4432	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
4148	4434	tGroup.add/Child/(child);
4149	4435	else
4150		- GraphreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
4151	4437	}
4152	4438
4153	4439	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
4156	4442	if (cut)
4157	4443	{
4158	4444	ResetModel();
..	..	@@ -4162,11 +4448,11 @@
4162	4448
4163	4449	void paste(boolean expand)
4164	4450	{
4165		- // if (GraphreeD.clipboard == null)
	4451	+ // if (GrafreeD.clipboard == null)
4166	4452	// return;
4167	4453	boolean first = true;
4168	4454
4169		- if (GraphreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
4170	4456	{
4171	4457	Composite temp;
4172	4458
..	..	@@ -4177,7 +4463,7 @@
4177	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4464	*/
4179	4465	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4466	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4467	{
4182	4468	Object3D child = (Object3D)e.nextElement();
4183	4469
..	..	@@ -4191,7 +4477,7 @@
4191	4477	else
4192	4478	elem = child.deepCopy(); // ?
4193	4479	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4480	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4481	// elem = elem.get(0);
4196	4482	makeSomething(elem, true); // ?? first);
4197	4483	//group.addChild(elem);
..	..	@@ -4211,23 +4497,23 @@
4211	4497	//Object3D cb = Applet3D.clipboard;
4212	4498	//temp.addChild(cb);
4213	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4500	+ assert(Grafreed.clipboard.parent == null);
	4501	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4502	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4503	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4504	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4505	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4508	}
4223	4509
4224	4510	ResetModel();
4225	4511	refreshContents();
4226	4512	}
4227	4513
4228		- void pasteInto(boolean copyit)
	4514	+ void pasteInto(boolean copyit, boolean clone)
4229	4515	{
4230		-// if (GraphreeD.clipboard == null)
	4516	+// if (GrafreeD.clipboard == null)
4231	4517	// return;
4232	4518
4233	4519	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4540,22 @@
4254	4540	if (copyit)
4255	4541	{
4256	4542	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4543	+ if (clone)
	4544	+ {
	4545	+ CloneClipboard(false); // sept 2014
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ paste(false);
	4550	+ }
4258	4551	}
4259	4552	else
4260	4553	{
4261	4554	boolean first = true;
4262	4555
4263		- if (GraphreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4264	4557	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4559	Object3D copy;
4267	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4561	{
..	..	@@ -4272,7 +4565,7 @@
4272	4565	}
4273	4566	} else
4274	4567	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4569	}
4277	4570	}
4278	4571	}
..	..	@@ -4464,6 +4757,26 @@
4464	4757	makeSomething(csg);
4465	4758	}
4466	4759
	4760	+ void Ungroup(Object3D g)
	4761	+ {
	4762	+ if (g instanceof HiddenObject)
	4763	+ {
	4764	+ HiddenObject h = (HiddenObject) g;
	4765	+
	4766	+ for (int i=0; i<h.ActualSize(); i++)
	4767	+ {
	4768	+ objEditor.makeSomething(h.get(i), false);
	4769	+ }
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ for (int i=0; i<g.Size(); i++)
	4774	+ {
	4775	+ objEditor.makeSomething(g.get(i), false);
	4776	+ }
	4777	+ }
	4778	+ }
	4779	+
4467	4780	void ungroup()
4468	4781	{
4469	4782	/*
..	..	@@ -4659,7 +4972,7 @@
4659	4972
4660	4973	void ImportGFD()
4661	4974	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4975	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4976	browser.show();
4664	4977	String filename = browser.getFile();
4665	4978	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +5010,7 @@
4697	5010
4698	5011	void ImportVRMLX3D()
4699	5012	{
4700		- if (GraphreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4701	5014	{
4702	5015	/**/
4703	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +5027,7 @@
4714	5027
4715	5028	String GetFile(String dialogName)
4716	5029	{
4717		- if (GraphreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4718	5031	{
4719	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5033	browser.show();
..	..	@@ -4778,10 +5091,12 @@
4778	5091	cButton flashSelectionButton;
4779	5092	cButton editButton;
4780	5093	cButton uneditButton;
	5094	+ JCheckBox allParamsButton;
4781	5095	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5096	cButton unselectButton;
4784	5097
	5098	+ cButton oneStepButton;
	5099	+
4785	5100	cButton screenfitButton;
4786	5101	cButton screenfitpointButton;
4787	5102	cButton snapobjectButton;
..	..	@@ -4823,8 +5138,9 @@
4823	5138	private MenuItem resetsupportItem;
4824	5139	private MenuItem resetreferencesItem;
4825	5140	private MenuItem linkverticesItem;
	5141	+ private MenuItem relinkverticesItem;
4826	5142	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
4828	5144	private MenuItem stepAllItem;
4829	5145	private MenuItem revertMeshItem;
4830	5146	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5151,17 @@
4835	5151	private MenuItem mergeGeometriesItem;
4836	5152	private MenuItem copyItem;
4837	5153	private MenuItem pasteItem;
	5154	+ private MenuItem pasteIntoItem;
4838	5155	private MenuItem pasteLinkItem;
4839	5156	private MenuItem pasteCloneItem;
4840	5157	private MenuItem pasteExpandItem;
4841	5158	private MenuItem clearItem;
4842	5159	private MenuItem clearAllItem;
4843	5160	private MenuItem genUVItem;
	5161	+ private MenuItem genNormalsMESHItem;
4844	5162	private MenuItem genNormalsCADItem;
4845	5163	private MenuItem genNormalsORGANItem;
	5164	+ private MenuItem genNormalsMINEItem;
4846	5165	private MenuItem stripifyItem;
4847	5166	private MenuItem unstripifyItem;
4848	5167	private MenuItem trimItem;
..	..	@@ -4882,8 +5201,11 @@
4882	5201	private MenuItem panoTexturesItem;
4883	5202
4884	5203	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
4886	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
	5208	+ private MenuItem hideItem;
4887	5209	private MenuItem grabItem;
4888	5210	private MenuItem backItem;
4889	5211	private MenuItem frontItem;
..	..	@@ -4904,6 +5226,7 @@
4904	5226
4905	5227	private MenuItem resetParentItem;
4906	5228	private MenuItem repairParentItem;
	5229	+ private MenuItem repairShadowItem;
4907	5230	private MenuItem sortbysizeItem;
4908	5231	private MenuItem sortbynameItem;
4909	5232
..	..	@@ -4924,10 +5247,11 @@
4924	5247	private MenuItem coneItem;
4925	5248	private MenuItem torusItem;
4926	5249	private MenuItem superItem;
	5250	+ private MenuItem kleinItem;
4927	5251	private MenuItem blobItem;
4928	5252	private MenuItem latheItem;
4929	5253	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5254	+ private MenuItem overlayItem;
4931	5255	private MenuItem meshItem;
4932	5256	// private MenuItem meshGroupItem;
4933	5257	private MenuItem springItem;
..	..	@@ -4936,6 +5260,7 @@
4936	5260	private MenuItem csgItem;
4937	5261	private MenuItem templateItem;
4938	5262	private MenuItem textureItem;
	5263	+ private MenuItem billboardItem;
4939	5264	private MenuItem shadowXItem;
4940	5265	private MenuItem shadowYItem;
4941	5266	private MenuItem shadowZItem;