~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,
..	..	@@ -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,18 +185,31 @@
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"));
	211	+ if (Globals.ADVANCED)
	212	+ {
193	213	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	214	resetMeshItem.addActionListener(this);
195	215	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +219,7 @@
199	219	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	220	resetreferencesItem.addActionListener(this);
201	221	menu.add("-");
	222	+ }
202	223	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	224	overwriteGeoItem.addActionListener(this);
204	225	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +231,26 @@
210	231	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	232	overwriteUVItem.addActionListener(this);
212	233	menu.add("-");
	234	+ if (Globals.ADVANCED)
	235	+ {
213	236	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	237	generateMeshItem.addActionListener(this);
215	238	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	239	poseMeshItem.addActionListener(this);
217	240	menu.add("-");
	241	+ }
218	242	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	243	resetsupportItem.addActionListener(this);
220	244	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	245	linkverticesItem.addActionListener(this);
	246	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	247	+ relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
222	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	252	setMasterItem.addActionListener(this);
	253	+ }
224	254
225	255	oe.menuBar.add(menu = new Menu("Group"));
226	256	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +261,38 @@
231	261	frontItem.addActionListener(this);
232	262	compositeItem = menu.add(new MenuItem("Composite"));
233	263	compositeItem.addActionListener(this);
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	265	+ hideItem.addActionListener(this);
	266	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	267	+ ungroupItem.addActionListener(this);
234	268	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
236	270	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	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	272	switchGeoItem.addActionListener(this);
243	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	274	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	276	morphItem.addActionListener(this);
	277	+
	278	+ if (Globals.ADVANCED)
	279	+ {
	280	+ menu.add("-");
	281	+ physicsItem = menu.add(new MenuItem("Physics"));
	282	+ physicsItem.addActionListener(this);
	283	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	284	+ frameselectorItem.addActionListener(this);
247	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	286	scriptNodeItem.addActionListener(this);
249	287	cameraItem = menu.add(new MenuItem("Camera"));
250	288	cameraItem.addActionListener(this);
	289	+ }
251	290
252	291	oe.menuBar.add(menu = new Menu("Object"));
253	292	textureItem = menu.add(new MenuItem("Texture"));
254	293	textureItem.addActionListener(this);
	294	+ billboardItem = menu.add(new MenuItem("Billboard"));
	295	+ billboardItem.addActionListener(this);
255	296	csgItem = menu.add(new MenuItem("CSG"));
256	297	csgItem.addActionListener(this);
257	298	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +301,25 @@
260	301	shadowYItem.addActionListener(this);
261	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
263	307	linkerItem = menu.add(new MenuItem("Linker"));
264	308	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	309	attributeItem = menu.add(new MenuItem("Attribute"));
268	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
269	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	314	pointflowItem.addActionListener(this);
	315	+ }
271	316	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	318	resetTransformItem.addActionListener(this);
276	319	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	320	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	321	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	322	+ transformgeometryItem.addActionListener(this);
280	323
281	324	oe.menuBar.add(menu = new Menu("Geometry"));
282	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +330,11 @@
287	330	genNormalsCADItem.addActionListener(this);
288	331	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	332	genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
290	338	stripifyItem = menu.add(new MenuItem("Stripify"));
291	339	stripifyItem.addActionListener(this);
292	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,10 +356,14 @@
308	356	reduce34MeshItem.addActionListener(this);
309	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	358	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
315	367
316	368	oe.menuBar.add(menu = new Menu("Attributes"));
317	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -321,10 +373,13 @@
321	373	liveleavesItem.addActionListener(this);
322	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
324	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	379	supportleavesItem.addActionListener(this);
326	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	381	unsupportleavesItem.addActionListener(this);
	382	+ }
328	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	384	hideleavesItem.addActionListener(this);
330	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -367,6 +422,8 @@
367	422	sortbysizeItem.addActionListener(this);
368	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
370	427	menu.add("-");
371	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -376,20 +433,23 @@
376	433	shareGeometriesItem.addActionListener(this);
377	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
379	437
380	438	oe.menuBar.add(menu = new Menu("Insert"));
381	439	buildCreateMenu(menu);
382	440
383		-
384	441	oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	442	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
390	443	importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	444	+ menu.add("-");
	445	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
392	446	import3DSItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	449	+ importVRMLX3DItem.addActionListener(this);
	450	+ menu.add("-");
	451	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	452	+ importGFDItem.addActionListener(this);
393	453
394	454	oe.menuBar.add(menu = new Menu("Tools"));
395	455	buildToolsMenu(menu);
..	..	@@ -425,150 +485,98 @@
425	485	oe.radioPanel.add(dummyButton);
426	486	oe.buttonGroup.add(dummyButton);
427	487	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	488	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	489
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	490	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	491	+ liveCB.setToolTipText("Enabled animation");
433	492	liveCB.addItemListener(this);
434	493
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	494	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	495	+ oneStepButton.setToolTipText("Animate one step forward");
	496	+ oneStepButton.addActionListener(this);
	497	+
	498	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	499	+ fastCB.setToolTipText("Fast mode");
453	500	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	501	+
	502	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	503	+ trackCB.setToolTipText("Enable tracking");
495	504	trackCB.addItemListener(this);
496	505
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	506	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	507	+ screenfitButton.setToolTipText("Screen fit");
499	508	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	509	+
501	510	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	511	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	512
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	513	+ if (Globals.ADVANCED)
	514	+ {
	515	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ snapobjectButton.addActionListener(this);
	517	+ snapobjectButton.setToolTipText("Snap Object");
	518	+ }
	519	+
	520	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	521	+ flashSelectionButton.setToolTipText("Show selection");
514	522	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	523
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	524	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	525	+
	526	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	527	+ twoButton.setToolTipText("Show center view only");
521	528	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523	530	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	531	+ fourButton.setToolTipText("Show left panel only");
	532	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	533	+ sixButton.setToolTipText("2-column layout left");
525	534	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	536	+ threeButton.setToolTipText("2-column layout right");
527	537	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	538	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	539	+ sevenButton.setToolTipText("3-column layout");
529	540	sevenButton.addActionListener(this);
530	541	//
531	542
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	544	+ rootButton.setToolTipText("Edit selection in new tab");
533	545	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	546	+
	547	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	548	+ closeButton.setToolTipText("Close tab");
536	549	closeButton.addActionListener(this);
537	550	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	551	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	552
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	553	+ cGridBag commandsPanel = new cGridBag();
	554	+
	555	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	556	+ editButton.setToolTipText("Edit selection");
543	557	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	558
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	559	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ uneditButton.setToolTipText("Unedit selection");
549	561	uneditButton.addActionListener(this);
550	562
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	563	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	564	+ allParamsButton.setToolTipText("Edit all params");
563	565	allParamsButton.addActionListener(this);
564	566
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	567	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	568	+ clearPanelButton.setToolTipText("Clear edit panel");
	569	+ clearPanelButton.addActionListener(this);
	570	+
	571	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	572	+ unselectButton.setToolTipText("Unselect");
570	573	unselectButton.addActionListener(this);
571	574
	575	+ commandsPanel.preferredHeight = 1;
	576	+
	577	+ oe.treePanel.add(commandsPanel);
	578	+ oe.treePanel.Return();
	579	+
572	580	// oe.aConstraints.gridx += 1;
573	581	// oe.aConstraints.weighty = 0;
574	582	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +588,37 @@
580	588	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	589	// gcButton.addActionListener(this);
582	590
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	591	+ cGridBag jSPPanel = new cGridBag();
	592	+
	593	+ JScrollPane jSP;
594	594	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	595	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	596	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	597	+
	598	+ oe.treePanel.add(jSPPanel);
	599	+ oe.treePanel.Return();
601	600
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	601	+ cGridBag copyOptionsPanel = new cGridBag();
	602	+
	603	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	604	+ colorCB.setToolTipText("Copy color when dropped");
606	605	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	606	+
	607	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	608	+ materialCB.setToolTipText("Copy material when dropped");
609	609	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	610	+
	611	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	612	+ textureCB.setToolTipText("Copy texture when dropped");
612	613	textureCB.addItemListener(this);
613	614
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	615	+ copyOptionsPanel.preferredHeight = 1;
	616	+ oe.treePanel.add(copyOptionsPanel);
	617	+ oe.treePanel.Return();
616	618
	619	+// mainPanel.setDividerLocation(0.5); //1.0);
	620	+// mainPanel.setResizeWeight(0.5);
	621	+
