~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,153 +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	523
524		- oe.toolbarPanel.add(new cButton(" ", false));
	524	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	525
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	527	+ twoButton.setToolTipText("Show center view only");
532	528	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534	530	fourButton.addActionListener(this);
535		- 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");
536	534	sixButton.addActionListener(this);
537		- 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");
538	537	threeButton.addActionListener(this);
539		- 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");
540	540	sevenButton.addActionListener(this);
541	541	//
542	542
543		- 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");
544	545	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- 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");
547	549	closeButton.addActionListener(this);
548	550	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	551	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	552
552		- oe.aConstraints.gridx = 1; //
553		- 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");
554	557	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	558
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	559	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ uneditButton.setToolTipText("Unedit selection");
560	561	uneditButton.addActionListener(this);
561	562
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- 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");
574	565	allParamsButton.addActionListener(this);
575	566
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- 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");
581	573	unselectButton.addActionListener(this);
582	574
	575	+ commandsPanel.preferredHeight = 1;
	576	+
	577	+ oe.treePanel.add(commandsPanel);
	578	+ oe.treePanel.Return();
	579	+
583	580	// oe.aConstraints.gridx += 1;
584	581	// oe.aConstraints.weighty = 0;
585	582	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +588,37 @@
591	588	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	589	// gcButton.addActionListener(this);
593	590
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	591	+ cGridBag jSPPanel = new cGridBag();
	592	+
	593	+ JScrollPane jSP;
605	594	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- 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);
607	596	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	597	+
	598	+ oe.treePanel.add(jSPPanel);
	599	+ oe.treePanel.Return();
612	600
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- 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");
617	605	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- 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");
620	609	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- 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");
623	613	textureCB.addItemListener(this);
624	614
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	615	+ copyOptionsPanel.preferredHeight = 1;
	616	+ oe.treePanel.add(copyOptionsPanel);
	617	+ oe.treePanel.Return();
627	618
	619	+// mainPanel.setDividerLocation(0.5); //1.0);
	620	+// mainPanel.setResizeWeight(0.5);
	621	+
628	622	//jList.addListSelectionListener(this);
629	623	oe.jTree.addTreeSelectionListener(this);
630	624	//jTree.setRootVisible(false);
..	..	@@ -646,6 +640,78 @@
646	640	radio.layout = sevenButton;
647	641	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	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	+ }
649	715
650	716	void EditObject(Object3D obj)
651	717	{
..	..	@@ -676,6 +742,7 @@
676	742	JCheckBox fastCB;
677	743	JCheckBox slowCB;
678	744	JCheckBox boxCB;
	745	+ JCheckBox zoomBoxCB;
679	746	JCheckBox trackCB;
680	747	JCheckBox smoothfocusCB;
681	748	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +822,10 @@
755	822	Recompile();
756	823	cameraView.repaint();
757	824	// refreshContents();
	825	+ }
	826	+ else if(e.getSource() == zoomBoxCB)
	827	+ {
	828	+ cameraView.ToggleZoomBoxMode();
758	829	}
759	830	else if(e.getSource() == smoothfocusCB)
760	831	{
..	..	@@ -869,7 +940,9 @@
869	940	// objEditor.DropFile((java.io.File[]) object, true);
870	941	// return;
871	942	// }
872		- if (string.charAt(0) == '/')
	943	+
	944	+ // File path for Mac and Windows
	945	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	946	{
874	947	// file(s)
875	948	String[] names = string.split("\n");
..	..	@@ -896,7 +969,7 @@
896	969
897	970	flashIt = false;
898	971	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	972	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	973	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	974
902	975	if (group.selection.size() == 1)
..	..	@@ -923,11 +996,11 @@
923	996	{
924	997	loadClipboard(true);
925	998	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	999	+ pasteInto(false, false);
927	1000	} else {
928	1001	loadClipboard(false);
929	1002	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1003	+ pasteInto(false, false); // true); // ???
931	1004	}
932	1005	}
933	1006	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1122,33 @@
1049	1122	kleinItem.addActionListener(this);
1050	1123	particleItem = menu.add(new MenuItem("Particle system"));
1051	1124	particleItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1052	1127	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1128	ragdollItem.addActionListener(this);
1054	1129	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1130	ragdoll2Item.addActionListener(this);
	1131	+ }
1056	1132	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1133	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1134	meshItem.addActionListener(this);
1059	1135	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1136	// meshGroupItem.addActionListener(this);
	1137	+ if (Globals.ADVANCED)
	1138	+ {
1061	1139	springItem = menu.add(new MenuItem("Spring"));
1062	1140	springItem.addActionListener(this);
1063	1141	flagItem = menu.add(new MenuItem("Flag"));
1064	1142	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1143	blobItem = menu.add(new MenuItem("Blob"));
1070	1144	blobItem.addActionListener(this);
1071	1145	latheItem = menu.add(new MenuItem("Lathe"));
1072	1146	latheItem.addActionListener(this);
	1147	+ }
	1148	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1149	+ bezierItem.addActionListener(this);
	1150	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1151	+ overlayItem.addActionListener(this);
1073	1152	lightItem = menu.add(new MenuItem("Light"));
1074	1153	lightItem.addActionListener(this);
1075	1154	menu.add("-");
..	..	@@ -1079,34 +1158,39 @@
1079	1158	loopItem.addActionListener(this);
1080	1159	doubleItem = menu.add(new MenuItem("Fork"));
1081	1160	doubleItem.addActionListener(this);
	1161	+ if (Globals.ADVANCED)
	1162	+ {
1082	1163	tripleItem = menu.add(new MenuItem("Trident"));
1083	1164	tripleItem.addActionListener(this);
	1165	+ }
