~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,36 +163,48 @@
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		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175	174	cutItem = menu.add(new MenuItem("Cut"));
176	175	cutItem.addActionListener(this);
177	176	copyItem = menu.add(new MenuItem("Copy"));
178	177	copyItem.addActionListener(this);
179	178	pasteItem = menu.add(new MenuItem("Paste"));
180	179	pasteItem.addActionListener(this);
	180	+ menu.add("-");
	181	+ cloneItem = menu.add(new MenuItem("Clone"));
	182	+ cloneItem.addActionListener(this);
	183	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	184	+ cloneSupportItem.addActionListener(this);
	185	+ menu.add("-");
	186	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	187	+ pasteIntoItem.addActionListener(this);
181	188	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	189	pasteLinkItem.addActionListener(this);
183	190	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	191	pasteCloneItem.addActionListener(this);
185	192	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	193	// pasteExpandItem.addActionListener(this);
	194	+ menu.add("-");
187	195	clearItem = menu.add(new MenuItem("Clear"));
188	196	clearItem.addActionListener(this);
	197	+
	198	+ if (Globals.ADVANCED)
	199	+ {
	200	+ // Deletes the cameras...
189	201	clearAllItem = menu.add(new MenuItem("Clear All"));
190	202	clearAllItem.addActionListener(this);
	203	+ }
191	204
192	205	oe.menuBar.add(menu = new Menu("Setting"));
	206	+ if (Globals.ADVANCED)
	207	+ {
193	208	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	209	resetMeshItem.addActionListener(this);
195	210	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +214,7 @@
199	214	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	215	resetreferencesItem.addActionListener(this);
201	216	menu.add("-");
	217	+ }
202	218	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	219	overwriteGeoItem.addActionListener(this);
204	220	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +226,26 @@
210	226	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	227	overwriteUVItem.addActionListener(this);
212	228	menu.add("-");
	229	+ if (Globals.ADVANCED)
	230	+ {
213	231	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	232	generateMeshItem.addActionListener(this);
215	233	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	234	poseMeshItem.addActionListener(this);
217	235	menu.add("-");
	236	+ }
218	237	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	238	resetsupportItem.addActionListener(this);
220	239	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	240	linkverticesItem.addActionListener(this);
	241	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	242	+ relinkverticesItem.addActionListener(this);
	243	+
	244	+ if (Globals.ADVANCED)
	245	+ {
222	246	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	247	setMasterItem.addActionListener(this);
	248	+ }
224	249
225	250	oe.menuBar.add(menu = new Menu("Group"));
226	251	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +256,37 @@
231	256	frontItem.addActionListener(this);
232	257	compositeItem = menu.add(new MenuItem("Composite"));
233	258	compositeItem.addActionListener(this);
	259	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	260	+ hideItem.addActionListener(this);
	261	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	262	+ ungroupItem.addActionListener(this);
234	263	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	264	+ randomItem = menu.add(new MenuItem("Switch node"));
236	265	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	266	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	267	switchGeoItem.addActionListener(this);
243	268	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	269	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	270	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	271	morphItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ physicsItem = menu.add(new MenuItem("Physics"));
	276	+ physicsItem.addActionListener(this);
	277	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	278	+ frameselectorItem.addActionListener(this);
247	279	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	280	scriptNodeItem.addActionListener(this);
249	281	cameraItem = menu.add(new MenuItem("Camera"));
250	282	cameraItem.addActionListener(this);
	283	+ }
251	284
252	285	oe.menuBar.add(menu = new Menu("Object"));
253	286	textureItem = menu.add(new MenuItem("Texture"));
254	287	textureItem.addActionListener(this);
	288	+ billboardItem = menu.add(new MenuItem("Billboard"));
	289	+ billboardItem.addActionListener(this);
255	290	csgItem = menu.add(new MenuItem("CSG"));
256	291	csgItem.addActionListener(this);
257	292	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +295,24 @@
260	295	shadowYItem.addActionListener(this);
261	296	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	297	shadowZItem.addActionListener(this);
	298	+ if (Globals.ADVANCED)
	299	+ {
263	300	linkerItem = menu.add(new MenuItem("Linker"));
264	301	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	302	attributeItem = menu.add(new MenuItem("Attribute"));
268	303	attributeItem.addActionListener(this);
	304	+ templateItem = menu.add(new MenuItem("Template"));
	305	+ templateItem.addActionListener(this);
269	306	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	307	pointflowItem.addActionListener(this);
271	308	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
	309	+ }
274	310	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	311	resetTransformItem.addActionListener(this);
276	312	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	313	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	314	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	315	+ transformgeometryItem.addActionListener(this);
280	316
281	317	oe.menuBar.add(menu = new Menu("Geometry"));
282	318	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +321,13 @@
285	321	genNormalsORGANItem.addActionListener(this);
286	322	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	323	genNormalsCADItem.addActionListener(this);
	324	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	325	+ genNormalsMESHItem.addActionListener(this);
	326	+ if (Globals.ADVANCED)
	327	+ {
	328	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	329	+ genNormalsMINEItem.addActionListener(this);
	330	+ }
288	331	stripifyItem = menu.add(new MenuItem("Stripify"));
289	332	stripifyItem.addActionListener(this);
290	333	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,10 +349,14 @@
306	349	reduce34MeshItem.addActionListener(this);
307	350	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	351	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	352	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	353	clipMeshItem.addActionListener(this);
	354	+
	355	+ if (Globals.ADVANCED)
	356	+ {
	357	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	358	+ smoothMeshItem.addActionListener(this);
	359	+ }
313	360
314	361	oe.menuBar.add(menu = new Menu("Attributes"));
315	362	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -319,10 +366,13 @@
319	366	liveleavesItem.addActionListener(this);
320	367	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	368	unliveleavesItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
322	371	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	372	supportleavesItem.addActionListener(this);
324	373	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	374	unsupportleavesItem.addActionListener(this);
	375	+ }
326	376	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	377	hideleavesItem.addActionListener(this);
328	378	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -365,6 +415,8 @@
365	415	sortbysizeItem.addActionListener(this);
366	416	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	417	sortbynameItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
368	420	menu.add("-");
369	421	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	422	extractGeometriesItem.addActionListener(this);
..	..	@@ -374,11 +426,11 @@
374	426	shareGeometriesItem.addActionListener(this);
375	427	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376	428	mergeGeometriesItem.addActionListener(this);
	429	+ }
377	430
378	431	oe.menuBar.add(menu = new Menu("Insert"));
379	432	buildCreateMenu(menu);
380	433
381		-
382	434	oe.menuBar.add(menu = new Menu("Include"));
383	435	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384	436	importGFDItem.addActionListener(this);
..	..	@@ -423,150 +475,98 @@
423	475	oe.radioPanel.add(dummyButton);
424	476	oe.buttonGroup.add(dummyButton);
425	477	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	478	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	479
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	480	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	481	+ liveCB.setToolTipText("Enabled animation");
431	482	liveCB.addItemListener(this);
432	483
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);
	484	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	485	+ oneStepButton.setToolTipText("Animate one step forward");
	486	+ oneStepButton.addActionListener(this);
	487	+
	488	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	489	+ fastCB.setToolTipText("Fast mode");
451	490	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);
	491	+
	492	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	493	+ trackCB.setToolTipText("Enable tracking");
493	494	trackCB.addItemListener(this);
494	495
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	496	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	497	+ screenfitButton.setToolTipText("Screen fit");
497	498	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	499	+
499	500	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	501	// 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	502
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);
	503	+ if (Globals.ADVANCED)
	504	+ {
	505	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ snapobjectButton.addActionListener(this);
	507	+ snapobjectButton.setToolTipText("Snap Object");
	508	+ }
	509	+
	510	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ flashSelectionButton.setToolTipText("Show selection");
512	512	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	513
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	514	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	515	+
	516	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ twoButton.setToolTipText("Show center view only");
519	518	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	519	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	520	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	521	+ fourButton.setToolTipText("Show left panel only");
	522	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	523	+ sixButton.setToolTipText("2-column layout left");
523	524	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	526	+ threeButton.setToolTipText("2-column layout right");
525	527	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	528	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	529	+ sevenButton.setToolTipText("3-column layout");
527	530	sevenButton.addActionListener(this);
528	531	//
529	532
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	533	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ rootButton.setToolTipText("Edit selection in new tab");
531	535	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	536	+
	537	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	538	+ closeButton.setToolTipText("Close tab");
