~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"));
..	..	@@ -285,6 +328,13 @@
285	328	genNormalsORGANItem.addActionListener(this);
286	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	330	genNormalsCADItem.addActionListener(this);
	331	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	332	+ genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
288	338	stripifyItem = menu.add(new MenuItem("Stripify"));
289	339	stripifyItem.addActionListener(this);
290	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,10 +356,14 @@
306	356	reduce34MeshItem.addActionListener(this);
307	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	358	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
313	367
314	368	oe.menuBar.add(menu = new Menu("Attributes"));
315	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -319,10 +373,13 @@
319	373	liveleavesItem.addActionListener(this);
320	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
322	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	379	supportleavesItem.addActionListener(this);
324	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	381	unsupportleavesItem.addActionListener(this);
	382	+ }
326	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	384	hideleavesItem.addActionListener(this);
328	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -365,6 +422,8 @@
365	422	sortbysizeItem.addActionListener(this);
366	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
368	427	menu.add("-");
369	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -374,11 +433,11 @@
374	433	shareGeometriesItem.addActionListener(this);
375	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
377	437
378	438	oe.menuBar.add(menu = new Menu("Insert"));
379	439	buildCreateMenu(menu);
380	440
381		-
382	441	oe.menuBar.add(menu = new Menu("Include"));
383	442	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384	443	importGFDItem.addActionListener(this);
..	..	@@ -423,150 +482,98 @@
423	482	oe.radioPanel.add(dummyButton);
424	483	oe.buttonGroup.add(dummyButton);
425	484	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	485	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	486
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	487	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	488	+ liveCB.setToolTipText("Enabled animation");
431	489	liveCB.addItemListener(this);
432	490
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);
	491	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ oneStepButton.setToolTipText("Animate one step forward");
	493	+ oneStepButton.addActionListener(this);
	494	+
	495	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	496	+ fastCB.setToolTipText("Fast mode");
451	497	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);
	498	+
	499	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	500	+ trackCB.setToolTipText("Enable tracking");
493	501	trackCB.addItemListener(this);
494	502
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	503	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ screenfitButton.setToolTipText("Screen fit");
497	505	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	506	+
499	507	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	508	// 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	509
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);
	510	+ if (Globals.ADVANCED)
	511	+ {
	512	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	513	+ snapobjectButton.addActionListener(this);
	514	+ snapobjectButton.setToolTipText("Snap Object");
	515	+ }
	516	+
	517	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	518	+ flashSelectionButton.setToolTipText("Show selection");
512	519	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	520
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	521	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	522	+
	523	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	524	+ twoButton.setToolTipText("Show center view only");
519	525	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	527	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	528	+ fourButton.setToolTipText("Show left panel only");
	529	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	530	+ sixButton.setToolTipText("2-column layout left");
523	531	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	532	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	533	+ threeButton.setToolTipText("2-column layout right");
525	534	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	536	+ sevenButton.setToolTipText("3-column layout");
527	537	sevenButton.addActionListener(this);
528	538	//
529	539
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	541	+ rootButton.setToolTipText("Edit selection in new tab");
531	542	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	543	+
	544	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	545	+ closeButton.setToolTipText("Close tab");
534	546	closeButton.addActionListener(this);
535	547	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	548	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	549
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	550	+ cGridBag commandsPanel = new cGridBag();
	551	+
	552	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	553	+ editButton.setToolTipText("Edit selection");
541	554	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	555
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	556	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	557	+ uneditButton.setToolTipText("Unedit selection");
547	558	uneditButton.addActionListener(this);
548	559
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);
	560	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	561	+ allParamsButton.setToolTipText("Edit all params");
561	562	allParamsButton.addActionListener(this);
562	563
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);
	564	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	565	+ clearPanelButton.setToolTipText("Clear edit panel");
	566	+ clearPanelButton.addActionListener(this);
	567	+
	568	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	569	+ unselectButton.setToolTipText("Unselect");
568	570	unselectButton.addActionListener(this);
569	571
	572	+ commandsPanel.preferredHeight = 1;
	573	+
	574	+ oe.treePanel.add(commandsPanel);
	575	+ oe.treePanel.Return();
	576	+
570	577	// oe.aConstraints.gridx += 1;
571	578	// oe.aConstraints.weighty = 0;
572	579	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +585,37 @@
578	585	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	586	// gcButton.addActionListener(this);
580	587
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;
	588	+ cGridBag jSPPanel = new cGridBag();
	589	+
	590	+ JScrollPane jSP;
592	591	//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);
	592	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	593	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	594	+
	595	+ oe.treePanel.add(jSPPanel);
	596	+ oe.treePanel.Return();
599	597
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);
	598	+ cGridBag copyOptionsPanel = new cGridBag();
	599	+
	600	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	601	+ colorCB.setToolTipText("Copy color when dropped");
604	602	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	603	+
	604	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	605	+ materialCB.setToolTipText("Copy material when dropped");
607	606	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	607	+
	608	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	609	+ textureCB.setToolTipText("Copy texture when dropped");
610	610	textureCB.addItemListener(this);
611	611
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	612	+ copyOptionsPanel.preferredHeight = 1;
	613	+ oe.treePanel.add(copyOptionsPanel);
	614	+ oe.treePanel.Return();
614	615
	616	+// mainPanel.setDividerLocation(0.5); //1.0);
	617	+// mainPanel.setResizeWeight(0.5);
	618	+
615	619	//jList.addListSelectionListener(this);
616	620	oe.jTree.addTreeSelectionListener(this);
617	621	//jTree.setRootVisible(false);
..	..	@@ -633,17 +637,89 @@
633	637	radio.layout = sevenButton;
634	638	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	639	}
	640	+
	641	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	642	+ {
	643	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	644	+ boxCB.setToolTipText("Display bounding boxes");
	645	+ boxCB.addItemListener(this);
	646	+
	647	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	648	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	649	+ zoomBoxCB.addItemListener(this);
	650	+
	651	+ if (Globals.ADVANCED)
	652	+ {
	653	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	654	+ supportCB.setToolTipText("Enable rigging");
	655	+ supportCB.addItemListener(this);
	656	+
	657	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	658	+ // localCB.addItemListener(this);
	659	+
	660	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	661	+ crowdCB.setToolTipText("Used for crowds");
	662	+ crowdCB.addItemListener(this);
	663	+
	664	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	665	+ smoothCB.setToolTipText("Snapping delay");
	666	+ smoothCB.addItemListener(this);
	667	+
	668	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	669	+ slowCB.setToolTipText("Smooth interpolation");
	670	+ slowCB.addItemListener(this);
	671	+
	672	+// constraints.gridy += 1;
	673	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	674	+// speakerMocapCB.addItemListener(this);
	675	+
	676	+ if (false)
	677	+ {
	678	+ // handled in scripts
	679	+ //constraints.gridy += 1;
	680	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	681	+ speakerCameraCB.addItemListener(this);
	682	+
	683	+ //constraints.gridy += 1;
	684	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	685	+ speakerFocusCB.addItemListener(this);
	686	+
	687	+ //constraints.gridy += 1;
	688	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	689	+ smoothfocusCB.addItemListener(this);
	690	+ }
	691	+
	692	+//constraints.gridx += 1;
	693	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	694	+// debugCB.addItemListener(this);
	695	+
	696	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	697	+ oeilCB.addItemListener(this);
	698	+
	699	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	700	+ lookAtCB.setToolTipText("Look-at target");
	701	+ lookAtCB.addItemListener(this);
	702	+
	703	+ }
	704	+
	705	+ cGridBag fill = new cGridBag();
	706	+
	707	+ fill.preferredHeight = 200;
	708	+
	709	+ panel.add(fill);
	710	+
	711	+ }