1084	1166	}
1085	1167
1086	1168	void buildToolsMenu(Menu menu)
1087	1169	{
1088	1170	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1171	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1172	+ animationItem.setState(Globals.ANIMATION);
1091	1173
1092	1174	menu.add("-");
1093	1175	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1176	parseverticesItem.addActionListener(this);
1095	1177	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1178	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1179	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1180	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1181	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1182	reduceMorphItem.addActionListener(this);
1103	1183	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1184	reduce34MorphItem.addActionListener(this);
1105		-
	1185	+ menu.add("-");
1106	1186	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1187	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1188
	1189	+ if (Globals.ADVANCED)
	1190	+ {
	1191	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1192	+ mirrorItem.addActionListener(this);
	1193	+ menu.add("-");
1110	1194	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1195	memoryItem.addActionListener(this);
1112	1196	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1120,6 +1204,8 @@
1120	1204	resetParentItem.addActionListener(this);
1121	1205	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	1206	repairParentItem.addActionListener(this);
	1207	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1208	+ repairShadowItem.addActionListener(this);
1123	1209	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	1210	invariantsItem.addActionListener(this);
1125	1211	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1127,6 +1213,7 @@
1127	1213	menu.add("-");
1128	1214	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1129	1215	editScriptItem.addActionListener(this);
	1216	+ }
1130	1217	}
1131	1218
1132	1219	void ScreenFit()
..	..	@@ -1480,6 +1567,7 @@
1480	1567	//
1481	1568	public void actionPerformed(ActionEvent event) // , Object arg)
1482	1569	{
	1570	+ Object source = event.getSource();
1483	1571	/*
1484	1572	if (event.getSource() == nameField)
1485	1573	{
..	..	@@ -1491,11 +1579,11 @@
1491	1579	}
1492	1580	else
1493	1581	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1582	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	1583	{
1496	1584	ScreenFit();
1497	1585	} else
1498		- if (event.getSource() == switchItem)
	1586	+ if (source == switchItem)
1499	1587	{
1500	1588	cVector v1 = new cVector();
1501	1589	cVector v2 = new cVector();
..	..	@@ -1504,11 +1592,11 @@
1504	1592	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	1593	objEditor.cameraView.repaint();
1506	1594	} else
1507		- if (event.getSource() == rectoidItem)
	1595	+ if (source == rectoidItem)
1508	1596	{
1509	1597	makeSomething(new Box());
1510	1598	} else
1511		- if (event.getSource() == particleItem)
	1599	+ if (source == particleItem)
1512	1600	{
1513	1601	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	1602	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +1617,9 @@
1529	1617	applyExample(particleGeom, "SMOKE");
1530	1618	makeSomething(particleGeom);
1531	1619	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1620	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	1621	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1622	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	1623
1536	1624	ragdoll.toParent = LA.newMatrix();
1537	1625	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +1637,7 @@
1549	1637	} else
1550	1638	/*
1551	1639	*/
1552		- if (event.getSource() == heightFieldItem)
	1640	+ if (source == heightFieldItem)
1553	1641	{
1554	1642	Object3D obj = new Object3D();
1555	1643
..	..	@@ -1587,31 +1675,31 @@
1587	1675
1588	1676	makeSomething(obj);
1589	1677	} else
1590		- if (event.getSource() == gridItem)
	1678	+ if (source == gridItem)
1591	1679	{
1592	1680	makeSomething(new Grid());
1593	1681	} else
1594		- if (event.getSource() == ellipsoidItem)
	1682	+ if (source == ellipsoidItem)
1595	1683	{
1596	1684	makeSomething(new Sphere());
1597	1685	} else
1598		- if (event.getSource() == coneItem)
	1686	+ if (source == coneItem)
1599	1687	{
1600	1688	makeSomething(new Cone());
1601	1689	} else
1602		- if (event.getSource() == torusItem)
	1690	+ if (source == torusItem)
1603	1691	{
1604	1692	makeSomething(new Torus());
1605	1693	} else
1606		- if (event.getSource() == superItem)
	1694	+ if (source == superItem)
1607	1695	{
1608	1696	makeSomething(new Superellipsoid());
1609	1697	} else
1610		- if (event.getSource() == kleinItem)
	1698	+ if (source == kleinItem)
1611	1699	{
1612	1700	makeSomething(new Klein());
1613	1701	} else
1614		- if (event.getSource() == blobItem)
	1702	+ if (source == blobItem)
1615	1703	{
1616	1704	Blob blob = new Blob();
1617	1705	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +1707,15 @@
1619	1707	//blob.retile();
1620	1708	makeSomething(blob);
1621	1709	} else
1622		- if (event.getSource() == latheItem)
	1710	+ if (source == latheItem)
1623	1711	{
1624	1712	makeSomething(new Lathe());
1625	1713	} else
1626		- if (event.getSource() == bezierItem)
	1714	+ if (source == bezierItem)
1627	1715	{
1628	1716	makeSomething(new BezierSurface());
1629	1717	} else
1630		- if (event.getSource() == checkerItem)
	1718	+ if (source == overlayItem)
1631	1719	{
1632	1720	/*
1633	1721	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +1730,7 @@
1642	1730	*/
1643	1731	makeSomething(new Checker());
1644	1732	} else
1645		- if (event.getSource() == meshItem)
	1733	+ if (source == meshItem)
1646	1734	{
1647	1735	Object3D itemtomake = new Object3D();
1648	1736	Object3D child;
..	..	@@ -1663,35 +1751,35 @@
1663	1751	makeSomething(child);
1664	1752	}
1665	1753	} else
1666		- if (event.getSource() == springItem)
	1754	+ if (source == springItem)
1667	1755	{
1668	1756	cSpring s = new cSpring();
1669	1757	s.setup();
1670	1758	makeSomething(s);
1671	1759	} else
1672		- if (event.getSource() == flagItem)
	1760	+ if (source == flagItem)
1673	1761	{
1674	1762	cSpring s = new cFlag();
1675	1763	s.setup();
1676	1764	makeSomething(s);
1677	1765	} else
1678		- if (event.getSource() == lightItem)
	1766	+ if (source == lightItem)
1679	1767	{
1680	1768	makeSomething(new Light());
1681	1769	} else
1682		- if (event.getSource() == csgItem)
	1770	+ if (source == csgItem)
1683	1771	{
1684	1772	group(new CSG());
1685	1773	} else
1686		- if (event.getSource() == templateItem)
	1774	+ if (source == templateItem)
1687	1775	{
1688	1776	group(new cTemplate());
1689	1777	} else
1690		- if (event.getSource() == attributeItem)
	1778	+ if (source == attributeItem)
1691	1779	{
1692	1780	makeSomething(new Attribute());
1693	1781	} else
1694		- if (event.getSource() == pointflowItem)
	1782	+ if (source == pointflowItem)
1695	1783	{
1696	1784	makeSomething(new PointFlow());
1697	1785	} else
..	..	@@ -1703,7 +1791,7 @@
1703	1791	} else
1704	1792	*/
1705	1793
1706		- if (event.getSource() == superLoopItem)
	1794	+ if (source == superLoopItem)
1707	1795	{
1708	1796	Composite g = new cGroup();
1709	1797	for (int i=0; i<15; i++)
..	..	@@ -1725,7 +1813,7 @@
1725	1813
1726	1814	group(g);
1727	1815	} else
1728		- if (event.getSource() == loopItem)
	1816	+ if (source == loopItem)
1729	1817	{
1730	1818	Composite csg = new GroupLeaf();
1731	1819	csg.count = 5;
..	..	@@ -1734,7 +1822,7 @@
1734	1822	csg.addChild(child);
1735	1823	child.addChild(csg);
1736	1824	} else
1737		- if (event.getSource() == doubleItem)
	1825	+ if (source == doubleItem)
1738	1826	{
1739	1827	Composite csg = new GroupLeaf();
1740	1828	csg.count = 5;
..	..	@@ -1746,7 +1834,7 @@
1746	1834	csg.addChild(child);
1747	1835	child.addChild(csg);
1748	1836	} else
1749		- if (event.getSource() == tripleItem)
	1837	+ if (source == tripleItem)
1750	1838	{
1751	1839	Composite csg = new GroupLeaf();
1752	1840	csg.count = 4;
..	..	@@ -1762,70 +1850,83 @@
1762	1850	child.addChild(csg);
1763	1851	} else
1764	1852
1765		- if (event.getSource() == importGFDItem)
	1853	+ if (source == importGFDItem)
1766	1854	{
1767	1855	ImportGFD();
1768	1856	} else
1769		- if (event.getSource() == importVRMLX3DItem)
	1857	+ if (source == importVRMLX3DItem)
1770	1858	{
1771	1859	ImportVRMLX3D();
1772	1860	} else
1773		- if (event.getSource() == import3DSItem)
	1861	+ if (source == import3DSItem)
1774	1862	{
1775	1863	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776	1864	} else
1777		- if (event.getSource() == importOBJItem)
	1865	+ if (source == importOBJItem)
1778	1866	{
1779		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1867	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1868	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1869	+ browser.setVisible(true);
	1870	+ String filename = browser.getFile();
	1871	+ if (filename != null && filename.length() > 0)
	1872	+ {
	1873	+ String fullname = browser.getDirectory() + filename;
	1874	+ makeSomething(ReadOBJ(fullname), true);
	1875	+ }
1780	1876	} else
1781		- if (event.getSource() == computeAOItem)
	1877	+ if (source == computeAOItem)
1782	1878	{
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
	1879	+ Globals.drawMode = CameraPane.OCCLUSION;
	1880	+ Globals.theRenderer.repaint();
1785	1881	} else
1786		- if (event.getSource() == recompileItem)
	1882	+ if (source == recompileItem)
1787	1883	{
1788	1884	Recompile();
1789	1885	refreshContents();
1790	1886	} else
1791		- if (event.getSource() == editScriptItem)
	1887	+ if (source == editScriptItem)