534	539	closeButton.addActionListener(this);
535	540	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	541	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	542
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	543	+ cGridBag commandsPanel = new cGridBag();
	544	+
	545	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+ editButton.setToolTipText("Edit selection");
541	547	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	548
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	549	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	550	+ uneditButton.setToolTipText("Unedit selection");
547	551	uneditButton.addActionListener(this);
548	552
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);
	553	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	554	+ allParamsButton.setToolTipText("Edit all params");
561	555	allParamsButton.addActionListener(this);
562	556
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);
	557	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	558	+ clearPanelButton.setToolTipText("Clear edit panel");
	559	+ clearPanelButton.addActionListener(this);
	560	+
	561	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	562	+ unselectButton.setToolTipText("Unselect");
568	563	unselectButton.addActionListener(this);
569	564
	565	+ commandsPanel.preferredHeight = 1;
	566	+
	567	+ oe.treePanel.add(commandsPanel);
	568	+ oe.treePanel.Return();
	569	+
570	570	// oe.aConstraints.gridx += 1;
571	571	// oe.aConstraints.weighty = 0;
572	572	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +578,37 @@
578	578	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	579	// gcButton.addActionListener(this);
580	580
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;
	581	+ cGridBag jSPPanel = new cGridBag();
	582	+
	583	+ JScrollPane jSP;
592	584	//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);
	585	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	586	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	587	+
	588	+ oe.treePanel.add(jSPPanel);
	589	+ oe.treePanel.Return();
599	590
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);
	591	+ cGridBag copyOptionsPanel = new cGridBag();
	592	+
	593	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	594	+ colorCB.setToolTipText("Copy color when dropped");
604	595	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	596	+
	597	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	598	+ materialCB.setToolTipText("Copy material when dropped");
607	599	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	600	+
	601	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	602	+ textureCB.setToolTipText("Copy texture when dropped");
610	603	textureCB.addItemListener(this);
611	604
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	605	+ copyOptionsPanel.preferredHeight = 1;
	606	+ oe.treePanel.add(copyOptionsPanel);
	607	+ oe.treePanel.Return();
614	608
	609	+// mainPanel.setDividerLocation(0.5); //1.0);
	610	+// mainPanel.setResizeWeight(0.5);
	611	+
615	612	//jList.addListSelectionListener(this);
616	613	oe.jTree.addTreeSelectionListener(this);
617	614	//jTree.setRootVisible(false);
..	..	@@ -633,17 +630,89 @@
633	630	radio.layout = sevenButton;
634	631	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	632	}
	633	+
	634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	635	+ {
	636	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	637	+ boxCB.setToolTipText("Display bounding boxes");
	638	+ boxCB.addItemListener(this);
	639	+
	640	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	641	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	642	+ zoomBoxCB.addItemListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	647	+ supportCB.setToolTipText("Enable rigging");
	648	+ supportCB.addItemListener(this);
	649	+
	650	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	651	+ // localCB.addItemListener(this);
	652	+
	653	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	654	+ crowdCB.setToolTipText("Used for crowds");
	655	+ crowdCB.addItemListener(this);
	656	+
	657	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	658	+ smoothCB.setToolTipText("Snapping delay");
	659	+ smoothCB.addItemListener(this);
	660	+
	661	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	662	+ slowCB.setToolTipText("Smooth interpolation");
	663	+ slowCB.addItemListener(this);
	664	+
	665	+// constraints.gridy += 1;
	666	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	667	+// speakerMocapCB.addItemListener(this);
	668	+
	669	+ if (false)
	670	+ {
	671	+ // handled in scripts
	672	+ //constraints.gridy += 1;
	673	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	674	+ speakerCameraCB.addItemListener(this);
	675	+
	676	+ //constraints.gridy += 1;
	677	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	678	+ speakerFocusCB.addItemListener(this);
	679	+
	680	+ //constraints.gridy += 1;
	681	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	682	+ smoothfocusCB.addItemListener(this);
	683	+ }
	684	+
	685	+//constraints.gridx += 1;
	686	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	687	+// debugCB.addItemListener(this);
	688	+
	689	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	690	+ oeilCB.addItemListener(this);
	691	+
	692	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	693	+ lookAtCB.setToolTipText("Look-at target");
	694	+ lookAtCB.addItemListener(this);
	695	+
	696	+ }
	697	+
	698	+ cGridBag fill = new cGridBag();
	699	+
	700	+ fill.preferredHeight = 200;
	701	+
	702	+ panel.add(fill);
	703	+
	704	+ }
636	705
637	706	void EditObject(Object3D obj)
638	707	{
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();
	708	+ cRadio radioButton = new cRadio(obj.name);
	709	+ radioButton.SetObject(obj);
	710	+ radioButton.layout = sevenButton;
	711	+ radioButton.SetCamera(cameraView.renderCamera, false);
	712	+ radioButton.addActionListener(this);
	713	+ radioPanel.add(radioButton);
	714	+ buttonGroup.add(radioButton);
	715	+ radioButton.doClick();
647	716	}
648	717	void SetupViews(ObjEditor oe)
649	718	{
..	..	@@ -663,6 +732,7 @@
663	732	JCheckBox fastCB;
664	733	JCheckBox slowCB;
665	734	JCheckBox boxCB;
	735	+ JCheckBox zoomBoxCB;
666	736	JCheckBox trackCB;
667	737	JCheckBox smoothfocusCB;
668	738	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +775,7 @@
705	775	dropAttributes \|= Object3D.TEXTURE;
706	776	else
707	777	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	778	+ } else if(e.getSource() == liveCB)
710	779	{
711	780	cameraView.ToggleLive();
712	781	}
..	..	@@ -743,6 +812,10 @@
743	812	Recompile();
744	813	cameraView.repaint();
745	814	// refreshContents();
	815	+ }
	816	+ else if(e.getSource() == zoomBoxCB)
	817	+ {
	818	+ cameraView.ToggleZoomBoxMode();
746	819	}
747	820	else if(e.getSource() == smoothfocusCB)
748	821	{
..	..	@@ -911,11 +984,11 @@
911	984	{
912	985	loadClipboard(true);
913	986	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	987	+ pasteInto(false, false);
915	988	} else {
916	989	loadClipboard(false);
917	990	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	991	+ pasteInto(false, false); // true); // ???
919	992	}
920	993	}
921	994	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1106,37 @@
1033	1106	torusItem.addActionListener(this);
1034	1107	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1108	superItem.addActionListener(this);
	1109	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1110	+ kleinItem.addActionListener(this);
1036	1111	particleItem = menu.add(new MenuItem("Particle system"));
1037	1112	particleItem.addActionListener(this);
	1113	+ if (Globals.ADVANCED)
	1114	+ {
1038	1115	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1116	ragdollItem.addActionListener(this);
1040	1117	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1118	ragdoll2Item.addActionListener(this);
	1119	+ }
1042	1120	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1121	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1122	meshItem.addActionListener(this);
1045	1123	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1124	// meshGroupItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1047	1127	springItem = menu.add(new MenuItem("Spring"));
1048	1128	springItem.addActionListener(this);
1049	1129	flagItem = menu.add(new MenuItem("Flag"));
1050	1130	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	1131	blobItem = menu.add(new MenuItem("Blob"));
1056	1132	blobItem.addActionListener(this);
1057	1133	latheItem = menu.add(new MenuItem("Lathe"));
1058	1134	latheItem.addActionListener(this);
	1135	+ }
	1136	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1137	+ bezierItem.addActionListener(this);
	1138	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1139	+ overlayItem.addActionListener(this);
1059	1140	lightItem = menu.add(new MenuItem("Light"));
1060	1141	lightItem.addActionListener(this);
1061	1142	menu.add("-");
..	..	@@ -1065,25 +1146,26 @@
1065	1146	loopItem.addActionListener(this);
1066	1147	doubleItem = menu.add(new MenuItem("Fork"));
1067	1148	doubleItem.addActionListener(this);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
1068	1151	tripleItem = menu.add(new MenuItem("Trident"));
1069	1152	tripleItem.addActionListener(this);
	1153	+ }