617	622	//jList.addListSelectionListener(this);
618	623	oe.jTree.addTreeSelectionListener(this);
619	624	//jTree.setRootVisible(false);
..	..	@@ -635,17 +640,89 @@
635	640	radio.layout = sevenButton;
636	641	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	642	}
	643	+
	644	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	645	+ {
	646	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	647	+ boxCB.setToolTipText("Display bounding boxes");
	648	+ boxCB.addItemListener(this);
	649	+
	650	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	651	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	652	+ zoomBoxCB.addItemListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	657	+ supportCB.setToolTipText("Enable rigging");
	658	+ supportCB.addItemListener(this);
	659	+
	660	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	661	+ // localCB.addItemListener(this);
	662	+
	663	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	664	+ crowdCB.setToolTipText("Used for crowds");
	665	+ crowdCB.addItemListener(this);
	666	+
	667	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	668	+ smoothCB.setToolTipText("Snapping delay");
	669	+ smoothCB.addItemListener(this);
	670	+
	671	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	672	+ slowCB.setToolTipText("Smooth interpolation");
	673	+ slowCB.addItemListener(this);
	674	+
	675	+// constraints.gridy += 1;
	676	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	677	+// speakerMocapCB.addItemListener(this);
	678	+
	679	+ if (false)
	680	+ {
	681	+ // handled in scripts
	682	+ //constraints.gridy += 1;
	683	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	684	+ speakerCameraCB.addItemListener(this);
	685	+
	686	+ //constraints.gridy += 1;
	687	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	688	+ speakerFocusCB.addItemListener(this);
	689	+
	690	+ //constraints.gridy += 1;
	691	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	692	+ smoothfocusCB.addItemListener(this);
	693	+ }
	694	+
	695	+//constraints.gridx += 1;
	696	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	697	+// debugCB.addItemListener(this);
	698	+
	699	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	700	+ oeilCB.addItemListener(this);
	701	+
	702	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	703	+ lookAtCB.setToolTipText("Look-at target");
	704	+ lookAtCB.addItemListener(this);
	705	+
	706	+ }
	707	+
	708	+ cGridBag fill = new cGridBag();
	709	+
	710	+ fill.preferredHeight = 200;
	711	+
	712	+ panel.add(fill);
	713	+
	714	+ }
638	715
639	716	void EditObject(Object3D obj)
640	717	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	718	+ cRadio radioButton = new cRadio(obj.name);
	719	+ radioButton.SetObject(obj);
	720	+ radioButton.layout = sevenButton;
	721	+ radioButton.SetCamera(cameraView.renderCamera, false);
	722	+ radioButton.addActionListener(this);
	723	+ radioPanel.add(radioButton);
	724	+ buttonGroup.add(radioButton);
	725	+ radioButton.doClick();
649	726	}
650	727	void SetupViews(ObjEditor oe)
651	728	{
..	..	@@ -665,6 +742,7 @@
665	742	JCheckBox fastCB;
666	743	JCheckBox slowCB;
667	744	JCheckBox boxCB;
	745	+ JCheckBox zoomBoxCB;
668	746	JCheckBox trackCB;
669	747	JCheckBox smoothfocusCB;
670	748	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +785,7 @@
707	785	dropAttributes \|= Object3D.TEXTURE;
708	786	else
709	787	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	788	+ } else if(e.getSource() == liveCB)
712	789	{
713	790	cameraView.ToggleLive();
714	791	}
..	..	@@ -745,6 +822,10 @@
745	822	Recompile();
746	823	cameraView.repaint();
747	824	// refreshContents();
	825	+ }
	826	+ else if(e.getSource() == zoomBoxCB)
	827	+ {
	828	+ cameraView.ToggleZoomBoxMode();
748	829	}
749	830	else if(e.getSource() == smoothfocusCB)
750	831	{
..	..	@@ -913,11 +994,11 @@
913	994	{
914	995	loadClipboard(true);
915	996	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	997	+ pasteInto(false, false);
917	998	} else {
918	999	loadClipboard(false);
919	1000	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1001	+ pasteInto(false, false); // true); // ???
921	1002	}
922	1003	}
923	1004	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1116,37 @@
1035	1116	torusItem.addActionListener(this);
1036	1117	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1118	superItem.addActionListener(this);
	1119	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1120	+ kleinItem.addActionListener(this);
1038	1121	particleItem = menu.add(new MenuItem("Particle system"));
1039	1122	particleItem.addActionListener(this);
	1123	+ if (Globals.ADVANCED)
	1124	+ {
1040	1125	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1126	ragdollItem.addActionListener(this);
1042	1127	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1128	ragdoll2Item.addActionListener(this);
	1129	+ }
1044	1130	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1131	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1132	meshItem.addActionListener(this);
1047	1133	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1134	// meshGroupItem.addActionListener(this);
	1135	+ if (Globals.ADVANCED)
	1136	+ {
1049	1137	springItem = menu.add(new MenuItem("Spring"));
1050	1138	springItem.addActionListener(this);
1051	1139	flagItem = menu.add(new MenuItem("Flag"));
1052	1140	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1141	blobItem = menu.add(new MenuItem("Blob"));
1058	1142	blobItem.addActionListener(this);
1059	1143	latheItem = menu.add(new MenuItem("Lathe"));
1060	1144	latheItem.addActionListener(this);
	1145	+ }
	1146	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1147	+ bezierItem.addActionListener(this);
	1148	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1149	+ overlayItem.addActionListener(this);
1061	1150	lightItem = menu.add(new MenuItem("Light"));
1062	1151	lightItem.addActionListener(this);
1063	1152	menu.add("-");
..	..	@@ -1067,34 +1156,39 @@
1067	1156	loopItem.addActionListener(this);
1068	1157	doubleItem = menu.add(new MenuItem("Fork"));
1069	1158	doubleItem.addActionListener(this);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
1070	1161	tripleItem = menu.add(new MenuItem("Trident"));
1071	1162	tripleItem.addActionListener(this);
	1163	+ }
1072	1164	}
1073	1165
1074	1166	void buildToolsMenu(Menu menu)
1075	1167	{
1076	1168	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1169	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1170	+ animationItem.setState(Globals.ANIMATION);
1079	1171
1080	1172	menu.add("-");
1081	1173	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1174	parseverticesItem.addActionListener(this);
1083	1175	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1176	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1177	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1178	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1179	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1180	reduceMorphItem.addActionListener(this);
1091	1181	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1182	reduce34MorphItem.addActionListener(this);
1093		-
	1183	+ menu.add("-");
1094	1184	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1185	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1186
	1187	+ if (Globals.ADVANCED)
	1188	+ {
	1189	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1190	+ mirrorItem.addActionListener(this);
	1191	+ menu.add("-");
1098	1192	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1193	memoryItem.addActionListener(this);
1100	1194	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1108,6 +1202,8 @@
1108	1202	resetParentItem.addActionListener(this);
1109	1203	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1204	repairParentItem.addActionListener(this);
	1205	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1206	+ repairShadowItem.addActionListener(this);
1111	1207	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1208	invariantsItem.addActionListener(this);
1113	1209	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1211,7 @@
1115	1211	menu.add("-");
1116	1212	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1213	editScriptItem.addActionListener(this);
	1214	+ }
1118	1215	}
1119	1216
1120	1217	void ScreenFit()
..	..	@@ -1468,6 +1565,7 @@
1468	1565	//
1469	1566	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1567	{
	1568	+ Object source = event.getSource();
1471	1569	/*
1472	1570	if (event.getSource() == nameField)
1473	1571	{
..	..	@@ -1479,11 +1577,11 @@
1479	1577	}
1480	1578	else
1481	1579	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1580	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1581	{
1484	1582	ScreenFit();
1485	1583	} else
1486		- if (event.getSource() == switchItem)
	1584	+ if (source == switchItem)
1487	1585	{
1488	1586	cVector v1 = new cVector();
1489	1587	cVector v2 = new cVector();
..	..	@@ -1492,11 +1590,11 @@
1492	1590	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1591	objEditor.cameraView.repaint();
1494	1592	} else
1495		- if (event.getSource() == rectoidItem)
	1593	+ if (source == rectoidItem)
1496	1594	{
1497	1595	makeSomething(new Box());
1498	1596	} else
1499		- if (event.getSource() == particleItem)
	1597	+ if (source == particleItem)
1500	1598	{
1501	1599	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1600	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1615,9 @@
1517	1615	applyExample(particleGeom, "SMOKE");
1518	1616	makeSomething(particleGeom);
1519	1617	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1618	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1619	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1620	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1621
1524	1622	ragdoll.toParent = LA.newMatrix();
1525	1623	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1635,7 @@
1537	1635	} else
1538	1636	/*
1539	1637	*/
1540		- if (event.getSource() == heightFieldItem)
	1638	+ if (source == heightFieldItem)
1541	1639	{
1542	1640	Object3D obj = new Object3D();
1543	1641
..	..	@@ -1575,27 +1673,31 @@
1575	1673
1576	1674	makeSomething(obj);
1577	1675	} else
1578		- if (event.getSource() == gridItem)
	1676	+ if (source == gridItem)
1579	1677	{
1580	1678	makeSomething(new Grid());
1581	1679	} else
1582		- if (event.getSource() == ellipsoidItem)
	1680	+ if (source == ellipsoidItem)
1583	1681	{
1584	1682	makeSomething(new Sphere());
1585	1683	} else
1586		- if (event.getSource() == coneItem)
	1684	+ if (source == coneItem)
1587	1685	{
1588	1686	makeSomething(new Cone());
1589	1687	} else
1590		- if (event.getSource() == torusItem)
	1688	+ if (source == torusItem)
1591	1689	{
1592	1690	makeSomething(new Torus());
1593	1691	} else
1594		- if (event.getSource() == superItem)
	1692	+ if (source == superItem)
1595	1693	{
1596	1694	makeSomething(new Superellipsoid());
1597	1695	} else
1598		- if (event.getSource() == blobItem)
	1696	+ if (source == kleinItem)
	1697	+ {
	1698	+ makeSomething(new Klein());
	1699	+ } else
	1700	+ if (source == blobItem)
1599	1701	{
1600	1702	Blob blob = new Blob();
1601	1703	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1705,15 @@
1603	1705	//blob.retile();
1604	1706	makeSomething(blob);
1605	1707	} else
1606		- if (event.getSource() == latheItem)
	1708	+ if (source == latheItem)
1607	1709	{
1608	1710	makeSomething(new Lathe());
1609	1711	} else
1610		- if (event.getSource() == bezierItem)
	1712	+ if (source == bezierItem)
1611	1713	{
1612	1714	makeSomething(new BezierSurface());
1613	1715	} else
1614		- if (event.getSource() == checkerItem)
	1716	+ if (source == overlayItem)
1615	1717	{
1616	1718	/*
1617	1719	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1728,7 @@
1626	1728	*/
1627	1729	makeSomething(new Checker());
1628	1730	} else
1629		- if (event.getSource() == meshItem)
	1731	+ if (source == meshItem)
1630	1732	{
1631	1733	Object3D itemtomake = new Object3D();
1632	1734	Object3D child;
..	..	@@ -1647,35 +1749,35 @@
1647	1749	makeSomething(child);
1648	1750	}
1649	1751	} else
1650		- if (event.getSource() == springItem)
	1752	+ if (source == springItem)