636	712
637	713	void EditObject(Object3D obj)
638	714	{
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();
	715	+ cRadio radioButton = new cRadio(obj.name);
	716	+ radioButton.SetObject(obj);
	717	+ radioButton.layout = sevenButton;
	718	+ radioButton.SetCamera(cameraView.renderCamera, false);
	719	+ radioButton.addActionListener(this);
	720	+ radioPanel.add(radioButton);
	721	+ buttonGroup.add(radioButton);
	722	+ radioButton.doClick();
647	723	}
648	724	void SetupViews(ObjEditor oe)
649	725	{
..	..	@@ -663,6 +739,7 @@
663	739	JCheckBox fastCB;
664	740	JCheckBox slowCB;
665	741	JCheckBox boxCB;
	742	+ JCheckBox zoomBoxCB;
666	743	JCheckBox trackCB;
667	744	JCheckBox smoothfocusCB;
668	745	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +782,7 @@
705	782	dropAttributes \|= Object3D.TEXTURE;
706	783	else
707	784	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	785	+ } else if(e.getSource() == liveCB)
710	786	{
711	787	cameraView.ToggleLive();
712	788	}
..	..	@@ -743,6 +819,10 @@
743	819	Recompile();
744	820	cameraView.repaint();
745	821	// refreshContents();
	822	+ }
	823	+ else if(e.getSource() == zoomBoxCB)
	824	+ {
	825	+ cameraView.ToggleZoomBoxMode();
746	826	}
747	827	else if(e.getSource() == smoothfocusCB)
748	828	{
..	..	@@ -911,11 +991,11 @@
911	991	{
912	992	loadClipboard(true);
913	993	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	994	+ pasteInto(false, false);
915	995	} else {
916	996	loadClipboard(false);
917	997	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	998	+ pasteInto(false, false); // true); // ???
919	999	}
920	1000	}
921	1001	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1113,37 @@
1033	1113	torusItem.addActionListener(this);
1034	1114	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1115	superItem.addActionListener(this);
	1116	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1117	+ kleinItem.addActionListener(this);
1036	1118	particleItem = menu.add(new MenuItem("Particle system"));
1037	1119	particleItem.addActionListener(this);
	1120	+ if (Globals.ADVANCED)
	1121	+ {
1038	1122	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1123	ragdollItem.addActionListener(this);
1040	1124	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1125	ragdoll2Item.addActionListener(this);
	1126	+ }
1042	1127	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1128	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1129	meshItem.addActionListener(this);
1045	1130	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1131	// meshGroupItem.addActionListener(this);
	1132	+ if (Globals.ADVANCED)
	1133	+ {
1047	1134	springItem = menu.add(new MenuItem("Spring"));
1048	1135	springItem.addActionListener(this);
1049	1136	flagItem = menu.add(new MenuItem("Flag"));
1050	1137	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	1138	blobItem = menu.add(new MenuItem("Blob"));
1056	1139	blobItem.addActionListener(this);
1057	1140	latheItem = menu.add(new MenuItem("Lathe"));
1058	1141	latheItem.addActionListener(this);
	1142	+ }
	1143	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1144	+ bezierItem.addActionListener(this);
	1145	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1146	+ overlayItem.addActionListener(this);
1059	1147	lightItem = menu.add(new MenuItem("Light"));
1060	1148	lightItem.addActionListener(this);
1061	1149	menu.add("-");
..	..	@@ -1065,34 +1153,39 @@
1065	1153	loopItem.addActionListener(this);
1066	1154	doubleItem = menu.add(new MenuItem("Fork"));
1067	1155	doubleItem.addActionListener(this);
	1156	+ if (Globals.ADVANCED)
	1157	+ {
1068	1158	tripleItem = menu.add(new MenuItem("Trident"));
1069	1159	tripleItem.addActionListener(this);
	1160	+ }
1070	1161	}
1071	1162
1072	1163	void buildToolsMenu(Menu menu)
1073	1164	{
1074	1165	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1166	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1167	+ animationItem.setState(Globals.ANIMATION);
1077	1168
1078	1169	menu.add("-");
1079	1170	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1171	parseverticesItem.addActionListener(this);
1081	1172	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1173	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1174	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1175	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1176	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1177	reduceMorphItem.addActionListener(this);
1089	1178	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1179	reduce34MorphItem.addActionListener(this);
1091		-
	1180	+ menu.add("-");
1092	1181	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1182	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1183
	1184	+ if (Globals.ADVANCED)
	1185	+ {
	1186	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1187	+ mirrorItem.addActionListener(this);
	1188	+ menu.add("-");
1096	1189	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1190	memoryItem.addActionListener(this);
1098	1191	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1199,8 @@
1106	1199	resetParentItem.addActionListener(this);
1107	1200	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1201	repairParentItem.addActionListener(this);
	1202	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1203	+ repairShadowItem.addActionListener(this);
1109	1204	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1205	invariantsItem.addActionListener(this);
1111	1206	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1208,7 @@
1113	1208	menu.add("-");
1114	1209	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1210	editScriptItem.addActionListener(this);
	1211	+ }
1116	1212	}
1117	1213
1118	1214	void ScreenFit()
..	..	@@ -1466,6 +1562,7 @@
1466	1562	//
1467	1563	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1564	{
	1565	+ Object source = event.getSource();
1469	1566	/*
1470	1567	if (event.getSource() == nameField)
1471	1568	{
..	..	@@ -1477,11 +1574,11 @@
1477	1574	}
1478	1575	else
1479	1576	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1577	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1578	{
1482	1579	ScreenFit();
1483	1580	} else
1484		- if (event.getSource() == switchItem)
	1581	+ if (source == switchItem)
1485	1582	{
1486	1583	cVector v1 = new cVector();
1487	1584	cVector v2 = new cVector();
..	..	@@ -1490,11 +1587,11 @@
1490	1587	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1588	objEditor.cameraView.repaint();
1492	1589	} else
1493		- if (event.getSource() == rectoidItem)
	1590	+ if (source == rectoidItem)
1494	1591	{
1495	1592	makeSomething(new Box());
1496	1593	} else
1497		- if (event.getSource() == particleItem)
	1594	+ if (source == particleItem)
1498	1595	{
1499	1596	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1597	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1612,9 @@
1515	1612	applyExample(particleGeom, "SMOKE");
1516	1613	makeSomething(particleGeom);
1517	1614	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1615	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1616	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1617	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1618
1522	1619	ragdoll.toParent = LA.newMatrix();
1523	1620	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1632,7 @@
1535	1632	} else
1536	1633	/*
1537	1634	*/
1538		- if (event.getSource() == heightFieldItem)
	1635	+ if (source == heightFieldItem)
1539	1636	{
1540	1637	Object3D obj = new Object3D();
1541	1638
..	..	@@ -1573,27 +1670,31 @@
1573	1670
1574	1671	makeSomething(obj);
1575	1672	} else
1576		- if (event.getSource() == gridItem)
	1673	+ if (source == gridItem)
1577	1674	{
1578	1675	makeSomething(new Grid());
1579	1676	} else
1580		- if (event.getSource() == ellipsoidItem)
	1677	+ if (source == ellipsoidItem)
1581	1678	{
1582	1679	makeSomething(new Sphere());
1583	1680	} else
1584		- if (event.getSource() == coneItem)
	1681	+ if (source == coneItem)
1585	1682	{
1586	1683	makeSomething(new Cone());
1587	1684	} else
1588		- if (event.getSource() == torusItem)
	1685	+ if (source == torusItem)
1589	1686	{
1590	1687	makeSomething(new Torus());
1591	1688	} else
1592		- if (event.getSource() == superItem)
	1689	+ if (source == superItem)
1593	1690	{
1594	1691	makeSomething(new Superellipsoid());
1595	1692	} else
1596		- if (event.getSource() == blobItem)
	1693	+ if (source == kleinItem)
	1694	+ {
	1695	+ makeSomething(new Klein());
	1696	+ } else
	1697	+ if (source == blobItem)
1597	1698	{
1598	1699	Blob blob = new Blob();
1599	1700	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1702,15 @@
1601	1702	//blob.retile();
1602	1703	makeSomething(blob);
1603	1704	} else
1604		- if (event.getSource() == latheItem)
	1705	+ if (source == latheItem)
1605	1706	{
1606	1707	makeSomething(new Lathe());
1607	1708	} else
1608		- if (event.getSource() == bezierItem)
	1709	+ if (source == bezierItem)
1609	1710	{
1610	1711	makeSomething(new BezierSurface());
1611	1712	} else
1612		- if (event.getSource() == checkerItem)
	1713	+ if (source == overlayItem)
1613	1714	{
1614	1715	/*
1615	1716	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1725,7 @@
1624	1725	*/
1625	1726	makeSomething(new Checker());
1626	1727	} else
1627		- if (event.getSource() == meshItem)
	1728	+ if (source == meshItem)
1628	1729	{
1629	1730	Object3D itemtomake = new Object3D();
1630	1731	Object3D child;
..	..	@@ -1645,35 +1746,35 @@
1645	1746	makeSomething(child);
1646	1747	}
1647	1748	} else
1648		- if (event.getSource() == springItem)
	1749	+ if (source == springItem)