1070	1154	}
1071	1155
1072	1156	void buildToolsMenu(Menu menu)
1073	1157	{
1074	1158	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1159	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1160	+ animationItem.setState(Globals.ANIMATION);
1077	1161
1078	1162	menu.add("-");
1079	1163	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1164	parseverticesItem.addActionListener(this);
1081	1165	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1166	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1167	+ alignItem = menu.add(new MenuItem("Align Object"));
1084	1168	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1169	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1170	reduceMorphItem.addActionListener(this);
1089	1171	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..	..	@@ -1091,8 +1173,12 @@
1091	1173
1092	1174	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1175	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1180	+ mirrorItem.addActionListener(this);
	1181	+ menu.add("-");
1096	1182	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1183	memoryItem.addActionListener(this);
1098	1184	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1192,8 @@
1106	1192	resetParentItem.addActionListener(this);
1107	1193	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1194	repairParentItem.addActionListener(this);
	1195	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1196	+ repairShadowItem.addActionListener(this);
1109	1197	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1198	invariantsItem.addActionListener(this);
1111	1199	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1201,7 @@
1113	1201	menu.add("-");
1114	1202	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1203	editScriptItem.addActionListener(this);
	1204	+ }
1116	1205	}
1117	1206
1118	1207	void ScreenFit()
..	..	@@ -1466,6 +1555,7 @@
1466	1555	//
1467	1556	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1557	{
	1558	+ Object source = event.getSource();
1469	1559	/*
1470	1560	if (event.getSource() == nameField)
1471	1561	{
..	..	@@ -1477,11 +1567,11 @@
1477	1567	}
1478	1568	else
1479	1569	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1570	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1571	{
1482	1572	ScreenFit();
1483	1573	} else
1484		- if (event.getSource() == switchItem)
	1574	+ if (source == switchItem)
1485	1575	{
1486	1576	cVector v1 = new cVector();
1487	1577	cVector v2 = new cVector();
..	..	@@ -1490,11 +1580,11 @@
1490	1580	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1581	objEditor.cameraView.repaint();
1492	1582	} else
1493		- if (event.getSource() == rectoidItem)
	1583	+ if (source == rectoidItem)
1494	1584	{
1495	1585	makeSomething(new Box());
1496	1586	} else
1497		- if (event.getSource() == particleItem)
	1587	+ if (source == particleItem)
1498	1588	{
1499	1589	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1590	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1605,9 @@
1515	1605	applyExample(particleGeom, "SMOKE");
1516	1606	makeSomething(particleGeom);
1517	1607	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1608	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1609	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1610	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1611
1522	1612	ragdoll.toParent = LA.newMatrix();
1523	1613	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1625,7 @@
1535	1625	} else
1536	1626	/*
1537	1627	*/
1538		- if (event.getSource() == heightFieldItem)
	1628	+ if (source == heightFieldItem)
1539	1629	{
1540	1630	Object3D obj = new Object3D();
1541	1631
..	..	@@ -1573,27 +1663,31 @@
1573	1663
1574	1664	makeSomething(obj);
1575	1665	} else
1576		- if (event.getSource() == gridItem)
	1666	+ if (source == gridItem)
1577	1667	{
1578	1668	makeSomething(new Grid());
1579	1669	} else
1580		- if (event.getSource() == ellipsoidItem)
	1670	+ if (source == ellipsoidItem)
1581	1671	{
1582	1672	makeSomething(new Sphere());
1583	1673	} else
1584		- if (event.getSource() == coneItem)
	1674	+ if (source == coneItem)
1585	1675	{
1586	1676	makeSomething(new Cone());
1587	1677	} else
1588		- if (event.getSource() == torusItem)
	1678	+ if (source == torusItem)
1589	1679	{
1590	1680	makeSomething(new Torus());
1591	1681	} else
1592		- if (event.getSource() == superItem)
	1682	+ if (source == superItem)
1593	1683	{
1594	1684	makeSomething(new Superellipsoid());
1595	1685	} else
1596		- if (event.getSource() == blobItem)
	1686	+ if (source == kleinItem)
	1687	+ {
	1688	+ makeSomething(new Klein());
	1689	+ } else
	1690	+ if (source == blobItem)
1597	1691	{
1598	1692	Blob blob = new Blob();
1599	1693	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1695,15 @@
1601	1695	//blob.retile();
1602	1696	makeSomething(blob);
1603	1697	} else
1604		- if (event.getSource() == latheItem)
	1698	+ if (source == latheItem)
1605	1699	{
1606	1700	makeSomething(new Lathe());
1607	1701	} else
1608		- if (event.getSource() == bezierItem)
	1702	+ if (source == bezierItem)
1609	1703	{
1610	1704	makeSomething(new BezierSurface());
1611	1705	} else
1612		- if (event.getSource() == checkerItem)
	1706	+ if (source == overlayItem)
1613	1707	{
1614	1708	/*
1615	1709	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1718,7 @@
1624	1718	*/
1625	1719	makeSomething(new Checker());
1626	1720	} else
1627		- if (event.getSource() == meshItem)
	1721	+ if (source == meshItem)
1628	1722	{
1629	1723	Object3D itemtomake = new Object3D();
1630	1724	Object3D child;
..	..	@@ -1645,35 +1739,35 @@
1645	1739	makeSomething(child);
1646	1740	}
1647	1741	} else
1648		- if (event.getSource() == springItem)
	1742	+ if (source == springItem)
1649	1743	{
1650	1744	cSpring s = new cSpring();
1651	1745	s.setup();
1652	1746	makeSomething(s);
1653	1747	} else
1654		- if (event.getSource() == flagItem)
	1748	+ if (source == flagItem)
1655	1749	{
1656	1750	cSpring s = new cFlag();
1657	1751	s.setup();
1658	1752	makeSomething(s);
1659	1753	} else
1660		- if (event.getSource() == lightItem)
	1754	+ if (source == lightItem)
1661	1755	{
1662	1756	makeSomething(new Light());
1663	1757	} else
1664		- if (event.getSource() == csgItem)
	1758	+ if (source == csgItem)
1665	1759	{
1666	1760	group(new CSG());
1667	1761	} else
1668		- if (event.getSource() == templateItem)
	1762	+ if (source == templateItem)
1669	1763	{
1670	1764	group(new cTemplate());
1671	1765	} else
1672		- if (event.getSource() == attributeItem)
	1766	+ if (source == attributeItem)
1673	1767	{
1674	1768	makeSomething(new Attribute());
1675	1769	} else
1676		- if (event.getSource() == pointflowItem)
	1770	+ if (source == pointflowItem)
1677	1771	{
1678	1772	makeSomething(new PointFlow());
1679	1773	} else
..	..	@@ -1685,7 +1779,7 @@
1685	1779	} else
1686	1780	*/
1687	1781
1688		- if (event.getSource() == superLoopItem)
	1782	+ if (source == superLoopItem)
1689	1783	{
1690	1784	Composite g = new cGroup();
1691	1785	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1801,7 @@
1707	1801
1708	1802	group(g);
1709	1803	} else
1710		- if (event.getSource() == loopItem)
	1804	+ if (source == loopItem)
1711	1805	{
1712	1806	Composite csg = new GroupLeaf();
1713	1807	csg.count = 5;
..	..	@@ -1716,7 +1810,7 @@
1716	1810	csg.addChild(child);
1717	1811	child.addChild(csg);
1718	1812	} else
1719		- if (event.getSource() == doubleItem)
	1813	+ if (source == doubleItem)
1720	1814	{
1721	1815	Composite csg = new GroupLeaf();
1722	1816	csg.count = 5;
..	..	@@ -1728,7 +1822,7 @@
1728	1822	csg.addChild(child);
1729	1823	child.addChild(csg);
1730	1824	} else
1731		- if (event.getSource() == tripleItem)
	1825	+ if (source == tripleItem)
1732	1826	{
1733	1827	Composite csg = new GroupLeaf();
1734	1828	csg.count = 4;
..	..	@@ -1744,70 +1838,75 @@
1744	1838	child.addChild(csg);
1745	1839	} else
1746	1840
1747		- if (event.getSource() == importGFDItem)
	1841	+ if (source == importGFDItem)
1748	1842	{
1749	1843	ImportGFD();
1750	1844	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1845	+ if (source == importVRMLX3DItem)
1752	1846	{
1753	1847	ImportVRMLX3D();
1754	1848	} else
1755		- if (event.getSource() == import3DSItem)
	1849	+ if (source == import3DSItem)
1756	1850	{
1757	1851	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1852	} else
1759		- if (event.getSource() == importOBJItem)
	1853	+ if (source == importOBJItem)
1760	1854	{
1761	1855	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1856	} else
1763		- if (event.getSource() == computeAOItem)
	1857	+ if (source == computeAOItem)
1764	1858	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1859	+ Globals.drawMode = CameraPane.OCCLUSION;
	1860	+ Globals.theRenderer.repaint();
1767	1861	} else
1768		- if (event.getSource() == recompileItem)
	1862	+ if (source == recompileItem)
