~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,36 +163,48 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175	174	cutItem = menu.add(new MenuItem("Cut"));
176	175	cutItem.addActionListener(this);
177	176	copyItem = menu.add(new MenuItem("Copy"));
178	177	copyItem.addActionListener(this);
179	178	pasteItem = menu.add(new MenuItem("Paste"));
180	179	pasteItem.addActionListener(this);
	180	+ menu.add("-");
	181	+ cloneItem = menu.add(new MenuItem("Clone"));
	182	+ cloneItem.addActionListener(this);
	183	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	184	+ cloneSupportItem.addActionListener(this);
	185	+ menu.add("-");
	186	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	187	+ pasteIntoItem.addActionListener(this);
181	188	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	189	pasteLinkItem.addActionListener(this);
183	190	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	191	pasteCloneItem.addActionListener(this);
185	192	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	193	// pasteExpandItem.addActionListener(this);
	194	+ menu.add("-");
187	195	clearItem = menu.add(new MenuItem("Clear"));
188	196	clearItem.addActionListener(this);
	197	+
	198	+ if (Globals.ADVANCED)
	199	+ {
	200	+ // Deletes the cameras...
189	201	clearAllItem = menu.add(new MenuItem("Clear All"));
190	202	clearAllItem.addActionListener(this);
	203	+ }
191	204
192	205	oe.menuBar.add(menu = new Menu("Setting"));
	206	+ if (Globals.ADVANCED)
	207	+ {
193	208	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	209	resetMeshItem.addActionListener(this);
195	210	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +214,7 @@
199	214	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	215	resetreferencesItem.addActionListener(this);
201	216	menu.add("-");
	217	+ }
202	218	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	219	overwriteGeoItem.addActionListener(this);
204	220	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +226,26 @@
210	226	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	227	overwriteUVItem.addActionListener(this);
212	228	menu.add("-");
	229	+ if (Globals.ADVANCED)
	230	+ {
213	231	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	232	generateMeshItem.addActionListener(this);
215	233	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	234	poseMeshItem.addActionListener(this);
217	235	menu.add("-");
	236	+ }
218	237	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	238	resetsupportItem.addActionListener(this);
220	239	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	240	linkverticesItem.addActionListener(this);
222	241	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	242	relinkverticesItem.addActionListener(this);
	243	+
	244	+ if (Globals.ADVANCED)
	245	+ {
224	246	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	247	setMasterItem.addActionListener(this);
	248	+ }
226	249
227	250	oe.menuBar.add(menu = new Menu("Group"));
228	251	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +256,31 @@
233	256	frontItem.addActionListener(this);
234	257	compositeItem = menu.add(new MenuItem("Composite"));
235	258	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	259	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	260	hideItem.addActionListener(this);
238	261	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	262	ungroupItem.addActionListener(this);
240	263	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	264	+ randomItem = menu.add(new MenuItem("Switch node"));
242	265	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	266	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	267	switchGeoItem.addActionListener(this);
249	268	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	269	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	270	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	271	morphItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ physicsItem = menu.add(new MenuItem("Physics"));
	276	+ physicsItem.addActionListener(this);
	277	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	278	+ frameselectorItem.addActionListener(this);
253	279	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	280	scriptNodeItem.addActionListener(this);
255	281	cameraItem = menu.add(new MenuItem("Camera"));
256	282	cameraItem.addActionListener(this);
	283	+ }
257	284
258	285	oe.menuBar.add(menu = new Menu("Object"));
259	286	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -268,15 +295,18 @@
268	295	shadowYItem.addActionListener(this);
269	296	shadowZItem = menu.add(new MenuItem("Shadow Z"));
270	297	shadowZItem.addActionListener(this);
	298	+ if (Globals.ADVANCED)
	299	+ {
271	300	linkerItem = menu.add(new MenuItem("Linker"));
272	301	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	302	attributeItem = menu.add(new MenuItem("Attribute"));
276	303	attributeItem.addActionListener(this);
	304	+ templateItem = menu.add(new MenuItem("Template"));
	305	+ templateItem.addActionListener(this);
277	306	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	307	pointflowItem.addActionListener(this);
279	308	menu.add("-");
	309	+ }
280	310	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	311	resetTransformItem.addActionListener(this);
282	312	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
..	..	@@ -293,8 +323,11 @@
293	323	genNormalsCADItem.addActionListener(this);
294	324	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	325	genNormalsMESHItem.addActionListener(this);
	326	+ if (Globals.ADVANCED)
	327	+ {
296	328	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	329	genNormalsMINEItem.addActionListener(this);
	330	+ }
298	331	stripifyItem = menu.add(new MenuItem("Stripify"));
299	332	stripifyItem.addActionListener(this);
300	333	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,10 +349,14 @@
316	349	reduce34MeshItem.addActionListener(this);
317	350	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	351	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	352	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	353	clipMeshItem.addActionListener(this);
	354	+
	355	+ if (Globals.ADVANCED)
	356	+ {
	357	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	358	+ smoothMeshItem.addActionListener(this);
	359	+ }
323	360
324	361	oe.menuBar.add(menu = new Menu("Attributes"));
325	362	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -329,10 +366,13 @@
329	366	liveleavesItem.addActionListener(this);
330	367	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	368	unliveleavesItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
332	371	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	372	supportleavesItem.addActionListener(this);
334	373	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	374	unsupportleavesItem.addActionListener(this);
	375	+ }
336	376	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	377	hideleavesItem.addActionListener(this);
338	378	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -375,6 +415,8 @@
375	415	sortbysizeItem.addActionListener(this);
376	416	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	417	sortbynameItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
378	420	menu.add("-");
379	421	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	422	extractGeometriesItem.addActionListener(this);
..	..	@@ -384,11 +426,11 @@
384	426	shareGeometriesItem.addActionListener(this);
385	427	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386	428	mergeGeometriesItem.addActionListener(this);
	429	+ }
387	430
388	431	oe.menuBar.add(menu = new Menu("Insert"));
389	432	buildCreateMenu(menu);
390	433
391		-
392	434	oe.menuBar.add(menu = new Menu("Include"));
393	435	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394	436	importGFDItem.addActionListener(this);
..	..	@@ -433,150 +475,98 @@
433	475	oe.radioPanel.add(dummyButton);
434	476	oe.buttonGroup.add(dummyButton);
435	477	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	478	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	479
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	480	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	481	+ liveCB.setToolTipText("Enabled animation");
441	482	liveCB.addItemListener(this);
442	483
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);
	484	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	485	+ oneStepButton.setToolTipText("Animate one step forward");
	486	+ oneStepButton.addActionListener(this);
	487	+
	488	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	489	+ fastCB.setToolTipText("Fast mode");
461	490	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);
	491	+
	492	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	493	+ trackCB.setToolTipText("Enable tracking");
503	494	trackCB.addItemListener(this);
504	495
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	496	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	497	+ screenfitButton.setToolTipText("Screen fit");
507	498	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	499	+
509	500	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	501	// 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	502
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);
	503	+ if (Globals.ADVANCED)
	504	+ {
	505	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ snapobjectButton.addActionListener(this);
	507	+ snapobjectButton.setToolTipText("Snap Object");
	508	+ }
	509	+
	510	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ flashSelectionButton.setToolTipText("Show selection");
522	512	flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
526	513
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	514	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	515	+
	516	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ twoButton.setToolTipText("Show center view only");
529	518	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	519	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
531	520	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	521	+ fourButton.setToolTipText("Show left panel only");
	522	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	523	+ sixButton.setToolTipText("2-column layout left");
533	524	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	526	+ threeButton.setToolTipText("2-column layout right");
535	527	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	528	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	529	+ sevenButton.setToolTipText("3-column layout");
537	530	sevenButton.addActionListener(this);
538	531	//
539	532
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	533	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ rootButton.setToolTipText("Edit selection in new tab");
541	535	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	536	+
	537	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	538	+ closeButton.setToolTipText("Close tab");