1651	1753	{
1652	1754	cSpring s = new cSpring();
1653	1755	s.setup();
1654	1756	makeSomething(s);
1655	1757	} else
1656		- if (event.getSource() == flagItem)
	1758	+ if (source == flagItem)
1657	1759	{
1658	1760	cSpring s = new cFlag();
1659	1761	s.setup();
1660	1762	makeSomething(s);
1661	1763	} else
1662		- if (event.getSource() == lightItem)
	1764	+ if (source == lightItem)
1663	1765	{
1664	1766	makeSomething(new Light());
1665	1767	} else
1666		- if (event.getSource() == csgItem)
	1768	+ if (source == csgItem)
1667	1769	{
1668	1770	group(new CSG());
1669	1771	} else
1670		- if (event.getSource() == templateItem)
	1772	+ if (source == templateItem)
1671	1773	{
1672	1774	group(new cTemplate());
1673	1775	} else
1674		- if (event.getSource() == attributeItem)
	1776	+ if (source == attributeItem)
1675	1777	{
1676	1778	makeSomething(new Attribute());
1677	1779	} else
1678		- if (event.getSource() == pointflowItem)
	1780	+ if (source == pointflowItem)
1679	1781	{
1680	1782	makeSomething(new PointFlow());
1681	1783	} else
..	..	@@ -1687,7 +1789,7 @@
1687	1789	} else
1688	1790	*/
1689	1791
1690		- if (event.getSource() == superLoopItem)
	1792	+ if (source == superLoopItem)
1691	1793	{
1692	1794	Composite g = new cGroup();
1693	1795	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1811,7 @@
1709	1811
1710	1812	group(g);
1711	1813	} else
1712		- if (event.getSource() == loopItem)
	1814	+ if (source == loopItem)
1713	1815	{
1714	1816	Composite csg = new GroupLeaf();
1715	1817	csg.count = 5;
..	..	@@ -1718,7 +1820,7 @@
1718	1820	csg.addChild(child);
1719	1821	child.addChild(csg);
1720	1822	} else
1721		- if (event.getSource() == doubleItem)
	1823	+ if (source == doubleItem)
1722	1824	{
1723	1825	Composite csg = new GroupLeaf();
1724	1826	csg.count = 5;
..	..	@@ -1730,7 +1832,7 @@
1730	1832	csg.addChild(child);
1731	1833	child.addChild(csg);
1732	1834	} else
1733		- if (event.getSource() == tripleItem)
	1835	+ if (source == tripleItem)
1734	1836	{
1735	1837	Composite csg = new GroupLeaf();
1736	1838	csg.count = 4;
..	..	@@ -1746,70 +1848,83 @@
1746	1848	child.addChild(csg);
1747	1849	} else
1748	1850
1749		- if (event.getSource() == importGFDItem)
	1851	+ if (source == importGFDItem)
1750	1852	{
1751	1853	ImportGFD();
1752	1854	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1855	+ if (source == importVRMLX3DItem)
1754	1856	{
1755	1857	ImportVRMLX3D();
1756	1858	} else
1757		- if (event.getSource() == import3DSItem)
	1859	+ if (source == import3DSItem)
1758	1860	{
1759	1861	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1862	} else
1761		- if (event.getSource() == importOBJItem)
	1863	+ if (source == importOBJItem)
1762	1864	{
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1865	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1866	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1867	+ browser.setVisible(true);
	1868	+ String filename = browser.getFile();
	1869	+ if (filename != null && filename.length() > 0)
	1870	+ {
	1871	+ String fullname = browser.getDirectory() + filename;
	1872	+ makeSomething(ReadOBJ(fullname), true);
	1873	+ }
1764	1874	} else
1765		- if (event.getSource() == computeAOItem)
	1875	+ if (source == computeAOItem)
1766	1876	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1877	+ Globals.drawMode = CameraPane.OCCLUSION;
	1878	+ Globals.theRenderer.repaint();
1769	1879	} else
1770		- if (event.getSource() == recompileItem)
	1880	+ if (source == recompileItem)
1771	1881	{
1772	1882	Recompile();
1773	1883	refreshContents();
1774	1884	} else
1775		- if (event.getSource() == editScriptItem)
	1885	+ if (source == editScriptItem)
1776	1886	{
1777	1887	OpenDialog();
1778	1888	refreshContents();
1779	1889	} else
1780		- if (event.getSource() == invariantsItem)
	1890	+ if (source == invariantsItem)
1781	1891	{
1782	1892	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1893	+ GrafreeD.grafreeD.universe.invariants();
1784	1894	} else
1785		- if (event.getSource() == memoryItem)
	1895	+ if (source == memoryItem)
1786	1896	{
1787	1897	//System.out.println("Invariants:");
1788	1898	PrintMemory();
1789	1899	} else
1790		- if (event.getSource() == pathItem)
	1900	+ if (source == pathItem)
1791	1901	{
1792	1902	PrintPath();
1793	1903	} else
1794		- if (event.getSource() == analyzeItem)
	1904	+ if (source == analyzeItem)
1795	1905	{
1796	1906	AnalyzeObject();
1797	1907	} else
1798		- if (event.getSource() == dumpItem)
	1908	+ if (source == dumpItem)
1799	1909	{
1800	1910	DumpObject();
1801	1911	} else
1802		- if (event.getSource() == screenfitButton)
	1912	+ if (source == oneStepButton)
	1913	+ {
	1914	+ Globals.ONESTEP = true;
	1915	+ cameraView.repaint();
	1916	+ } else
	1917	+ if (source == screenfitButton)
1803	1918	{
1804	1919	//Reload(lastConverter, lastFilename, true);
1805	1920	ScreenFit();
1806	1921	} else
1807		- if (event.getSource() == screenfitpointButton)
	1922	+ if (source == screenfitpointButton)
1808	1923	{
1809	1924	//Reload(lastConverter, lastFilename, true);
1810	1925	ScreenFitPoint();
1811	1926	} else
1812		- if (event.getSource() == snapobjectButton)
	1927	+ if (source == snapobjectButton)