1649	1750	{
1650	1751	cSpring s = new cSpring();
1651	1752	s.setup();
1652	1753	makeSomething(s);
1653	1754	} else
1654		- if (event.getSource() == flagItem)
	1755	+ if (source == flagItem)
1655	1756	{
1656	1757	cSpring s = new cFlag();
1657	1758	s.setup();
1658	1759	makeSomething(s);
1659	1760	} else
1660		- if (event.getSource() == lightItem)
	1761	+ if (source == lightItem)
1661	1762	{
1662	1763	makeSomething(new Light());
1663	1764	} else
1664		- if (event.getSource() == csgItem)
	1765	+ if (source == csgItem)
1665	1766	{
1666	1767	group(new CSG());
1667	1768	} else
1668		- if (event.getSource() == templateItem)
	1769	+ if (source == templateItem)
1669	1770	{
1670	1771	group(new cTemplate());
1671	1772	} else
1672		- if (event.getSource() == attributeItem)
	1773	+ if (source == attributeItem)
1673	1774	{
1674	1775	makeSomething(new Attribute());
1675	1776	} else
1676		- if (event.getSource() == pointflowItem)
	1777	+ if (source == pointflowItem)
1677	1778	{
1678	1779	makeSomething(new PointFlow());
1679	1780	} else
..	..	@@ -1685,7 +1786,7 @@
1685	1786	} else
1686	1787	*/
1687	1788
1688		- if (event.getSource() == superLoopItem)
	1789	+ if (source == superLoopItem)
1689	1790	{
1690	1791	Composite g = new cGroup();
1691	1792	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1808,7 @@
1707	1808
1708	1809	group(g);
1709	1810	} else
1710		- if (event.getSource() == loopItem)
	1811	+ if (source == loopItem)
1711	1812	{
1712	1813	Composite csg = new GroupLeaf();
1713	1814	csg.count = 5;
..	..	@@ -1716,7 +1817,7 @@
1716	1817	csg.addChild(child);
1717	1818	child.addChild(csg);
1718	1819	} else
1719		- if (event.getSource() == doubleItem)
	1820	+ if (source == doubleItem)
1720	1821	{
1721	1822	Composite csg = new GroupLeaf();
1722	1823	csg.count = 5;
..	..	@@ -1728,7 +1829,7 @@
1728	1829	csg.addChild(child);
1729	1830	child.addChild(csg);
1730	1831	} else
1731		- if (event.getSource() == tripleItem)
	1832	+ if (source == tripleItem)
1732	1833	{
1733	1834	Composite csg = new GroupLeaf();
1734	1835	csg.count = 4;
..	..	@@ -1744,70 +1845,75 @@
1744	1845	child.addChild(csg);
1745	1846	} else
1746	1847
1747		- if (event.getSource() == importGFDItem)
	1848	+ if (source == importGFDItem)
1748	1849	{
1749	1850	ImportGFD();
1750	1851	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1852	+ if (source == importVRMLX3DItem)
1752	1853	{
1753	1854	ImportVRMLX3D();
1754	1855	} else
1755		- if (event.getSource() == import3DSItem)
	1856	+ if (source == import3DSItem)
1756	1857	{
1757	1858	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1859	} else
1759		- if (event.getSource() == importOBJItem)
	1860	+ if (source == importOBJItem)
1760	1861	{
1761	1862	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762	1863	} else
1763		- if (event.getSource() == computeAOItem)
	1864	+ if (source == computeAOItem)
1764	1865	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1866	+ Globals.drawMode = CameraPane.OCCLUSION;
	1867	+ Globals.theRenderer.repaint();
1767	1868	} else
1768		- if (event.getSource() == recompileItem)
	1869	+ if (source == recompileItem)
1769	1870	{
1770	1871	Recompile();
1771	1872	refreshContents();
1772	1873	} else
1773		- if (event.getSource() == editScriptItem)
	1874	+ if (source == editScriptItem)
1774	1875	{
1775	1876	OpenDialog();
1776	1877	refreshContents();
1777	1878	} else
1778		- if (event.getSource() == invariantsItem)
	1879	+ if (source == invariantsItem)
1779	1880	{
1780	1881	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1882	+ GrafreeD.grafreeD.universe.invariants();
1782	1883	} else
1783		- if (event.getSource() == memoryItem)
	1884	+ if (source == memoryItem)
1784	1885	{
1785	1886	//System.out.println("Invariants:");
1786	1887	PrintMemory();
1787	1888	} else
1788		- if (event.getSource() == pathItem)
	1889	+ if (source == pathItem)
1789	1890	{
1790	1891	PrintPath();
1791	1892	} else
1792		- if (event.getSource() == analyzeItem)
	1893	+ if (source == analyzeItem)
1793	1894	{
1794	1895	AnalyzeObject();
1795	1896	} else
1796		- if (event.getSource() == dumpItem)
	1897	+ if (source == dumpItem)
1797	1898	{
1798	1899	DumpObject();
1799	1900	} else
1800		- if (event.getSource() == screenfitButton)
	1901	+ if (source == oneStepButton)
	1902	+ {
	1903	+ Globals.ONESTEP = true;
	1904	+ cameraView.repaint();
	1905	+ } else
	1906	+ if (source == screenfitButton)
1801	1907	{
1802	1908	//Reload(lastConverter, lastFilename, true);
1803	1909	ScreenFit();
1804	1910	} else
1805		- if (event.getSource() == screenfitpointButton)
	1911	+ if (source == screenfitpointButton)
1806	1912	{
1807	1913	//Reload(lastConverter, lastFilename, true);
1808	1914	ScreenFitPoint();
1809	1915	} else
1810		- if (event.getSource() == snapobjectButton)
	1916	+ if (source == snapobjectButton)
1811	1917	{
1812	1918	//Reload(lastConverter, lastFilename, true);
1813	1919	SnapObject();
..	..	@@ -1818,13 +1924,13 @@
1818	1924	// Recompile();
1819	1925	// refreshContents();
1820	1926	// } else
1821		- if (event.getSource() == gcButton)
	1927	+ if (source == gcButton)
1822	1928	{
1823	1929	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1930	System.gc();
1825	1931	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1932	} else
1827		- if (event.getSource() == editLeafItem)
	1933	+ if (source == editLeafItem)
1828	1934	{
1829	1935	Object3D obj;
1830	1936	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +1944,66 @@
1838	1944	}
1839	1945	refreshContents(true);
1840	1946	} else
1841		- if (event.getSource() == openWindowItem)
	1947	+ if (source == openWindowItem)