544	539	closeButton.addActionListener(this);
545	540	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	541	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548	542
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	543	+ cGridBag commandsPanel = new cGridBag();
	544	+
	545	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+ editButton.setToolTipText("Edit selection");
551	547	editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	548
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	549	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	550	+ uneditButton.setToolTipText("Unedit selection");
557	551	uneditButton.addActionListener(this);
558	552
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);
	553	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	554	+ allParamsButton.setToolTipText("Edit all params");
571	555	allParamsButton.addActionListener(this);
572	556
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);
	557	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	558	+ clearPanelButton.setToolTipText("Clear edit panel");
	559	+ clearPanelButton.addActionListener(this);
	560	+
	561	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	562	+ unselectButton.setToolTipText("Unselect");
578	563	unselectButton.addActionListener(this);
579	564
	565	+ commandsPanel.preferredHeight = 1;
	566	+
	567	+ oe.treePanel.add(commandsPanel);
	568	+ oe.treePanel.Return();
	569	+
580	570	// oe.aConstraints.gridx += 1;
581	571	// oe.aConstraints.weighty = 0;
582	572	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +578,37 @@
588	578	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	579	// gcButton.addActionListener(this);
590	580
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;
	581	+ cGridBag jSPPanel = new cGridBag();
	582	+
	583	+ JScrollPane jSP;
602	584	//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);
	585	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
604	586	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
	587	+
	588	+ oe.treePanel.add(jSPPanel);
	589	+ oe.treePanel.Return();
609	590
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);
	591	+ cGridBag copyOptionsPanel = new cGridBag();
	592	+
	593	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	594	+ colorCB.setToolTipText("Copy color when dropped");
614	595	colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	596	+
	597	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	598	+ materialCB.setToolTipText("Copy material when dropped");
617	599	materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	600	+
	601	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	602	+ textureCB.setToolTipText("Copy texture when dropped");
620	603	textureCB.addItemListener(this);
621	604
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
	605	+ copyOptionsPanel.preferredHeight = 1;
	606	+ oe.treePanel.add(copyOptionsPanel);
	607	+ oe.treePanel.Return();
624	608
	609	+// mainPanel.setDividerLocation(0.5); //1.0);
	610	+// mainPanel.setResizeWeight(0.5);
	611	+
625	612	//jList.addListSelectionListener(this);
626	613	oe.jTree.addTreeSelectionListener(this);
627	614	//jTree.setRootVisible(false);
..	..	@@ -643,17 +630,89 @@
643	630	radio.layout = sevenButton;
644	631	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	632	}
	633	+
	634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	635	+ {
	636	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	637	+ boxCB.setToolTipText("Display bounding boxes");
	638	+ boxCB.addItemListener(this);
	639	+
	640	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	641	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	642	+ zoomBoxCB.addItemListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	647	+ supportCB.setToolTipText("Enable rigging");
	648	+ supportCB.addItemListener(this);
	649	+
	650	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	651	+ // localCB.addItemListener(this);
	652	+
	653	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	654	+ crowdCB.setToolTipText("Used for crowds");
	655	+ crowdCB.addItemListener(this);
	656	+
	657	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	658	+ smoothCB.setToolTipText("Snapping delay");
	659	+ smoothCB.addItemListener(this);
	660	+
	661	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	662	+ slowCB.setToolTipText("Smooth interpolation");
	663	+ slowCB.addItemListener(this);
	664	+
	665	+// constraints.gridy += 1;
	666	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	667	+// speakerMocapCB.addItemListener(this);
	668	+
	669	+ if (false)
	670	+ {
	671	+ // handled in scripts
	672	+ //constraints.gridy += 1;
	673	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	674	+ speakerCameraCB.addItemListener(this);
	675	+
	676	+ //constraints.gridy += 1;
	677	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	678	+ speakerFocusCB.addItemListener(this);
	679	+
	680	+ //constraints.gridy += 1;
	681	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	682	+ smoothfocusCB.addItemListener(this);
	683	+ }
	684	+
	685	+//constraints.gridx += 1;
	686	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	687	+// debugCB.addItemListener(this);
	688	+
	689	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	690	+ oeilCB.addItemListener(this);
	691	+
	692	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	693	+ lookAtCB.setToolTipText("Look-at target");
	694	+ lookAtCB.addItemListener(this);
	695	+
	696	+ }
	697	+
	698	+ cGridBag fill = new cGridBag();
	699	+
	700	+ fill.preferredHeight = 200;
	701	+
	702	+ panel.add(fill);
	703	+
	704	+ }
646	705
647	706	void EditObject(Object3D obj)
648	707	{
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();
	708	+ cRadio radioButton = new cRadio(obj.name);
	709	+ radioButton.SetObject(obj);
	710	+ radioButton.layout = sevenButton;
	711	+ radioButton.SetCamera(cameraView.renderCamera, false);
	712	+ radioButton.addActionListener(this);
	713	+ radioPanel.add(radioButton);
	714	+ buttonGroup.add(radioButton);
	715	+ radioButton.doClick();
657	716	}
658	717	void SetupViews(ObjEditor oe)
659	718	{
..	..	@@ -673,6 +732,7 @@
673	732	JCheckBox fastCB;
674	733	JCheckBox slowCB;
675	734	JCheckBox boxCB;
	735	+ JCheckBox zoomBoxCB;
676	736	JCheckBox trackCB;
677	737	JCheckBox smoothfocusCB;
678	738	// JCheckBox speakerMocapCB;
..	..	@@ -715,8 +775,7 @@
715	775	dropAttributes \|= Object3D.TEXTURE;
716	776	else
717	777	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	778	+ } else if(e.getSource() == liveCB)
720	779	{
721	780	cameraView.ToggleLive();
722	781	}
..	..	@@ -753,6 +812,10 @@
753	812	Recompile();
754	813	cameraView.repaint();
755	814	// refreshContents();
	815	+ }
	816	+ else if(e.getSource() == zoomBoxCB)
	817	+ {
	818	+ cameraView.ToggleZoomBoxMode();
756	819	}
757	820	else if(e.getSource() == smoothfocusCB)
758	821	{
..	..	@@ -921,11 +984,11 @@
921	984	{
922	985	loadClipboard(true);
923	986	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
	987	+ pasteInto(false, false);
925	988	} else {
926	989	loadClipboard(false);
927	990	objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
	991	+ pasteInto(false, false); // true); // ???
929	992	}
930	993	}
931	994	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1047,27 +1110,33 @@
1047	1110	kleinItem.addActionListener(this);
1048	1111	particleItem = menu.add(new MenuItem("Particle system"));
1049	1112	particleItem.addActionListener(this);
	1113	+ if (Globals.ADVANCED)
	1114	+ {
1050	1115	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1116	ragdollItem.addActionListener(this);
1052	1117	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1118	ragdoll2Item.addActionListener(this);
	1119	+ }
1054	1120	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1121	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1122	meshItem.addActionListener(this);
1057	1123	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1124	// meshGroupItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1059	1127	springItem = menu.add(new MenuItem("Spring"));
1060	1128	springItem.addActionListener(this);
1061	1129	flagItem = menu.add(new MenuItem("Flag"));
1062	1130	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	1131	blobItem = menu.add(new MenuItem("Blob"));
1068	1132	blobItem.addActionListener(this);
1069	1133	latheItem = menu.add(new MenuItem("Lathe"));
1070	1134	latheItem.addActionListener(this);
	1135	+ }
	1136	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1137	+ bezierItem.addActionListener(this);
	1138	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1139	+ overlayItem.addActionListener(this);
1071	1140	lightItem = menu.add(new MenuItem("Light"));
1072	1141	lightItem.addActionListener(this);
1073	1142	menu.add("-");
..	..	@@ -1077,25 +1146,26 @@
1077	1146	loopItem.addActionListener(this);
1078	1147	doubleItem = menu.add(new MenuItem("Fork"));
1079	1148	doubleItem.addActionListener(this);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
1080	1151	tripleItem = menu.add(new MenuItem("Trident"));
1081	1152	tripleItem.addActionListener(this);
	1153	+ }