1769	1863	{
1770	1864	Recompile();
1771	1865	refreshContents();
1772	1866	} else
1773		- if (event.getSource() == editScriptItem)
	1867	+ if (source == editScriptItem)
1774	1868	{
1775	1869	OpenDialog();
1776	1870	refreshContents();
1777	1871	} else
1778		- if (event.getSource() == invariantsItem)
	1872	+ if (source == invariantsItem)
1779	1873	{
1780	1874	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1875	+ GrafreeD.grafreeD.universe.invariants();
1782	1876	} else
1783		- if (event.getSource() == memoryItem)
	1877	+ if (source == memoryItem)
1784	1878	{
1785	1879	//System.out.println("Invariants:");
1786	1880	PrintMemory();
1787	1881	} else
1788		- if (event.getSource() == pathItem)
	1882	+ if (source == pathItem)
1789	1883	{
1790	1884	PrintPath();
1791	1885	} else
1792		- if (event.getSource() == analyzeItem)
	1886	+ if (source == analyzeItem)
1793	1887	{
1794	1888	AnalyzeObject();
1795	1889	} else
1796		- if (event.getSource() == dumpItem)
	1890	+ if (source == dumpItem)
1797	1891	{
1798	1892	DumpObject();
1799	1893	} else
1800		- if (event.getSource() == screenfitButton)
	1894	+ if (source == oneStepButton)
	1895	+ {
	1896	+ Globals.ONESTEP = true;
	1897	+ cameraView.repaint();
	1898	+ } else
	1899	+ if (source == screenfitButton)
1801	1900	{
1802	1901	//Reload(lastConverter, lastFilename, true);
1803	1902	ScreenFit();
1804	1903	} else
1805		- if (event.getSource() == screenfitpointButton)
	1904	+ if (source == screenfitpointButton)
1806	1905	{
1807	1906	//Reload(lastConverter, lastFilename, true);
1808	1907	ScreenFitPoint();
1809	1908	} else
1810		- if (event.getSource() == snapobjectButton)
	1909	+ if (source == snapobjectButton)
1811	1910	{
1812	1911	//Reload(lastConverter, lastFilename, true);
1813	1912	SnapObject();
..	..	@@ -1818,13 +1917,13 @@
1818	1917	// Recompile();
1819	1918	// refreshContents();
1820	1919	// } else
1821		- if (event.getSource() == gcButton)
	1920	+ if (source == gcButton)
1822	1921	{
1823	1922	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1923	System.gc();
1825	1924	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1925	} else
1827		- if (event.getSource() == editLeafItem)
	1926	+ if (source == editLeafItem)
1828	1927	{
1829	1928	Object3D obj;
1830	1929	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +1937,66 @@
1838	1937	}
1839	1938	refreshContents(true);
1840	1939	} else
1841		- if (event.getSource() == openWindowItem)
	1940	+ if (source == openWindowItem)