1842	1948	{
1843	1949	EditSelection(true);
1844	1950	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1951	+ if (source == cutItem \|\| source == clearButton)
1846	1952	{
1847	1953	loadClipboard(true);
1848	1954	} else
1849		- if (event.getSource() == duplicateItem)
	1955	+ if (source == duplicateItem)
1850	1956	{
1851	1957	Object3D keep = GrafreeD.clipboard;
1852	1958	loadClipboard(false);
1853	1959	paste(false);
1854	1960	GrafreeD.clipboard = keep;
1855	1961	} else
1856		- if (event.getSource() == cloneItem)
	1962	+ if (source == cloneItem)
1857	1963	{
1858	1964	CloneSelection(false);
1859	1965	} else
1860		- if (event.getSource() == cloneSupportItem)
	1966	+ if (source == cloneSupportItem)
1861	1967	{
1862	1968	CloneSelection(true);
1863	1969	} else
1864		- if (event.getSource() == copyItem)
	1970	+ if (source == copyItem)
1865	1971	{
1866	1972	loadClipboard(false);
1867	1973	} else
1868		- if (event.getSource() == pasteItem)
	1974	+ if (source == pasteItem)
1869	1975	{
1870	1976	paste(false);
1871	1977	} else
1872		- if (event.getSource() == pasteLinkItem)
	1978	+ if (source == pasteIntoItem)
1873	1979	{
1874		- pasteInto(false);
	1980	+ pasteInto(true, false);
1875	1981	} else
1876		- if (event.getSource() == pasteCloneItem)
	1982	+ if (source == pasteLinkItem)
1877	1983	{
1878		- pasteInto(true);
	1984	+ pasteInto(false, false);
1879	1985	} else
1880		- if (event.getSource() == pasteExpandItem)
	1986	+ if (source == pasteCloneItem)
	1987	+ {
	1988	+ pasteInto(true, true);
	1989	+ } else
	1990	+ if (source == pasteExpandItem)
1881	1991	{
1882	1992	paste(true);
1883	1993	} else
1884		- if (event.getSource() == synchronizeItem)
	1994	+ if (source == synchronizeItem)
1885	1995	{
1886	1996	Overwrite(Object3D.TRANSFORM);
1887	1997	} else
1888		- if (event.getSource() == overwriteNameItem)
	1998	+ if (source == overwriteNameItem)
1889	1999	{
1890	2000	Overwrite(Object3D.NAME);
1891	2001	} else
1892		- if (event.getSource() == overwriteUVItem)
	2002	+ if (source == overwriteUVItem)
1893	2003	{
1894	2004	Overwrite(Object3D.UV);
1895	2005	} else
1896		- if (event.getSource() == overwriteMatItem)
	2006	+ if (source == overwriteMatItem)
1897	2007	{
1898	2008	/* july 2015
1899	2009	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2023,7 @@
1913	2023
1914	2024	Overwrite(dropAttributes);
1915	2025	}
1916		- if (event.getSource() == overwriteGeoItem)
	2026	+ if (source == overwriteGeoItem)
1917	2027	{
1918	2028	Overwrite(Object3D.GEOMETRY);
1919	2029	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2040,7 @@
1930	2040	// refreshContents();
1931	2041	// }
1932	2042	} else
1933		- if (event.getSource() == generateMeshItem)
	2043	+ if (source == generateMeshItem)
1934	2044	{
1935	2045	//if (group.selection.size() == 1)
1936	2046	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2051,7 @@
1941	2051	ResetModel();
1942	2052	refreshContents();
1943	2053	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2054	+ if (source == extractGeometriesItem)
1945	2055	{
1946	2056	boolean one = false;
1947	2057
..	..	@@ -1968,7 +2078,7 @@
1968	2078	ResetModel();
1969	2079	refreshContents();
1970	2080	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2081	+ if (source == cloneGeometriesItem)
1972	2082	{
1973	2083	boolean one = false;
1974	2084
..	..	@@ -1994,32 +2104,37 @@
1994	2104	ResetModel();
1995	2105	refreshContents();
1996	2106	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2107	+ if (source == shareGeometriesItem)
1998	2108	{
1999	2109	boolean one = false;
2000	2110
2001	2111	if (group.selection.size() == 1)
2002	2112	one = true;
2003	2113
	2114	+ Object3D merge = null;
	2115	+
2004	2116	Object3D content = new cGroup();
2005	2117
2006	2118	for (int i=0; i<group.selection.size(); i++)
2007	2119	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2120	+ merge = new Merge(group.selection.get(i));
2009	2121
2010	2122	if (one)
2011		- makeSomething(sel, false);
	2123	+ makeSomething(merge, false);
2012	2124	else
2013		- content.addChild(sel);
	2125	+ content.addChild(merge);
2014	2126	}
2015	2127
2016	2128	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2129	+ makeSomething(content, true);
	2130	+ else
	2131	+ {
	2132	+ ResetModel();
	2133	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2134	+ refreshContents();
	2135	+ }
2021	2136	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2137	+ if (source == mergeGeometriesItem)
2023	2138	{
2024	2139	boolean one = false;
2025	2140
..	..	@@ -2049,7 +2164,7 @@
2049	2164	ResetModel();
2050	2165	refreshContents();
2051	2166	} else
2052		- if (event.getSource() == linkverticesItem)
	2167	+ if (source == linkverticesItem)
2053	2168	{
2054	2169	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2170	// {
..	..	@@ -2069,32 +2184,41 @@
2069	2184	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2185	content = ((cGroup)content).get(0);
2071	2186
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2187	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2188	for (int i=0; i<group.selection.size(); i++)
2074	2189	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2190	+ boolean random = CameraPane.SWITCH;
	2191	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2192	group.selection.get(i).linkVerticesThis(content);
2078	2193	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2194	+ CameraPane.SWITCH = random;
2080	2195	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2196	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2197	refreshContents();
2083	2198	}
2084	2199	} else
2085		- if (event.getSource() == resetsupportItem)
	2200	+ if (source == resetsupportItem)
2086	2201	{
2087	2202	for (int i=0; i<group.selection.size(); i++)
2088	2203	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2204	+ boolean random = CameraPane.SWITCH;
	2205	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2206	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2093	2208	}
2094	2209
2095	2210	refreshContents();
2096	2211	} else
2097		- if (event.getSource() == resetreferencesItem)
	2212	+ if (source == relinkverticesItem)
	2213	+ {
	2214	+ boolean random = CameraPane.SWITCH;
	2215	+ CameraPane.SWITCH = false; // parse all random nodes
	2216	+ group.selection.RelinkToSupport();
	2217	+ CameraPane.SWITCH = random;
	2218	+
	2219	+ refreshContents();
	2220	+ } else
	2221	+ if (source == resetreferencesItem)
2098	2222	{
2099	2223	for (int i=0; i<group.selection.size(); i++)
2100	2224	{
..	..	@@ -2103,7 +2227,7 @@
2103	2227
2104	2228	refreshContents();
2105	2229	} else
2106		- if (event.getSource() == setMasterItem)
	2230	+ if (source == setMasterItem)
2107	2231	{
2108	2232	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2109	2233	{
..	..	@@ -2116,7 +2240,7 @@
2116	2240	refreshContents();
2117	2241	}
2118	2242	} else
2119		- if (event.getSource() == poseMeshItem)
	2243	+ if (source == poseMeshItem)
2120	2244	{
2121	2245	if (group.selection.size() == 1)
2122	2246	{
..	..	@@ -2135,19 +2259,19 @@
2135	2259	}
2136	2260
2137	2261	} else
2138		- if (event.getSource() == revertMeshItem)
	2262	+ if (source == revertMeshItem)
2139	2263	{
2140	2264	RevertMeshes();
2141	2265	} else
2142		- if (event.getSource() == resetMeshItem)
	2266	+ if (source == resetMeshItem)
2143	2267	{
2144	2268	ResetAll();
2145	2269	} else
2146		- if (event.getSource() == stepAllItem)
	2270	+ if (source == stepAllItem)
2147	2271	{
2148	2272	StepAll();
2149	2273	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2274	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2275	{
2152	2276	//int indices[] = jList.getSelectedIndices();
2153	2277	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2279,46 @@
2155	2279
2156	2280	ClearSelection(false);
2157	2281	} else
2158		- if (event.getSource() == clearAllItem)
	2282	+ if (source == clearAllItem)
2159	2283	{
2160	2284	ClearSelection(true);
2161	2285	} else
2162		- if (event.getSource() == grabItem)
	2286	+ if (source == grabItem)
2163	2287	{
2164	2288	group(new cGroup(), true);
2165	2289	} else
2166		- if (event.getSource() == frontItem)
	2290	+ if (source == hideItem)
	2291	+ {
	2292	+ group(new HiddenObject());
	2293	+ } else
	2294	+ if (source == frontItem)
2167	2295	{
2168	2296	front();
2169	2297	} else
2170		- if (event.getSource() == backItem)
	2298	+ if (source == backItem)
2171	2299	{
2172	2300	back();
2173	2301	} else
2174		- if (event.getSource() == cameraItem)
	2302	+ if (source == cameraItem)
2175	2303	{
2176	2304	makeSomething(new Camera());
2177	2305	} else
2178		- if (event.getSource() == compositeItem)
	2306	+ if (source == compositeItem)
2179	2307	{
2180	2308	group(new Composite());
2181	2309	} else
2182		- if (event.getSource() == randomItem)
	2310	+ if (source == randomItem)
2183	2311	{
2184	2312	RandomNode random = new RandomNode();
2185	2313	group(random);
2186	2314	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2315	+ random.name = random.get(0).name + "Switch";
2188	2316	} else
2189		- if (event.getSource() == physicsItem)
	2317	+ if (source == physicsItem)
2190	2318	{
2191	2319	group(new PhysicsNode());
2192	2320	} else
2193		- if (event.getSource() == frameselectorItem)
	2321	+ if (source == frameselectorItem)
2194	2322	{
2195	2323	for (int i=0; i<group.selection.size(); i++)
2196	2324	{
..	..	@@ -2202,7 +2330,7 @@
2202	2330	ResetModel();
2203	2331	refreshContents();
2204	2332	} else
2205		- if (event.getSource() == switchGeoItem)
	2333	+ if (source == switchGeoItem)
2206	2334	{
2207	2335	for (int i=0; i<group.selection.size(); i++)
2208	2336	{
..	..	@@ -2214,7 +2342,7 @@
2214	2342	ResetModel();
2215	2343	refreshContents();
2216	2344	} else
2217		- if (event.getSource() == switchTransfoItem)
	2345	+ if (source == switchTransfoItem)
2218	2346	{
2219	2347	for (int i=0; i<group.selection.size(); i++)
2220	2348	{
..	..	@@ -2226,7 +2354,7 @@
2226	2354	ResetModel();
2227	2355	refreshContents();
2228	2356	} else
2229		- if (event.getSource() == morphItem)
	2357	+ if (source == morphItem)
2230	2358	{
2231	2359	for (int i=0; i<group.selection.size(); i++)
2232	2360	{
..	..	@@ -2238,7 +2366,7 @@
2238	2366	ResetModel();
2239	2367	refreshContents();
2240	2368	} else
2241		- if (event.getSource() == scriptNodeItem)
	2369	+ if (source == scriptNodeItem)
2242	2370	{
2243	2371	boolean atleastone = false;
2244	2372
..	..	@@ -2277,195 +2405,215 @@
2277	2405	}
2278	2406	}
2279	2407	} else
2280		- if (event.getSource() == linkerItem)
	2408	+ if (source == linkerItem)
2281	2409	{
2282	2410	group(new cLinker());
2283	2411	} else
2284		- if (event.getSource() == textureItem)
	2412	+ if (source == textureItem)
2285	2413	{
2286	2414	group(new TextureNode());
2287	2415	} else
2288		- if (event.getSource() == shadowXItem)
	2416	+ if (source == billboardItem)
	2417	+ {
	2418	+ group(new BillboardNode());
	2419	+ } else
	2420	+ if (source == shadowXItem)
2289	2421	{
2290	2422	CastShadow(0);
2291	2423	} else
2292		- if (event.getSource() == shadowYItem)
	2424	+ if (source == shadowYItem)
2293	2425	{
2294	2426	CastShadow(1);
2295	2427	} else
2296		- if (event.getSource() == shadowZItem)
	2428	+ if (source == shadowZItem)
2297	2429	{
2298	2430	CastShadow(2);
2299	2431	} else
2300		- if (event.getSource() == ungroupItem)
	2432	+ if (source == ungroupItem)
2301	2433	{
2302		- ungroup();
	2434	+ //ungroup();
	2435	+ for (int i=0; i<group.selection.size(); i++)
	2436	+ {
	2437	+ Ungroup(group.selection.get(i));
	2438	+ }
	2439	+
	2440	+ ClearSelection(false);
	2441	+
	2442	+ refreshContents();
2303	2443	} else
2304		- if (event.getSource() == genUVItem)
	2444	+ if (source == genUVItem)
2305	2445	{
2306	2446	GenUV();
2307	2447	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2448	+ if (source == genNormalsCADItem)
2309	2449	{
2310	2450	GenNormals(true);
2311	2451	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2452	+ if (source == genNormalsMESHItem)
	2453	+ {
	2454	+ GenNormals(true); // TODO
	2455	+ } else
	2456	+ if (source == genNormalsORGANItem)
2313	2457	{
2314	2458	GenNormals(false);
2315	2459	} else
2316		- if (event.getSource() == stripifyItem)
	2460	+ if (source == genNormalsMINEItem)
	2461	+ {
	2462	+ GenNormalsMINE();
	2463	+ } else
	2464	+ if (source == stripifyItem)
2317	2465	{
2318	2466	Stripify();
2319	2467	} else
2320		- if (event.getSource() == unstripifyItem)
	2468	+ if (source == unstripifyItem)
2321	2469	{
2322	2470	Unstripify();
2323	2471	} else
2324		- if (event.getSource() == trimItem)
	2472	+ if (source == trimItem)
2325	2473	{
2326	2474	Trim();
2327	2475	} else
2328		- if (event.getSource() == untrimItem)
	2476	+ if (source == untrimItem)
2329	2477	{
2330	2478	Untrim();
2331	2479	} else
2332		- if (event.getSource() == clearColorsItem)
	2480	+ if (source == clearColorsItem)
2333	2481	{
2334	2482	ClearColors();
2335	2483	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2484	+ if (source == clearMaterialsItem)
2337	2485	{
2338	2486	ClearMaterials();
2339	2487	} else
2340		- if (event.getSource() == liveleavesItem)
	2488	+ if (source == liveleavesItem)
2341	2489	{
2342	2490	LiveLeaves(true);
2343	2491	} else
2344		- if (event.getSource() == unliveleavesItem)
	2492	+ if (source == unliveleavesItem)
2345	2493	{
2346	2494	LiveLeaves(false);
2347	2495	} else
2348		- if (event.getSource() == supportleavesItem)
	2496	+ if (source == supportleavesItem)
2349	2497	{
2350	2498	SupportLeaves(true);
2351	2499	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2500	+ if (source == unsupportleavesItem)
2353	2501	{
2354	2502	SupportLeaves(false);
2355	2503	} else
2356		- if (event.getSource() == hideleavesItem)
	2504	+ if (source == hideleavesItem)
2357	2505	{
2358	2506	HideLeaves(true);
2359	2507	} else
2360		- if (event.getSource() == showleavesItem)
	2508	+ if (source == showleavesItem)
2361	2509	{
2362	2510	HideLeaves(false);
2363	2511	} else
2364		- if (event.getSource() == markleavesItem)
	2512	+ if (source == markleavesItem)
2365	2513	{
2366	2514	MarkLeaves(true);
2367	2515	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2516	+ if (source == unmarkleavesItem)
2369	2517	{
2370	2518	MarkLeaves(false);
2371	2519	} else
2372		- if (event.getSource() == flipVItem)
	2520	+ if (source == flipVItem)
2373	2521	{
2374	2522	FlipV(true);
2375	2523	} else
2376		- if (event.getSource() == unflipVItem)
	2524	+ if (source == unflipVItem)
2377	2525	{
2378	2526	FlipV(false);
2379	2527	} else
2380		- if (event.getSource() == lowTexturesItem)
	2528	+ if (source == lowTexturesItem)
2381	2529	{
2382	2530	SetTexRes(0);
2383	2531	} else
2384		- if (event.getSource() == normalTexturesItem)
	2532	+ if (source == normalTexturesItem)
2385	2533	{
2386	2534	SetTexRes(1);
2387	2535	} else
2388		- if (event.getSource() == highTexturesItem)
	2536	+ if (source == highTexturesItem)
2389	2537	{
2390	2538	SetTexRes(2);
2391	2539	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2540	+ if (source == veryhighTexturesItem)
2393	2541	{
2394	2542	SetTexRes(3);
2395	2543	} else
2396		- if (event.getSource() == maxTexturesItem)
	2544	+ if (source == maxTexturesItem)
2397	2545	{
2398	2546	SetTexRes(4);
2399	2547	} else
2400		- if (event.getSource() == panoTexturesItem)
	2548	+ if (source == panoTexturesItem)
2401	2549	{
2402	2550	SetTexRes(5);
2403	2551	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2552	+ if (source == reverseNormalsItem)
2405	2553	{
2406	2554	ReverseNormals();
2407	2555	} else
2408		- if (event.getSource() == parseverticesItem)
	2556	+ if (source == parseverticesItem)
2409	2557	{
2410	2558	ParseVertices();
2411	2559	} else
2412		- if (event.getSource() == textureFieldItem)
	2560	+ if (source == textureFieldItem)
2413	2561	{
2414	2562	TextureVertices();
2415	2563	} else
2416		- if (event.getSource() == alignItem)
	2564	+ if (source == alignItem)
2417	2565	{
2418	2566	Align();
2419	2567	} else
2420		- if (event.getSource() == mirrorItem)
	2568	+ if (source == mirrorItem)
2421	2569	{
2422	2570	MirrorPoses();
2423	2571	} else
2424		- if (event.getSource() == reduceMorphItem)
	2572	+ if (source == reduceMorphItem)
2425	2573	{
2426	2574	MeshReduction(false);
2427	2575	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2576	+ if (source == reduce34MorphItem)
2429	2577	{
2430	2578	MeshReduction(true);
2431	2579	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2580	+ if (source == reverseTrianglesItem)
2433	2581	{
2434	2582	ReverseTriangles();
2435	2583	} else
2436		- if (event.getSource() == reduceMeshItem)
	2584	+ if (source == reduceMeshItem)
2437	2585	{
2438	2586	ReduceMesh(false);
2439	2587	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2588	+ if (source == reduce34MeshItem)
2441	2589	{
2442	2590	ReduceMesh(true);
2443	2591	} else
2444		- if (event.getSource() == increaseMeshItem)
	2592	+ if (source == increaseMeshItem)
2445	2593	{
2446	2594	IncreaseMesh();
2447	2595	} else
2448		- if (event.getSource() == clipMeshItem)
	2596	+ if (source == clipMeshItem)
2449	2597	{
2450	2598	ClipMesh();
2451	2599	} else
2452		- if (event.getSource() == smoothMeshItem)
	2600	+ if (source == smoothMeshItem)
2453	2601	{
2454	2602	SmoothMesh();
2455	2603	} else
2456		- if (event.getSource() == transformgeometryItem)
	2604	+ if (source == transformgeometryItem)
2457	2605	{
2458	2606	TransformGeometry();
2459	2607	} else
2460		- if (event.getSource() == resetTransformItem)
	2608	+ if (source == resetTransformItem)
2461	2609	{
2462	2610	ResetTransform();
2463	2611	} else
2464		- if (event.getSource() == resetCentroidItem)
	2612	+ if (source == resetCentroidItem)
2465	2613	{
2466	2614	ResetCentroid();
2467	2615	} else
2468		- if (event.getSource() == resetParentItem)
	2616	+ if (source == resetParentItem)
2469	2617	{
2470	2618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2619	{
..	..	@@ -2475,7 +2623,7 @@
2475	2623
2476	2624	refreshContents();
2477	2625	} else
2478		- if (event.getSource() == repairParentItem)
	2626	+ if (source == repairParentItem)
2479	2627	{
2480	2628	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2629	{
..	..	@@ -2489,7 +2637,21 @@
2489	2637
2490	2638	refreshContents();
2491	2639	} else
2492		- if (event.getSource() == sortbysizeItem)
	2640	+ if (source == repairShadowItem)
	2641	+ {
	2642	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2643	+ {
	2644	+ Object3D obj = (Object3D)e.nextElement();
	2645	+ obj.RepairShadow();
	2646	+// for (int i=0; i<obj.size(); i++)
	2647	+// {
	2648	+// obj.get(i).parent = obj;
	2649	+// }
	2650	+ }
	2651	+
	2652	+ refreshContents();
	2653	+ } else
	2654	+ if (source == sortbysizeItem)
2493	2655	{
2494	2656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2657	{
..	..	@@ -2501,7 +2663,7 @@
2501	2663	ResetModel();
2502	2664	refreshContents();
2503	2665	} else
2504		- if (event.getSource() == sortbynameItem)
	2666	+ if (source == sortbynameItem)
2505	2667	{
2506	2668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2669	{
..	..	@@ -2513,7 +2675,7 @@
2513	2675	ResetModel();
2514	2676	refreshContents();
2515	2677	} else
2516		- if (event.getSource() == attachPigmentItem)
	2678	+ if (source == attachPigmentItem)
2517	2679	{
2518	2680	String texture = GetFile("Attach pigment");
2519	2681	Object3D obj;
..	..	@@ -2525,7 +2687,7 @@
2525	2687
2526	2688	refreshContents();
2527	2689	} else
2528		- if (event.getSource() == detachPigmentItem)
	2690	+ if (source == detachPigmentItem)
2529	2691	{
2530	2692	Object3D obj;
2531	2693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2698,7 @@
2536	2698
2537	2699	refreshContents();
2538	2700	} else
2539		- if (event.getSource() == attachBumpItem)
	2701	+ if (source == attachBumpItem)
2540	2702	{
2541	2703	String texture = GetFile("Attach bump");
2542	2704	Object3D obj;
..	..	@@ -2548,7 +2710,7 @@
2548	2710
2549	2711	refreshContents();
2550	2712	} else
2551		- if (event.getSource() == detachBumpItem)
	2713	+ if (source == detachBumpItem)
2552	2714	{
2553	2715	Object3D obj;
2554	2716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2721,7 @@
2559	2721
2560	2722	refreshContents();
2561	2723	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2724	+ if (source == pigmentBumpItem)
2563	2725	{
2564	2726	Object3D obj;
2565	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2732,195 @@
2570	2732
2571	2733	refreshContents();
2572	2734	} else
2573		- if (event.getSource() == flashSelectionButton)
	2735	+ if (source == flashSelectionButton)
2574	2736	{
2575	2737	CameraPane.flash = true;
2576	2738	refreshContents();
2577	2739	} else
2578		- if (event.getSource() == oneButton)
	2740	+ if (source == oneButton)
2579	2741	{
2580	2742	} else
2581		- if (event.getSource() == twoButton)
	2743	+ if (source == twoButton)
2582	2744	{
2583	2745	radio.layout = twoButton;
2584	2746	// bug
2585	2747	//gridPanel.setDividerLocation(1.0);
2586	2748	//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();
	2749	+// bigThree.remove(scenePanel);
	2750	+// bigThree.remove(centralPanel);
	2751	+// bigThree.remove(XYZPanel);
	2752	+// aWindowConstraints.gridx = 0;
	2753	+// aWindowConstraints.gridy = 0;
	2754	+// aWindowConstraints.gridwidth = 1;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2757	+// aWindowConstraints.weightx = 0;
	2758	+// aWindowConstraints.weighty = 1;
	2759	+// //bigThree.add(jtp, aWindowConstraints);
	2760	+// aWindowConstraints.weightx = 1;
	2761	+// aWindowConstraints.gridwidth = 3;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.gridx = 1;
	2764	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2765	+// bigThree.add(centralPanel, aWindowConstraints);
	2766	+// aWindowConstraints.weightx = 0;
	2767	+// aWindowConstraints.gridx = 4;
	2768	+// aWindowConstraints.gridwidth = 1;
	2769	+// // aConstraints.gridheight = 3;
	2770	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2771	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2772	+// scenePanel.setVisible(false);
	2773	+// centralPanel.setVisible(true);
	2774	+// XYZPanel.setVisible(false);
	2775	+ bigThree.ClearUI();
	2776	+ bigThree.add(centralPanel);
	2777	+ bigThree.FlushUI();
2611	2778	} else
2612		- if (event.getSource() == threeButton)
	2779	+ if (source == threeButton)
2613	2780	{
2614	2781	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();
	2782	+
	2783	+// bigThree.remove(scenePanel);
	2784	+// bigThree.remove(centralPanel);
	2785	+// bigThree.remove(XYZPanel);
	2786	+// aWindowConstraints.gridx = 0;
	2787	+// aWindowConstraints.gridy = 0;
	2788	+// aWindowConstraints.gridwidth = 1;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2791	+// aWindowConstraints.weightx = 0;
	2792	+// aWindowConstraints.weighty = 1;
	2793	+// //bigThree.add(jtp, aWindowConstraints);
	2794	+// aWindowConstraints.weightx = 1;
	2795	+// aWindowConstraints.gridwidth = 3;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.gridx = 1;
	2798	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2799	+// bigThree.add(centralPanel, aWindowConstraints);
	2800	+// aWindowConstraints.weightx = 0;
	2801	+// aWindowConstraints.gridx = 4;
	2802	+// aWindowConstraints.gridwidth = 1;
	2803	+// // aConstraints.gridheight = 3;
	2804	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2805	+// bigThree.add(XYZPanel, aWindowConstraints);
	2806	+// bigThree.validate();
	2807	+// scenePanel.setVisible(false);
	2808	+// centralPanel.setVisible(true);
	2809	+// XYZPanel.setVisible(true);
	2810	+ bigThree.ClearUI();
	2811	+ bigThree.add(centralPanel);
	2812	+ bigThree.add(XYZPanel);
	2813	+ bigThree.FlushUI();
2639	2814	} else
2640		- if (event.getSource() == fourButton)
	2815	+ if (source == fourButton)
2641	2816	{
2642	2817	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();
	2818	+
	2819	+// bigThree.remove(scenePanel);
	2820	+// bigThree.remove(centralPanel);
	2821	+// bigThree.remove(XYZPanel);
	2822	+// aWindowConstraints.gridx = 0;
	2823	+// aWindowConstraints.gridy = 0;
	2824	+// aWindowConstraints.gridwidth = 1;
	2825	+// // aWindowConstraints.gridheight = 3;
	2826	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2827	+// aWindowConstraints.weightx = 1;
	2828	+// aWindowConstraints.weighty = 1;
	2829	+// bigThree.add(scenePanel, aWindowConstraints);
	2830	+// aWindowConstraints.weightx = 1;
	2831	+// aWindowConstraints.gridwidth = 3;
	2832	+// // aConstraints.gridheight = 3;
	2833	+// aWindowConstraints.gridx = 1;
	2834	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2835	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2836	+// aWindowConstraints.weightx = 0;
	2837	+// aWindowConstraints.gridx = 4;
	2838	+// aWindowConstraints.gridwidth = 1;
	2839	+// // aWindowConstraints.gridheight = 3;
	2840	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2841	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2842	+// bigThree.validate();
	2843	+// scenePanel.setVisible(true);
	2844	+// centralPanel.setVisible(false);
	2845	+// XYZPanel.setVisible(false);
	2846	+ bigThree.ClearUI();
	2847	+ bigThree.add(scenePanel);
	2848	+ bigThree.FlushUI();
2667	2849	} else
2668		- if (event.getSource() == sixButton)
	2850	+ if (source == sixButton)
2669	2851	{
2670	2852	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();
	2853	+
	2854	+// bigThree.remove(scenePanel);
	2855	+// bigThree.remove(centralPanel);
	2856	+// bigThree.remove(XYZPanel);
	2857	+// aWindowConstraints.gridx = 0;
	2858	+// aWindowConstraints.gridy = 0;
	2859	+// aWindowConstraints.gridwidth = 1;
	2860	+// // aConstraints.gridheight = 3;
	2861	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2862	+// aWindowConstraints.weightx = 0;
	2863	+// aWindowConstraints.weighty = 1;
	2864	+// bigThree.add(scenePanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 1;
	2866	+// aWindowConstraints.gridwidth = 3;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.gridx = 1;
	2869	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2870	+// bigThree.add(centralPanel, aWindowConstraints);
	2871	+// aWindowConstraints.weightx = 0;
	2872	+// aWindowConstraints.gridx = 4;
	2873	+// aWindowConstraints.gridwidth = 1;
	2874	+// // aWindowConstraints.gridheight = 3;
	2875	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2876	+// //bigThree.add(XYZPanel, aConstraints);
	2877	+// bigThree.validate();
	2878	+// scenePanel.setVisible(true);
	2879	+// centralPanel.setVisible(true);
	2880	+// XYZPanel.setVisible(false);
	2881	+ bigThree.ClearUI();
	2882	+ bigThree.add(scenePanel);
	2883	+ bigThree.add(centralPanel);
	2884	+ bigThree.FlushUI();
2695	2885	} else
2696		- if (event.getSource() == sevenButton)
	2886	+ if (source == sevenButton)
2697	2887	{
2698	2888	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();
	2889	+
	2890	+// bigThree.remove(scenePanel);
	2891	+// bigThree.remove(centralPanel);
	2892	+// bigThree.remove(XYZPanel);
	2893	+// aWindowConstraints.gridx = 0;
	2894	+// aWindowConstraints.gridy = 0;
	2895	+// aWindowConstraints.gridwidth = 1;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2898	+// aWindowConstraints.weightx = 0;
	2899	+// aWindowConstraints.weighty = 1;
	2900	+// bigThree.add(scenePanel, aWindowConstraints);
	2901	+// aWindowConstraints.weightx = 1;
	2902	+// aWindowConstraints.gridwidth = 3;
	2903	+// // aWindowConstraints.gridheight = 3;
	2904	+// aWindowConstraints.gridx = 1;
	2905	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2906	+// bigThree.add(centralPanel, aWindowConstraints);
	2907	+// aWindowConstraints.weightx = 0;
	2908	+// aWindowConstraints.gridx = 4;
	2909	+// aWindowConstraints.gridwidth = 1;
	2910	+// // aConstraints.gridheight = 3;
	2911	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2912	+// bigThree.add(XYZPanel, aWindowConstraints);
	2913	+// bigThree.validate();
	2914	+// scenePanel.setVisible(true);
	2915	+// centralPanel.setVisible(true);
	2916	+// XYZPanel.setVisible(true);
	2917	+ bigThree.ClearUI();
	2918	+ bigThree.add(scenePanel);
	2919	+ bigThree.add(centralPanel);
	2920	+ bigThree.add(XYZPanel);
	2921	+ bigThree.FlushUI();
2723	2922	} else
2724		- if (event.getSource() == rootButton)
	2923	+ if (source == rootButton)
2725	2924	{
2726	2925	Object3D obj;
2727	2926	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +2932,7 @@
2733	2932
2734	2933	refreshContents(true);
2735	2934	} else
2736		- if (event.getSource() == closeButton)
	2935	+ if (source == closeButton)
2737	2936	{
2738	2937	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	2938	cRadio ab;
..	..	@@ -2754,11 +2953,11 @@
2754	2953	}
2755	2954	refreshContents(true);
2756	2955	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2956	+ if (source == editItem \|\| source == editButton)
2758	2957	{
2759	2958	EditSelection(false);
2760	2959	} else
2761		- if (event.getSource() == uneditButton)
	2960	+ if (source == uneditButton)
2762	2961	{
2763	2962	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	2963	{
..	..	@@ -2770,12 +2969,12 @@
2770	2969
2771	2970	child.editWindow = null; // ???????????
2772	2971	}
2773		- objEditor.ctrlPanel.revalidate();
	2972	+ objEditor.ctrlPanel.FlushUI();
2774	2973	//objEditor.jTree.clearSelection();
2775	2974	//objEditor.ResetSliders();
2776	2975	refreshContents(true);
2777	2976	} else
2778		- if (event.getSource() == clearPanelButton)
	2977	+ if (source == clearPanelButton)
2779	2978	{
2780	2979	assert(copy == group);
2781	2980	//copy.ClearUI();
..	..	@@ -2786,7 +2985,7 @@
2786	2985	listUI.clear();
2787	2986	refreshContents(true);
2788	2987	} else
2789		- if (event.getSource() == allParamsButton)
	2988	+ if (source == allParamsButton)
2790	2989	{
2791	2990	assert(copy == group);
2792	2991
..	..	@@ -2807,19 +3006,19 @@
2807	3006
2808	3007	refreshContents(true);
2809	3008	} else
2810		- if (event.getSource() == unselectButton)
	3009	+ if (source == unselectButton)
2811	3010	{
2812	3011	objEditor.jTree.clearSelection();
2813	3012	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3013	objEditor.ResetSliders();
2815	3014	refreshContents(true);
2816	3015	} else
2817		- if(event.getSource() instanceof cRadio)
	3016	+ if(source instanceof cRadio)
2818	3017	{
2819	3018	group.parent = keepparent;
2820	3019	group.attributes = 0;
2821	3020	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3021	+ /cRadio/ radio = (cRadio)source;
2823	3022	Object3D obj = radio.GetObject();
2824	3023	System.out.println("Edit " + obj);
2825	3024	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3038,7 @@
2839	3038	}
2840	3039
2841	3040	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3041	+ //Globals.theRenderer.object = group;
2843	3042	if(!useclient)
2844	3043	{
2845	3044	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,7 +3047,8 @@
2848	3047	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3048	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3049	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3050	+ //cameraView.lighttouched = true;
	3051	+ Globals.lighttouched = true;
2852	3052	topView.object = group;
2853	3053	frontView.object = group;
2854	3054	sideView.object = group;
..	..	@@ -2884,7 +3084,7 @@
2884	3084	if (useclient)
2885	3085	{
2886	3086	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3087	+ Globals.lighttouched = true;
2888	3088	//topView.object = client;
2889	3089	//frontView.object = client;
2890	3090	//sideView.object = client;
..	..	@@ -2892,7 +3092,7 @@
2892	3092	else
2893	3093	{
2894	3094	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3095	+ Globals.lighttouched = true;
2896	3096	//topView.object = group;
2897	3097	//frontView.object = group;
2898	3098	//sideView.object = group;
..	..	@@ -3173,6 +3373,13 @@
3173	3373	refreshContents();
3174	3374	}
3175	3375
	3376	+ void GenNormalsMINE()
	3377	+ {
	3378	+ group.selection.GenNormalsMINE();
	3379	+
	3380	+ refreshContents();
	3381	+ }
	3382	+
3176	3383	void Stripify()
3177	3384	{
3178	3385	group.StripifyS();
..	..	@@ -3393,7 +3600,7 @@
3393	3600	String pigment = Object3D.GetPigment(tex);
3394	3601	//String bump = Object3D.GetBump(tex);
3395	3602
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3603	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3397	3604
3398	3605	double s = v.s;
3399	3606
..	..	@@ -3441,12 +3648,26 @@
3441	3648
3442	3649	void Align()
3443	3650	{
	3651	+ if (group.selection.size() == 0)
	3652	+ return;
	3653	+
	3654	+ cVector bbmin = new cVector();
	3655	+ cVector bbmax = new cVector();
	3656	+
	3657	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3658	+
	3659	+ double dx = bbmax.x - bbmin.x;
	3660	+ double dy = bbmax.y - bbmin.y;
	3661	+ double dz = bbmax.z - bbmin.z;
	3662	+
	3663	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3664	+
3444	3665	for (int i=0; i<group.selection.size(); i++)
3445	3666	{
3446	3667	Object3D obj = group.selection.get(i);
3447	3668
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3669	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3670	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3671	}
3451	3672
3452	3673	refreshContents();
..	..	@@ -3467,11 +3688,11 @@
3467	3688
3468	3689	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	3690
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	3691	+ boolean random = CameraPane.SWITCH;
	3692	+ CameraPane.SWITCH = false; // parse all random nodes
3472	3693	lowres.linkVerticesThis(null);
3473	3694	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	3695	+ CameraPane.SWITCH = random;
3475	3696
3476	3697	System.err.flush();
3477	3698
..	..	@@ -3680,7 +3901,7 @@
3680	3901	group.selection.RelinkToSupport(); // july 2014
3681	3902	System.out.println("DONE.");
3682	3903	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3904	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	3905	}
3685	3906
3686	3907	void ReduceMesh(boolean reduction34)
..	..	@@ -3956,25 +4177,25 @@
3956	4177	System.err.println("info : " + child.GetPath());
3957	4178	}
3958	4179	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4180	+// else
	4181	+// {
	4182	+// objEditor.SetMaterial(group); // .GetMaterial());
	4183	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4184	+// System.err.println("info : " + group.GetPath());
	4185	+// }
3965	4186
3966	4187	objEditor.SetText(); // jan 2014
3967	4188
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4189	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3969	4190	CameraPane.flash = true;
3970	4191
3971	4192	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3972	4193	// a camera
3973	4194	{
3974	4195	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;
	4196	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4197	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4198	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4199	}
3979	4200
3980	4201	refreshContents();
..	..	@@ -4229,7 +4450,7 @@
4229	4450	refreshContents();
4230	4451	}
4231	4452
4232		- void pasteInto(boolean copyit)
	4453	+ void pasteInto(boolean copyit, boolean clone)
4233	4454	{
4234	4455	// if (GrafreeD.clipboard == null)
4235	4456	// return;
..	..	@@ -4258,7 +4479,14 @@
4258	4479	if (copyit)
4259	4480	{
4260	4481	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4482	+ if (clone)
	4483	+ {
	4484	+ CloneClipboard(false); // sept 2014
	4485	+ }
	4486	+ else
	4487	+ {
	4488	+ paste(false);
	4489	+ }
4262	4490	}
4263	4491	else
4264	4492	{
..	..	@@ -4468,6 +4696,26 @@
4468	4696	makeSomething(csg);
4469	4697	}
4470	4698
	4699	+ void Ungroup(Object3D g)
	4700	+ {
	4701	+ if (g instanceof HiddenObject)
	4702	+ {
	4703	+ HiddenObject h = (HiddenObject) g;
	4704	+
	4705	+ for (int i=0; i<h.ActualSize(); i++)
	4706	+ {
	4707	+ objEditor.makeSomething(h.get(i), false);
	4708	+ }
	4709	+ }
	4710	+ else
	4711	+ {
	4712	+ for (int i=0; i<g.Size(); i++)
	4713	+ {
	4714	+ objEditor.makeSomething(g.get(i), false);
	4715	+ }
	4716	+ }
	4717	+ }
	4718	+
4471	4719	void ungroup()
4472	4720	{
4473	4721	/*
..	..	@@ -4782,10 +5030,12 @@
4782	5030	cButton flashSelectionButton;
4783	5031	cButton editButton;
4784	5032	cButton uneditButton;
	5033	+ JCheckBox allParamsButton;
4785	5034	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5035	cButton unselectButton;
4788	5036
	5037	+ cButton oneStepButton;
	5038	+
4789	5039	cButton screenfitButton;
4790	5040	cButton screenfitpointButton;
4791	5041	cButton snapobjectButton;
..	..	@@ -4827,6 +5077,7 @@
4827	5077	private MenuItem resetsupportItem;
4828	5078	private MenuItem resetreferencesItem;
4829	5079	private MenuItem linkverticesItem;
	5080	+ private MenuItem relinkverticesItem;
4830	5081	private MenuItem setMasterItem;
4831	5082	private MenuItem resetMeshItem;
4832	5083	private MenuItem stepAllItem;
..	..	@@ -4839,14 +5090,17 @@
4839	5090	private MenuItem mergeGeometriesItem;
4840	5091	private MenuItem copyItem;
4841	5092	private MenuItem pasteItem;
	5093	+ private MenuItem pasteIntoItem;
4842	5094	private MenuItem pasteLinkItem;
4843	5095	private MenuItem pasteCloneItem;
4844	5096	private MenuItem pasteExpandItem;
4845	5097	private MenuItem clearItem;
4846	5098	private MenuItem clearAllItem;
4847	5099	private MenuItem genUVItem;
	5100	+ private MenuItem genNormalsMESHItem;
4848	5101	private MenuItem genNormalsCADItem;
4849	5102	private MenuItem genNormalsORGANItem;
	5103	+ private MenuItem genNormalsMINEItem;
4850	5104	private MenuItem stripifyItem;
4851	5105	private MenuItem unstripifyItem;
4852	5106	private MenuItem trimItem;
..	..	@@ -4888,6 +5142,7 @@
4888	5142	private MenuItem resetCentroidItem;
4889	5143	private MenuItem transformgeometryItem;
4890	5144	private MenuItem resetTransformItem;
	5145	+ private MenuItem hideItem;
4891	5146	private MenuItem grabItem;
4892	5147	private MenuItem backItem;
4893	5148	private MenuItem frontItem;
..	..	@@ -4908,6 +5163,7 @@
4908	5163
4909	5164	private MenuItem resetParentItem;
4910	5165	private MenuItem repairParentItem;
	5166	+ private MenuItem repairShadowItem;
4911	5167	private MenuItem sortbysizeItem;
4912	5168	private MenuItem sortbynameItem;
4913	5169
..	..	@@ -4928,10 +5184,11 @@
4928	5184	private MenuItem coneItem;
4929	5185	private MenuItem torusItem;
4930	5186	private MenuItem superItem;
	5187	+ private MenuItem kleinItem;
4931	5188	private MenuItem blobItem;
4932	5189	private MenuItem latheItem;
4933	5190	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5191	+ private MenuItem overlayItem;
4935	5192	private MenuItem meshItem;
4936	5193	// private MenuItem meshGroupItem;
4937	5194	private MenuItem springItem;
..	..	@@ -4940,6 +5197,7 @@
4940	5197	private MenuItem csgItem;
4941	5198	private MenuItem templateItem;
4942	5199	private MenuItem textureItem;
	5200	+ private MenuItem billboardItem;
4943	5201	private MenuItem shadowXItem;
4944	5202	private MenuItem shadowYItem;
4945	5203	private MenuItem shadowZItem;