1082	1154	}
1083	1155
1084	1156	void buildToolsMenu(Menu menu)
1085	1157	{
1086	1158	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1159	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1160	+ animationItem.setState(Globals.ANIMATION);
1089	1161
1090	1162	menu.add("-");
1091	1163	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1164	parseverticesItem.addActionListener(this);
1093	1165	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1166	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1167	+ alignItem = menu.add(new MenuItem("Align Object"));
1096	1168	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1169	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1170	reduceMorphItem.addActionListener(this);
1101	1171	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..	..	@@ -1103,8 +1173,12 @@
1103	1173
1104	1174	menu.add(computeAOItem = new MenuItem("Compute AO"));
1105	1175	computeAOItem.addActionListener(this);
1106		- menu.add("-");
1107	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1180	+ mirrorItem.addActionListener(this);
	1181	+ menu.add("-");
1108	1182	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1183	memoryItem.addActionListener(this);
1110	1184	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1118,6 +1192,8 @@
1118	1192	resetParentItem.addActionListener(this);
1119	1193	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1194	repairParentItem.addActionListener(this);
	1195	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1196	+ repairShadowItem.addActionListener(this);
1121	1197	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1198	invariantsItem.addActionListener(this);
1123	1199	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1201,7 @@
1125	1201	menu.add("-");
1126	1202	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1203	editScriptItem.addActionListener(this);
	1204	+ }
1128	1205	}
1129	1206
1130	1207	void ScreenFit()
..	..	@@ -1478,6 +1555,7 @@
1478	1555	//
1479	1556	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1557	{
	1558	+ Object source = event.getSource();
1481	1559	/*
1482	1560	if (event.getSource() == nameField)
1483	1561	{
..	..	@@ -1489,11 +1567,11 @@
1489	1567	}
1490	1568	else
1491	1569	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1570	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1571	{
1494	1572	ScreenFit();
1495	1573	} else
1496		- if (event.getSource() == switchItem)
	1574	+ if (source == switchItem)
1497	1575	{
1498	1576	cVector v1 = new cVector();
1499	1577	cVector v2 = new cVector();
..	..	@@ -1502,11 +1580,11 @@
1502	1580	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1581	objEditor.cameraView.repaint();
1504	1582	} else
1505		- if (event.getSource() == rectoidItem)
	1583	+ if (source == rectoidItem)
1506	1584	{
1507	1585	makeSomething(new Box());
1508	1586	} else
1509		- if (event.getSource() == particleItem)
	1587	+ if (source == particleItem)
1510	1588	{
1511	1589	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1590	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1605,9 @@
1527	1605	applyExample(particleGeom, "SMOKE");
1528	1606	makeSomething(particleGeom);
1529	1607	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1608	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1609	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1610	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1611
1534	1612	ragdoll.toParent = LA.newMatrix();
1535	1613	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1625,7 @@
1547	1625	} else
1548	1626	/*
1549	1627	*/
1550		- if (event.getSource() == heightFieldItem)
	1628	+ if (source == heightFieldItem)
1551	1629	{
1552	1630	Object3D obj = new Object3D();
1553	1631
..	..	@@ -1585,31 +1663,31 @@
1585	1663
1586	1664	makeSomething(obj);
1587	1665	} else
1588		- if (event.getSource() == gridItem)
	1666	+ if (source == gridItem)
1589	1667	{
1590	1668	makeSomething(new Grid());
1591	1669	} else
1592		- if (event.getSource() == ellipsoidItem)
	1670	+ if (source == ellipsoidItem)
1593	1671	{
1594	1672	makeSomething(new Sphere());
1595	1673	} else
1596		- if (event.getSource() == coneItem)
	1674	+ if (source == coneItem)
1597	1675	{
1598	1676	makeSomething(new Cone());
1599	1677	} else
1600		- if (event.getSource() == torusItem)
	1678	+ if (source == torusItem)
1601	1679	{
1602	1680	makeSomething(new Torus());
1603	1681	} else
1604		- if (event.getSource() == superItem)
	1682	+ if (source == superItem)
1605	1683	{
1606	1684	makeSomething(new Superellipsoid());
1607	1685	} else
1608		- if (event.getSource() == kleinItem)
	1686	+ if (source == kleinItem)
1609	1687	{
1610	1688	makeSomething(new Klein());
1611	1689	} else
1612		- if (event.getSource() == blobItem)
	1690	+ if (source == blobItem)
1613	1691	{
1614	1692	Blob blob = new Blob();
1615	1693	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +1695,15 @@
1617	1695	//blob.retile();
1618	1696	makeSomething(blob);
1619	1697	} else
1620		- if (event.getSource() == latheItem)
	1698	+ if (source == latheItem)
1621	1699	{
1622	1700	makeSomething(new Lathe());
1623	1701	} else
1624		- if (event.getSource() == bezierItem)
	1702	+ if (source == bezierItem)
1625	1703	{
1626	1704	makeSomething(new BezierSurface());
1627	1705	} else
1628		- if (event.getSource() == checkerItem)
	1706	+ if (source == overlayItem)
1629	1707	{
1630	1708	/*
1631	1709	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +1718,7 @@
1640	1718	*/
1641	1719	makeSomething(new Checker());
1642	1720	} else
1643		- if (event.getSource() == meshItem)
	1721	+ if (source == meshItem)
1644	1722	{
1645	1723	Object3D itemtomake = new Object3D();
1646	1724	Object3D child;
..	..	@@ -1661,35 +1739,35 @@
1661	1739	makeSomething(child);
1662	1740	}
1663	1741	} else
1664		- if (event.getSource() == springItem)
	1742	+ if (source == springItem)
1665	1743	{
1666	1744	cSpring s = new cSpring();
1667	1745	s.setup();
1668	1746	makeSomething(s);
1669	1747	} else
1670		- if (event.getSource() == flagItem)
	1748	+ if (source == flagItem)
1671	1749	{
1672	1750	cSpring s = new cFlag();
1673	1751	s.setup();
1674	1752	makeSomething(s);
1675	1753	} else
1676		- if (event.getSource() == lightItem)
	1754	+ if (source == lightItem)
1677	1755	{
1678	1756	makeSomething(new Light());
1679	1757	} else
1680		- if (event.getSource() == csgItem)
	1758	+ if (source == csgItem)
1681	1759	{
1682	1760	group(new CSG());
1683	1761	} else
1684		- if (event.getSource() == templateItem)
	1762	+ if (source == templateItem)
1685	1763	{
1686	1764	group(new cTemplate());
1687	1765	} else
1688		- if (event.getSource() == attributeItem)
	1766	+ if (source == attributeItem)
1689	1767	{
1690	1768	makeSomething(new Attribute());
1691	1769	} else
1692		- if (event.getSource() == pointflowItem)
	1770	+ if (source == pointflowItem)
1693	1771	{
1694	1772	makeSomething(new PointFlow());
1695	1773	} else
..	..	@@ -1701,7 +1779,7 @@
1701	1779	} else
1702	1780	*/
1703	1781
1704		- if (event.getSource() == superLoopItem)
	1782	+ if (source == superLoopItem)
1705	1783	{
1706	1784	Composite g = new cGroup();
1707	1785	for (int i=0; i<15; i++)
..	..	@@ -1723,7 +1801,7 @@
1723	1801
1724	1802	group(g);
1725	1803	} else
1726		- if (event.getSource() == loopItem)
	1804	+ if (source == loopItem)
1727	1805	{
1728	1806	Composite csg = new GroupLeaf();
1729	1807	csg.count = 5;
..	..	@@ -1732,7 +1810,7 @@
1732	1810	csg.addChild(child);
1733	1811	child.addChild(csg);
1734	1812	} else
1735		- if (event.getSource() == doubleItem)
	1813	+ if (source == doubleItem)