1813	1928	{
1814	1929	//Reload(lastConverter, lastFilename, true);
1815	1930	SnapObject();
..	..	@@ -1820,13 +1935,13 @@
1820	1935	// Recompile();
1821	1936	// refreshContents();
1822	1937	// } else
1823		- if (event.getSource() == gcButton)
	1938	+ if (source == gcButton)
1824	1939	{
1825	1940	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1941	System.gc();
1827	1942	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1943	} else
1829		- if (event.getSource() == editLeafItem)
	1944	+ if (source == editLeafItem)
1830	1945	{
1831	1946	Object3D obj;
1832	1947	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1955,66 @@
1840	1955	}
1841	1956	refreshContents(true);
1842	1957	} else
1843		- if (event.getSource() == openWindowItem)
	1958	+ if (source == openWindowItem)
1844	1959	{
1845	1960	EditSelection(true);
1846	1961	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1962	+ if (source == cutItem \|\| source == clearButton)
1848	1963	{
1849	1964	loadClipboard(true);
1850	1965	} else
1851		- if (event.getSource() == duplicateItem)
	1966	+ if (source == duplicateItem)
1852	1967	{
1853	1968	Object3D keep = GrafreeD.clipboard;
1854	1969	loadClipboard(false);
1855	1970	paste(false);
1856	1971	GrafreeD.clipboard = keep;
1857	1972	} else
1858		- if (event.getSource() == cloneItem)
	1973	+ if (source == cloneItem)
1859	1974	{
1860	1975	CloneSelection(false);
1861	1976	} else
1862		- if (event.getSource() == cloneSupportItem)
	1977	+ if (source == cloneSupportItem)
1863	1978	{
1864	1979	CloneSelection(true);
1865	1980	} else
1866		- if (event.getSource() == copyItem)
	1981	+ if (source == copyItem)
1867	1982	{
1868	1983	loadClipboard(false);
1869	1984	} else
1870		- if (event.getSource() == pasteItem)
	1985	+ if (source == pasteItem)
1871	1986	{
1872	1987	paste(false);
1873	1988	} else
1874		- if (event.getSource() == pasteLinkItem)
	1989	+ if (source == pasteIntoItem)
1875	1990	{
1876		- pasteInto(false);
	1991	+ pasteInto(true, false);
1877	1992	} else
1878		- if (event.getSource() == pasteCloneItem)
	1993	+ if (source == pasteLinkItem)
1879	1994	{
1880		- pasteInto(true);
	1995	+ pasteInto(false, false);
1881	1996	} else
1882		- if (event.getSource() == pasteExpandItem)
	1997	+ if (source == pasteCloneItem)
	1998	+ {
	1999	+ pasteInto(true, true);
	2000	+ } else
	2001	+ if (source == pasteExpandItem)
1883	2002	{
1884	2003	paste(true);
1885	2004	} else
1886		- if (event.getSource() == synchronizeItem)
	2005	+ if (source == synchronizeItem)
1887	2006	{
1888	2007	Overwrite(Object3D.TRANSFORM);
1889	2008	} else
1890		- if (event.getSource() == overwriteNameItem)
	2009	+ if (source == overwriteNameItem)
1891	2010	{
1892	2011	Overwrite(Object3D.NAME);
1893	2012	} else
1894		- if (event.getSource() == overwriteUVItem)
	2013	+ if (source == overwriteUVItem)
1895	2014	{
1896	2015	Overwrite(Object3D.UV);
1897	2016	} else
1898		- if (event.getSource() == overwriteMatItem)
	2017	+ if (source == overwriteMatItem)
1899	2018	{
1900	2019	/* july 2015
1901	2020	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2034,7 @@
1915	2034
1916	2035	Overwrite(dropAttributes);
1917	2036	}
1918		- if (event.getSource() == overwriteGeoItem)
	2037	+ if (source == overwriteGeoItem)
1919	2038	{
1920	2039	Overwrite(Object3D.GEOMETRY);
1921	2040	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2051,7 @@
1932	2051	// refreshContents();
1933	2052	// }
1934	2053	} else
1935		- if (event.getSource() == generateMeshItem)
	2054	+ if (source == generateMeshItem)
1936	2055	{
1937	2056	//if (group.selection.size() == 1)
1938	2057	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2062,7 @@
1943	2062	ResetModel();
1944	2063	refreshContents();
1945	2064	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2065	+ if (source == extractGeometriesItem)
1947	2066	{
1948	2067	boolean one = false;
1949	2068
..	..	@@ -1970,7 +2089,7 @@
1970	2089	ResetModel();
1971	2090	refreshContents();
1972	2091	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2092	+ if (source == cloneGeometriesItem)
1974	2093	{
1975	2094	boolean one = false;
1976	2095
..	..	@@ -1996,32 +2115,37 @@
1996	2115	ResetModel();
1997	2116	refreshContents();
1998	2117	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2118	+ if (source == shareGeometriesItem)
2000	2119	{
2001	2120	boolean one = false;
2002	2121
2003	2122	if (group.selection.size() == 1)
2004	2123	one = true;
2005	2124
	2125	+ Object3D merge = null;
	2126	+
2006	2127	Object3D content = new cGroup();
2007	2128
2008	2129	for (int i=0; i<group.selection.size(); i++)
2009	2130	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2131	+ merge = new Merge(group.selection.get(i));
2011	2132
2012	2133	if (one)
2013		- makeSomething(sel, false);
	2134	+ makeSomething(merge, false);
2014	2135	else
2015		- content.addChild(sel);
	2136	+ content.addChild(merge);
2016	2137	}
2017	2138
2018	2139	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2140	+ makeSomething(content, true);
	2141	+ else
	2142	+ {
	2143	+ ResetModel();
	2144	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2145	+ refreshContents();
	2146	+ }
2023	2147	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2148	+ if (source == mergeGeometriesItem)
2025	2149	{
2026	2150	boolean one = false;
2027	2151
..	..	@@ -2051,7 +2175,7 @@
2051	2175	ResetModel();
2052	2176	refreshContents();
2053	2177	} else
2054		- if (event.getSource() == linkverticesItem)
	2178	+ if (source == linkverticesItem)
2055	2179	{
2056	2180	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2181	// {
..	..	@@ -2071,32 +2195,41 @@
2071	2195	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2196	content = ((cGroup)content).get(0);
2073	2197
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2198	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2199	for (int i=0; i<group.selection.size(); i++)
2076	2200	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2201	+ boolean random = CameraPane.SWITCH;
	2202	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2203	group.selection.get(i).linkVerticesThis(content);
2080	2204	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2205	+ CameraPane.SWITCH = random;
2082	2206	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2207	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2208	refreshContents();
2085	2209	}
2086	2210	} else
2087		- if (event.getSource() == resetsupportItem)
	2211	+ if (source == resetsupportItem)
2088	2212	{
2089	2213	for (int i=0; i<group.selection.size(); i++)
2090	2214	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2215	+ boolean random = CameraPane.SWITCH;
	2216	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2217	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2218	+ CameraPane.SWITCH = random;
2095	2219	}
2096	2220
2097	2221	refreshContents();
2098	2222	} else
2099		- if (event.getSource() == resetreferencesItem)
	2223	+ if (source == relinkverticesItem)
	2224	+ {
	2225	+ boolean random = CameraPane.SWITCH;
	2226	+ CameraPane.SWITCH = false; // parse all random nodes
	2227	+ group.selection.RelinkToSupport();
	2228	+ CameraPane.SWITCH = random;
	2229	+
	2230	+ refreshContents();
	2231	+ } else
	2232	+ if (source == resetreferencesItem)
2100	2233	{
2101	2234	for (int i=0; i<group.selection.size(); i++)
2102	2235	{
..	..	@@ -2105,7 +2238,7 @@
2105	2238
2106	2239	refreshContents();
2107	2240	} else
2108		- if (event.getSource() == setMasterItem)
	2241	+ if (source == setMasterItem)
2109	2242	{
2110	2243	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2244	{
..	..	@@ -2118,7 +2251,7 @@
2118	2251	refreshContents();
2119	2252	}
2120	2253	} else
2121		- if (event.getSource() == poseMeshItem)
	2254	+ if (source == poseMeshItem)
2122	2255	{
2123	2256	if (group.selection.size() == 1)
2124	2257	{
..	..	@@ -2137,19 +2270,19 @@
2137	2270	}
2138	2271
2139	2272	} else
2140		- if (event.getSource() == revertMeshItem)
	2273	+ if (source == revertMeshItem)
2141	2274	{
2142	2275	RevertMeshes();
2143	2276	} else
2144		- if (event.getSource() == resetMeshItem)
	2277	+ if (source == resetMeshItem)
2145	2278	{
2146	2279	ResetAll();
2147	2280	} else
2148		- if (event.getSource() == stepAllItem)
	2281	+ if (source == stepAllItem)
2149	2282	{
2150	2283	StepAll();
2151	2284	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2285	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2286	{
2154	2287	//int indices[] = jList.getSelectedIndices();
2155	2288	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2290,46 @@
2157	2290
2158	2291	ClearSelection(false);
2159	2292	} else
2160		- if (event.getSource() == clearAllItem)
	2293	+ if (source == clearAllItem)
2161	2294	{
2162	2295	ClearSelection(true);
2163	2296	} else
2164		- if (event.getSource() == grabItem)
	2297	+ if (source == grabItem)
2165	2298	{
2166	2299	group(new cGroup(), true);
2167	2300	} else
2168		- if (event.getSource() == frontItem)
	2301	+ if (source == hideItem)
	2302	+ {
	2303	+ group(new HiddenObject());
	2304	+ } else
	2305	+ if (source == frontItem)
2169	2306	{
2170	2307	front();
2171	2308	} else
2172		- if (event.getSource() == backItem)
	2309	+ if (source == backItem)
2173	2310	{
2174	2311	back();
2175	2312	} else
2176		- if (event.getSource() == cameraItem)
	2313	+ if (source == cameraItem)
2177	2314	{
2178	2315	makeSomething(new Camera());
2179	2316	} else
2180		- if (event.getSource() == compositeItem)
	2317	+ if (source == compositeItem)
2181	2318	{
2182	2319	group(new Composite());
2183	2320	} else
2184		- if (event.getSource() == randomItem)
	2321	+ if (source == randomItem)
2185	2322	{
2186	2323	RandomNode random = new RandomNode();
2187	2324	group(random);
2188	2325	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2326	+ random.name = random.get(0).name + "Switch";
2190	2327	} else
2191		- if (event.getSource() == physicsItem)
	2328	+ if (source == physicsItem)
2192	2329	{
2193	2330	group(new PhysicsNode());
2194	2331	} else
2195		- if (event.getSource() == frameselectorItem)
	2332	+ if (source == frameselectorItem)
2196	2333	{
2197	2334	for (int i=0; i<group.selection.size(); i++)
2198	2335	{
..	..	@@ -2204,7 +2341,7 @@
2204	2341	ResetModel();
2205	2342	refreshContents();
2206	2343	} else
2207		- if (event.getSource() == switchGeoItem)
	2344	+ if (source == switchGeoItem)
2208	2345	{
2209	2346	for (int i=0; i<group.selection.size(); i++)
2210	2347	{
..	..	@@ -2216,7 +2353,7 @@
2216	2353	ResetModel();
2217	2354	refreshContents();
2218	2355	} else
2219		- if (event.getSource() == switchTransfoItem)
	2356	+ if (source == switchTransfoItem)
2220	2357	{
2221	2358	for (int i=0; i<group.selection.size(); i++)
2222	2359	{
..	..	@@ -2228,7 +2365,7 @@
2228	2365	ResetModel();
2229	2366	refreshContents();
2230	2367	} else
2231		- if (event.getSource() == morphItem)
	2368	+ if (source == morphItem)
2232	2369	{
2233	2370	for (int i=0; i<group.selection.size(); i++)
2234	2371	{
..	..	@@ -2240,7 +2377,7 @@
2240	2377	ResetModel();
2241	2378	refreshContents();
2242	2379	} else
2243		- if (event.getSource() == scriptNodeItem)
	2380	+ if (source == scriptNodeItem)
2244	2381	{
2245	2382	boolean atleastone = false;
2246	2383
..	..	@@ -2279,199 +2416,215 @@
2279	2416	}
2280	2417	}
2281	2418	} else
2282		- if (event.getSource() == linkerItem)
	2419	+ if (source == linkerItem)
2283	2420	{
2284	2421	group(new cLinker());
2285	2422	} else
2286		- if (event.getSource() == textureItem)
	2423	+ if (source == textureItem)
2287	2424	{
2288	2425	group(new TextureNode());
2289	2426	} else
2290		- if (event.getSource() == shadowXItem)
	2427	+ if (source == billboardItem)
	2428	+ {
	2429	+ group(new BillboardNode());
	2430	+ } else
	2431	+ if (source == shadowXItem)
2291	2432	{
2292	2433	CastShadow(0);
2293	2434	} else
2294		- if (event.getSource() == shadowYItem)
	2435	+ if (source == shadowYItem)
2295	2436	{
2296	2437	CastShadow(1);
2297	2438	} else
2298		- if (event.getSource() == shadowZItem)
	2439	+ if (source == shadowZItem)
2299	2440	{
2300	2441	CastShadow(2);
2301	2442	} else
2302		- if (event.getSource() == ungroupItem)
	2443	+ if (source == ungroupItem)
2303	2444	{
2304		- ungroup();
	2445	+ //ungroup();
	2446	+ for (int i=0; i<group.selection.size(); i++)
	2447	+ {
	2448	+ Ungroup(group.selection.get(i));
	2449	+ }
	2450	+
	2451	+ ClearSelection(false);
	2452	+
	2453	+ refreshContents();
2305	2454	} else
2306		- if (event.getSource() == genUVItem)
	2455	+ if (source == genUVItem)
2307	2456	{
2308	2457	GenUV();
2309	2458	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2459	+ if (source == genNormalsCADItem)
2311	2460	{
2312	2461	GenNormals(true);
2313	2462	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2463	+ if (source == genNormalsMESHItem)
2315	2464	{
2316	2465	GenNormals(true); // TODO
2317	2466	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2467	+ if (source == genNormalsORGANItem)
2319	2468	{
2320	2469	GenNormals(false);
2321	2470	} else
2322		- if (event.getSource() == stripifyItem)
	2471	+ if (source == genNormalsMINEItem)
	2472	+ {
	2473	+ GenNormalsMINE();
	2474	+ } else
	2475	+ if (source == stripifyItem)
2323	2476	{
2324	2477	Stripify();
2325	2478	} else
2326		- if (event.getSource() == unstripifyItem)
	2479	+ if (source == unstripifyItem)
2327	2480	{
2328	2481	Unstripify();
2329	2482	} else
2330		- if (event.getSource() == trimItem)
	2483	+ if (source == trimItem)
2331	2484	{
2332	2485	Trim();
2333	2486	} else
2334		- if (event.getSource() == untrimItem)
	2487	+ if (source == untrimItem)
2335	2488	{
2336	2489	Untrim();
2337	2490	} else
2338		- if (event.getSource() == clearColorsItem)
	2491	+ if (source == clearColorsItem)
2339	2492	{
2340	2493	ClearColors();
2341	2494	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2495	+ if (source == clearMaterialsItem)
2343	2496	{
2344	2497	ClearMaterials();
2345	2498	} else
2346		- if (event.getSource() == liveleavesItem)
	2499	+ if (source == liveleavesItem)
2347	2500	{
2348	2501	LiveLeaves(true);
2349	2502	} else
2350		- if (event.getSource() == unliveleavesItem)
	2503	+ if (source == unliveleavesItem)
2351	2504	{
2352	2505	LiveLeaves(false);
2353	2506	} else
2354		- if (event.getSource() == supportleavesItem)
	2507	+ if (source == supportleavesItem)
2355	2508	{
2356	2509	SupportLeaves(true);
2357	2510	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2511	+ if (source == unsupportleavesItem)
2359	2512	{
2360	2513	SupportLeaves(false);
2361	2514	} else
2362		- if (event.getSource() == hideleavesItem)
	2515	+ if (source == hideleavesItem)
2363	2516	{
2364	2517	HideLeaves(true);
2365	2518	} else
2366		- if (event.getSource() == showleavesItem)
	2519	+ if (source == showleavesItem)
2367	2520	{
2368	2521	HideLeaves(false);
2369	2522	} else
2370		- if (event.getSource() == markleavesItem)
	2523	+ if (source == markleavesItem)
2371	2524	{
2372	2525	MarkLeaves(true);
2373	2526	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2527	+ if (source == unmarkleavesItem)
2375	2528	{
2376	2529	MarkLeaves(false);
2377	2530	} else
2378		- if (event.getSource() == flipVItem)
	2531	+ if (source == flipVItem)
2379	2532	{
2380	2533	FlipV(true);
2381	2534	} else
2382		- if (event.getSource() == unflipVItem)
	2535	+ if (source == unflipVItem)
2383	2536	{
2384	2537	FlipV(false);
2385	2538	} else
2386		- if (event.getSource() == lowTexturesItem)
	2539	+ if (source == lowTexturesItem)
2387	2540	{
2388	2541	SetTexRes(0);
2389	2542	} else
2390		- if (event.getSource() == normalTexturesItem)
	2543	+ if (source == normalTexturesItem)
2391	2544	{
2392	2545	SetTexRes(1);
2393	2546	} else
2394		- if (event.getSource() == highTexturesItem)
	2547	+ if (source == highTexturesItem)
2395	2548	{
2396	2549	SetTexRes(2);
2397	2550	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2551	+ if (source == veryhighTexturesItem)
2399	2552	{
2400	2553	SetTexRes(3);
2401	2554	} else
2402		- if (event.getSource() == maxTexturesItem)
	2555	+ if (source == maxTexturesItem)
2403	2556	{
2404	2557	SetTexRes(4);
2405	2558	} else
2406		- if (event.getSource() == panoTexturesItem)
	2559	+ if (source == panoTexturesItem)
2407	2560	{
2408	2561	SetTexRes(5);
2409	2562	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2563	+ if (source == reverseNormalsItem)
2411	2564	{
2412	2565	ReverseNormals();
2413	2566	} else
2414		- if (event.getSource() == parseverticesItem)
	2567	+ if (source == parseverticesItem)
2415	2568	{
2416	2569	ParseVertices();
2417	2570	} else
2418		- if (event.getSource() == textureFieldItem)
	2571	+ if (source == textureFieldItem)
2419	2572	{
2420	2573	TextureVertices();
2421	2574	} else
2422		- if (event.getSource() == alignItem)
	2575	+ if (source == alignItem)
2423	2576	{
2424	2577	Align();
2425	2578	} else
2426		- if (event.getSource() == mirrorItem)
	2579	+ if (source == mirrorItem)
2427	2580	{
2428	2581	MirrorPoses();
2429	2582	} else
2430		- if (event.getSource() == reduceMorphItem)
	2583	+ if (source == reduceMorphItem)
2431	2584	{
2432	2585	MeshReduction(false);
2433	2586	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2587	+ if (source == reduce34MorphItem)
2435	2588	{
2436	2589	MeshReduction(true);
2437	2590	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2591	+ if (source == reverseTrianglesItem)
2439	2592	{
2440	2593	ReverseTriangles();
2441	2594	} else
2442		- if (event.getSource() == reduceMeshItem)
	2595	+ if (source == reduceMeshItem)
2443	2596	{
2444	2597	ReduceMesh(false);
2445	2598	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2599	+ if (source == reduce34MeshItem)
2447	2600	{
2448	2601	ReduceMesh(true);
2449	2602	} else
2450		- if (event.getSource() == increaseMeshItem)
	2603	+ if (source == increaseMeshItem)
2451	2604	{
2452	2605	IncreaseMesh();
2453	2606	} else
2454		- if (event.getSource() == clipMeshItem)
	2607	+ if (source == clipMeshItem)
2455	2608	{
2456	2609	ClipMesh();
2457	2610	} else
2458		- if (event.getSource() == smoothMeshItem)
	2611	+ if (source == smoothMeshItem)
2459	2612	{
2460	2613	SmoothMesh();
2461	2614	} else
2462		- if (event.getSource() == transformgeometryItem)
	2615	+ if (source == transformgeometryItem)
2463	2616	{
2464	2617	TransformGeometry();
2465	2618	} else
2466		- if (event.getSource() == resetTransformItem)
	2619	+ if (source == resetTransformItem)
2467	2620	{
2468	2621	ResetTransform();
2469	2622	} else
2470		- if (event.getSource() == resetCentroidItem)
	2623	+ if (source == resetCentroidItem)
2471	2624	{
2472	2625	ResetCentroid();
2473	2626	} else
2474		- if (event.getSource() == resetParentItem)
	2627	+ if (source == resetParentItem)
2475	2628	{
2476	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2630	{
..	..	@@ -2481,7 +2634,7 @@
2481	2634
2482	2635	refreshContents();
2483	2636	} else
2484		- if (event.getSource() == repairParentItem)
	2637	+ if (source == repairParentItem)
2485	2638	{
2486	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2640	{
..	..	@@ -2495,7 +2648,21 @@
2495	2648
2496	2649	refreshContents();
2497	2650	} else
2498		- if (event.getSource() == sortbysizeItem)
	2651	+ if (source == repairShadowItem)
	2652	+ {
	2653	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2654	+ {
	2655	+ Object3D obj = (Object3D)e.nextElement();
	2656	+ obj.RepairShadow();
	2657	+// for (int i=0; i<obj.size(); i++)
	2658	+// {
	2659	+// obj.get(i).parent = obj;
	2660	+// }
	2661	+ }
	2662	+
	2663	+ refreshContents();
	2664	+ } else
	2665	+ if (source == sortbysizeItem)
2499	2666	{
2500	2667	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2668	{
..	..	@@ -2507,7 +2674,7 @@
2507	2674	ResetModel();
2508	2675	refreshContents();
2509	2676	} else
2510		- if (event.getSource() == sortbynameItem)
	2677	+ if (source == sortbynameItem)
2511	2678	{
2512	2679	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2680	{
..	..	@@ -2519,7 +2686,7 @@
2519	2686	ResetModel();
2520	2687	refreshContents();
2521	2688	} else
2522		- if (event.getSource() == attachPigmentItem)
	2689	+ if (source == attachPigmentItem)
2523	2690	{
2524	2691	String texture = GetFile("Attach pigment");
2525	2692	Object3D obj;
..	..	@@ -2531,7 +2698,7 @@
2531	2698
2532	2699	refreshContents();
2533	2700	} else
2534		- if (event.getSource() == detachPigmentItem)
	2701	+ if (source == detachPigmentItem)
2535	2702	{
2536	2703	Object3D obj;
2537	2704	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2709,7 @@
2542	2709
2543	2710	refreshContents();
2544	2711	} else
2545		- if (event.getSource() == attachBumpItem)
	2712	+ if (source == attachBumpItem)
2546	2713	{
2547	2714	String texture = GetFile("Attach bump");
2548	2715	Object3D obj;
..	..	@@ -2554,7 +2721,7 @@
2554	2721
2555	2722	refreshContents();
2556	2723	} else
2557		- if (event.getSource() == detachBumpItem)
	2724	+ if (source == detachBumpItem)
2558	2725	{
2559	2726	Object3D obj;
2560	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2732,7 @@
2565	2732
2566	2733	refreshContents();
2567	2734	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2735	+ if (source == pigmentBumpItem)
2569	2736	{
2570	2737	Object3D obj;
2571	2738	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2743,195 @@
2576	2743
2577	2744	refreshContents();
2578	2745	} else
2579		- if (event.getSource() == flashSelectionButton)
	2746	+ if (source == flashSelectionButton)
2580	2747	{
2581	2748	CameraPane.flash = true;
2582	2749	refreshContents();
2583	2750	} else
2584		- if (event.getSource() == oneButton)
	2751	+ if (source == oneButton)
2585	2752	{
2586	2753	} else
2587		- if (event.getSource() == twoButton)
	2754	+ if (source == twoButton)
2588	2755	{
2589	2756	radio.layout = twoButton;
2590	2757	// bug
2591	2758	//gridPanel.setDividerLocation(1.0);
2592	2759	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	2760	+// bigThree.remove(scenePanel);
	2761	+// bigThree.remove(centralPanel);
	2762	+// bigThree.remove(XYZPanel);
	2763	+// aWindowConstraints.gridx = 0;
	2764	+// aWindowConstraints.gridy = 0;
	2765	+// aWindowConstraints.gridwidth = 1;
	2766	+// // aConstraints.gridheight = 3;
	2767	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2768	+// aWindowConstraints.weightx = 0;
	2769	+// aWindowConstraints.weighty = 1;
	2770	+// //bigThree.add(jtp, aWindowConstraints);
	2771	+// aWindowConstraints.weightx = 1;
	2772	+// aWindowConstraints.gridwidth = 3;
	2773	+// // aConstraints.gridheight = 3;
	2774	+// aWindowConstraints.gridx = 1;
	2775	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2776	+// bigThree.add(centralPanel, aWindowConstraints);
	2777	+// aWindowConstraints.weightx = 0;
	2778	+// aWindowConstraints.gridx = 4;
	2779	+// aWindowConstraints.gridwidth = 1;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2782	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2783	+// scenePanel.setVisible(false);
	2784	+// centralPanel.setVisible(true);
	2785	+// XYZPanel.setVisible(false);
	2786	+ bigThree.ClearUI();
	2787	+ bigThree.add(centralPanel);
	2788	+ bigThree.FlushUI();
2617	2789	} else
2618		- if (event.getSource() == threeButton)
	2790	+ if (source == threeButton)
2619	2791	{
2620	2792	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	2793	+
	2794	+// bigThree.remove(scenePanel);
	2795	+// bigThree.remove(centralPanel);
	2796	+// bigThree.remove(XYZPanel);
	2797	+// aWindowConstraints.gridx = 0;
	2798	+// aWindowConstraints.gridy = 0;
	2799	+// aWindowConstraints.gridwidth = 1;
	2800	+// // aConstraints.gridheight = 3;
	2801	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2802	+// aWindowConstraints.weightx = 0;
	2803	+// aWindowConstraints.weighty = 1;
	2804	+// //bigThree.add(jtp, aWindowConstraints);
	2805	+// aWindowConstraints.weightx = 1;
	2806	+// aWindowConstraints.gridwidth = 3;
	2807	+// // aConstraints.gridheight = 3;
	2808	+// aWindowConstraints.gridx = 1;
	2809	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2810	+// bigThree.add(centralPanel, aWindowConstraints);
	2811	+// aWindowConstraints.weightx = 0;
	2812	+// aWindowConstraints.gridx = 4;
	2813	+// aWindowConstraints.gridwidth = 1;
	2814	+// // aConstraints.gridheight = 3;
	2815	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2816	+// bigThree.add(XYZPanel, aWindowConstraints);
	2817	+// bigThree.validate();
	2818	+// scenePanel.setVisible(false);
	2819	+// centralPanel.setVisible(true);
	2820	+// XYZPanel.setVisible(true);
	2821	+ bigThree.ClearUI();
	2822	+ bigThree.add(centralPanel);
	2823	+ bigThree.add(XYZPanel);
	2824	+ bigThree.FlushUI();
2645	2825	} else
2646		- if (event.getSource() == fourButton)
	2826	+ if (source == fourButton)
2647	2827	{
2648	2828	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	2829	+
	2830	+// bigThree.remove(scenePanel);
	2831	+// bigThree.remove(centralPanel);
	2832	+// bigThree.remove(XYZPanel);
	2833	+// aWindowConstraints.gridx = 0;
	2834	+// aWindowConstraints.gridy = 0;
	2835	+// aWindowConstraints.gridwidth = 1;
	2836	+// // aWindowConstraints.gridheight = 3;
	2837	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2838	+// aWindowConstraints.weightx = 1;
	2839	+// aWindowConstraints.weighty = 1;
	2840	+// bigThree.add(scenePanel, aWindowConstraints);
	2841	+// aWindowConstraints.weightx = 1;
	2842	+// aWindowConstraints.gridwidth = 3;
	2843	+// // aConstraints.gridheight = 3;
	2844	+// aWindowConstraints.gridx = 1;
	2845	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2846	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2847	+// aWindowConstraints.weightx = 0;
	2848	+// aWindowConstraints.gridx = 4;
	2849	+// aWindowConstraints.gridwidth = 1;
	2850	+// // aWindowConstraints.gridheight = 3;
	2851	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2852	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2853	+// bigThree.validate();
	2854	+// scenePanel.setVisible(true);
	2855	+// centralPanel.setVisible(false);
	2856	+// XYZPanel.setVisible(false);
	2857	+ bigThree.ClearUI();
	2858	+ bigThree.add(scenePanel);
	2859	+ bigThree.FlushUI();
2673	2860	} else
2674		- if (event.getSource() == sixButton)
	2861	+ if (source == sixButton)
2675	2862	{
2676	2863	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	2864	+
	2865	+// bigThree.remove(scenePanel);
	2866	+// bigThree.remove(centralPanel);
	2867	+// bigThree.remove(XYZPanel);
	2868	+// aWindowConstraints.gridx = 0;
	2869	+// aWindowConstraints.gridy = 0;
	2870	+// aWindowConstraints.gridwidth = 1;
	2871	+// // aConstraints.gridheight = 3;
	2872	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2873	+// aWindowConstraints.weightx = 0;
	2874	+// aWindowConstraints.weighty = 1;
	2875	+// bigThree.add(scenePanel, aWindowConstraints);
	2876	+// aWindowConstraints.weightx = 1;
	2877	+// aWindowConstraints.gridwidth = 3;
	2878	+// // aWindowConstraints.gridheight = 3;
	2879	+// aWindowConstraints.gridx = 1;
	2880	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2881	+// bigThree.add(centralPanel, aWindowConstraints);
	2882	+// aWindowConstraints.weightx = 0;
	2883	+// aWindowConstraints.gridx = 4;
	2884	+// aWindowConstraints.gridwidth = 1;
	2885	+// // aWindowConstraints.gridheight = 3;
	2886	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2887	+// //bigThree.add(XYZPanel, aConstraints);
	2888	+// bigThree.validate();
	2889	+// scenePanel.setVisible(true);
	2890	+// centralPanel.setVisible(true);
	2891	+// XYZPanel.setVisible(false);
	2892	+ bigThree.ClearUI();
	2893	+ bigThree.add(scenePanel);
	2894	+ bigThree.add(centralPanel);
	2895	+ bigThree.FlushUI();
2701	2896	} else
2702		- if (event.getSource() == sevenButton)
	2897	+ if (source == sevenButton)
2703	2898	{
2704	2899	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	2900	+
	2901	+// bigThree.remove(scenePanel);
	2902	+// bigThree.remove(centralPanel);
	2903	+// bigThree.remove(XYZPanel);
	2904	+// aWindowConstraints.gridx = 0;
	2905	+// aWindowConstraints.gridy = 0;
	2906	+// aWindowConstraints.gridwidth = 1;
	2907	+// // aWindowConstraints.gridheight = 3;
	2908	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2909	+// aWindowConstraints.weightx = 0;
	2910	+// aWindowConstraints.weighty = 1;
	2911	+// bigThree.add(scenePanel, aWindowConstraints);
	2912	+// aWindowConstraints.weightx = 1;
	2913	+// aWindowConstraints.gridwidth = 3;
	2914	+// // aWindowConstraints.gridheight = 3;
	2915	+// aWindowConstraints.gridx = 1;
	2916	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2917	+// bigThree.add(centralPanel, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 0;
	2919	+// aWindowConstraints.gridx = 4;
	2920	+// aWindowConstraints.gridwidth = 1;
	2921	+// // aConstraints.gridheight = 3;
	2922	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2923	+// bigThree.add(XYZPanel, aWindowConstraints);
	2924	+// bigThree.validate();
	2925	+// scenePanel.setVisible(true);
	2926	+// centralPanel.setVisible(true);
	2927	+// XYZPanel.setVisible(true);
	2928	+ bigThree.ClearUI();
	2929	+ bigThree.add(scenePanel);
	2930	+ bigThree.add(centralPanel);
	2931	+ bigThree.add(XYZPanel);
	2932	+ bigThree.FlushUI();
2729	2933	} else
2730		- if (event.getSource() == rootButton)
	2934	+ if (source == rootButton)
2731	2935	{
2732	2936	Object3D obj;
2733	2937	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2943,7 @@
2739	2943
2740	2944	refreshContents(true);
2741	2945	} else
2742		- if (event.getSource() == closeButton)
	2946	+ if (source == closeButton)
2743	2947	{
2744	2948	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2949	cRadio ab;
..	..	@@ -2760,11 +2964,11 @@
2760	2964	}
2761	2965	refreshContents(true);
2762	2966	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2967	+ if (source == editItem \|\| source == editButton)
2764	2968	{
2765	2969	EditSelection(false);
2766	2970	} else
2767		- if (event.getSource() == uneditButton)
	2971	+ if (source == uneditButton)
2768	2972	{
2769	2973	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2974	{
..	..	@@ -2776,12 +2980,12 @@
2776	2980
2777	2981	child.editWindow = null; // ???????????
2778	2982	}
2779		- objEditor.ctrlPanel.revalidate();
	2983	+ objEditor.ctrlPanel.FlushUI();
2780	2984	//objEditor.jTree.clearSelection();
2781	2985	//objEditor.ResetSliders();
2782	2986	refreshContents(true);
2783	2987	} else
2784		- if (event.getSource() == clearPanelButton)
	2988	+ if (source == clearPanelButton)
2785	2989	{
2786	2990	assert(copy == group);
2787	2991	//copy.ClearUI();
..	..	@@ -2792,7 +2996,7 @@
2792	2996	listUI.clear();
2793	2997	refreshContents(true);
2794	2998	} else
2795		- if (event.getSource() == allParamsButton)
	2999	+ if (source == allParamsButton)
2796	3000	{
2797	3001	assert(copy == group);
2798	3002
..	..	@@ -2813,19 +3017,19 @@
2813	3017
2814	3018	refreshContents(true);
2815	3019	} else
2816		- if (event.getSource() == unselectButton)
	3020	+ if (source == unselectButton)
2817	3021	{
2818	3022	objEditor.jTree.clearSelection();
2819	3023	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3024	objEditor.ResetSliders();
2821	3025	refreshContents(true);
2822	3026	} else
2823		- if(event.getSource() instanceof cRadio)
	3027	+ if(source instanceof cRadio)
2824	3028	{
2825	3029	group.parent = keepparent;
2826	3030	group.attributes = 0;
2827	3031	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3032	+ /cRadio/ radio = (cRadio)source;
2829	3033	Object3D obj = radio.GetObject();
2830	3034	System.out.println("Edit " + obj);
2831	3035	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3049,7 @@
2845	3049	}
2846	3050
2847	3051	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3052	+ //Globals.theRenderer.object = group;
2849	3053	if(!useclient)
2850	3054	{
2851	3055	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +3058,8 @@
2854	3058	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3059	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3060	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3061	+ //cameraView.lighttouched = true;
	3062	+ Globals.lighttouched = true;
2858	3063	topView.object = group;
2859	3064	frontView.object = group;
2860	3065	sideView.object = group;
..	..	@@ -2890,7 +3095,7 @@
2890	3095	if (useclient)
2891	3096	{
2892	3097	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3098	+ Globals.lighttouched = true;
2894	3099	//topView.object = client;
2895	3100	//frontView.object = client;
2896	3101	//sideView.object = client;
..	..	@@ -2898,7 +3103,7 @@
2898	3103	else
2899	3104	{
2900	3105	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3106	+ Globals.lighttouched = true;
2902	3107	//topView.object = group;
2903	3108	//frontView.object = group;
2904	3109	//sideView.object = group;
..	..	@@ -3179,6 +3384,13 @@
3179	3384	refreshContents();
3180	3385	}
3181	3386
	3387	+ void GenNormalsMINE()
	3388	+ {
	3389	+ group.selection.GenNormalsMINE();
	3390	+
	3391	+ refreshContents();
	3392	+ }
	3393	+
3182	3394	void Stripify()
3183	3395	{
3184	3396	group.StripifyS();
..	..	@@ -3399,7 +3611,7 @@
3399	3611	String pigment = Object3D.GetPigment(tex);
3400	3612	//String bump = Object3D.GetBump(tex);
3401	3613
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3614	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3615
3404	3616	double s = v.s;
3405	3617
..	..	@@ -3447,12 +3659,26 @@
3447	3659
3448	3660	void Align()
3449	3661	{
	3662	+ if (group.selection.size() == 0)
	3663	+ return;
	3664	+
	3665	+ cVector bbmin = new cVector();
	3666	+ cVector bbmax = new cVector();
	3667	+
	3668	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3669	+
	3670	+ double dx = bbmax.x - bbmin.x;
	3671	+ double dy = bbmax.y - bbmin.y;
	3672	+ double dz = bbmax.z - bbmin.z;
	3673	+
	3674	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3675	+
3450	3676	for (int i=0; i<group.selection.size(); i++)
3451	3677	{
3452	3678	Object3D obj = group.selection.get(i);
3453	3679
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3680	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3681	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3682	}
3457	3683
3458	3684	refreshContents();
..	..	@@ -3473,11 +3699,11 @@
3473	3699
3474	3700	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3701
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3702	+ boolean random = CameraPane.SWITCH;
	3703	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3704	lowres.linkVerticesThis(null);
3479	3705	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3706	+ CameraPane.SWITCH = random;
3481	3707
3482	3708	System.err.flush();
3483	3709
..	..	@@ -3686,7 +3912,7 @@
3686	3912	group.selection.RelinkToSupport(); // july 2014
3687	3913	System.out.println("DONE.");
3688	3914	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3915	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3916	}
3691	3917
3692	3918	void ReduceMesh(boolean reduction34)
..	..	@@ -3962,25 +4188,25 @@
3962	4188	System.err.println("info : " + child.GetPath());
3963	4189	}
3964	4190	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4191	+// else
	4192	+// {
	4193	+// objEditor.SetMaterial(group); // .GetMaterial());
	4194	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4195	+// System.err.println("info : " + group.GetPath());
	4196	+// }
3971	4197
3972	4198	objEditor.SetText(); // jan 2014
3973	4199
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4200	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4201	CameraPane.flash = true;
3976	4202
3977	4203	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4204	// a camera
3979	4205	{
3980	4206	CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4207	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4208	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4209	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4210	}
3985	4211
3986	4212	refreshContents();
..	..	@@ -4235,7 +4461,7 @@
4235	4461	refreshContents();
4236	4462	}
4237	4463
4238		- void pasteInto(boolean copyit)
	4464	+ void pasteInto(boolean copyit, boolean clone)
4239	4465	{
4240	4466	// if (GrafreeD.clipboard == null)
4241	4467	// return;
..	..	@@ -4264,7 +4490,14 @@
4264	4490	if (copyit)
4265	4491	{
4266	4492	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4493	+ if (clone)
	4494	+ {
	4495	+ CloneClipboard(false); // sept 2014
	4496	+ }
	4497	+ else
	4498	+ {
	4499	+ paste(false);
	4500	+ }
4268	4501	}
4269	4502	else
4270	4503	{
..	..	@@ -4474,6 +4707,26 @@
4474	4707	makeSomething(csg);
4475	4708	}
4476	4709
	4710	+ void Ungroup(Object3D g)
	4711	+ {
	4712	+ if (g instanceof HiddenObject)
	4713	+ {
	4714	+ HiddenObject h = (HiddenObject) g;
	4715	+
	4716	+ for (int i=0; i<h.ActualSize(); i++)
	4717	+ {
	4718	+ objEditor.makeSomething(h.get(i), false);
	4719	+ }
	4720	+ }
	4721	+ else
	4722	+ {
	4723	+ for (int i=0; i<g.Size(); i++)
	4724	+ {
	4725	+ objEditor.makeSomething(g.get(i), false);
	4726	+ }
	4727	+ }
	4728	+ }
	4729	+
4477	4730	void ungroup()
4478	4731	{
4479	4732	/*
..	..	@@ -4788,10 +5041,12 @@
4788	5041	cButton flashSelectionButton;
4789	5042	cButton editButton;
4790	5043	cButton uneditButton;
	5044	+ JCheckBox allParamsButton;
4791	5045	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5046	cButton unselectButton;
4794	5047
	5048	+ cButton oneStepButton;
	5049	+
4795	5050	cButton screenfitButton;
4796	5051	cButton screenfitpointButton;
4797	5052	cButton snapobjectButton;
..	..	@@ -4833,6 +5088,7 @@
4833	5088	private MenuItem resetsupportItem;
4834	5089	private MenuItem resetreferencesItem;
4835	5090	private MenuItem linkverticesItem;
	5091	+ private MenuItem relinkverticesItem;
4836	5092	private MenuItem setMasterItem;
4837	5093	private MenuItem resetMeshItem;
4838	5094	private MenuItem stepAllItem;
..	..	@@ -4845,6 +5101,7 @@
4845	5101	private MenuItem mergeGeometriesItem;
4846	5102	private MenuItem copyItem;
4847	5103	private MenuItem pasteItem;
	5104	+ private MenuItem pasteIntoItem;
4848	5105	private MenuItem pasteLinkItem;
4849	5106	private MenuItem pasteCloneItem;
4850	5107	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5111,7 @@
4854	5111	private MenuItem genNormalsMESHItem;
4855	5112	private MenuItem genNormalsCADItem;
4856	5113	private MenuItem genNormalsORGANItem;
	5114	+ private MenuItem genNormalsMINEItem;
4857	5115	private MenuItem stripifyItem;
4858	5116	private MenuItem unstripifyItem;
4859	5117	private MenuItem trimItem;
..	..	@@ -4895,6 +5153,7 @@
4895	5153	private MenuItem resetCentroidItem;
4896	5154	private MenuItem transformgeometryItem;
4897	5155	private MenuItem resetTransformItem;
	5156	+ private MenuItem hideItem;
4898	5157	private MenuItem grabItem;
4899	5158	private MenuItem backItem;
4900	5159	private MenuItem frontItem;
..	..	@@ -4915,6 +5174,7 @@
4915	5174
4916	5175	private MenuItem resetParentItem;
4917	5176	private MenuItem repairParentItem;
	5177	+ private MenuItem repairShadowItem;
4918	5178	private MenuItem sortbysizeItem;
4919	5179	private MenuItem sortbynameItem;
4920	5180
..	..	@@ -4935,10 +5195,11 @@
4935	5195	private MenuItem coneItem;
4936	5196	private MenuItem torusItem;
4937	5197	private MenuItem superItem;
	5198	+ private MenuItem kleinItem;
4938	5199	private MenuItem blobItem;
4939	5200	private MenuItem latheItem;
4940	5201	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5202	+ private MenuItem overlayItem;
4942	5203	private MenuItem meshItem;
4943	5204	// private MenuItem meshGroupItem;
4944	5205	private MenuItem springItem;
..	..	@@ -4947,6 +5208,7 @@
4947	5208	private MenuItem csgItem;
4948	5209	private MenuItem templateItem;
4949	5210	private MenuItem textureItem;
	5211	+ private MenuItem billboardItem;
4950	5212	private MenuItem shadowXItem;
4951	5213	private MenuItem shadowYItem;
4952	5214	private MenuItem shadowZItem;