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