1736	1814	{
1737	1815	Composite csg = new GroupLeaf();
1738	1816	csg.count = 5;
..	..	@@ -1744,7 +1822,7 @@
1744	1822	csg.addChild(child);
1745	1823	child.addChild(csg);
1746	1824	} else
1747		- if (event.getSource() == tripleItem)
	1825	+ if (source == tripleItem)
1748	1826	{
1749	1827	Composite csg = new GroupLeaf();
1750	1828	csg.count = 4;
..	..	@@ -1760,70 +1838,75 @@
1760	1838	child.addChild(csg);
1761	1839	} else
1762	1840
1763		- if (event.getSource() == importGFDItem)
	1841	+ if (source == importGFDItem)
1764	1842	{
1765	1843	ImportGFD();
1766	1844	} else
1767		- if (event.getSource() == importVRMLX3DItem)
	1845	+ if (source == importVRMLX3DItem)
1768	1846	{
1769	1847	ImportVRMLX3D();
1770	1848	} else
1771		- if (event.getSource() == import3DSItem)
	1849	+ if (source == import3DSItem)
1772	1850	{
1773	1851	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774	1852	} else
1775		- if (event.getSource() == importOBJItem)
	1853	+ if (source == importOBJItem)
1776	1854	{
1777	1855	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778	1856	} else
1779		- if (event.getSource() == computeAOItem)
	1857	+ if (source == computeAOItem)
1780	1858	{
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
	1859	+ Globals.drawMode = CameraPane.OCCLUSION;
	1860	+ Globals.theRenderer.repaint();
1783	1861	} else
1784		- if (event.getSource() == recompileItem)
	1862	+ if (source == recompileItem)
1785	1863	{
1786	1864	Recompile();
1787	1865	refreshContents();
1788	1866	} else
1789		- if (event.getSource() == editScriptItem)
	1867	+ if (source == editScriptItem)
1790	1868	{
1791	1869	OpenDialog();
1792	1870	refreshContents();
1793	1871	} else
1794		- if (event.getSource() == invariantsItem)
	1872	+ if (source == invariantsItem)
1795	1873	{
1796	1874	System.out.println("Invariants:");
1797	1875	GrafreeD.grafreeD.universe.invariants();
1798	1876	} else
1799		- if (event.getSource() == memoryItem)
	1877	+ if (source == memoryItem)
1800	1878	{
1801	1879	//System.out.println("Invariants:");
1802	1880	PrintMemory();
1803	1881	} else
1804		- if (event.getSource() == pathItem)
	1882	+ if (source == pathItem)
1805	1883	{
1806	1884	PrintPath();
1807	1885	} else
1808		- if (event.getSource() == analyzeItem)
	1886	+ if (source == analyzeItem)
1809	1887	{
1810	1888	AnalyzeObject();
1811	1889	} else
1812		- if (event.getSource() == dumpItem)
	1890	+ if (source == dumpItem)
1813	1891	{
1814	1892	DumpObject();
1815	1893	} else
1816		- if (event.getSource() == screenfitButton)
	1894	+ if (source == oneStepButton)
	1895	+ {
	1896	+ Globals.ONESTEP = true;
	1897	+ cameraView.repaint();
	1898	+ } else
	1899	+ if (source == screenfitButton)
1817	1900	{
1818	1901	//Reload(lastConverter, lastFilename, true);
1819	1902	ScreenFit();
1820	1903	} else
1821		- if (event.getSource() == screenfitpointButton)
	1904	+ if (source == screenfitpointButton)
1822	1905	{
1823	1906	//Reload(lastConverter, lastFilename, true);
1824	1907	ScreenFitPoint();
1825	1908	} else
1826		- if (event.getSource() == snapobjectButton)
	1909	+ if (source == snapobjectButton)
1827	1910	{
1828	1911	//Reload(lastConverter, lastFilename, true);
1829	1912	SnapObject();
..	..	@@ -1834,13 +1917,13 @@
1834	1917	// Recompile();
1835	1918	// refreshContents();
1836	1919	// } else
1837		- if (event.getSource() == gcButton)
	1920	+ if (source == gcButton)
1838	1921	{
1839	1922	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	1923	System.gc();
1841	1924	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1925	} else
1843		- if (event.getSource() == editLeafItem)
	1926	+ if (source == editLeafItem)
1844	1927	{
1845	1928	Object3D obj;
1846	1929	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +1937,66 @@
1854	1937	}
1855	1938	refreshContents(true);
1856	1939	} else
1857		- if (event.getSource() == openWindowItem)
	1940	+ if (source == openWindowItem)