1792	1888	{
1793	1889	OpenDialog();
1794	1890	refreshContents();
1795	1891	} else
1796		- if (event.getSource() == invariantsItem)
	1892	+ if (source == invariantsItem)
1797	1893	{
1798	1894	System.out.println("Invariants:");
1799	1895	GrafreeD.grafreeD.universe.invariants();
1800	1896	} else
1801		- if (event.getSource() == memoryItem)
	1897	+ if (source == memoryItem)
1802	1898	{
1803	1899	//System.out.println("Invariants:");
1804	1900	PrintMemory();
1805	1901	} else
1806		- if (event.getSource() == pathItem)
	1902	+ if (source == pathItem)
1807	1903	{
1808	1904	PrintPath();
1809	1905	} else
1810		- if (event.getSource() == analyzeItem)
	1906	+ if (source == analyzeItem)
1811	1907	{
1812	1908	AnalyzeObject();
1813	1909	} else
1814		- if (event.getSource() == dumpItem)
	1910	+ if (source == dumpItem)
1815	1911	{
1816	1912	DumpObject();
1817	1913	} else
1818		- if (event.getSource() == screenfitButton)
	1914	+ if (source == oneStepButton)
	1915	+ {
	1916	+ Globals.ONESTEP = true;
	1917	+ cameraView.repaint();
	1918	+ } else
	1919	+ if (source == screenfitButton)
1819	1920	{
1820	1921	//Reload(lastConverter, lastFilename, true);
1821	1922	ScreenFit();
1822	1923	} else
1823		- if (event.getSource() == screenfitpointButton)
	1924	+ if (source == screenfitpointButton)
1824	1925	{
1825	1926	//Reload(lastConverter, lastFilename, true);
1826	1927	ScreenFitPoint();
1827	1928	} else
1828		- if (event.getSource() == snapobjectButton)
	1929	+ if (source == snapobjectButton)
1829	1930	{
1830	1931	//Reload(lastConverter, lastFilename, true);
1831	1932	SnapObject();
..	..	@@ -1836,13 +1937,13 @@
1836	1937	// Recompile();
1837	1938	// refreshContents();
1838	1939	// } else
1839		- if (event.getSource() == gcButton)
	1940	+ if (source == gcButton)
1840	1941	{
1841	1942	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1943	System.gc();
1843	1944	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1945	} else
1845		- if (event.getSource() == editLeafItem)
	1946	+ if (source == editLeafItem)
1846	1947	{
1847	1948	Object3D obj;
1848	1949	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +1957,66 @@
1856	1957	}
1857	1958	refreshContents(true);
1858	1959	} else
1859		- if (event.getSource() == openWindowItem)
	1960	+ if (source == openWindowItem)