1842	1941	{
1843	1942	EditSelection(true);
1844	1943	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1944	+ if (source == cutItem \|\| source == clearButton)
1846	1945	{
1847	1946	loadClipboard(true);
1848	1947	} else
1849		- if (event.getSource() == duplicateItem)
	1948	+ if (source == duplicateItem)
1850	1949	{
1851	1950	Object3D keep = GrafreeD.clipboard;
1852	1951	loadClipboard(false);
1853	1952	paste(false);
1854	1953	GrafreeD.clipboard = keep;
1855	1954	} else
1856		- if (event.getSource() == cloneItem)
	1955	+ if (source == cloneItem)
1857	1956	{
1858	1957	CloneSelection(false);
1859	1958	} else
1860		- if (event.getSource() == cloneSupportItem)
	1959	+ if (source == cloneSupportItem)
1861	1960	{
1862	1961	CloneSelection(true);
1863	1962	} else
1864		- if (event.getSource() == copyItem)
	1963	+ if (source == copyItem)
1865	1964	{
1866	1965	loadClipboard(false);
1867	1966	} else
1868		- if (event.getSource() == pasteItem)
	1967	+ if (source == pasteItem)
1869	1968	{
1870	1969	paste(false);
1871	1970	} else
1872		- if (event.getSource() == pasteLinkItem)
	1971	+ if (source == pasteIntoItem)
1873	1972	{
1874		- pasteInto(false);
	1973	+ pasteInto(true, false);
1875	1974	} else
1876		- if (event.getSource() == pasteCloneItem)
	1975	+ if (source == pasteLinkItem)
1877	1976	{
1878		- pasteInto(true);
	1977	+ pasteInto(false, false);
1879	1978	} else
1880		- if (event.getSource() == pasteExpandItem)
	1979	+ if (source == pasteCloneItem)
	1980	+ {
	1981	+ pasteInto(true, true);
	1982	+ } else
	1983	+ if (source == pasteExpandItem)
1881	1984	{
1882	1985	paste(true);
1883	1986	} else
1884		- if (event.getSource() == synchronizeItem)
	1987	+ if (source == synchronizeItem)
1885	1988	{
1886	1989	Overwrite(Object3D.TRANSFORM);
1887	1990	} else
1888		- if (event.getSource() == overwriteNameItem)
	1991	+ if (source == overwriteNameItem)
1889	1992	{
1890	1993	Overwrite(Object3D.NAME);
1891	1994	} else
1892		- if (event.getSource() == overwriteUVItem)
	1995	+ if (source == overwriteUVItem)
1893	1996	{
1894	1997	Overwrite(Object3D.UV);
1895	1998	} else
1896		- if (event.getSource() == overwriteMatItem)
	1999	+ if (source == overwriteMatItem)
1897	2000	{
1898	2001	/* july 2015
1899	2002	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2016,7 @@
1913	2016
1914	2017	Overwrite(dropAttributes);
1915	2018	}
1916		- if (event.getSource() == overwriteGeoItem)
	2019	+ if (source == overwriteGeoItem)
1917	2020	{
1918	2021	Overwrite(Object3D.GEOMETRY);
1919	2022	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2033,7 @@
1930	2033	// refreshContents();
1931	2034	// }
1932	2035	} else
1933		- if (event.getSource() == generateMeshItem)
	2036	+ if (source == generateMeshItem)
1934	2037	{
1935	2038	//if (group.selection.size() == 1)
1936	2039	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2044,7 @@
1941	2044	ResetModel();
1942	2045	refreshContents();
1943	2046	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2047	+ if (source == extractGeometriesItem)
1945	2048	{
1946	2049	boolean one = false;
1947	2050
..	..	@@ -1968,7 +2071,7 @@
1968	2071	ResetModel();
1969	2072	refreshContents();
1970	2073	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2074	+ if (source == cloneGeometriesItem)
1972	2075	{
1973	2076	boolean one = false;
1974	2077
..	..	@@ -1994,32 +2097,37 @@
1994	2097	ResetModel();
1995	2098	refreshContents();
1996	2099	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2100	+ if (source == shareGeometriesItem)
1998	2101	{
1999	2102	boolean one = false;
2000	2103
2001	2104	if (group.selection.size() == 1)
2002	2105	one = true;
2003	2106
	2107	+ Object3D merge = null;
	2108	+
2004	2109	Object3D content = new cGroup();
2005	2110
2006	2111	for (int i=0; i<group.selection.size(); i++)
2007	2112	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2113	+ merge = new Merge(group.selection.get(i));
2009	2114
2010	2115	if (one)
2011		- makeSomething(sel, false);
	2116	+ makeSomething(merge, false);
2012	2117	else
2013		- content.addChild(sel);
	2118	+ content.addChild(merge);
2014	2119	}
2015	2120
2016	2121	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2122	+ makeSomething(content, true);
	2123	+ else
	2124	+ {
	2125	+ ResetModel();
	2126	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2127	+ refreshContents();
	2128	+ }
2021	2129	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2130	+ if (source == mergeGeometriesItem)
2023	2131	{
2024	2132	boolean one = false;
2025	2133
..	..	@@ -2049,7 +2157,7 @@
2049	2157	ResetModel();
2050	2158	refreshContents();
2051	2159	} else
2052		- if (event.getSource() == linkverticesItem)
	2160	+ if (source == linkverticesItem)
2053	2161	{
2054	2162	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2163	// {
..	..	@@ -2069,32 +2177,41 @@
2069	2177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2178	content = ((cGroup)content).get(0);
2071	2179
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2180	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2181	for (int i=0; i<group.selection.size(); i++)
2074	2182	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2183	+ boolean random = CameraPane.SWITCH;
	2184	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2185	group.selection.get(i).linkVerticesThis(content);
2078	2186	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2187	+ CameraPane.SWITCH = random;
2080	2188	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2189	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2190	refreshContents();
2083	2191	}
2084	2192	} else
2085		- if (event.getSource() == resetsupportItem)
	2193	+ if (source == resetsupportItem)
2086	2194	{
2087	2195	for (int i=0; i<group.selection.size(); i++)
2088	2196	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2197	+ boolean random = CameraPane.SWITCH;
	2198	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2199	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2200	+ CameraPane.SWITCH = random;
2093	2201	}
2094	2202
2095	2203	refreshContents();
2096	2204	} else
2097		- if (event.getSource() == resetreferencesItem)
	2205	+ if (source == relinkverticesItem)
	2206	+ {
	2207	+ boolean random = CameraPane.SWITCH;
	2208	+ CameraPane.SWITCH = false; // parse all random nodes
	2209	+ group.selection.RelinkToSupport();
	2210	+ CameraPane.SWITCH = random;
	2211	+
	2212	+ refreshContents();
	2213	+ } else
	2214	+ if (source == resetreferencesItem)
2098	2215	{
2099	2216	for (int i=0; i<group.selection.size(); i++)
2100	2217	{
..	..	@@ -2103,7 +2220,7 @@
2103	2220
2104	2221	refreshContents();
2105	2222	} else
2106		- if (event.getSource() == setMasterItem)
	2223	+ if (source == setMasterItem)
2107	2224	{
2108	2225	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2109	2226	{
..	..	@@ -2116,7 +2233,7 @@
2116	2233	refreshContents();
2117	2234	}
2118	2235	} else
2119		- if (event.getSource() == poseMeshItem)
	2236	+ if (source == poseMeshItem)
2120	2237	{
2121	2238	if (group.selection.size() == 1)
2122	2239	{
..	..	@@ -2135,19 +2252,19 @@
2135	2252	}
2136	2253
2137	2254	} else
2138		- if (event.getSource() == revertMeshItem)
	2255	+ if (source == revertMeshItem)
2139	2256	{
2140	2257	RevertMeshes();
2141	2258	} else
2142		- if (event.getSource() == resetMeshItem)
	2259	+ if (source == resetMeshItem)
2143	2260	{
2144	2261	ResetAll();
2145	2262	} else
2146		- if (event.getSource() == stepAllItem)
	2263	+ if (source == stepAllItem)
2147	2264	{
2148	2265	StepAll();
2149	2266	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2267	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2268	{
2152	2269	//int indices[] = jList.getSelectedIndices();
2153	2270	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2272,46 @@
2155	2272
2156	2273	ClearSelection(false);
2157	2274	} else
2158		- if (event.getSource() == clearAllItem)
	2275	+ if (source == clearAllItem)
2159	2276	{
2160	2277	ClearSelection(true);
2161	2278	} else
2162		- if (event.getSource() == grabItem)
	2279	+ if (source == grabItem)
2163	2280	{
2164	2281	group(new cGroup(), true);
2165	2282	} else
2166		- if (event.getSource() == frontItem)
	2283	+ if (source == hideItem)
	2284	+ {
	2285	+ group(new HiddenObject());
	2286	+ } else
	2287	+ if (source == frontItem)
2167	2288	{
2168	2289	front();
2169	2290	} else
2170		- if (event.getSource() == backItem)
	2291	+ if (source == backItem)
2171	2292	{
2172	2293	back();
2173	2294	} else
2174		- if (event.getSource() == cameraItem)
	2295	+ if (source == cameraItem)
2175	2296	{
2176	2297	makeSomething(new Camera());
2177	2298	} else
2178		- if (event.getSource() == compositeItem)
	2299	+ if (source == compositeItem)
2179	2300	{
2180	2301	group(new Composite());
2181	2302	} else
2182		- if (event.getSource() == randomItem)
	2303	+ if (source == randomItem)
2183	2304	{
2184	2305	RandomNode random = new RandomNode();
2185	2306	group(random);
2186	2307	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2308	+ random.name = random.get(0).name + "Switch";
2188	2309	} else
2189		- if (event.getSource() == physicsItem)
	2310	+ if (source == physicsItem)
2190	2311	{
2191	2312	group(new PhysicsNode());
2192	2313	} else
2193		- if (event.getSource() == frameselectorItem)
	2314	+ if (source == frameselectorItem)
2194	2315	{
2195	2316	for (int i=0; i<group.selection.size(); i++)
2196	2317	{
..	..	@@ -2202,7 +2323,7 @@
2202	2323	ResetModel();
2203	2324	refreshContents();
2204	2325	} else
2205		- if (event.getSource() == switchGeoItem)
	2326	+ if (source == switchGeoItem)
2206	2327	{
2207	2328	for (int i=0; i<group.selection.size(); i++)
2208	2329	{
..	..	@@ -2214,7 +2335,7 @@
2214	2335	ResetModel();
2215	2336	refreshContents();
2216	2337	} else
2217		- if (event.getSource() == switchTransfoItem)
	2338	+ if (source == switchTransfoItem)
2218	2339	{
2219	2340	for (int i=0; i<group.selection.size(); i++)
2220	2341	{
..	..	@@ -2226,7 +2347,7 @@
2226	2347	ResetModel();
2227	2348	refreshContents();
2228	2349	} else
2229		- if (event.getSource() == morphItem)
	2350	+ if (source == morphItem)
2230	2351	{
2231	2352	for (int i=0; i<group.selection.size(); i++)
2232	2353	{
..	..	@@ -2238,7 +2359,7 @@
2238	2359	ResetModel();
2239	2360	refreshContents();
2240	2361	} else
2241		- if (event.getSource() == scriptNodeItem)
	2362	+ if (source == scriptNodeItem)
2242	2363	{
2243	2364	boolean atleastone = false;
2244	2365
..	..	@@ -2277,195 +2398,215 @@
2277	2398	}
2278	2399	}
2279	2400	} else
2280		- if (event.getSource() == linkerItem)
	2401	+ if (source == linkerItem)
2281	2402	{
2282	2403	group(new cLinker());
2283	2404	} else
2284		- if (event.getSource() == textureItem)
	2405	+ if (source == textureItem)
2285	2406	{
2286	2407	group(new TextureNode());
2287	2408	} else
2288		- if (event.getSource() == shadowXItem)
	2409	+ if (source == billboardItem)
	2410	+ {
	2411	+ group(new BillboardNode());
	2412	+ } else
	2413	+ if (source == shadowXItem)
2289	2414	{
2290	2415	CastShadow(0);
2291	2416	} else
2292		- if (event.getSource() == shadowYItem)
	2417	+ if (source == shadowYItem)
2293	2418	{
2294	2419	CastShadow(1);
2295	2420	} else
2296		- if (event.getSource() == shadowZItem)
	2421	+ if (source == shadowZItem)
2297	2422	{
2298	2423	CastShadow(2);
2299	2424	} else
2300		- if (event.getSource() == ungroupItem)
	2425	+ if (source == ungroupItem)
2301	2426	{
2302		- ungroup();
	2427	+ //ungroup();
	2428	+ for (int i=0; i<group.selection.size(); i++)
	2429	+ {
	2430	+ Ungroup(group.selection.get(i));
	2431	+ }
	2432	+
	2433	+ ClearSelection(false);
	2434	+
	2435	+ refreshContents();
2303	2436	} else
2304		- if (event.getSource() == genUVItem)
	2437	+ if (source == genUVItem)
2305	2438	{
2306	2439	GenUV();
2307	2440	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2441	+ if (source == genNormalsCADItem)
2309	2442	{
2310	2443	GenNormals(true);
2311	2444	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2445	+ if (source == genNormalsMESHItem)
	2446	+ {
	2447	+ GenNormals(true); // TODO
	2448	+ } else
	2449	+ if (source == genNormalsORGANItem)
2313	2450	{
2314	2451	GenNormals(false);
2315	2452	} else
2316		- if (event.getSource() == stripifyItem)
	2453	+ if (source == genNormalsMINEItem)
	2454	+ {
	2455	+ GenNormalsMINE();
	2456	+ } else
	2457	+ if (source == stripifyItem)
2317	2458	{
2318	2459	Stripify();
2319	2460	} else
2320		- if (event.getSource() == unstripifyItem)
	2461	+ if (source == unstripifyItem)
2321	2462	{
2322	2463	Unstripify();
2323	2464	} else
2324		- if (event.getSource() == trimItem)
	2465	+ if (source == trimItem)
2325	2466	{
2326	2467	Trim();
2327	2468	} else
2328		- if (event.getSource() == untrimItem)
	2469	+ if (source == untrimItem)
2329	2470	{
2330	2471	Untrim();
2331	2472	} else
2332		- if (event.getSource() == clearColorsItem)
	2473	+ if (source == clearColorsItem)
2333	2474	{
2334	2475	ClearColors();
2335	2476	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2477	+ if (source == clearMaterialsItem)
2337	2478	{
2338	2479	ClearMaterials();
2339	2480	} else
2340		- if (event.getSource() == liveleavesItem)
	2481	+ if (source == liveleavesItem)
2341	2482	{
2342	2483	LiveLeaves(true);
2343	2484	} else
2344		- if (event.getSource() == unliveleavesItem)
	2485	+ if (source == unliveleavesItem)
2345	2486	{
2346	2487	LiveLeaves(false);
2347	2488	} else
2348		- if (event.getSource() == supportleavesItem)
	2489	+ if (source == supportleavesItem)
2349	2490	{
2350	2491	SupportLeaves(true);
2351	2492	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2493	+ if (source == unsupportleavesItem)
2353	2494	{
2354	2495	SupportLeaves(false);
2355	2496	} else
2356		- if (event.getSource() == hideleavesItem)
	2497	+ if (source == hideleavesItem)
2357	2498	{
2358	2499	HideLeaves(true);
2359	2500	} else
2360		- if (event.getSource() == showleavesItem)
	2501	+ if (source == showleavesItem)
2361	2502	{
2362	2503	HideLeaves(false);
2363	2504	} else
2364		- if (event.getSource() == markleavesItem)
	2505	+ if (source == markleavesItem)
2365	2506	{
2366	2507	MarkLeaves(true);
2367	2508	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2509	+ if (source == unmarkleavesItem)
2369	2510	{
2370	2511	MarkLeaves(false);
2371	2512	} else
2372		- if (event.getSource() == flipVItem)
	2513	+ if (source == flipVItem)
2373	2514	{
2374	2515	FlipV(true);
2375	2516	} else
2376		- if (event.getSource() == unflipVItem)
	2517	+ if (source == unflipVItem)
2377	2518	{
2378	2519	FlipV(false);
2379	2520	} else
2380		- if (event.getSource() == lowTexturesItem)
	2521	+ if (source == lowTexturesItem)
2381	2522	{
2382	2523	SetTexRes(0);
2383	2524	} else
2384		- if (event.getSource() == normalTexturesItem)
	2525	+ if (source == normalTexturesItem)
2385	2526	{
2386	2527	SetTexRes(1);
2387	2528	} else
2388		- if (event.getSource() == highTexturesItem)
	2529	+ if (source == highTexturesItem)
2389	2530	{
2390	2531	SetTexRes(2);
2391	2532	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2533	+ if (source == veryhighTexturesItem)
2393	2534	{
2394	2535	SetTexRes(3);
2395	2536	} else
2396		- if (event.getSource() == maxTexturesItem)
	2537	+ if (source == maxTexturesItem)
2397	2538	{
2398	2539	SetTexRes(4);
2399	2540	} else
2400		- if (event.getSource() == panoTexturesItem)
	2541	+ if (source == panoTexturesItem)
2401	2542	{
2402	2543	SetTexRes(5);
2403	2544	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2545	+ if (source == reverseNormalsItem)
2405	2546	{
2406	2547	ReverseNormals();
2407	2548	} else
2408		- if (event.getSource() == parseverticesItem)
	2549	+ if (source == parseverticesItem)
2409	2550	{
2410	2551	ParseVertices();
2411	2552	} else
2412		- if (event.getSource() == textureFieldItem)
	2553	+ if (source == textureFieldItem)
2413	2554	{
2414	2555	TextureVertices();
2415	2556	} else
2416		- if (event.getSource() == alignItem)
	2557	+ if (source == alignItem)
2417	2558	{
2418	2559	Align();
2419	2560	} else
2420		- if (event.getSource() == mirrorItem)
	2561	+ if (source == mirrorItem)
2421	2562	{
2422	2563	MirrorPoses();
2423	2564	} else
2424		- if (event.getSource() == reduceMorphItem)
	2565	+ if (source == reduceMorphItem)
2425	2566	{
2426	2567	MeshReduction(false);
2427	2568	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2569	+ if (source == reduce34MorphItem)
2429	2570	{
2430	2571	MeshReduction(true);
2431	2572	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2573	+ if (source == reverseTrianglesItem)
2433	2574	{
2434	2575	ReverseTriangles();
2435	2576	} else
2436		- if (event.getSource() == reduceMeshItem)
	2577	+ if (source == reduceMeshItem)
2437	2578	{
2438	2579	ReduceMesh(false);
2439	2580	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2581	+ if (source == reduce34MeshItem)
2441	2582	{
2442	2583	ReduceMesh(true);
2443	2584	} else
2444		- if (event.getSource() == increaseMeshItem)
	2585	+ if (source == increaseMeshItem)
2445	2586	{
2446	2587	IncreaseMesh();
2447	2588	} else
2448		- if (event.getSource() == clipMeshItem)
	2589	+ if (source == clipMeshItem)
2449	2590	{
2450	2591	ClipMesh();
2451	2592	} else
2452		- if (event.getSource() == smoothMeshItem)
	2593	+ if (source == smoothMeshItem)
2453	2594	{
2454	2595	SmoothMesh();
2455	2596	} else
2456		- if (event.getSource() == transformgeometryItem)
	2597	+ if (source == transformgeometryItem)
2457	2598	{
2458	2599	TransformGeometry();
2459	2600	} else
2460		- if (event.getSource() == resetTransformItem)
	2601	+ if (source == resetTransformItem)
2461	2602	{
2462	2603	ResetTransform();
2463	2604	} else
2464		- if (event.getSource() == resetCentroidItem)
	2605	+ if (source == resetCentroidItem)
2465	2606	{
2466	2607	ResetCentroid();
2467	2608	} else
2468		- if (event.getSource() == resetParentItem)
	2609	+ if (source == resetParentItem)
2469	2610	{
2470	2611	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2612	{
..	..	@@ -2475,7 +2616,7 @@
2475	2616
2476	2617	refreshContents();
2477	2618	} else
2478		- if (event.getSource() == repairParentItem)
	2619	+ if (source == repairParentItem)
2479	2620	{
2480	2621	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2622	{
..	..	@@ -2489,7 +2630,21 @@
2489	2630
2490	2631	refreshContents();
2491	2632	} else
2492		- if (event.getSource() == sortbysizeItem)
	2633	+ if (source == repairShadowItem)
	2634	+ {
	2635	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2636	+ {
	2637	+ Object3D obj = (Object3D)e.nextElement();
	2638	+ obj.RepairShadow();
	2639	+// for (int i=0; i<obj.size(); i++)
	2640	+// {
	2641	+// obj.get(i).parent = obj;
	2642	+// }
	2643	+ }
	2644	+
	2645	+ refreshContents();
	2646	+ } else
	2647	+ if (source == sortbysizeItem)
2493	2648	{
2494	2649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2650	{
..	..	@@ -2501,7 +2656,7 @@
2501	2656	ResetModel();
2502	2657	refreshContents();
2503	2658	} else
2504		- if (event.getSource() == sortbynameItem)
	2659	+ if (source == sortbynameItem)
2505	2660	{
2506	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2662	{
..	..	@@ -2513,7 +2668,7 @@
2513	2668	ResetModel();
2514	2669	refreshContents();
2515	2670	} else
2516		- if (event.getSource() == attachPigmentItem)
	2671	+ if (source == attachPigmentItem)
2517	2672	{
2518	2673	String texture = GetFile("Attach pigment");
2519	2674	Object3D obj;
..	..	@@ -2525,7 +2680,7 @@
2525	2680
2526	2681	refreshContents();
2527	2682	} else
2528		- if (event.getSource() == detachPigmentItem)
	2683	+ if (source == detachPigmentItem)
2529	2684	{
2530	2685	Object3D obj;
2531	2686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2691,7 @@
2536	2691
2537	2692	refreshContents();
2538	2693	} else
2539		- if (event.getSource() == attachBumpItem)
	2694	+ if (source == attachBumpItem)
2540	2695	{
2541	2696	String texture = GetFile("Attach bump");
2542	2697	Object3D obj;
..	..	@@ -2548,7 +2703,7 @@
2548	2703
2549	2704	refreshContents();
2550	2705	} else
2551		- if (event.getSource() == detachBumpItem)
	2706	+ if (source == detachBumpItem)
2552	2707	{
2553	2708	Object3D obj;
2554	2709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2714,7 @@
2559	2714
2560	2715	refreshContents();
2561	2716	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2717	+ if (source == pigmentBumpItem)
2563	2718	{
2564	2719	Object3D obj;
2565	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2725,195 @@
2570	2725
2571	2726	refreshContents();
2572	2727	} else
2573		- if (event.getSource() == flashSelectionButton)
	2728	+ if (source == flashSelectionButton)
2574	2729	{
2575	2730	CameraPane.flash = true;
2576	2731	refreshContents();
2577	2732	} else
2578		- if (event.getSource() == oneButton)
	2733	+ if (source == oneButton)
2579	2734	{
2580	2735	} else
2581		- if (event.getSource() == twoButton)
	2736	+ if (source == twoButton)
2582	2737	{
2583	2738	radio.layout = twoButton;
2584	2739	// bug
2585	2740	//gridPanel.setDividerLocation(1.0);
2586	2741	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2750	+// aWindowConstraints.weightx = 0;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// //bigThree.add(jtp, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// bigThree.add(centralPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// scenePanel.setVisible(false);
	2766	+// centralPanel.setVisible(true);
	2767	+// XYZPanel.setVisible(false);
	2768	+ bigThree.ClearUI();
	2769	+ bigThree.add(centralPanel);
	2770	+ bigThree.FlushUI();
2611	2771	} else
2612		- if (event.getSource() == threeButton)
	2772	+ if (source == threeButton)
2613	2773	{
2614	2774	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	2775	+
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// bigThree.validate();
	2800	+// scenePanel.setVisible(false);
	2801	+// centralPanel.setVisible(true);
	2802	+// XYZPanel.setVisible(true);
	2803	+ bigThree.ClearUI();
	2804	+ bigThree.add(centralPanel);
	2805	+ bigThree.add(XYZPanel);
	2806	+ bigThree.FlushUI();
2639	2807	} else
2640		- if (event.getSource() == fourButton)
	2808	+ if (source == fourButton)
2641	2809	{
2642	2810	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	2811	+
	2812	+// bigThree.remove(scenePanel);
	2813	+// bigThree.remove(centralPanel);
	2814	+// bigThree.remove(XYZPanel);
	2815	+// aWindowConstraints.gridx = 0;
	2816	+// aWindowConstraints.gridy = 0;
	2817	+// aWindowConstraints.gridwidth = 1;
	2818	+// // aWindowConstraints.gridheight = 3;
	2819	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.weighty = 1;
	2822	+// bigThree.add(scenePanel, aWindowConstraints);
	2823	+// aWindowConstraints.weightx = 1;
	2824	+// aWindowConstraints.gridwidth = 3;
	2825	+// // aConstraints.gridheight = 3;
	2826	+// aWindowConstraints.gridx = 1;
	2827	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2828	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2829	+// aWindowConstraints.weightx = 0;
	2830	+// aWindowConstraints.gridx = 4;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2835	+// bigThree.validate();
	2836	+// scenePanel.setVisible(true);
	2837	+// centralPanel.setVisible(false);
	2838	+// XYZPanel.setVisible(false);
	2839	+ bigThree.ClearUI();
	2840	+ bigThree.add(scenePanel);
	2841	+ bigThree.FlushUI();
2667	2842	} else
2668		- if (event.getSource() == sixButton)
	2843	+ if (source == sixButton)
2669	2844	{
2670	2845	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	2846	+
	2847	+// bigThree.remove(scenePanel);
	2848	+// bigThree.remove(centralPanel);
	2849	+// bigThree.remove(XYZPanel);
	2850	+// aWindowConstraints.gridx = 0;
	2851	+// aWindowConstraints.gridy = 0;
	2852	+// aWindowConstraints.gridwidth = 1;
	2853	+// // aConstraints.gridheight = 3;
	2854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.weighty = 1;
	2857	+// bigThree.add(scenePanel, aWindowConstraints);
	2858	+// aWindowConstraints.weightx = 1;
	2859	+// aWindowConstraints.gridwidth = 3;
	2860	+// // aWindowConstraints.gridheight = 3;
	2861	+// aWindowConstraints.gridx = 1;
	2862	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2863	+// bigThree.add(centralPanel, aWindowConstraints);
	2864	+// aWindowConstraints.weightx = 0;
	2865	+// aWindowConstraints.gridx = 4;
	2866	+// aWindowConstraints.gridwidth = 1;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2869	+// //bigThree.add(XYZPanel, aConstraints);
	2870	+// bigThree.validate();
	2871	+// scenePanel.setVisible(true);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(scenePanel);
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2695	2878	} else
2696		- if (event.getSource() == sevenButton)
	2879	+ if (source == sevenButton)
2697	2880	{
2698	2881	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aWindowConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// bigThree.add(scenePanel, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(true);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(scenePanel);
	2912	+ bigThree.add(centralPanel);
	2913	+ bigThree.add(XYZPanel);
	2914	+ bigThree.FlushUI();
2723	2915	} else
2724		- if (event.getSource() == rootButton)
	2916	+ if (source == rootButton)
2725	2917	{
2726	2918	Object3D obj;
2727	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +2925,7 @@
2733	2925
2734	2926	refreshContents(true);
2735	2927	} else
2736		- if (event.getSource() == closeButton)
	2928	+ if (source == closeButton)
2737	2929	{
2738	2930	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	2931	cRadio ab;
..	..	@@ -2754,11 +2946,11 @@
2754	2946	}
2755	2947	refreshContents(true);
2756	2948	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2949	+ if (source == editItem \|\| source == editButton)
2758	2950	{
2759	2951	EditSelection(false);
2760	2952	} else
2761		- if (event.getSource() == uneditButton)
	2953	+ if (source == uneditButton)
2762	2954	{
2763	2955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	2956	{
..	..	@@ -2770,12 +2962,12 @@
2770	2962
2771	2963	child.editWindow = null; // ???????????
2772	2964	}
2773		- objEditor.ctrlPanel.revalidate();
	2965	+ objEditor.ctrlPanel.FlushUI();
2774	2966	//objEditor.jTree.clearSelection();
2775	2967	//objEditor.ResetSliders();
2776	2968	refreshContents(true);
2777	2969	} else
2778		- if (event.getSource() == clearPanelButton)
	2970	+ if (source == clearPanelButton)
2779	2971	{
2780	2972	assert(copy == group);
2781	2973	//copy.ClearUI();
..	..	@@ -2786,7 +2978,7 @@
2786	2978	listUI.clear();
2787	2979	refreshContents(true);
2788	2980	} else
2789		- if (event.getSource() == allParamsButton)
	2981	+ if (source == allParamsButton)
2790	2982	{
2791	2983	assert(copy == group);
2792	2984
..	..	@@ -2807,19 +2999,19 @@
2807	2999
2808	3000	refreshContents(true);
2809	3001	} else
2810		- if (event.getSource() == unselectButton)
	3002	+ if (source == unselectButton)
2811	3003	{
2812	3004	objEditor.jTree.clearSelection();
2813	3005	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3006	objEditor.ResetSliders();
2815	3007	refreshContents(true);
2816	3008	} else
2817		- if(event.getSource() instanceof cRadio)
	3009	+ if(source instanceof cRadio)
2818	3010	{
2819	3011	group.parent = keepparent;
2820	3012	group.attributes = 0;
2821	3013	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3014	+ /cRadio/ radio = (cRadio)source;
2823	3015	Object3D obj = radio.GetObject();
2824	3016	System.out.println("Edit " + obj);
2825	3017	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3031,7 @@
2839	3031	}
2840	3032
2841	3033	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3034	+ //Globals.theRenderer.object = group;
2843	3035	if(!useclient)
2844	3036	{
2845	3037	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,7 +3040,8 @@
2848	3040	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3041	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3042	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3043	+ //cameraView.lighttouched = true;
	3044	+ Globals.lighttouched = true;
2852	3045	topView.object = group;
2853	3046	frontView.object = group;
2854	3047	sideView.object = group;
..	..	@@ -2884,7 +3077,7 @@
2884	3077	if (useclient)
2885	3078	{
2886	3079	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3080	+ Globals.lighttouched = true;
2888	3081	//topView.object = client;
2889	3082	//frontView.object = client;
2890	3083	//sideView.object = client;
..	..	@@ -2892,7 +3085,7 @@
2892	3085	else
2893	3086	{
2894	3087	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3088	+ Globals.lighttouched = true;
2896	3089	//topView.object = group;
2897	3090	//frontView.object = group;
2898	3091	//sideView.object = group;
..	..	@@ -3173,6 +3366,13 @@
3173	3366	refreshContents();
3174	3367	}
3175	3368
	3369	+ void GenNormalsMINE()
	3370	+ {
	3371	+ group.selection.GenNormalsMINE();
	3372	+
	3373	+ refreshContents();
	3374	+ }
	3375	+
3176	3376	void Stripify()
3177	3377	{
3178	3378	group.StripifyS();
..	..	@@ -3393,7 +3593,7 @@
3393	3593	String pigment = Object3D.GetPigment(tex);
3394	3594	//String bump = Object3D.GetBump(tex);
3395	3595
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3596	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3397	3597
3398	3598	double s = v.s;
3399	3599
..	..	@@ -3441,12 +3641,26 @@
3441	3641
3442	3642	void Align()
3443	3643	{
	3644	+ if (group.selection.size() == 0)
	3645	+ return;
	3646	+
	3647	+ cVector bbmin = new cVector();
	3648	+ cVector bbmax = new cVector();
	3649	+
	3650	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3651	+
	3652	+ double dx = bbmax.x - bbmin.x;
	3653	+ double dy = bbmax.y - bbmin.y;
	3654	+ double dz = bbmax.z - bbmin.z;
	3655	+
	3656	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3657	+
3444	3658	for (int i=0; i<group.selection.size(); i++)
3445	3659	{
3446	3660	Object3D obj = group.selection.get(i);
3447	3661
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3662	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3663	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3664	}
3451	3665
3452	3666	refreshContents();
..	..	@@ -3467,11 +3681,11 @@
3467	3681
3468	3682	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	3683
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	3684	+ boolean random = CameraPane.SWITCH;
	3685	+ CameraPane.SWITCH = false; // parse all random nodes
3472	3686	lowres.linkVerticesThis(null);
3473	3687	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	3688	+ CameraPane.SWITCH = random;
3475	3689
3476	3690	System.err.flush();
3477	3691
..	..	@@ -3680,7 +3894,7 @@
3680	3894	group.selection.RelinkToSupport(); // july 2014
3681	3895	System.out.println("DONE.");
3682	3896	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3897	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	3898	}
3685	3899
3686	3900	void ReduceMesh(boolean reduction34)
..	..	@@ -3956,25 +4170,25 @@
3956	4170	System.err.println("info : " + child.GetPath());
3957	4171	}
3958	4172	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4173	+// else
	4174	+// {
	4175	+// objEditor.SetMaterial(group); // .GetMaterial());
	4176	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4177	+// System.err.println("info : " + group.GetPath());
	4178	+// }
3965	4179
3966	4180	objEditor.SetText(); // jan 2014
3967	4181
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4182	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3969	4183	CameraPane.flash = true;
3970	4184
3971	4185	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3972	4186	// a camera
3973	4187	{
3974	4188	CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4189	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4190	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4191	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4192	}
3979	4193
3980	4194	refreshContents();
..	..	@@ -4229,7 +4443,7 @@
4229	4443	refreshContents();
4230	4444	}
4231	4445
4232		- void pasteInto(boolean copyit)
	4446	+ void pasteInto(boolean copyit, boolean clone)
4233	4447	{
4234	4448	// if (GrafreeD.clipboard == null)
4235	4449	// return;
..	..	@@ -4258,7 +4472,14 @@
4258	4472	if (copyit)
4259	4473	{
4260	4474	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4475	+ if (clone)
	4476	+ {
	4477	+ CloneClipboard(false); // sept 2014
	4478	+ }
	4479	+ else
	4480	+ {
	4481	+ paste(false);
	4482	+ }
4262	4483	}
4263	4484	else
4264	4485	{
..	..	@@ -4468,6 +4689,26 @@
4468	4689	makeSomething(csg);
4469	4690	}
4470	4691
	4692	+ void Ungroup(Object3D g)
	4693	+ {
	4694	+ if (g instanceof HiddenObject)
	4695	+ {
	4696	+ HiddenObject h = (HiddenObject) g;
	4697	+
	4698	+ for (int i=0; i<h.ActualSize(); i++)
	4699	+ {
	4700	+ objEditor.makeSomething(h.get(i), false);
	4701	+ }
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ for (int i=0; i<g.Size(); i++)
	4706	+ {
	4707	+ objEditor.makeSomething(g.get(i), false);
	4708	+ }
	4709	+ }
	4710	+ }
	4711	+
4471	4712	void ungroup()
4472	4713	{
4473	4714	/*
..	..	@@ -4782,10 +5023,12 @@
4782	5023	cButton flashSelectionButton;
4783	5024	cButton editButton;
4784	5025	cButton uneditButton;
	5026	+ JCheckBox allParamsButton;
4785	5027	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5028	cButton unselectButton;
4788	5029
	5030	+ cButton oneStepButton;
	5031	+
4789	5032	cButton screenfitButton;
4790	5033	cButton screenfitpointButton;
4791	5034	cButton snapobjectButton;
..	..	@@ -4827,6 +5070,7 @@
4827	5070	private MenuItem resetsupportItem;
4828	5071	private MenuItem resetreferencesItem;
4829	5072	private MenuItem linkverticesItem;
	5073	+ private MenuItem relinkverticesItem;
4830	5074	private MenuItem setMasterItem;
4831	5075	private MenuItem resetMeshItem;
4832	5076	private MenuItem stepAllItem;
..	..	@@ -4839,14 +5083,17 @@
4839	5083	private MenuItem mergeGeometriesItem;
4840	5084	private MenuItem copyItem;
4841	5085	private MenuItem pasteItem;
	5086	+ private MenuItem pasteIntoItem;
4842	5087	private MenuItem pasteLinkItem;
4843	5088	private MenuItem pasteCloneItem;
4844	5089	private MenuItem pasteExpandItem;
4845	5090	private MenuItem clearItem;
4846	5091	private MenuItem clearAllItem;
4847	5092	private MenuItem genUVItem;
	5093	+ private MenuItem genNormalsMESHItem;
4848	5094	private MenuItem genNormalsCADItem;
4849	5095	private MenuItem genNormalsORGANItem;
	5096	+ private MenuItem genNormalsMINEItem;
4850	5097	private MenuItem stripifyItem;
4851	5098	private MenuItem unstripifyItem;
4852	5099	private MenuItem trimItem;
..	..	@@ -4888,6 +5135,7 @@
4888	5135	private MenuItem resetCentroidItem;
4889	5136	private MenuItem transformgeometryItem;
4890	5137	private MenuItem resetTransformItem;
	5138	+ private MenuItem hideItem;
4891	5139	private MenuItem grabItem;
4892	5140	private MenuItem backItem;
4893	5141	private MenuItem frontItem;
..	..	@@ -4908,6 +5156,7 @@
4908	5156
4909	5157	private MenuItem resetParentItem;
4910	5158	private MenuItem repairParentItem;
	5159	+ private MenuItem repairShadowItem;
4911	5160	private MenuItem sortbysizeItem;
4912	5161	private MenuItem sortbynameItem;
4913	5162
..	..	@@ -4928,10 +5177,11 @@
4928	5177	private MenuItem coneItem;
4929	5178	private MenuItem torusItem;
4930	5179	private MenuItem superItem;
	5180	+ private MenuItem kleinItem;
4931	5181	private MenuItem blobItem;
4932	5182	private MenuItem latheItem;
4933	5183	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5184	+ private MenuItem overlayItem;
4935	5185	private MenuItem meshItem;
4936	5186	// private MenuItem meshGroupItem;
4937	5187	private MenuItem springItem;
..	..	@@ -4940,6 +5190,7 @@
4940	5190	private MenuItem csgItem;
4941	5191	private MenuItem templateItem;
4942	5192	private MenuItem textureItem;
	5193	+ private MenuItem billboardItem;
4943	5194	private MenuItem shadowXItem;
4944	5195	private MenuItem shadowYItem;
4945	5196	private MenuItem shadowZItem;