1858	1941	{
1859	1942	EditSelection(true);
1860	1943	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1944	+ if (source == cutItem \|\| source == clearButton)
1862	1945	{
1863	1946	loadClipboard(true);
1864	1947	} else
1865		- if (event.getSource() == duplicateItem)
	1948	+ if (source == duplicateItem)
1866	1949	{
1867	1950	Object3D keep = GrafreeD.clipboard;
1868	1951	loadClipboard(false);
1869	1952	paste(false);
1870	1953	GrafreeD.clipboard = keep;
1871	1954	} else
1872		- if (event.getSource() == cloneItem)
	1955	+ if (source == cloneItem)
1873	1956	{
1874	1957	CloneSelection(false);
1875	1958	} else
1876		- if (event.getSource() == cloneSupportItem)
	1959	+ if (source == cloneSupportItem)
1877	1960	{
1878	1961	CloneSelection(true);
1879	1962	} else
1880		- if (event.getSource() == copyItem)
	1963	+ if (source == copyItem)
1881	1964	{
1882	1965	loadClipboard(false);
1883	1966	} else
1884		- if (event.getSource() == pasteItem)
	1967	+ if (source == pasteItem)
1885	1968	{
1886	1969	paste(false);
1887	1970	} else
1888		- if (event.getSource() == pasteLinkItem)
	1971	+ if (source == pasteIntoItem)
1889	1972	{
1890		- pasteInto(false);
	1973	+ pasteInto(true, false);
1891	1974	} else
1892		- if (event.getSource() == pasteCloneItem)
	1975	+ if (source == pasteLinkItem)
1893	1976	{
1894		- pasteInto(true);
	1977	+ pasteInto(false, false);
1895	1978	} else
1896		- if (event.getSource() == pasteExpandItem)
	1979	+ if (source == pasteCloneItem)
	1980	+ {
	1981	+ pasteInto(true, true);
	1982	+ } else
	1983	+ if (source == pasteExpandItem)
1897	1984	{
1898	1985	paste(true);
1899	1986	} else
1900		- if (event.getSource() == synchronizeItem)
	1987	+ if (source == synchronizeItem)
1901	1988	{
1902	1989	Overwrite(Object3D.TRANSFORM);
1903	1990	} else
1904		- if (event.getSource() == overwriteNameItem)
	1991	+ if (source == overwriteNameItem)
1905	1992	{
1906	1993	Overwrite(Object3D.NAME);
1907	1994	} else
1908		- if (event.getSource() == overwriteUVItem)
	1995	+ if (source == overwriteUVItem)
1909	1996	{
1910	1997	Overwrite(Object3D.UV);
1911	1998	} else
1912		- if (event.getSource() == overwriteMatItem)
	1999	+ if (source == overwriteMatItem)
1913	2000	{
1914	2001	/* july 2015
1915	2002	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2016,7 @@
1929	2016
1930	2017	Overwrite(dropAttributes);
1931	2018	}
1932		- if (event.getSource() == overwriteGeoItem)
	2019	+ if (source == overwriteGeoItem)
1933	2020	{
1934	2021	Overwrite(Object3D.GEOMETRY);
1935	2022	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2033,7 @@
1946	2033	// refreshContents();
1947	2034	// }
1948	2035	} else
1949		- if (event.getSource() == generateMeshItem)
	2036	+ if (source == generateMeshItem)
1950	2037	{
1951	2038	//if (group.selection.size() == 1)
1952	2039	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2044,7 @@
1957	2044	ResetModel();
1958	2045	refreshContents();
1959	2046	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2047	+ if (source == extractGeometriesItem)
1961	2048	{
1962	2049	boolean one = false;
1963	2050
..	..	@@ -1984,7 +2071,7 @@
1984	2071	ResetModel();
1985	2072	refreshContents();
1986	2073	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2074	+ if (source == cloneGeometriesItem)
1988	2075	{
1989	2076	boolean one = false;
1990	2077
..	..	@@ -2010,7 +2097,7 @@
2010	2097	ResetModel();
2011	2098	refreshContents();
2012	2099	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2100	+ if (source == shareGeometriesItem)
2014	2101	{
2015	2102	boolean one = false;
2016	2103
..	..	@@ -2040,7 +2127,7 @@
2040	2127	refreshContents();
2041	2128	}
2042	2129	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2130	+ if (source == mergeGeometriesItem)
2044	2131	{
2045	2132	boolean one = false;
2046	2133
..	..	@@ -2070,7 +2157,7 @@
2070	2157	ResetModel();
2071	2158	refreshContents();
2072	2159	} else
2073		- if (event.getSource() == linkverticesItem)
	2160	+ if (source == linkverticesItem)
2074	2161	{
2075	2162	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2163	// {
..	..	@@ -2090,41 +2177,41 @@
2090	2177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2178	content = ((cGroup)content).get(0);
2092	2179
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2180	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2181	for (int i=0; i<group.selection.size(); i++)
2095	2182	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2183	+ boolean random = CameraPane.SWITCH;
	2184	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2185	group.selection.get(i).linkVerticesThis(content);
2099	2186	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2187	+ CameraPane.SWITCH = random;
2101	2188	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2189	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2190	refreshContents();
2104	2191	}
2105	2192	} else
2106		- if (event.getSource() == resetsupportItem)
	2193	+ if (source == resetsupportItem)
2107	2194	{
2108	2195	for (int i=0; i<group.selection.size(); i++)
2109	2196	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2197	+ boolean random = CameraPane.SWITCH;
	2198	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2199	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2200	+ CameraPane.SWITCH = random;
2114	2201	}
2115	2202
2116	2203	refreshContents();
2117	2204	} else
2118		- if (event.getSource() == relinkverticesItem)
	2205	+ if (source == relinkverticesItem)
2119	2206	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2207	+ boolean random = CameraPane.SWITCH;
	2208	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2209	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2210	+ CameraPane.SWITCH = random;
2124	2211
2125	2212	refreshContents();
2126	2213	} else
2127		- if (event.getSource() == resetreferencesItem)
	2214	+ if (source == resetreferencesItem)
2128	2215	{
2129	2216	for (int i=0; i<group.selection.size(); i++)
2130	2217	{
..	..	@@ -2133,7 +2220,7 @@
2133	2220
2134	2221	refreshContents();
2135	2222	} else
2136		- if (event.getSource() == setMasterItem)
	2223	+ if (source == setMasterItem)
2137	2224	{
2138	2225	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2139	2226	{
..	..	@@ -2146,7 +2233,7 @@
2146	2233	refreshContents();
2147	2234	}
2148	2235	} else
2149		- if (event.getSource() == poseMeshItem)
	2236	+ if (source == poseMeshItem)
2150	2237	{
2151	2238	if (group.selection.size() == 1)
2152	2239	{
..	..	@@ -2165,19 +2252,19 @@
2165	2252	}
2166	2253
2167	2254	} else
2168		- if (event.getSource() == revertMeshItem)
	2255	+ if (source == revertMeshItem)
2169	2256	{
2170	2257	RevertMeshes();
2171	2258	} else
2172		- if (event.getSource() == resetMeshItem)
	2259	+ if (source == resetMeshItem)
2173	2260	{
2174	2261	ResetAll();
2175	2262	} else
2176		- if (event.getSource() == stepAllItem)
	2263	+ if (source == stepAllItem)
2177	2264	{
2178	2265	StepAll();
2179	2266	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2267	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2268	{
2182	2269	//int indices[] = jList.getSelectedIndices();
2183	2270	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2272,46 @@
2185	2272
2186	2273	ClearSelection(false);
2187	2274	} else
2188		- if (event.getSource() == clearAllItem)
	2275	+ if (source == clearAllItem)
2189	2276	{
2190	2277	ClearSelection(true);
2191	2278	} else
2192		- if (event.getSource() == grabItem)
	2279	+ if (source == grabItem)
2193	2280	{
2194	2281	group(new cGroup(), true);
2195	2282	} else
2196		- if (event.getSource() == hideItem)
	2283	+ if (source == hideItem)
2197	2284	{
2198	2285	group(new HiddenObject());
2199	2286	} else
2200		- if (event.getSource() == frontItem)
	2287	+ if (source == frontItem)
2201	2288	{
2202	2289	front();
2203	2290	} else
2204		- if (event.getSource() == backItem)
	2291	+ if (source == backItem)
2205	2292	{
2206	2293	back();
2207	2294	} else
2208		- if (event.getSource() == cameraItem)
	2295	+ if (source == cameraItem)
2209	2296	{
2210	2297	makeSomething(new Camera());
2211	2298	} else
2212		- if (event.getSource() == compositeItem)
	2299	+ if (source == compositeItem)
2213	2300	{
2214	2301	group(new Composite());
2215	2302	} else
2216		- if (event.getSource() == randomItem)
	2303	+ if (source == randomItem)
2217	2304	{
2218	2305	RandomNode random = new RandomNode();
2219	2306	group(random);
2220	2307	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2308	+ random.name = random.get(0).name + "Switch";
2222	2309	} else
2223		- if (event.getSource() == physicsItem)
	2310	+ if (source == physicsItem)
2224	2311	{
2225	2312	group(new PhysicsNode());
2226	2313	} else
2227		- if (event.getSource() == frameselectorItem)
	2314	+ if (source == frameselectorItem)
2228	2315	{
2229	2316	for (int i=0; i<group.selection.size(); i++)
2230	2317	{
..	..	@@ -2236,7 +2323,7 @@
2236	2323	ResetModel();
2237	2324	refreshContents();
2238	2325	} else
2239		- if (event.getSource() == switchGeoItem)
	2326	+ if (source == switchGeoItem)
2240	2327	{
2241	2328	for (int i=0; i<group.selection.size(); i++)
2242	2329	{
..	..	@@ -2248,7 +2335,7 @@
2248	2335	ResetModel();
2249	2336	refreshContents();
2250	2337	} else
2251		- if (event.getSource() == switchTransfoItem)
	2338	+ if (source == switchTransfoItem)
2252	2339	{
2253	2340	for (int i=0; i<group.selection.size(); i++)
2254	2341	{
..	..	@@ -2260,7 +2347,7 @@
2260	2347	ResetModel();
2261	2348	refreshContents();
2262	2349	} else
2263		- if (event.getSource() == morphItem)
	2350	+ if (source == morphItem)
2264	2351	{
2265	2352	for (int i=0; i<group.selection.size(); i++)
2266	2353	{
..	..	@@ -2272,7 +2359,7 @@
2272	2359	ResetModel();
2273	2360	refreshContents();
2274	2361	} else
2275		- if (event.getSource() == scriptNodeItem)
	2362	+ if (source == scriptNodeItem)
2276	2363	{
2277	2364	boolean atleastone = false;
2278	2365
..	..	@@ -2311,31 +2398,31 @@
2311	2398	}
2312	2399	}
2313	2400	} else
2314		- if (event.getSource() == linkerItem)
	2401	+ if (source == linkerItem)
2315	2402	{
2316	2403	group(new cLinker());
2317	2404	} else
2318		- if (event.getSource() == textureItem)
	2405	+ if (source == textureItem)
2319	2406	{
2320	2407	group(new TextureNode());
2321	2408	} else
2322		- if (event.getSource() == billboardItem)
	2409	+ if (source == billboardItem)
2323	2410	{
2324	2411	group(new BillboardNode());
2325	2412	} else
2326		- if (event.getSource() == shadowXItem)
	2413	+ if (source == shadowXItem)
2327	2414	{
2328	2415	CastShadow(0);
2329	2416	} else
2330		- if (event.getSource() == shadowYItem)
	2417	+ if (source == shadowYItem)
2331	2418	{
2332	2419	CastShadow(1);
2333	2420	} else
2334		- if (event.getSource() == shadowZItem)
	2421	+ if (source == shadowZItem)
2335	2422	{
2336	2423	CastShadow(2);
2337	2424	} else
2338		- if (event.getSource() == ungroupItem)
	2425	+ if (source == ungroupItem)
2339	2426	{
2340	2427	//ungroup();
2341	2428	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2347,179 +2434,179 @@
2347	2434
2348	2435	refreshContents();
2349	2436	} else
2350		- if (event.getSource() == genUVItem)
	2437	+ if (source == genUVItem)
2351	2438	{
2352	2439	GenUV();
2353	2440	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2441	+ if (source == genNormalsCADItem)
2355	2442	{
2356	2443	GenNormals(true);
2357	2444	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2445	+ if (source == genNormalsMESHItem)
2359	2446	{
2360	2447	GenNormals(true); // TODO
2361	2448	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2449	+ if (source == genNormalsORGANItem)
2363	2450	{
2364	2451	GenNormals(false);
2365	2452	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2453	+ if (source == genNormalsMINEItem)
2367	2454	{
2368	2455	GenNormalsMINE();
2369	2456	} else
2370		- if (event.getSource() == stripifyItem)
	2457	+ if (source == stripifyItem)
2371	2458	{
2372	2459	Stripify();
2373	2460	} else
2374		- if (event.getSource() == unstripifyItem)
	2461	+ if (source == unstripifyItem)
2375	2462	{
2376	2463	Unstripify();
2377	2464	} else
2378		- if (event.getSource() == trimItem)
	2465	+ if (source == trimItem)
2379	2466	{
2380	2467	Trim();
2381	2468	} else
2382		- if (event.getSource() == untrimItem)
	2469	+ if (source == untrimItem)
2383	2470	{
2384	2471	Untrim();
2385	2472	} else
2386		- if (event.getSource() == clearColorsItem)
	2473	+ if (source == clearColorsItem)
2387	2474	{
2388	2475	ClearColors();
2389	2476	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2477	+ if (source == clearMaterialsItem)
2391	2478	{
2392	2479	ClearMaterials();
2393	2480	} else
2394		- if (event.getSource() == liveleavesItem)
	2481	+ if (source == liveleavesItem)
2395	2482	{
2396	2483	LiveLeaves(true);
2397	2484	} else
2398		- if (event.getSource() == unliveleavesItem)
	2485	+ if (source == unliveleavesItem)
2399	2486	{
2400	2487	LiveLeaves(false);
2401	2488	} else
2402		- if (event.getSource() == supportleavesItem)
	2489	+ if (source == supportleavesItem)
2403	2490	{
2404	2491	SupportLeaves(true);
2405	2492	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2493	+ if (source == unsupportleavesItem)
2407	2494	{
2408	2495	SupportLeaves(false);
2409	2496	} else
2410		- if (event.getSource() == hideleavesItem)
	2497	+ if (source == hideleavesItem)
2411	2498	{
2412	2499	HideLeaves(true);
2413	2500	} else
2414		- if (event.getSource() == showleavesItem)
	2501	+ if (source == showleavesItem)
2415	2502	{
2416	2503	HideLeaves(false);
2417	2504	} else
2418		- if (event.getSource() == markleavesItem)
	2505	+ if (source == markleavesItem)
2419	2506	{
2420	2507	MarkLeaves(true);
2421	2508	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2509	+ if (source == unmarkleavesItem)
2423	2510	{
2424	2511	MarkLeaves(false);
2425	2512	} else
2426		- if (event.getSource() == flipVItem)
	2513	+ if (source == flipVItem)
2427	2514	{
2428	2515	FlipV(true);
2429	2516	} else
2430		- if (event.getSource() == unflipVItem)
	2517	+ if (source == unflipVItem)
2431	2518	{
2432	2519	FlipV(false);
2433	2520	} else
2434		- if (event.getSource() == lowTexturesItem)
	2521	+ if (source == lowTexturesItem)
2435	2522	{
2436	2523	SetTexRes(0);
2437	2524	} else
2438		- if (event.getSource() == normalTexturesItem)
	2525	+ if (source == normalTexturesItem)
2439	2526	{
2440	2527	SetTexRes(1);
2441	2528	} else
2442		- if (event.getSource() == highTexturesItem)
	2529	+ if (source == highTexturesItem)
2443	2530	{
2444	2531	SetTexRes(2);
2445	2532	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2533	+ if (source == veryhighTexturesItem)
2447	2534	{
2448	2535	SetTexRes(3);
2449	2536	} else
2450		- if (event.getSource() == maxTexturesItem)
	2537	+ if (source == maxTexturesItem)
2451	2538	{
2452	2539	SetTexRes(4);
2453	2540	} else
2454		- if (event.getSource() == panoTexturesItem)
	2541	+ if (source == panoTexturesItem)
2455	2542	{
2456	2543	SetTexRes(5);
2457	2544	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2545	+ if (source == reverseNormalsItem)
2459	2546	{
2460	2547	ReverseNormals();
2461	2548	} else
2462		- if (event.getSource() == parseverticesItem)
	2549	+ if (source == parseverticesItem)
2463	2550	{
2464	2551	ParseVertices();
2465	2552	} else
2466		- if (event.getSource() == textureFieldItem)
	2553	+ if (source == textureFieldItem)
2467	2554	{
2468	2555	TextureVertices();
2469	2556	} else
2470		- if (event.getSource() == alignItem)
	2557	+ if (source == alignItem)
2471	2558	{
2472	2559	Align();
2473	2560	} else
2474		- if (event.getSource() == mirrorItem)
	2561	+ if (source == mirrorItem)
2475	2562	{
2476	2563	MirrorPoses();
2477	2564	} else
2478		- if (event.getSource() == reduceMorphItem)
	2565	+ if (source == reduceMorphItem)
2479	2566	{
2480	2567	MeshReduction(false);
2481	2568	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2569	+ if (source == reduce34MorphItem)
2483	2570	{
2484	2571	MeshReduction(true);
2485	2572	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2573	+ if (source == reverseTrianglesItem)
2487	2574	{
2488	2575	ReverseTriangles();
2489	2576	} else
2490		- if (event.getSource() == reduceMeshItem)
	2577	+ if (source == reduceMeshItem)
2491	2578	{
2492	2579	ReduceMesh(false);
2493	2580	} else
2494		- if (event.getSource() == reduce34MeshItem)
	2581	+ if (source == reduce34MeshItem)
2495	2582	{
2496	2583	ReduceMesh(true);
2497	2584	} else
2498		- if (event.getSource() == increaseMeshItem)
	2585	+ if (source == increaseMeshItem)
2499	2586	{
2500	2587	IncreaseMesh();
2501	2588	} else
2502		- if (event.getSource() == clipMeshItem)
	2589	+ if (source == clipMeshItem)
2503	2590	{
2504	2591	ClipMesh();
2505	2592	} else
2506		- if (event.getSource() == smoothMeshItem)
	2593	+ if (source == smoothMeshItem)
2507	2594	{
2508	2595	SmoothMesh();
2509	2596	} else
2510		- if (event.getSource() == transformgeometryItem)
	2597	+ if (source == transformgeometryItem)
2511	2598	{
2512	2599	TransformGeometry();
2513	2600	} else
2514		- if (event.getSource() == resetTransformItem)
	2601	+ if (source == resetTransformItem)
2515	2602	{
2516	2603	ResetTransform();
2517	2604	} else
2518		- if (event.getSource() == resetCentroidItem)
	2605	+ if (source == resetCentroidItem)
2519	2606	{
2520	2607	ResetCentroid();
2521	2608	} else
2522		- if (event.getSource() == resetParentItem)
	2609	+ if (source == resetParentItem)
2523	2610	{
2524	2611	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	2612	{
..	..	@@ -2529,7 +2616,7 @@
2529	2616
2530	2617	refreshContents();
2531	2618	} else
2532		- if (event.getSource() == repairParentItem)
	2619	+ if (source == repairParentItem)
2533	2620	{
2534	2621	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	2622	{
..	..	@@ -2543,7 +2630,21 @@
2543	2630
2544	2631	refreshContents();
2545	2632	} else
2546		- if (event.getSource() == sortbysizeItem)
	2633	+ if (source == repairShadowItem)
	2634	+ {
	2635	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2636	+ {
	2637	+ Object3D obj = (Object3D)e.nextElement();
	2638	+ obj.RepairShadow();
	2639	+// for (int i=0; i<obj.size(); i++)
	2640	+// {
	2641	+// obj.get(i).parent = obj;
	2642	+// }
	2643	+ }
	2644	+
	2645	+ refreshContents();
	2646	+ } else
	2647	+ if (source == sortbysizeItem)
2547	2648	{
2548	2649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	2650	{
..	..	@@ -2555,7 +2656,7 @@
2555	2656	ResetModel();
2556	2657	refreshContents();
2557	2658	} else
2558		- if (event.getSource() == sortbynameItem)
	2659	+ if (source == sortbynameItem)
2559	2660	{
2560	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	2662	{
..	..	@@ -2567,7 +2668,7 @@
2567	2668	ResetModel();
2568	2669	refreshContents();
2569	2670	} else
2570		- if (event.getSource() == attachPigmentItem)
	2671	+ if (source == attachPigmentItem)
2571	2672	{
2572	2673	String texture = GetFile("Attach pigment");
2573	2674	Object3D obj;
..	..	@@ -2579,7 +2680,7 @@
2579	2680
2580	2681	refreshContents();
2581	2682	} else
2582		- if (event.getSource() == detachPigmentItem)
	2683	+ if (source == detachPigmentItem)
2583	2684	{
2584	2685	Object3D obj;
2585	2686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +2691,7 @@
2590	2691
2591	2692	refreshContents();
2592	2693	} else
2593		- if (event.getSource() == attachBumpItem)
	2694	+ if (source == attachBumpItem)
2594	2695	{
2595	2696	String texture = GetFile("Attach bump");
2596	2697	Object3D obj;
..	..	@@ -2602,7 +2703,7 @@
2602	2703
2603	2704	refreshContents();
2604	2705	} else
2605		- if (event.getSource() == detachBumpItem)
	2706	+ if (source == detachBumpItem)
2606	2707	{
2607	2708	Object3D obj;
2608	2709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +2714,7 @@
2613	2714
2614	2715	refreshContents();
2615	2716	} else
2616		- if (event.getSource() == pigmentBumpItem)
	2717	+ if (source == pigmentBumpItem)
2617	2718	{
2618	2719	Object3D obj;
2619	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +2725,195 @@
2624	2725
2625	2726	refreshContents();
2626	2727	} else
2627		- if (event.getSource() == flashSelectionButton)
	2728	+ if (source == flashSelectionButton)
2628	2729	{
2629	2730	CameraPane.flash = true;
2630	2731	refreshContents();
2631	2732	} else
2632		- if (event.getSource() == oneButton)
	2733	+ if (source == oneButton)
2633	2734	{
2634	2735	} else
2635		- if (event.getSource() == twoButton)
	2736	+ if (source == twoButton)
2636	2737	{
2637	2738	radio.layout = twoButton;
2638	2739	// bug
2639	2740	//gridPanel.setDividerLocation(1.0);
2640	2741	//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();
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2750	+// aWindowConstraints.weightx = 0;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// //bigThree.add(jtp, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// bigThree.add(centralPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// scenePanel.setVisible(false);
	2766	+// centralPanel.setVisible(true);
	2767	+// XYZPanel.setVisible(false);
	2768	+ bigThree.ClearUI();
	2769	+ bigThree.add(centralPanel);
	2770	+ bigThree.FlushUI();
2665	2771	} else
2666		- if (event.getSource() == threeButton)
	2772	+ if (source == threeButton)
2667	2773	{
2668	2774	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();
	2775	+
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// bigThree.validate();
	2800	+// scenePanel.setVisible(false);
	2801	+// centralPanel.setVisible(true);
	2802	+// XYZPanel.setVisible(true);
	2803	+ bigThree.ClearUI();
	2804	+ bigThree.add(centralPanel);
	2805	+ bigThree.add(XYZPanel);
	2806	+ bigThree.FlushUI();
2693	2807	} else
2694		- if (event.getSource() == fourButton)
	2808	+ if (source == fourButton)
2695	2809	{
2696	2810	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();
	2811	+
	2812	+// bigThree.remove(scenePanel);
	2813	+// bigThree.remove(centralPanel);
	2814	+// bigThree.remove(XYZPanel);
	2815	+// aWindowConstraints.gridx = 0;
	2816	+// aWindowConstraints.gridy = 0;
	2817	+// aWindowConstraints.gridwidth = 1;
	2818	+// // aWindowConstraints.gridheight = 3;
	2819	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.weighty = 1;
	2822	+// bigThree.add(scenePanel, aWindowConstraints);
	2823	+// aWindowConstraints.weightx = 1;
	2824	+// aWindowConstraints.gridwidth = 3;
	2825	+// // aConstraints.gridheight = 3;
	2826	+// aWindowConstraints.gridx = 1;
	2827	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2828	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2829	+// aWindowConstraints.weightx = 0;
	2830	+// aWindowConstraints.gridx = 4;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2835	+// bigThree.validate();
	2836	+// scenePanel.setVisible(true);
	2837	+// centralPanel.setVisible(false);
	2838	+// XYZPanel.setVisible(false);
	2839	+ bigThree.ClearUI();
	2840	+ bigThree.add(scenePanel);
	2841	+ bigThree.FlushUI();
2721	2842	} else
2722		- if (event.getSource() == sixButton)
	2843	+ if (source == sixButton)
2723	2844	{
2724	2845	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();
	2846	+
	2847	+// bigThree.remove(scenePanel);
	2848	+// bigThree.remove(centralPanel);
	2849	+// bigThree.remove(XYZPanel);
	2850	+// aWindowConstraints.gridx = 0;
	2851	+// aWindowConstraints.gridy = 0;
	2852	+// aWindowConstraints.gridwidth = 1;
	2853	+// // aConstraints.gridheight = 3;
	2854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.weighty = 1;
	2857	+// bigThree.add(scenePanel, aWindowConstraints);
	2858	+// aWindowConstraints.weightx = 1;
	2859	+// aWindowConstraints.gridwidth = 3;
	2860	+// // aWindowConstraints.gridheight = 3;
	2861	+// aWindowConstraints.gridx = 1;
	2862	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2863	+// bigThree.add(centralPanel, aWindowConstraints);
	2864	+// aWindowConstraints.weightx = 0;
	2865	+// aWindowConstraints.gridx = 4;
	2866	+// aWindowConstraints.gridwidth = 1;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2869	+// //bigThree.add(XYZPanel, aConstraints);
	2870	+// bigThree.validate();
	2871	+// scenePanel.setVisible(true);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(scenePanel);
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2749	2878	} else
2750		- if (event.getSource() == sevenButton)
	2879	+ if (source == sevenButton)
2751	2880	{
2752	2881	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();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aWindowConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// bigThree.add(scenePanel, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(true);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(scenePanel);
	2912	+ bigThree.add(centralPanel);
	2913	+ bigThree.add(XYZPanel);
	2914	+ bigThree.FlushUI();
2777	2915	} else
2778		- if (event.getSource() == rootButton)
	2916	+ if (source == rootButton)
2779	2917	{
2780	2918	Object3D obj;
2781	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,7 +2925,7 @@
2787	2925
2788	2926	refreshContents(true);
2789	2927	} else
2790		- if (event.getSource() == closeButton)
	2928	+ if (source == closeButton)
2791	2929	{
2792	2930	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	2931	cRadio ab;
..	..	@@ -2808,11 +2946,11 @@
2808	2946	}
2809	2947	refreshContents(true);
2810	2948	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2949	+ if (source == editItem \|\| source == editButton)
2812	2950	{
2813	2951	EditSelection(false);
2814	2952	} else
2815		- if (event.getSource() == uneditButton)
	2953	+ if (source == uneditButton)
2816	2954	{
2817	2955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	2956	{
..	..	@@ -2824,12 +2962,12 @@
2824	2962
2825	2963	child.editWindow = null; // ???????????
2826	2964	}
2827		- objEditor.ctrlPanel.revalidate();
	2965	+ objEditor.ctrlPanel.FlushUI();
2828	2966	//objEditor.jTree.clearSelection();
2829	2967	//objEditor.ResetSliders();
2830	2968	refreshContents(true);
2831	2969	} else
2832		- if (event.getSource() == clearPanelButton)
	2970	+ if (source == clearPanelButton)
2833	2971	{
2834	2972	assert(copy == group);
2835	2973	//copy.ClearUI();
..	..	@@ -2840,7 +2978,7 @@
2840	2978	listUI.clear();
2841	2979	refreshContents(true);
2842	2980	} else
2843		- if (event.getSource() == allParamsButton)
	2981	+ if (source == allParamsButton)
2844	2982	{
2845	2983	assert(copy == group);
2846	2984
..	..	@@ -2861,19 +2999,19 @@
2861	2999
2862	3000	refreshContents(true);
2863	3001	} else
2864		- if (event.getSource() == unselectButton)
	3002	+ if (source == unselectButton)
2865	3003	{
2866	3004	objEditor.jTree.clearSelection();
2867	3005	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3006	objEditor.ResetSliders();
2869	3007	refreshContents(true);
2870	3008	} else
2871		- if(event.getSource() instanceof cRadio)
	3009	+ if(source instanceof cRadio)
2872	3010	{
2873	3011	group.parent = keepparent;
2874	3012	group.attributes = 0;
2875	3013	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3014	+ /cRadio/ radio = (cRadio)source;
2877	3015	Object3D obj = radio.GetObject();
2878	3016	System.out.println("Edit " + obj);
2879	3017	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3031,7 @@
2893	3031	}
2894	3032
2895	3033	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3034	+ //Globals.theRenderer.object = group;
2897	3035	if(!useclient)
2898	3036	{
2899	3037	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,7 +3040,8 @@
2902	3040	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3041	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3042	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3043	+ //cameraView.lighttouched = true;
	3044	+ Globals.lighttouched = true;
2906	3045	topView.object = group;
2907	3046	frontView.object = group;
2908	3047	sideView.object = group;
..	..	@@ -2938,7 +3077,7 @@
2938	3077	if (useclient)
2939	3078	{
2940	3079	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3080	+ Globals.lighttouched = true;
2942	3081	//topView.object = client;
2943	3082	//frontView.object = client;
2944	3083	//sideView.object = client;
..	..	@@ -2946,7 +3085,7 @@
2946	3085	else
2947	3086	{
2948	3087	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3088	+ Globals.lighttouched = true;
2950	3089	//topView.object = group;
2951	3090	//frontView.object = group;
2952	3091	//sideView.object = group;
..	..	@@ -3454,7 +3593,7 @@
3454	3593	String pigment = Object3D.GetPigment(tex);
3455	3594	//String bump = Object3D.GetBump(tex);
3456	3595
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3596	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3458	3597
3459	3598	double s = v.s;
3460	3599
..	..	@@ -3542,11 +3681,11 @@
3542	3681
3543	3682	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	3683
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	3684	+ boolean random = CameraPane.SWITCH;
	3685	+ CameraPane.SWITCH = false; // parse all random nodes
3547	3686	lowres.linkVerticesThis(null);
3548	3687	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	3688	+ CameraPane.SWITCH = random;
3550	3689
3551	3690	System.err.flush();
3552	3691
..	..	@@ -3755,7 +3894,7 @@
3755	3894	group.selection.RelinkToSupport(); // july 2014
3756	3895	System.out.println("DONE.");
3757	3896	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3897	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	3898	}
3760	3899
3761	3900	void ReduceMesh(boolean reduction34)
..	..	@@ -4031,25 +4170,25 @@
4031	4170	System.err.println("info : " + child.GetPath());
4032	4171	}
4033	4172	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4173	+// else
	4174	+// {
	4175	+// objEditor.SetMaterial(group); // .GetMaterial());
	4176	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4177	+// System.err.println("info : " + group.GetPath());
	4178	+// }
4040	4179
4041	4180	objEditor.SetText(); // jan 2014
4042	4181
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4182	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4044	4183	CameraPane.flash = true;
4045	4184
4046	4185	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4047	4186	// a camera
4048	4187	{
4049	4188	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;
	4189	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4190	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4191	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4192	}
4054	4193
4055	4194	refreshContents();
..	..	@@ -4304,7 +4443,7 @@
4304	4443	refreshContents();
4305	4444	}
4306	4445
4307		- void pasteInto(boolean copyit)
	4446	+ void pasteInto(boolean copyit, boolean clone)
4308	4447	{
4309	4448	// if (GrafreeD.clipboard == null)
4310	4449	// return;
..	..	@@ -4333,7 +4472,14 @@
4333	4472	if (copyit)
4334	4473	{
4335	4474	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	4475	+ if (clone)
	4476	+ {
	4477	+ CloneClipboard(false); // sept 2014
	4478	+ }
	4479	+ else
	4480	+ {
	4481	+ paste(false);
	4482	+ }
4337	4483	}
4338	4484	else
4339	4485	{
..	..	@@ -4877,10 +5023,12 @@
4877	5023	cButton flashSelectionButton;
4878	5024	cButton editButton;
4879	5025	cButton uneditButton;
	5026	+ JCheckBox allParamsButton;
4880	5027	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5028	cButton unselectButton;
4883	5029
	5030	+ cButton oneStepButton;
	5031	+
4884	5032	cButton screenfitButton;
4885	5033	cButton screenfitpointButton;
4886	5034	cButton snapobjectButton;
..	..	@@ -4935,6 +5083,7 @@
4935	5083	private MenuItem mergeGeometriesItem;
4936	5084	private MenuItem copyItem;
4937	5085	private MenuItem pasteItem;
	5086	+ private MenuItem pasteIntoItem;
4938	5087	private MenuItem pasteLinkItem;
4939	5088	private MenuItem pasteCloneItem;
4940	5089	private MenuItem pasteExpandItem;
..	..	@@ -5007,6 +5156,7 @@
5007	5156
5008	5157	private MenuItem resetParentItem;
5009	5158	private MenuItem repairParentItem;
	5159	+ private MenuItem repairShadowItem;
5010	5160	private MenuItem sortbysizeItem;
5011	5161	private MenuItem sortbynameItem;
5012	5162
..	..	@@ -5031,7 +5181,7 @@
5031	5181	private MenuItem blobItem;
5032	5182	private MenuItem latheItem;
5033	5183	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5184	+ private MenuItem overlayItem;
5035	5185	private MenuItem meshItem;
5036	5186	// private MenuItem meshGroupItem;
5037	5187	private MenuItem springItem;