1860	1961	{
1861	1962	EditSelection(true);
1862	1963	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1964	+ if (source == cutItem \|\| source == clearButton)
1864	1965	{
1865	1966	loadClipboard(true);
1866	1967	} else
1867		- if (event.getSource() == duplicateItem)
	1968	+ if (source == duplicateItem)
1868	1969	{
1869	1970	Object3D keep = GrafreeD.clipboard;
1870	1971	loadClipboard(false);
1871	1972	paste(false);
1872	1973	GrafreeD.clipboard = keep;
1873	1974	} else
1874		- if (event.getSource() == cloneItem)
	1975	+ if (source == cloneItem)
1875	1976	{
1876	1977	CloneSelection(false);
1877	1978	} else
1878		- if (event.getSource() == cloneSupportItem)
	1979	+ if (source == cloneSupportItem)
1879	1980	{
1880	1981	CloneSelection(true);
1881	1982	} else
1882		- if (event.getSource() == copyItem)
	1983	+ if (source == copyItem)
1883	1984	{
1884	1985	loadClipboard(false);
1885	1986	} else
1886		- if (event.getSource() == pasteItem)
	1987	+ if (source == pasteItem)
1887	1988	{
1888	1989	paste(false);
1889	1990	} else
1890		- if (event.getSource() == pasteLinkItem)
	1991	+ if (source == pasteIntoItem)
1891	1992	{
1892		- pasteInto(false);
	1993	+ pasteInto(true, false);
1893	1994	} else
1894		- if (event.getSource() == pasteCloneItem)
	1995	+ if (source == pasteLinkItem)
1895	1996	{
1896		- pasteInto(true);
	1997	+ pasteInto(false, false);
1897	1998	} else
1898		- if (event.getSource() == pasteExpandItem)
	1999	+ if (source == pasteCloneItem)
	2000	+ {
	2001	+ pasteInto(true, true);
	2002	+ } else
	2003	+ if (source == pasteExpandItem)
1899	2004	{
1900	2005	paste(true);
1901	2006	} else
1902		- if (event.getSource() == synchronizeItem)
	2007	+ if (source == synchronizeItem)
1903	2008	{
1904	2009	Overwrite(Object3D.TRANSFORM);
1905	2010	} else
1906		- if (event.getSource() == overwriteNameItem)
	2011	+ if (source == overwriteNameItem)
1907	2012	{
1908	2013	Overwrite(Object3D.NAME);
1909	2014	} else
1910		- if (event.getSource() == overwriteUVItem)
	2015	+ if (source == overwriteUVItem)
1911	2016	{
1912	2017	Overwrite(Object3D.UV);
1913	2018	} else
1914		- if (event.getSource() == overwriteMatItem)
	2019	+ if (source == overwriteMatItem)
1915	2020	{
1916	2021	/* july 2015
1917	2022	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +2036,7 @@
1931	2036
1932	2037	Overwrite(dropAttributes);
1933	2038	}
1934		- if (event.getSource() == overwriteGeoItem)
	2039	+ if (source == overwriteGeoItem)
1935	2040	{
1936	2041	Overwrite(Object3D.GEOMETRY);
1937	2042	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +2053,7 @@
1948	2053	// refreshContents();
1949	2054	// }
1950	2055	} else
1951		- if (event.getSource() == generateMeshItem)
	2056	+ if (source == generateMeshItem)
1952	2057	{
1953	2058	//if (group.selection.size() == 1)
1954	2059	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +2064,7 @@
1959	2064	ResetModel();
1960	2065	refreshContents();
1961	2066	} else
1962		- if (event.getSource() == extractGeometriesItem)
	2067	+ if (source == extractGeometriesItem)
1963	2068	{
1964	2069	boolean one = false;
1965	2070
..	..	@@ -1986,7 +2091,7 @@
1986	2091	ResetModel();
1987	2092	refreshContents();
1988	2093	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2094	+ if (source == cloneGeometriesItem)
1990	2095	{
1991	2096	boolean one = false;
1992	2097
..	..	@@ -2012,7 +2117,7 @@
2012	2117	ResetModel();
2013	2118	refreshContents();
2014	2119	} else
2015		- if (event.getSource() == shareGeometriesItem)
	2120	+ if (source == shareGeometriesItem)
2016	2121	{
2017	2122	boolean one = false;
2018	2123
..	..	@@ -2042,7 +2147,7 @@
2042	2147	refreshContents();
2043	2148	}
2044	2149	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	2150	+ if (source == mergeGeometriesItem)
2046	2151	{
2047	2152	boolean one = false;
2048	2153
..	..	@@ -2072,7 +2177,7 @@
2072	2177	ResetModel();
2073	2178	refreshContents();
2074	2179	} else
2075		- if (event.getSource() == linkverticesItem)
	2180	+ if (source == linkverticesItem)
2076	2181	{
2077	2182	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	2183	// {
..	..	@@ -2092,41 +2197,41 @@
2092	2197	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	2198	content = ((cGroup)content).get(0);
2094	2199
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2200	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	2201	for (int i=0; i<group.selection.size(); i++)
2097	2202	{
2098		- boolean random = CameraPane.RANDOM;
2099		- CameraPane.RANDOM = false; // parse all random nodes
	2203	+ boolean random = CameraPane.SWITCH;
	2204	+ CameraPane.SWITCH = false; // parse all random nodes
2100	2205	group.selection.get(i).linkVerticesThis(content);
2101	2206	// group.selection.get(i).setMasterThis(content); // should be identity
2102		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2103	2208	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2209	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	2210	refreshContents();
2106	2211	}
2107	2212	} else
2108		- if (event.getSource() == resetsupportItem)
	2213	+ if (source == resetsupportItem)
2109	2214	{
2110	2215	for (int i=0; i<group.selection.size(); i++)
2111	2216	{
2112		- boolean random = CameraPane.RANDOM;
2113		- CameraPane.RANDOM = false; // parse all random nodes
	2217	+ boolean random = CameraPane.SWITCH;
	2218	+ CameraPane.SWITCH = false; // parse all random nodes
2114	2219	group.selection.get(i).linkVerticesThis(null);
2115		- CameraPane.RANDOM = random;
	2220	+ CameraPane.SWITCH = random;
2116	2221	}
2117	2222
2118	2223	refreshContents();
2119	2224	} else
2120		- if (event.getSource() == relinkverticesItem)
	2225	+ if (source == relinkverticesItem)
2121	2226	{
2122		- boolean random = CameraPane.RANDOM;
2123		- CameraPane.RANDOM = false; // parse all random nodes
	2227	+ boolean random = CameraPane.SWITCH;
	2228	+ CameraPane.SWITCH = false; // parse all random nodes
2124	2229	group.selection.RelinkToSupport();
2125		- CameraPane.RANDOM = random;
	2230	+ CameraPane.SWITCH = random;
2126	2231
2127	2232	refreshContents();
2128	2233	} else
2129		- if (event.getSource() == resetreferencesItem)
	2234	+ if (source == resetreferencesItem)
2130	2235	{
2131	2236	for (int i=0; i<group.selection.size(); i++)
2132	2237	{
..	..	@@ -2135,7 +2240,7 @@
2135	2240
2136	2241	refreshContents();
2137	2242	} else
2138		- if (event.getSource() == setMasterItem)
	2243	+ if (source == setMasterItem)
2139	2244	{
2140	2245	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2141	2246	{
..	..	@@ -2148,7 +2253,7 @@
2148	2253	refreshContents();
2149	2254	}
2150	2255	} else
2151		- if (event.getSource() == poseMeshItem)
	2256	+ if (source == poseMeshItem)
2152	2257	{
2153	2258	if (group.selection.size() == 1)
2154	2259	{
..	..	@@ -2167,19 +2272,19 @@
2167	2272	}
2168	2273
2169	2274	} else
2170		- if (event.getSource() == revertMeshItem)
	2275	+ if (source == revertMeshItem)
2171	2276	{
2172	2277	RevertMeshes();
2173	2278	} else
2174		- if (event.getSource() == resetMeshItem)
	2279	+ if (source == resetMeshItem)
2175	2280	{
2176	2281	ResetAll();
2177	2282	} else
2178		- if (event.getSource() == stepAllItem)
	2283	+ if (source == stepAllItem)
2179	2284	{
2180	2285	StepAll();
2181	2286	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2287	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2183	2288	{
2184	2289	//int indices[] = jList.getSelectedIndices();
2185	2290	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +2292,46 @@
2187	2292
2188	2293	ClearSelection(false);
2189	2294	} else
2190		- if (event.getSource() == clearAllItem)
	2295	+ if (source == clearAllItem)
2191	2296	{
2192	2297	ClearSelection(true);
2193	2298	} else
2194		- if (event.getSource() == grabItem)
	2299	+ if (source == grabItem)
2195	2300	{
2196	2301	group(new cGroup(), true);
2197	2302	} else
2198		- if (event.getSource() == hideItem)
	2303	+ if (source == hideItem)
2199	2304	{
2200	2305	group(new HiddenObject());
2201	2306	} else
2202		- if (event.getSource() == frontItem)
	2307	+ if (source == frontItem)
2203	2308	{
2204	2309	front();
2205	2310	} else
2206		- if (event.getSource() == backItem)
	2311	+ if (source == backItem)
2207	2312	{
2208	2313	back();
2209	2314	} else
2210		- if (event.getSource() == cameraItem)
	2315	+ if (source == cameraItem)
2211	2316	{
2212	2317	makeSomething(new Camera());
2213	2318	} else
2214		- if (event.getSource() == compositeItem)
	2319	+ if (source == compositeItem)
2215	2320	{
2216	2321	group(new Composite());
2217	2322	} else
2218		- if (event.getSource() == randomItem)
	2323	+ if (source == randomItem)
2219	2324	{
2220	2325	RandomNode random = new RandomNode();
2221	2326	group(random);
2222	2327	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	2328	+ random.name = random.get(0).name + "Switch";
2224	2329	} else
2225		- if (event.getSource() == physicsItem)
	2330	+ if (source == physicsItem)
2226	2331	{
2227	2332	group(new PhysicsNode());
2228	2333	} else
2229		- if (event.getSource() == frameselectorItem)
	2334	+ if (source == frameselectorItem)
2230	2335	{
2231	2336	for (int i=0; i<group.selection.size(); i++)
2232	2337	{
..	..	@@ -2238,7 +2343,7 @@
2238	2343	ResetModel();
2239	2344	refreshContents();
2240	2345	} else
2241		- if (event.getSource() == switchGeoItem)
	2346	+ if (source == switchGeoItem)
2242	2347	{
2243	2348	for (int i=0; i<group.selection.size(); i++)
2244	2349	{
..	..	@@ -2250,7 +2355,7 @@
2250	2355	ResetModel();
2251	2356	refreshContents();
2252	2357	} else
2253		- if (event.getSource() == switchTransfoItem)
	2358	+ if (source == switchTransfoItem)
2254	2359	{
2255	2360	for (int i=0; i<group.selection.size(); i++)
2256	2361	{
..	..	@@ -2262,7 +2367,7 @@
2262	2367	ResetModel();
2263	2368	refreshContents();
2264	2369	} else
2265		- if (event.getSource() == morphItem)
	2370	+ if (source == morphItem)
2266	2371	{
2267	2372	for (int i=0; i<group.selection.size(); i++)
2268	2373	{
..	..	@@ -2274,7 +2379,7 @@
2274	2379	ResetModel();
2275	2380	refreshContents();
2276	2381	} else
2277		- if (event.getSource() == scriptNodeItem)
	2382	+ if (source == scriptNodeItem)
2278	2383	{
2279	2384	boolean atleastone = false;
2280	2385
..	..	@@ -2313,31 +2418,31 @@
2313	2418	}
2314	2419	}
2315	2420	} else
2316		- if (event.getSource() == linkerItem)
	2421	+ if (source == linkerItem)
2317	2422	{
2318	2423	group(new cLinker());
2319	2424	} else
2320		- if (event.getSource() == textureItem)
	2425	+ if (source == textureItem)
2321	2426	{
2322	2427	group(new TextureNode());
2323	2428	} else
2324		- if (event.getSource() == billboardItem)
	2429	+ if (source == billboardItem)
2325	2430	{
2326	2431	group(new BillboardNode());
2327	2432	} else
2328		- if (event.getSource() == shadowXItem)
	2433	+ if (source == shadowXItem)
2329	2434	{
2330	2435	CastShadow(0);
2331	2436	} else
2332		- if (event.getSource() == shadowYItem)
	2437	+ if (source == shadowYItem)
2333	2438	{
2334	2439	CastShadow(1);
2335	2440	} else
2336		- if (event.getSource() == shadowZItem)
	2441	+ if (source == shadowZItem)
2337	2442	{
2338	2443	CastShadow(2);
2339	2444	} else
2340		- if (event.getSource() == ungroupItem)
	2445	+ if (source == ungroupItem)
2341	2446	{
2342	2447	//ungroup();
2343	2448	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2349,179 +2454,179 @@
2349	2454
2350	2455	refreshContents();
2351	2456	} else
2352		- if (event.getSource() == genUVItem)
	2457	+ if (source == genUVItem)
2353	2458	{
2354	2459	GenUV();
2355	2460	} else
2356		- if (event.getSource() == genNormalsCADItem)
	2461	+ if (source == genNormalsCADItem)
2357	2462	{
2358	2463	GenNormals(true);
2359	2464	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	2465	+ if (source == genNormalsMESHItem)
2361	2466	{
2362	2467	GenNormals(true); // TODO
2363	2468	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	2469	+ if (source == genNormalsORGANItem)
2365	2470	{
2366	2471	GenNormals(false);
2367	2472	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	2473	+ if (source == genNormalsMINEItem)
2369	2474	{
2370	2475	GenNormalsMINE();
2371	2476	} else
2372		- if (event.getSource() == stripifyItem)
	2477	+ if (source == stripifyItem)
2373	2478	{
2374	2479	Stripify();
2375	2480	} else
2376		- if (event.getSource() == unstripifyItem)
	2481	+ if (source == unstripifyItem)
2377	2482	{
2378	2483	Unstripify();
2379	2484	} else
2380		- if (event.getSource() == trimItem)
	2485	+ if (source == trimItem)
2381	2486	{
2382	2487	Trim();
2383	2488	} else
2384		- if (event.getSource() == untrimItem)
	2489	+ if (source == untrimItem)
2385	2490	{
2386	2491	Untrim();
2387	2492	} else
2388		- if (event.getSource() == clearColorsItem)
	2493	+ if (source == clearColorsItem)
2389	2494	{
2390	2495	ClearColors();
2391	2496	} else
2392		- if (event.getSource() == clearMaterialsItem)
	2497	+ if (source == clearMaterialsItem)
2393	2498	{
2394	2499	ClearMaterials();
2395	2500	} else
2396		- if (event.getSource() == liveleavesItem)
	2501	+ if (source == liveleavesItem)
2397	2502	{
2398	2503	LiveLeaves(true);
2399	2504	} else
2400		- if (event.getSource() == unliveleavesItem)
	2505	+ if (source == unliveleavesItem)
2401	2506	{
2402	2507	LiveLeaves(false);
2403	2508	} else
2404		- if (event.getSource() == supportleavesItem)
	2509	+ if (source == supportleavesItem)
2405	2510	{
2406	2511	SupportLeaves(true);
2407	2512	} else
2408		- if (event.getSource() == unsupportleavesItem)
	2513	+ if (source == unsupportleavesItem)
2409	2514	{
2410	2515	SupportLeaves(false);
2411	2516	} else
2412		- if (event.getSource() == hideleavesItem)
	2517	+ if (source == hideleavesItem)
2413	2518	{
2414	2519	HideLeaves(true);
2415	2520	} else
2416		- if (event.getSource() == showleavesItem)
	2521	+ if (source == showleavesItem)
2417	2522	{
2418	2523	HideLeaves(false);
2419	2524	} else
2420		- if (event.getSource() == markleavesItem)
	2525	+ if (source == markleavesItem)
2421	2526	{
2422	2527	MarkLeaves(true);
2423	2528	} else
2424		- if (event.getSource() == unmarkleavesItem)
	2529	+ if (source == unmarkleavesItem)
2425	2530	{
2426	2531	MarkLeaves(false);
2427	2532	} else
2428		- if (event.getSource() == flipVItem)
	2533	+ if (source == flipVItem)
2429	2534	{
2430	2535	FlipV(true);
2431	2536	} else
2432		- if (event.getSource() == unflipVItem)
	2537	+ if (source == unflipVItem)
2433	2538	{
2434	2539	FlipV(false);
2435	2540	} else
2436		- if (event.getSource() == lowTexturesItem)
	2541	+ if (source == lowTexturesItem)
2437	2542	{
2438	2543	SetTexRes(0);
2439	2544	} else
2440		- if (event.getSource() == normalTexturesItem)
	2545	+ if (source == normalTexturesItem)
2441	2546	{
2442	2547	SetTexRes(1);
2443	2548	} else
2444		- if (event.getSource() == highTexturesItem)
	2549	+ if (source == highTexturesItem)
2445	2550	{
2446	2551	SetTexRes(2);
2447	2552	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	2553	+ if (source == veryhighTexturesItem)
2449	2554	{
2450	2555	SetTexRes(3);
2451	2556	} else
2452		- if (event.getSource() == maxTexturesItem)
	2557	+ if (source == maxTexturesItem)
2453	2558	{
2454	2559	SetTexRes(4);
2455	2560	} else
2456		- if (event.getSource() == panoTexturesItem)
	2561	+ if (source == panoTexturesItem)
2457	2562	{
2458	2563	SetTexRes(5);
2459	2564	} else
2460		- if (event.getSource() == reverseNormalsItem)
	2565	+ if (source == reverseNormalsItem)
2461	2566	{
2462	2567	ReverseNormals();
2463	2568	} else
2464		- if (event.getSource() == parseverticesItem)
	2569	+ if (source == parseverticesItem)
2465	2570	{
2466	2571	ParseVertices();
2467	2572	} else
2468		- if (event.getSource() == textureFieldItem)
	2573	+ if (source == textureFieldItem)
2469	2574	{
2470	2575	TextureVertices();
2471	2576	} else
2472		- if (event.getSource() == alignItem)
	2577	+ if (source == alignItem)
2473	2578	{
2474	2579	Align();
2475	2580	} else
2476		- if (event.getSource() == mirrorItem)
	2581	+ if (source == mirrorItem)
2477	2582	{
2478	2583	MirrorPoses();
2479	2584	} else
2480		- if (event.getSource() == reduceMorphItem)
	2585	+ if (source == reduceMorphItem)
2481	2586	{
2482	2587	MeshReduction(false);
2483	2588	} else
2484		- if (event.getSource() == reduce34MorphItem)
	2589	+ if (source == reduce34MorphItem)
2485	2590	{
2486	2591	MeshReduction(true);
2487	2592	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	2593	+ if (source == reverseTrianglesItem)
2489	2594	{
2490	2595	ReverseTriangles();
2491	2596	} else
2492		- if (event.getSource() == reduceMeshItem)
	2597	+ if (source == reduceMeshItem)
2493	2598	{
2494	2599	ReduceMesh(false);
2495	2600	} else
2496		- if (event.getSource() == reduce34MeshItem)
	2601	+ if (source == reduce34MeshItem)
2497	2602	{
2498	2603	ReduceMesh(true);
2499	2604	} else
2500		- if (event.getSource() == increaseMeshItem)
	2605	+ if (source == increaseMeshItem)
2501	2606	{
2502	2607	IncreaseMesh();
2503	2608	} else
2504		- if (event.getSource() == clipMeshItem)
	2609	+ if (source == clipMeshItem)
2505	2610	{
2506	2611	ClipMesh();
2507	2612	} else
2508		- if (event.getSource() == smoothMeshItem)
	2613	+ if (source == smoothMeshItem)
2509	2614	{
2510	2615	SmoothMesh();
2511	2616	} else
2512		- if (event.getSource() == transformgeometryItem)
	2617	+ if (source == transformgeometryItem)
2513	2618	{
2514	2619	TransformGeometry();
2515	2620	} else
2516		- if (event.getSource() == resetTransformItem)
	2621	+ if (source == resetTransformItem)
2517	2622	{
2518	2623	ResetTransform();
2519	2624	} else
2520		- if (event.getSource() == resetCentroidItem)
	2625	+ if (source == resetCentroidItem)
2521	2626	{
2522	2627	ResetCentroid();
2523	2628	} else
2524		- if (event.getSource() == resetParentItem)
	2629	+ if (source == resetParentItem)
2525	2630	{
2526	2631	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	2632	{
..	..	@@ -2531,7 +2636,7 @@
2531	2636
2532	2637	refreshContents();
2533	2638	} else
2534		- if (event.getSource() == repairParentItem)
	2639	+ if (source == repairParentItem)
2535	2640	{
2536	2641	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	2642	{
..	..	@@ -2545,7 +2650,21 @@
2545	2650
2546	2651	refreshContents();
2547	2652	} else
2548		- if (event.getSource() == sortbysizeItem)
	2653	+ if (source == repairShadowItem)
	2654	+ {
	2655	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2656	+ {
	2657	+ Object3D obj = (Object3D)e.nextElement();
	2658	+ obj.RepairShadow();
	2659	+// for (int i=0; i<obj.size(); i++)
	2660	+// {
	2661	+// obj.get(i).parent = obj;
	2662	+// }
	2663	+ }
	2664	+
	2665	+ refreshContents();
	2666	+ } else
	2667	+ if (source == sortbysizeItem)
2549	2668	{
2550	2669	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	2670	{
..	..	@@ -2557,7 +2676,7 @@
2557	2676	ResetModel();
2558	2677	refreshContents();
2559	2678	} else
2560		- if (event.getSource() == sortbynameItem)
	2679	+ if (source == sortbynameItem)
2561	2680	{
2562	2681	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	2682	{
..	..	@@ -2569,7 +2688,7 @@
2569	2688	ResetModel();
2570	2689	refreshContents();
2571	2690	} else
2572		- if (event.getSource() == attachPigmentItem)
	2691	+ if (source == attachPigmentItem)
2573	2692	{
2574	2693	String texture = GetFile("Attach pigment");
2575	2694	Object3D obj;
..	..	@@ -2581,7 +2700,7 @@
2581	2700
2582	2701	refreshContents();
2583	2702	} else
2584		- if (event.getSource() == detachPigmentItem)
	2703	+ if (source == detachPigmentItem)
2585	2704	{
2586	2705	Object3D obj;
2587	2706	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +2711,7 @@
2592	2711
2593	2712	refreshContents();
2594	2713	} else
2595		- if (event.getSource() == attachBumpItem)
	2714	+ if (source == attachBumpItem)
2596	2715	{
2597	2716	String texture = GetFile("Attach bump");
2598	2717	Object3D obj;
..	..	@@ -2604,7 +2723,7 @@
2604	2723
2605	2724	refreshContents();
2606	2725	} else
2607		- if (event.getSource() == detachBumpItem)
	2726	+ if (source == detachBumpItem)
2608	2727	{
2609	2728	Object3D obj;
2610	2729	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2615,7 +2734,7 @@
2615	2734
2616	2735	refreshContents();
2617	2736	} else
2618		- if (event.getSource() == pigmentBumpItem)
	2737	+ if (source == pigmentBumpItem)
2619	2738	{
2620	2739	Object3D obj;
2621	2740	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +2745,195 @@
2626	2745
2627	2746	refreshContents();
2628	2747	} else
2629		- if (event.getSource() == flashSelectionButton)
	2748	+ if (source == flashSelectionButton)
2630	2749	{
2631	2750	CameraPane.flash = true;
2632	2751	refreshContents();
2633	2752	} else
2634		- if (event.getSource() == oneButton)
	2753	+ if (source == oneButton)
2635	2754	{
2636	2755	} else
2637		- if (event.getSource() == twoButton)
	2756	+ if (source == twoButton)
2638	2757	{
2639	2758	radio.layout = twoButton;
2640	2759	// bug
2641	2760	//gridPanel.setDividerLocation(1.0);
2642	2761	//bigPanel.setDividerLocation(0.0);
2643		- bigThree.remove(scenePanel);
2644		- bigThree.remove(centralPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2651		- aWindowConstraints.weightx = 0;
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(centralPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	2762	+// bigThree.remove(scenePanel);
	2763	+// bigThree.remove(centralPanel);
	2764	+// bigThree.remove(XYZPanel);
	2765	+// aWindowConstraints.gridx = 0;
	2766	+// aWindowConstraints.gridy = 0;
	2767	+// aWindowConstraints.gridwidth = 1;
	2768	+// // aConstraints.gridheight = 3;
	2769	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2770	+// aWindowConstraints.weightx = 0;
	2771	+// aWindowConstraints.weighty = 1;
	2772	+// //bigThree.add(jtp, aWindowConstraints);
	2773	+// aWindowConstraints.weightx = 1;
	2774	+// aWindowConstraints.gridwidth = 3;
	2775	+// // aConstraints.gridheight = 3;
	2776	+// aWindowConstraints.gridx = 1;
	2777	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2778	+// bigThree.add(centralPanel, aWindowConstraints);
	2779	+// aWindowConstraints.weightx = 0;
	2780	+// aWindowConstraints.gridx = 4;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2785	+// scenePanel.setVisible(false);
	2786	+// centralPanel.setVisible(true);
	2787	+// XYZPanel.setVisible(false);
	2788	+ bigThree.ClearUI();
	2789	+ bigThree.add(centralPanel);
	2790	+ bigThree.FlushUI();
2667	2791	} else
2668		- if (event.getSource() == threeButton)
	2792	+ if (source == threeButton)
2669	2793	{
2670	2794	radio.layout = threeButton;
2671		- bigThree.remove(scenePanel);
2672		- bigThree.remove(centralPanel);
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		- // aConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(centralPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aConstraints.gridheight = 3;
2692		- aConstraints.fill = GridBagConstraints.VERTICAL;
2693		- bigThree.add(XYZPanel, aWindowConstraints);
2694		- bigThree.revalidate();
	2795	+
	2796	+// bigThree.remove(scenePanel);
	2797	+// bigThree.remove(centralPanel);
	2798	+// bigThree.remove(XYZPanel);
	2799	+// aWindowConstraints.gridx = 0;
	2800	+// aWindowConstraints.gridy = 0;
	2801	+// aWindowConstraints.gridwidth = 1;
	2802	+// // aConstraints.gridheight = 3;
	2803	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2804	+// aWindowConstraints.weightx = 0;
	2805	+// aWindowConstraints.weighty = 1;
	2806	+// //bigThree.add(jtp, aWindowConstraints);
	2807	+// aWindowConstraints.weightx = 1;
	2808	+// aWindowConstraints.gridwidth = 3;
	2809	+// // aConstraints.gridheight = 3;
	2810	+// aWindowConstraints.gridx = 1;
	2811	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2812	+// bigThree.add(centralPanel, aWindowConstraints);
	2813	+// aWindowConstraints.weightx = 0;
	2814	+// aWindowConstraints.gridx = 4;
	2815	+// aWindowConstraints.gridwidth = 1;
	2816	+// // aConstraints.gridheight = 3;
	2817	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2818	+// bigThree.add(XYZPanel, aWindowConstraints);
	2819	+// bigThree.validate();
	2820	+// scenePanel.setVisible(false);
	2821	+// centralPanel.setVisible(true);
	2822	+// XYZPanel.setVisible(true);
	2823	+ bigThree.ClearUI();
	2824	+ bigThree.add(centralPanel);
	2825	+ bigThree.add(XYZPanel);
	2826	+ bigThree.FlushUI();
2695	2827	} else
2696		- if (event.getSource() == fourButton)
	2828	+ if (source == fourButton)
2697	2829	{
2698	2830	radio.layout = fourButton;
2699		- bigThree.remove(scenePanel);
2700		- bigThree.remove(centralPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2707		- aWindowConstraints.weightx = 1;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(scenePanel, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aConstraints.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		- // aWindowConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- //bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	2831	+
	2832	+// bigThree.remove(scenePanel);
	2833	+// bigThree.remove(centralPanel);
	2834	+// bigThree.remove(XYZPanel);
	2835	+// aWindowConstraints.gridx = 0;
	2836	+// aWindowConstraints.gridy = 0;
	2837	+// aWindowConstraints.gridwidth = 1;
	2838	+// // aWindowConstraints.gridheight = 3;
	2839	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2840	+// aWindowConstraints.weightx = 1;
	2841	+// aWindowConstraints.weighty = 1;
	2842	+// bigThree.add(scenePanel, aWindowConstraints);
	2843	+// aWindowConstraints.weightx = 1;
	2844	+// aWindowConstraints.gridwidth = 3;
	2845	+// // aConstraints.gridheight = 3;
	2846	+// aWindowConstraints.gridx = 1;
	2847	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2848	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2849	+// aWindowConstraints.weightx = 0;
	2850	+// aWindowConstraints.gridx = 4;
	2851	+// aWindowConstraints.gridwidth = 1;
	2852	+// // aWindowConstraints.gridheight = 3;
	2853	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2854	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2855	+// bigThree.validate();
	2856	+// scenePanel.setVisible(true);
	2857	+// centralPanel.setVisible(false);
	2858	+// XYZPanel.setVisible(false);
	2859	+ bigThree.ClearUI();
	2860	+ bigThree.add(scenePanel);
	2861	+ bigThree.FlushUI();
2723	2862	} else
2724		- if (event.getSource() == sixButton)
	2863	+ if (source == sixButton)
2725	2864	{
2726	2865	radio.layout = sixButton;
2727		- bigThree.remove(scenePanel);
2728		- bigThree.remove(centralPanel);
2729		- bigThree.remove(XYZPanel);
2730		- aWindowConstraints.gridx = 0;
2731		- aWindowConstraints.gridy = 0;
2732		- aWindowConstraints.gridwidth = 1;
2733		- // aConstraints.gridheight = 3;
2734		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2735		- aWindowConstraints.weightx = 0;
2736		- aWindowConstraints.weighty = 1;
2737		- bigThree.add(scenePanel, aWindowConstraints);
2738		- aWindowConstraints.weightx = 1;
2739		- aWindowConstraints.gridwidth = 3;
2740		- // aWindowConstraints.gridheight = 3;
2741		- aWindowConstraints.gridx = 1;
2742		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2743		- bigThree.add(centralPanel, aWindowConstraints);
2744		- aWindowConstraints.weightx = 0;
2745		- aWindowConstraints.gridx = 4;
2746		- aWindowConstraints.gridwidth = 1;
2747		- // aWindowConstraints.gridheight = 3;
2748		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2749		- //bigThree.add(XYZPanel, aConstraints);
2750		- bigThree.revalidate();
	2866	+
	2867	+// bigThree.remove(scenePanel);
	2868	+// bigThree.remove(centralPanel);
	2869	+// bigThree.remove(XYZPanel);
	2870	+// aWindowConstraints.gridx = 0;
	2871	+// aWindowConstraints.gridy = 0;
	2872	+// aWindowConstraints.gridwidth = 1;
	2873	+// // aConstraints.gridheight = 3;
	2874	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2875	+// aWindowConstraints.weightx = 0;
	2876	+// aWindowConstraints.weighty = 1;
	2877	+// bigThree.add(scenePanel, aWindowConstraints);
	2878	+// aWindowConstraints.weightx = 1;
	2879	+// aWindowConstraints.gridwidth = 3;
	2880	+// // aWindowConstraints.gridheight = 3;
	2881	+// aWindowConstraints.gridx = 1;
	2882	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2883	+// bigThree.add(centralPanel, aWindowConstraints);
	2884	+// aWindowConstraints.weightx = 0;
	2885	+// aWindowConstraints.gridx = 4;
	2886	+// aWindowConstraints.gridwidth = 1;
	2887	+// // aWindowConstraints.gridheight = 3;
	2888	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2889	+// //bigThree.add(XYZPanel, aConstraints);
	2890	+// bigThree.validate();
	2891	+// scenePanel.setVisible(true);
	2892	+// centralPanel.setVisible(true);
	2893	+// XYZPanel.setVisible(false);
	2894	+ bigThree.ClearUI();
	2895	+ bigThree.add(scenePanel);
	2896	+ bigThree.add(centralPanel);
	2897	+ bigThree.FlushUI();
2751	2898	} else
2752		- if (event.getSource() == sevenButton)
	2899	+ if (source == sevenButton)
2753	2900	{
2754	2901	radio.layout = sevenButton;
2755		- bigThree.remove(scenePanel);
2756		- bigThree.remove(centralPanel);
2757		- bigThree.remove(XYZPanel);
2758		- aWindowConstraints.gridx = 0;
2759		- aWindowConstraints.gridy = 0;
2760		- aWindowConstraints.gridwidth = 1;
2761		- // aWindowConstraints.gridheight = 3;
2762		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2763		- aWindowConstraints.weightx = 0;
2764		- aWindowConstraints.weighty = 1;
2765		- bigThree.add(scenePanel, aWindowConstraints);
2766		- aWindowConstraints.weightx = 1;
2767		- aWindowConstraints.gridwidth = 3;
2768		- // aWindowConstraints.gridheight = 3;
2769		- aWindowConstraints.gridx = 1;
2770		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2771		- bigThree.add(centralPanel, aWindowConstraints);
2772		- aWindowConstraints.weightx = 0;
2773		- aWindowConstraints.gridx = 4;
2774		- aWindowConstraints.gridwidth = 1;
2775		- // aConstraints.gridheight = 3;
2776		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2777		- bigThree.add(XYZPanel, aWindowConstraints);
2778		- bigThree.revalidate();
	2902	+
	2903	+// bigThree.remove(scenePanel);
	2904	+// bigThree.remove(centralPanel);
	2905	+// bigThree.remove(XYZPanel);
	2906	+// aWindowConstraints.gridx = 0;
	2907	+// aWindowConstraints.gridy = 0;
	2908	+// aWindowConstraints.gridwidth = 1;
	2909	+// // aWindowConstraints.gridheight = 3;
	2910	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2911	+// aWindowConstraints.weightx = 0;
	2912	+// aWindowConstraints.weighty = 1;
	2913	+// bigThree.add(scenePanel, aWindowConstraints);
	2914	+// aWindowConstraints.weightx = 1;
	2915	+// aWindowConstraints.gridwidth = 3;
	2916	+// // aWindowConstraints.gridheight = 3;
	2917	+// aWindowConstraints.gridx = 1;
	2918	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2919	+// bigThree.add(centralPanel, aWindowConstraints);
	2920	+// aWindowConstraints.weightx = 0;
	2921	+// aWindowConstraints.gridx = 4;
	2922	+// aWindowConstraints.gridwidth = 1;
	2923	+// // aConstraints.gridheight = 3;
	2924	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2925	+// bigThree.add(XYZPanel, aWindowConstraints);
	2926	+// bigThree.validate();
	2927	+// scenePanel.setVisible(true);
	2928	+// centralPanel.setVisible(true);
	2929	+// XYZPanel.setVisible(true);
	2930	+ bigThree.ClearUI();
	2931	+ bigThree.add(scenePanel);
	2932	+ bigThree.add(centralPanel);
	2933	+ bigThree.add(XYZPanel);
	2934	+ bigThree.FlushUI();
2779	2935	} else
2780		- if (event.getSource() == rootButton)
	2936	+ if (source == rootButton)
2781	2937	{
2782	2938	Object3D obj;
2783	2939	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2789,7 +2945,7 @@
2789	2945
2790	2946	refreshContents(true);
2791	2947	} else
2792		- if (event.getSource() == closeButton)
	2948	+ if (source == closeButton)
2793	2949	{
2794	2950	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	2951	cRadio ab;
..	..	@@ -2810,11 +2966,11 @@
2810	2966	}
2811	2967	refreshContents(true);
2812	2968	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2969	+ if (source == editItem \|\| source == editButton)
2814	2970	{
2815	2971	EditSelection(false);
2816	2972	} else
2817		- if (event.getSource() == uneditButton)
	2973	+ if (source == uneditButton)
2818	2974	{
2819	2975	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	2976	{
..	..	@@ -2826,12 +2982,12 @@
2826	2982
2827	2983	child.editWindow = null; // ???????????
2828	2984	}
2829		- objEditor.ctrlPanel.revalidate();
	2985	+ objEditor.ctrlPanel.FlushUI();
2830	2986	//objEditor.jTree.clearSelection();
2831	2987	//objEditor.ResetSliders();
2832	2988	refreshContents(true);
2833	2989	} else
2834		- if (event.getSource() == clearPanelButton)
	2990	+ if (source == clearPanelButton)
2835	2991	{
2836	2992	assert(copy == group);
2837	2993	//copy.ClearUI();
..	..	@@ -2842,7 +2998,7 @@
2842	2998	listUI.clear();
2843	2999	refreshContents(true);
2844	3000	} else
2845		- if (event.getSource() == allParamsButton)
	3001	+ if (source == allParamsButton)
2846	3002	{
2847	3003	assert(copy == group);
2848	3004
..	..	@@ -2863,19 +3019,19 @@
2863	3019
2864	3020	refreshContents(true);
2865	3021	} else
2866		- if (event.getSource() == unselectButton)
	3022	+ if (source == unselectButton)
2867	3023	{
2868	3024	objEditor.jTree.clearSelection();
2869	3025	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	3026	objEditor.ResetSliders();
2871	3027	refreshContents(true);
2872	3028	} else
2873		- if(event.getSource() instanceof cRadio)
	3029	+ if(source instanceof cRadio)
2874	3030	{
2875	3031	group.parent = keepparent;
2876	3032	group.attributes = 0;
2877	3033	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	3034	+ /cRadio/ radio = (cRadio)source;
2879	3035	Object3D obj = radio.GetObject();
2880	3036	System.out.println("Edit " + obj);
2881	3037	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +3051,7 @@
2895	3051	}
2896	3052
2897	3053	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	3054	+ //Globals.theRenderer.object = group;
2899	3055	if(!useclient)
2900	3056	{
2901	3057	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,7 +3060,8 @@
2904	3060	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	3061	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	3062	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	3063	+ //cameraView.lighttouched = true;
	3064	+ Globals.lighttouched = true;
2908	3065	topView.object = group;
2909	3066	frontView.object = group;
2910	3067	sideView.object = group;
..	..	@@ -2940,7 +3097,7 @@
2940	3097	if (useclient)
2941	3098	{
2942	3099	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	3100	+ Globals.lighttouched = true;
2944	3101	//topView.object = client;
2945	3102	//frontView.object = client;
2946	3103	//sideView.object = client;
..	..	@@ -2948,7 +3105,7 @@
2948	3105	else
2949	3106	{
2950	3107	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	3108	+ Globals.lighttouched = true;
2952	3109	//topView.object = group;
2953	3110	//frontView.object = group;
2954	3111	//sideView.object = group;
..	..	@@ -3456,7 +3613,7 @@
3456	3613	String pigment = Object3D.GetPigment(tex);
3457	3614	//String bump = Object3D.GetBump(tex);
3458	3615
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3616	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3460	3617
3461	3618	double s = v.s;
3462	3619
..	..	@@ -3544,11 +3701,11 @@
3544	3701
3545	3702	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3546	3703
3547		- boolean random = CameraPane.RANDOM;
3548		- CameraPane.RANDOM = false; // parse all random nodes
	3704	+ boolean random = CameraPane.SWITCH;
	3705	+ CameraPane.SWITCH = false; // parse all random nodes
3549	3706	lowres.linkVerticesThis(null);
3550	3707	lowres.linkVerticesThis(sn);
3551		- CameraPane.RANDOM = random;
	3708	+ CameraPane.SWITCH = random;
3552	3709
3553	3710	System.err.flush();
3554	3711
..	..	@@ -3757,7 +3914,7 @@
3757	3914	group.selection.RelinkToSupport(); // july 2014
3758	3915	System.out.println("DONE.");
3759	3916	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3917	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	3918	}
3762	3919
3763	3920	void ReduceMesh(boolean reduction34)
..	..	@@ -4033,25 +4190,25 @@
4033	4190	System.err.println("info : " + child.GetPath());
4034	4191	}
4035	4192	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	4193	+// else
	4194	+// {
	4195	+// objEditor.SetMaterial(group); // .GetMaterial());
	4196	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4197	+// System.err.println("info : " + group.GetPath());
	4198	+// }
4042	4199
4043	4200	objEditor.SetText(); // jan 2014
4044	4201
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4202	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4046	4203	CameraPane.flash = true;
4047	4204
4048	4205	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4049	4206	// a camera
4050	4207	{
4051	4208	CameraPane.camerachangeframe = 0; // don't refuse it
4052		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4209	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4210	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4211	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	4212	}
4056	4213
4057	4214	refreshContents();
..	..	@@ -4306,7 +4463,7 @@
4306	4463	refreshContents();
4307	4464	}
4308	4465
4309		- void pasteInto(boolean copyit)
	4466	+ void pasteInto(boolean copyit, boolean clone)
4310	4467	{
4311	4468	// if (GrafreeD.clipboard == null)
4312	4469	// return;
..	..	@@ -4335,7 +4492,14 @@
4335	4492	if (copyit)
4336	4493	{
4337	4494	// paste(false);
4338		- CloneClipboard(false); // sept 2014
	4495	+ if (clone)
	4496	+ {
	4497	+ CloneClipboard(false); // sept 2014
	4498	+ }
	4499	+ else
	4500	+ {
	4501	+ paste(false);
	4502	+ }
4339	4503	}
4340	4504	else
4341	4505	{
..	..	@@ -4879,10 +5043,12 @@
4879	5043	cButton flashSelectionButton;
4880	5044	cButton editButton;
4881	5045	cButton uneditButton;
	5046	+ JCheckBox allParamsButton;
4882	5047	cButton clearpanelButton;
4883		- cButton allParamsButton;
4884	5048	cButton unselectButton;
4885	5049
	5050	+ cButton oneStepButton;
	5051	+
4886	5052	cButton screenfitButton;
4887	5053	cButton screenfitpointButton;
4888	5054	cButton snapobjectButton;
..	..	@@ -4937,6 +5103,7 @@
4937	5103	private MenuItem mergeGeometriesItem;
4938	5104	private MenuItem copyItem;
4939	5105	private MenuItem pasteItem;
	5106	+ private MenuItem pasteIntoItem;
4940	5107	private MenuItem pasteLinkItem;
4941	5108	private MenuItem pasteCloneItem;
4942	5109	private MenuItem pasteExpandItem;
..	..	@@ -5009,6 +5176,7 @@
5009	5176
5010	5177	private MenuItem resetParentItem;
5011	5178	private MenuItem repairParentItem;
	5179	+ private MenuItem repairShadowItem;
5012	5180	private MenuItem sortbysizeItem;
5013	5181	private MenuItem sortbynameItem;
5014	5182
..	..	@@ -5033,7 +5201,7 @@
5033	5201	private MenuItem blobItem;
5034	5202	private MenuItem latheItem;
5035	5203	private MenuItem bezierItem;
5036		- private MenuItem checkerItem;
	5204	+ private MenuItem overlayItem;
5037	5205	private MenuItem meshItem;
5038	5206	// private MenuItem meshGroupItem;
5039	5207	private MenuItem springItem;