~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,11 +433,11 @@
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	442	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394	443	importGFDItem.addActionListener(this);
..	..	@@ -433,153 +482,98 @@
433	482	oe.radioPanel.add(dummyButton);
434	483	oe.buttonGroup.add(dummyButton);
435	484	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	485	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	486
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	487	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	488	+ liveCB.setToolTipText("Enabled animation");
441	489	liveCB.addItemListener(this);
442	490
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);
	491	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	492	+ oneStepButton.setToolTipText("Animate one step forward");
	493	+ oneStepButton.addActionListener(this);
	494	+
	495	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	496	+ fastCB.setToolTipText("Fast mode");
461	497	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);
	498	+
	499	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	500	+ trackCB.setToolTipText("Enable tracking");
503	501	trackCB.addItemListener(this);
504	502
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	503	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	504	+ screenfitButton.setToolTipText("Screen fit");
507	505	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	506	+
509	507	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	508	// 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	509
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);
	510	+ if (Globals.ADVANCED)
	511	+ {
	512	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	513	+ snapobjectButton.addActionListener(this);
	514	+ snapobjectButton.setToolTipText("Snap Object");
	515	+ }
	516	+
	517	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	518	+ flashSelectionButton.setToolTipText("Show selection");
522	519	flashSelectionButton.addActionListener(this);
523	520
524		- oe.toolbarPanel.add(new cButton(" ", false));
	521	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	522
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);
	523	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	524	+ twoButton.setToolTipText("Show center view only");
532	525	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
534	527	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	528	+ fourButton.setToolTipText("Show left panel only");
	529	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	530	+ sixButton.setToolTipText("2-column layout left");
536	531	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	532	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	533	+ threeButton.setToolTipText("2-column layout right");
538	534	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	536	+ sevenButton.setToolTipText("3-column layout");
540	537	sevenButton.addActionListener(this);
541	538	//
542	539
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	541	+ rootButton.setToolTipText("Edit selection in new tab");
544	542	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	543	+
	544	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	545	+ closeButton.setToolTipText("Close tab");
547	546	closeButton.addActionListener(this);
548	547	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	548	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	549
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	550	+ cGridBag commandsPanel = new cGridBag();
	551	+
	552	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	553	+ editButton.setToolTipText("Edit selection");
554	554	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	555
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	556	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	557	+ uneditButton.setToolTipText("Unedit selection");
560	558	uneditButton.addActionListener(this);
561	559
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);
	560	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	561	+ allParamsButton.setToolTipText("Edit all params");
574	562	allParamsButton.addActionListener(this);
575	563
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);
	564	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	565	+ clearPanelButton.setToolTipText("Clear edit panel");
	566	+ clearPanelButton.addActionListener(this);
	567	+
	568	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	569	+ unselectButton.setToolTipText("Unselect");
581	570	unselectButton.addActionListener(this);
582	571
	572	+ commandsPanel.preferredHeight = 1;
	573	+
	574	+ oe.treePanel.add(commandsPanel);
	575	+ oe.treePanel.Return();
	576	+
583	577	// oe.aConstraints.gridx += 1;
584	578	// oe.aConstraints.weighty = 0;
585	579	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +585,37 @@
591	585	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	586	// gcButton.addActionListener(this);
593	587
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;
	588	+ cGridBag jSPPanel = new cGridBag();
	589	+
	590	+ JScrollPane jSP;
605	591	//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);
	592	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
607	593	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	594	+
	595	+ oe.treePanel.add(jSPPanel);
	596	+ oe.treePanel.Return();
612	597
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);
	598	+ cGridBag copyOptionsPanel = new cGridBag();
	599	+
	600	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	601	+ colorCB.setToolTipText("Copy color when dropped");
617	602	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	603	+
	604	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	605	+ materialCB.setToolTipText("Copy material when dropped");
620	606	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	607	+
	608	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	609	+ textureCB.setToolTipText("Copy texture when dropped");
623	610	textureCB.addItemListener(this);
624	611
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	612	+ copyOptionsPanel.preferredHeight = 1;
	613	+ oe.treePanel.add(copyOptionsPanel);
	614	+ oe.treePanel.Return();
627	615
	616	+// mainPanel.setDividerLocation(0.5); //1.0);
	617	+// mainPanel.setResizeWeight(0.5);
	618	+
628	619	//jList.addListSelectionListener(this);
629	620	oe.jTree.addTreeSelectionListener(this);
630	621	//jTree.setRootVisible(false);
..	..	@@ -646,17 +637,89 @@
646	637	radio.layout = sevenButton;
647	638	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	639	}
	640	+
	641	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	642	+ {
	643	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	644	+ boxCB.setToolTipText("Display bounding boxes");
	645	+ boxCB.addItemListener(this);
	646	+
	647	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	648	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	649	+ zoomBoxCB.addItemListener(this);
	650	+
	651	+ if (Globals.ADVANCED)
	652	+ {
	653	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	654	+ supportCB.setToolTipText("Enable rigging");
	655	+ supportCB.addItemListener(this);
	656	+
	657	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	658	+ // localCB.addItemListener(this);
	659	+
	660	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	661	+ crowdCB.setToolTipText("Used for crowds");
	662	+ crowdCB.addItemListener(this);
	663	+
	664	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	665	+ smoothCB.setToolTipText("Snapping delay");
	666	+ smoothCB.addItemListener(this);
	667	+
	668	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	669	+ slowCB.setToolTipText("Smooth interpolation");
	670	+ slowCB.addItemListener(this);
	671	+
	672	+// constraints.gridy += 1;
	673	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	674	+// speakerMocapCB.addItemListener(this);
	675	+
	676	+ if (false)
	677	+ {
	678	+ // handled in scripts
	679	+ //constraints.gridy += 1;
	680	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	681	+ speakerCameraCB.addItemListener(this);
	682	+
	683	+ //constraints.gridy += 1;
	684	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	685	+ speakerFocusCB.addItemListener(this);
	686	+
	687	+ //constraints.gridy += 1;
	688	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	689	+ smoothfocusCB.addItemListener(this);
	690	+ }
	691	+
	692	+//constraints.gridx += 1;
	693	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	694	+// debugCB.addItemListener(this);
	695	+
	696	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	697	+ oeilCB.addItemListener(this);
	698	+
	699	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	700	+ lookAtCB.setToolTipText("Look-at target");
	701	+ lookAtCB.addItemListener(this);
	702	+
	703	+ }
	704	+
	705	+ cGridBag fill = new cGridBag();
	706	+
	707	+ fill.preferredHeight = 200;
	708	+
	709	+ panel.add(fill);
	710	+
	711	+ }
649	712
650	713	void EditObject(Object3D obj)
651	714	{
652		- cRadio dummyButton = new cRadio(obj.name);
653		- dummyButton.SetObject(obj);
654		- dummyButton.layout = sevenButton;
655		- dummyButton.SetCamera(cameraView.renderCamera, false);
656		- dummyButton.addActionListener(this);
657		- radioPanel.add(dummyButton);
658		- buttonGroup.add(dummyButton);
659		- dummyButton.doClick();
	715	+ cRadio radioButton = new cRadio(obj.name);
	716	+ radioButton.SetObject(obj);
	717	+ radioButton.layout = sevenButton;
	718	+ radioButton.SetCamera(cameraView.renderCamera, false);
	719	+ radioButton.addActionListener(this);
	720	+ radioPanel.add(radioButton);
	721	+ buttonGroup.add(radioButton);
	722	+ radioButton.doClick();
660	723	}
661	724	void SetupViews(ObjEditor oe)
662	725	{
..	..	@@ -676,6 +739,7 @@
676	739	JCheckBox fastCB;
677	740	JCheckBox slowCB;
678	741	JCheckBox boxCB;
	742	+ JCheckBox zoomBoxCB;
679	743	JCheckBox trackCB;
680	744	JCheckBox smoothfocusCB;
681	745	// JCheckBox speakerMocapCB;
..	..	@@ -755,6 +819,10 @@
755	819	Recompile();
756	820	cameraView.repaint();
757	821	// refreshContents();
	822	+ }
	823	+ else if(e.getSource() == zoomBoxCB)
	824	+ {
	825	+ cameraView.ToggleZoomBoxMode();
758	826	}
759	827	else if(e.getSource() == smoothfocusCB)
760	828	{
..	..	@@ -923,11 +991,11 @@
923	991	{
924	992	loadClipboard(true);
925	993	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	994	+ pasteInto(false, false);
927	995	} else {
928	996	loadClipboard(false);
929	997	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	998	+ pasteInto(false, false); // true); // ???
931	999	}
932	1000	}
933	1001	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1117,33 @@
1049	1117	kleinItem.addActionListener(this);
1050	1118	particleItem = menu.add(new MenuItem("Particle system"));
1051	1119	particleItem.addActionListener(this);
	1120	+ if (Globals.ADVANCED)
	1121	+ {
1052	1122	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1123	ragdollItem.addActionListener(this);
1054	1124	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1125	ragdoll2Item.addActionListener(this);
	1126	+ }
1056	1127	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1128	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1129	meshItem.addActionListener(this);
1059	1130	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1131	// meshGroupItem.addActionListener(this);
	1132	+ if (Globals.ADVANCED)
	1133	+ {
1061	1134	springItem = menu.add(new MenuItem("Spring"));
1062	1135	springItem.addActionListener(this);
1063	1136	flagItem = menu.add(new MenuItem("Flag"));
1064	1137	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	1138	blobItem = menu.add(new MenuItem("Blob"));
1070	1139	blobItem.addActionListener(this);
1071	1140	latheItem = menu.add(new MenuItem("Lathe"));
1072	1141	latheItem.addActionListener(this);
	1142	+ }
	1143	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1144	+ bezierItem.addActionListener(this);
	1145	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1146	+ overlayItem.addActionListener(this);
1073	1147	lightItem = menu.add(new MenuItem("Light"));
1074	1148	lightItem.addActionListener(this);
1075	1149	menu.add("-");
..	..	@@ -1079,34 +1153,39 @@
1079	1153	loopItem.addActionListener(this);
1080	1154	doubleItem = menu.add(new MenuItem("Fork"));
1081	1155	doubleItem.addActionListener(this);
	1156	+ if (Globals.ADVANCED)
	1157	+ {
1082	1158	tripleItem = menu.add(new MenuItem("Trident"));
1083	1159	tripleItem.addActionListener(this);
	1160	+ }
1084	1161	}
1085	1162
1086	1163	void buildToolsMenu(Menu menu)
1087	1164	{
1088	1165	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1166	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1167	+ animationItem.setState(Globals.ANIMATION);
1091	1168
1092	1169	menu.add("-");
1093	1170	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1171	parseverticesItem.addActionListener(this);
1095	1172	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1173	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1174	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1175	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1176	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1177	reduceMorphItem.addActionListener(this);
1103	1178	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1179	reduce34MorphItem.addActionListener(this);
1105		-
	1180	+ menu.add("-");
1106	1181	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1182	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1183
	1184	+ if (Globals.ADVANCED)
	1185	+ {
	1186	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1187	+ mirrorItem.addActionListener(this);
	1188	+ menu.add("-");
1110	1189	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1190	memoryItem.addActionListener(this);
1112	1191	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1120,6 +1199,8 @@
1120	1199	resetParentItem.addActionListener(this);
1121	1200	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	1201	repairParentItem.addActionListener(this);
	1202	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1203	+ repairShadowItem.addActionListener(this);
1123	1204	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	1205	invariantsItem.addActionListener(this);
1125	1206	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1127,6 +1208,7 @@
1127	1208	menu.add("-");
1128	1209	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1129	1210	editScriptItem.addActionListener(this);
	1211	+ }
1130	1212	}
1131	1213
1132	1214	void ScreenFit()
..	..	@@ -1480,6 +1562,7 @@
1480	1562	//
1481	1563	public void actionPerformed(ActionEvent event) // , Object arg)
1482	1564	{
	1565	+ Object source = event.getSource();
1483	1566	/*
1484	1567	if (event.getSource() == nameField)
1485	1568	{
..	..	@@ -1491,11 +1574,11 @@
1491	1574	}
1492	1575	else
1493	1576	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1577	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	1578	{
1496	1579	ScreenFit();
1497	1580	} else
1498		- if (event.getSource() == switchItem)
	1581	+ if (source == switchItem)
1499	1582	{
1500	1583	cVector v1 = new cVector();
1501	1584	cVector v2 = new cVector();
..	..	@@ -1504,11 +1587,11 @@
1504	1587	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	1588	objEditor.cameraView.repaint();
1506	1589	} else
1507		- if (event.getSource() == rectoidItem)
	1590	+ if (source == rectoidItem)
1508	1591	{
1509	1592	makeSomething(new Box());
1510	1593	} else
1511		- if (event.getSource() == particleItem)
	1594	+ if (source == particleItem)
1512	1595	{
1513	1596	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	1597	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +1612,9 @@
1529	1612	applyExample(particleGeom, "SMOKE");
1530	1613	makeSomething(particleGeom);
1531	1614	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1615	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	1616	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1617	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	1618
1536	1619	ragdoll.toParent = LA.newMatrix();
1537	1620	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +1632,7 @@
1549	1632	} else
1550	1633	/*
1551	1634	*/
1552		- if (event.getSource() == heightFieldItem)
	1635	+ if (source == heightFieldItem)
1553	1636	{
1554	1637	Object3D obj = new Object3D();
1555	1638
..	..	@@ -1587,31 +1670,31 @@
1587	1670
1588	1671	makeSomething(obj);
1589	1672	} else
1590		- if (event.getSource() == gridItem)
	1673	+ if (source == gridItem)
1591	1674	{
1592	1675	makeSomething(new Grid());
1593	1676	} else
1594		- if (event.getSource() == ellipsoidItem)
	1677	+ if (source == ellipsoidItem)
1595	1678	{
1596	1679	makeSomething(new Sphere());
1597	1680	} else
1598		- if (event.getSource() == coneItem)
	1681	+ if (source == coneItem)
1599	1682	{
1600	1683	makeSomething(new Cone());
1601	1684	} else
1602		- if (event.getSource() == torusItem)
	1685	+ if (source == torusItem)
1603	1686	{
1604	1687	makeSomething(new Torus());
1605	1688	} else
1606		- if (event.getSource() == superItem)
	1689	+ if (source == superItem)
1607	1690	{
1608	1691	makeSomething(new Superellipsoid());
1609	1692	} else
1610		- if (event.getSource() == kleinItem)
	1693	+ if (source == kleinItem)
1611	1694	{
1612	1695	makeSomething(new Klein());
1613	1696	} else
1614		- if (event.getSource() == blobItem)
	1697	+ if (source == blobItem)
1615	1698	{
1616	1699	Blob blob = new Blob();
1617	1700	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +1702,15 @@
1619	1702	//blob.retile();
1620	1703	makeSomething(blob);
1621	1704	} else
1622		- if (event.getSource() == latheItem)
	1705	+ if (source == latheItem)
1623	1706	{
1624	1707	makeSomething(new Lathe());
1625	1708	} else
1626		- if (event.getSource() == bezierItem)
	1709	+ if (source == bezierItem)
1627	1710	{
1628	1711	makeSomething(new BezierSurface());
1629	1712	} else
1630		- if (event.getSource() == checkerItem)
	1713	+ if (source == overlayItem)
1631	1714	{
1632	1715	/*
1633	1716	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +1725,7 @@
1642	1725	*/
1643	1726	makeSomething(new Checker());
1644	1727	} else
1645		- if (event.getSource() == meshItem)
	1728	+ if (source == meshItem)
1646	1729	{
1647	1730	Object3D itemtomake = new Object3D();
1648	1731	Object3D child;
..	..	@@ -1663,35 +1746,35 @@
1663	1746	makeSomething(child);
1664	1747	}
1665	1748	} else
1666		- if (event.getSource() == springItem)
	1749	+ if (source == springItem)
1667	1750	{
1668	1751	cSpring s = new cSpring();
1669	1752	s.setup();
1670	1753	makeSomething(s);
1671	1754	} else
1672		- if (event.getSource() == flagItem)
	1755	+ if (source == flagItem)
1673	1756	{
1674	1757	cSpring s = new cFlag();
1675	1758	s.setup();
1676	1759	makeSomething(s);
1677	1760	} else
1678		- if (event.getSource() == lightItem)
	1761	+ if (source == lightItem)
1679	1762	{
1680	1763	makeSomething(new Light());
1681	1764	} else
1682		- if (event.getSource() == csgItem)
	1765	+ if (source == csgItem)
1683	1766	{
1684	1767	group(new CSG());
1685	1768	} else
1686		- if (event.getSource() == templateItem)
	1769	+ if (source == templateItem)
1687	1770	{
1688	1771	group(new cTemplate());
1689	1772	} else
1690		- if (event.getSource() == attributeItem)
	1773	+ if (source == attributeItem)
1691	1774	{
1692	1775	makeSomething(new Attribute());
1693	1776	} else
1694		- if (event.getSource() == pointflowItem)
	1777	+ if (source == pointflowItem)
1695	1778	{
1696	1779	makeSomething(new PointFlow());
1697	1780	} else
..	..	@@ -1703,7 +1786,7 @@
1703	1786	} else
1704	1787	*/
1705	1788
1706		- if (event.getSource() == superLoopItem)
	1789	+ if (source == superLoopItem)
1707	1790	{
1708	1791	Composite g = new cGroup();
1709	1792	for (int i=0; i<15; i++)
..	..	@@ -1725,7 +1808,7 @@
1725	1808
1726	1809	group(g);
1727	1810	} else
1728		- if (event.getSource() == loopItem)
	1811	+ if (source == loopItem)
1729	1812	{
1730	1813	Composite csg = new GroupLeaf();
1731	1814	csg.count = 5;
..	..	@@ -1734,7 +1817,7 @@
1734	1817	csg.addChild(child);
1735	1818	child.addChild(csg);
1736	1819	} else
1737		- if (event.getSource() == doubleItem)
	1820	+ if (source == doubleItem)
1738	1821	{
1739	1822	Composite csg = new GroupLeaf();
1740	1823	csg.count = 5;
..	..	@@ -1746,7 +1829,7 @@
1746	1829	csg.addChild(child);
1747	1830	child.addChild(csg);
1748	1831	} else
1749		- if (event.getSource() == tripleItem)
	1832	+ if (source == tripleItem)
1750	1833	{
1751	1834	Composite csg = new GroupLeaf();
1752	1835	csg.count = 4;
..	..	@@ -1762,70 +1845,75 @@
1762	1845	child.addChild(csg);
1763	1846	} else
1764	1847
1765		- if (event.getSource() == importGFDItem)
	1848	+ if (source == importGFDItem)
1766	1849	{
1767	1850	ImportGFD();
1768	1851	} else
1769		- if (event.getSource() == importVRMLX3DItem)
	1852	+ if (source == importVRMLX3DItem)
1770	1853	{
1771	1854	ImportVRMLX3D();
1772	1855	} else
1773		- if (event.getSource() == import3DSItem)
	1856	+ if (source == import3DSItem)
1774	1857	{
1775	1858	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776	1859	} else
1777		- if (event.getSource() == importOBJItem)
	1860	+ if (source == importOBJItem)
1778	1861	{
1779	1862	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780	1863	} else
1781		- if (event.getSource() == computeAOItem)
	1864	+ if (source == computeAOItem)
1782	1865	{
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
	1866	+ Globals.drawMode = CameraPane.OCCLUSION;
	1867	+ Globals.theRenderer.repaint();
1785	1868	} else
1786		- if (event.getSource() == recompileItem)
	1869	+ if (source == recompileItem)
1787	1870	{
1788	1871	Recompile();
1789	1872	refreshContents();
1790	1873	} else
1791		- if (event.getSource() == editScriptItem)
	1874	+ if (source == editScriptItem)
1792	1875	{
1793	1876	OpenDialog();
1794	1877	refreshContents();
1795	1878	} else
1796		- if (event.getSource() == invariantsItem)
	1879	+ if (source == invariantsItem)
1797	1880	{
1798	1881	System.out.println("Invariants:");
1799	1882	GrafreeD.grafreeD.universe.invariants();
1800	1883	} else
1801		- if (event.getSource() == memoryItem)
	1884	+ if (source == memoryItem)
1802	1885	{
1803	1886	//System.out.println("Invariants:");
1804	1887	PrintMemory();
1805	1888	} else
1806		- if (event.getSource() == pathItem)
	1889	+ if (source == pathItem)
1807	1890	{
1808	1891	PrintPath();
1809	1892	} else
1810		- if (event.getSource() == analyzeItem)
	1893	+ if (source == analyzeItem)
1811	1894	{
1812	1895	AnalyzeObject();
1813	1896	} else
1814		- if (event.getSource() == dumpItem)
	1897	+ if (source == dumpItem)
1815	1898	{
1816	1899	DumpObject();
1817	1900	} else
1818		- if (event.getSource() == screenfitButton)
	1901	+ if (source == oneStepButton)
	1902	+ {
	1903	+ Globals.ONESTEP = true;
	1904	+ cameraView.repaint();
	1905	+ } else
	1906	+ if (source == screenfitButton)
1819	1907	{
1820	1908	//Reload(lastConverter, lastFilename, true);
1821	1909	ScreenFit();
1822	1910	} else
1823		- if (event.getSource() == screenfitpointButton)
	1911	+ if (source == screenfitpointButton)
1824	1912	{
1825	1913	//Reload(lastConverter, lastFilename, true);
1826	1914	ScreenFitPoint();
1827	1915	} else
1828		- if (event.getSource() == snapobjectButton)
	1916	+ if (source == snapobjectButton)
1829	1917	{
1830	1918	//Reload(lastConverter, lastFilename, true);
1831	1919	SnapObject();
..	..	@@ -1836,13 +1924,13 @@
1836	1924	// Recompile();
1837	1925	// refreshContents();
1838	1926	// } else
1839		- if (event.getSource() == gcButton)
	1927	+ if (source == gcButton)
1840	1928	{
1841	1929	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	1930	System.gc();
1843	1931	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	1932	} else
1845		- if (event.getSource() == editLeafItem)
	1933	+ if (source == editLeafItem)
1846	1934	{
1847	1935	Object3D obj;
1848	1936	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +1944,66 @@
1856	1944	}
1857	1945	refreshContents(true);
1858	1946	} else
1859		- if (event.getSource() == openWindowItem)
	1947	+ if (source == openWindowItem)
1860	1948	{
1861	1949	EditSelection(true);
1862	1950	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1951	+ if (source == cutItem \|\| source == clearButton)
1864	1952	{
1865	1953	loadClipboard(true);
1866	1954	} else
1867		- if (event.getSource() == duplicateItem)
	1955	+ if (source == duplicateItem)
1868	1956	{
1869	1957	Object3D keep = GrafreeD.clipboard;
1870	1958	loadClipboard(false);
1871	1959	paste(false);
1872	1960	GrafreeD.clipboard = keep;
1873	1961	} else
1874		- if (event.getSource() == cloneItem)
	1962	+ if (source == cloneItem)
1875	1963	{
1876	1964	CloneSelection(false);
1877	1965	} else
1878		- if (event.getSource() == cloneSupportItem)
	1966	+ if (source == cloneSupportItem)
1879	1967	{
1880	1968	CloneSelection(true);
1881	1969	} else
1882		- if (event.getSource() == copyItem)
	1970	+ if (source == copyItem)
1883	1971	{
1884	1972	loadClipboard(false);
1885	1973	} else
1886		- if (event.getSource() == pasteItem)
	1974	+ if (source == pasteItem)
1887	1975	{
1888	1976	paste(false);
1889	1977	} else
1890		- if (event.getSource() == pasteLinkItem)
	1978	+ if (source == pasteIntoItem)
1891	1979	{
1892		- pasteInto(false);
	1980	+ pasteInto(true, false);
1893	1981	} else
1894		- if (event.getSource() == pasteCloneItem)
	1982	+ if (source == pasteLinkItem)
1895	1983	{
1896		- pasteInto(true);
	1984	+ pasteInto(false, false);
1897	1985	} else
1898		- if (event.getSource() == pasteExpandItem)
	1986	+ if (source == pasteCloneItem)
	1987	+ {
	1988	+ pasteInto(true, true);
	1989	+ } else
	1990	+ if (source == pasteExpandItem)
1899	1991	{
1900	1992	paste(true);
1901	1993	} else
1902		- if (event.getSource() == synchronizeItem)
	1994	+ if (source == synchronizeItem)
1903	1995	{
1904	1996	Overwrite(Object3D.TRANSFORM);
1905	1997	} else
1906		- if (event.getSource() == overwriteNameItem)
	1998	+ if (source == overwriteNameItem)
1907	1999	{
1908	2000	Overwrite(Object3D.NAME);
1909	2001	} else
1910		- if (event.getSource() == overwriteUVItem)
	2002	+ if (source == overwriteUVItem)
1911	2003	{
1912	2004	Overwrite(Object3D.UV);
1913	2005	} else
1914		- if (event.getSource() == overwriteMatItem)
	2006	+ if (source == overwriteMatItem)
1915	2007	{
1916	2008	/* july 2015
1917	2009	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +2023,7 @@
1931	2023
1932	2024	Overwrite(dropAttributes);
1933	2025	}
1934		- if (event.getSource() == overwriteGeoItem)
	2026	+ if (source == overwriteGeoItem)
1935	2027	{
1936	2028	Overwrite(Object3D.GEOMETRY);
1937	2029	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +2040,7 @@
1948	2040	// refreshContents();
1949	2041	// }
1950	2042	} else
1951		- if (event.getSource() == generateMeshItem)
	2043	+ if (source == generateMeshItem)
1952	2044	{
1953	2045	//if (group.selection.size() == 1)
1954	2046	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +2051,7 @@
1959	2051	ResetModel();
1960	2052	refreshContents();
1961	2053	} else
1962		- if (event.getSource() == extractGeometriesItem)
	2054	+ if (source == extractGeometriesItem)
1963	2055	{
1964	2056	boolean one = false;
1965	2057
..	..	@@ -1986,7 +2078,7 @@
1986	2078	ResetModel();
1987	2079	refreshContents();
1988	2080	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2081	+ if (source == cloneGeometriesItem)
1990	2082	{
1991	2083	boolean one = false;
1992	2084
..	..	@@ -2012,7 +2104,7 @@
2012	2104	ResetModel();
2013	2105	refreshContents();
2014	2106	} else
2015		- if (event.getSource() == shareGeometriesItem)
	2107	+ if (source == shareGeometriesItem)
2016	2108	{
2017	2109	boolean one = false;
2018	2110
..	..	@@ -2042,7 +2134,7 @@
2042	2134	refreshContents();
2043	2135	}
2044	2136	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	2137	+ if (source == mergeGeometriesItem)
2046	2138	{
2047	2139	boolean one = false;
2048	2140
..	..	@@ -2072,7 +2164,7 @@
2072	2164	ResetModel();
2073	2165	refreshContents();
2074	2166	} else
2075		- if (event.getSource() == linkverticesItem)
	2167	+ if (source == linkverticesItem)
2076	2168	{
2077	2169	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	2170	// {
..	..	@@ -2092,41 +2184,41 @@
2092	2184	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	2185	content = ((cGroup)content).get(0);
2094	2186
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2187	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	2188	for (int i=0; i<group.selection.size(); i++)
2097	2189	{
2098		- boolean random = CameraPane.RANDOM;
2099		- CameraPane.RANDOM = false; // parse all random nodes
	2190	+ boolean random = CameraPane.SWITCH;
	2191	+ CameraPane.SWITCH = false; // parse all random nodes
2100	2192	group.selection.get(i).linkVerticesThis(content);
2101	2193	// group.selection.get(i).setMasterThis(content); // should be identity
2102		- CameraPane.RANDOM = random;
	2194	+ CameraPane.SWITCH = random;
2103	2195	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2196	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	2197	refreshContents();
2106	2198	}
2107	2199	} else
2108		- if (event.getSource() == resetsupportItem)
	2200	+ if (source == resetsupportItem)
2109	2201	{
2110	2202	for (int i=0; i<group.selection.size(); i++)
2111	2203	{
2112		- boolean random = CameraPane.RANDOM;
2113		- CameraPane.RANDOM = false; // parse all random nodes
	2204	+ boolean random = CameraPane.SWITCH;
	2205	+ CameraPane.SWITCH = false; // parse all random nodes
2114	2206	group.selection.get(i).linkVerticesThis(null);
2115		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2116	2208	}
2117	2209
2118	2210	refreshContents();
2119	2211	} else
2120		- if (event.getSource() == relinkverticesItem)
	2212	+ if (source == relinkverticesItem)
2121	2213	{
2122		- boolean random = CameraPane.RANDOM;
2123		- CameraPane.RANDOM = false; // parse all random nodes
	2214	+ boolean random = CameraPane.SWITCH;
	2215	+ CameraPane.SWITCH = false; // parse all random nodes
2124	2216	group.selection.RelinkToSupport();
2125		- CameraPane.RANDOM = random;
	2217	+ CameraPane.SWITCH = random;
2126	2218
2127	2219	refreshContents();
2128	2220	} else
2129		- if (event.getSource() == resetreferencesItem)
	2221	+ if (source == resetreferencesItem)
2130	2222	{
2131	2223	for (int i=0; i<group.selection.size(); i++)
2132	2224	{
..	..	@@ -2135,7 +2227,7 @@
2135	2227
2136	2228	refreshContents();
2137	2229	} else
2138		- if (event.getSource() == setMasterItem)
	2230	+ if (source == setMasterItem)
2139	2231	{
2140	2232	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2141	2233	{
..	..	@@ -2148,7 +2240,7 @@
2148	2240	refreshContents();
2149	2241	}
2150	2242	} else
2151		- if (event.getSource() == poseMeshItem)
	2243	+ if (source == poseMeshItem)
2152	2244	{
2153	2245	if (group.selection.size() == 1)
2154	2246	{
..	..	@@ -2167,19 +2259,19 @@
2167	2259	}
2168	2260
2169	2261	} else
2170		- if (event.getSource() == revertMeshItem)
	2262	+ if (source == revertMeshItem)
2171	2263	{
2172	2264	RevertMeshes();
2173	2265	} else
2174		- if (event.getSource() == resetMeshItem)
	2266	+ if (source == resetMeshItem)
2175	2267	{
2176	2268	ResetAll();
2177	2269	} else
2178		- if (event.getSource() == stepAllItem)
	2270	+ if (source == stepAllItem)
2179	2271	{
2180	2272	StepAll();
2181	2273	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2274	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2183	2275	{
2184	2276	//int indices[] = jList.getSelectedIndices();
2185	2277	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +2279,46 @@
2187	2279
2188	2280	ClearSelection(false);
2189	2281	} else
2190		- if (event.getSource() == clearAllItem)
	2282	+ if (source == clearAllItem)
2191	2283	{
2192	2284	ClearSelection(true);
2193	2285	} else
2194		- if (event.getSource() == grabItem)
	2286	+ if (source == grabItem)
2195	2287	{
2196	2288	group(new cGroup(), true);
2197	2289	} else
2198		- if (event.getSource() == hideItem)
	2290	+ if (source == hideItem)
2199	2291	{
2200	2292	group(new HiddenObject());
2201	2293	} else
2202		- if (event.getSource() == frontItem)
	2294	+ if (source == frontItem)
2203	2295	{
2204	2296	front();
2205	2297	} else
2206		- if (event.getSource() == backItem)
	2298	+ if (source == backItem)
2207	2299	{
2208	2300	back();
2209	2301	} else
2210		- if (event.getSource() == cameraItem)
	2302	+ if (source == cameraItem)
2211	2303	{
2212	2304	makeSomething(new Camera());
2213	2305	} else
2214		- if (event.getSource() == compositeItem)
	2306	+ if (source == compositeItem)
2215	2307	{
2216	2308	group(new Composite());
2217	2309	} else
2218		- if (event.getSource() == randomItem)
	2310	+ if (source == randomItem)
2219	2311	{
2220	2312	RandomNode random = new RandomNode();
2221	2313	group(random);
2222	2314	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	2315	+ random.name = random.get(0).name + "Switch";
2224	2316	} else
2225		- if (event.getSource() == physicsItem)
	2317	+ if (source == physicsItem)
2226	2318	{
2227	2319	group(new PhysicsNode());
2228	2320	} else
2229		- if (event.getSource() == frameselectorItem)
	2321	+ if (source == frameselectorItem)
2230	2322	{
2231	2323	for (int i=0; i<group.selection.size(); i++)
2232	2324	{
..	..	@@ -2238,7 +2330,7 @@
2238	2330	ResetModel();
2239	2331	refreshContents();
2240	2332	} else
2241		- if (event.getSource() == switchGeoItem)
	2333	+ if (source == switchGeoItem)
2242	2334	{
2243	2335	for (int i=0; i<group.selection.size(); i++)
2244	2336	{
..	..	@@ -2250,7 +2342,7 @@
2250	2342	ResetModel();
2251	2343	refreshContents();
2252	2344	} else
2253		- if (event.getSource() == switchTransfoItem)
	2345	+ if (source == switchTransfoItem)
2254	2346	{
2255	2347	for (int i=0; i<group.selection.size(); i++)
2256	2348	{
..	..	@@ -2262,7 +2354,7 @@
2262	2354	ResetModel();
2263	2355	refreshContents();
2264	2356	} else
2265		- if (event.getSource() == morphItem)
	2357	+ if (source == morphItem)
2266	2358	{
2267	2359	for (int i=0; i<group.selection.size(); i++)
2268	2360	{
..	..	@@ -2274,7 +2366,7 @@
2274	2366	ResetModel();
2275	2367	refreshContents();
2276	2368	} else
2277		- if (event.getSource() == scriptNodeItem)
	2369	+ if (source == scriptNodeItem)
2278	2370	{
2279	2371	boolean atleastone = false;
2280	2372
..	..	@@ -2313,31 +2405,31 @@
2313	2405	}
2314	2406	}
2315	2407	} else
2316		- if (event.getSource() == linkerItem)
	2408	+ if (source == linkerItem)
2317	2409	{
2318	2410	group(new cLinker());
2319	2411	} else
2320		- if (event.getSource() == textureItem)
	2412	+ if (source == textureItem)
2321	2413	{
2322	2414	group(new TextureNode());
2323	2415	} else
2324		- if (event.getSource() == billboardItem)
	2416	+ if (source == billboardItem)
2325	2417	{
2326	2418	group(new BillboardNode());
2327	2419	} else
2328		- if (event.getSource() == shadowXItem)
	2420	+ if (source == shadowXItem)
2329	2421	{
2330	2422	CastShadow(0);
2331	2423	} else
2332		- if (event.getSource() == shadowYItem)
	2424	+ if (source == shadowYItem)
2333	2425	{
2334	2426	CastShadow(1);
2335	2427	} else
2336		- if (event.getSource() == shadowZItem)
	2428	+ if (source == shadowZItem)
2337	2429	{
2338	2430	CastShadow(2);
2339	2431	} else
2340		- if (event.getSource() == ungroupItem)
	2432	+ if (source == ungroupItem)
2341	2433	{
2342	2434	//ungroup();
2343	2435	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2349,179 +2441,179 @@
2349	2441
2350	2442	refreshContents();
2351	2443	} else
2352		- if (event.getSource() == genUVItem)
	2444	+ if (source == genUVItem)
2353	2445	{
2354	2446	GenUV();
2355	2447	} else
2356		- if (event.getSource() == genNormalsCADItem)
	2448	+ if (source == genNormalsCADItem)
2357	2449	{
2358	2450	GenNormals(true);
2359	2451	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	2452	+ if (source == genNormalsMESHItem)
2361	2453	{
2362	2454	GenNormals(true); // TODO
2363	2455	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	2456	+ if (source == genNormalsORGANItem)
2365	2457	{
2366	2458	GenNormals(false);
2367	2459	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	2460	+ if (source == genNormalsMINEItem)
2369	2461	{
2370	2462	GenNormalsMINE();
2371	2463	} else
2372		- if (event.getSource() == stripifyItem)
	2464	+ if (source == stripifyItem)
2373	2465	{
2374	2466	Stripify();
2375	2467	} else
2376		- if (event.getSource() == unstripifyItem)
	2468	+ if (source == unstripifyItem)
2377	2469	{
2378	2470	Unstripify();
2379	2471	} else
2380		- if (event.getSource() == trimItem)
	2472	+ if (source == trimItem)
2381	2473	{
2382	2474	Trim();
2383	2475	} else
2384		- if (event.getSource() == untrimItem)
	2476	+ if (source == untrimItem)
2385	2477	{
2386	2478	Untrim();
2387	2479	} else
2388		- if (event.getSource() == clearColorsItem)
	2480	+ if (source == clearColorsItem)
2389	2481	{
2390	2482	ClearColors();
2391	2483	} else
2392		- if (event.getSource() == clearMaterialsItem)
	2484	+ if (source == clearMaterialsItem)
2393	2485	{
2394	2486	ClearMaterials();
2395	2487	} else
2396		- if (event.getSource() == liveleavesItem)
	2488	+ if (source == liveleavesItem)
2397	2489	{
2398	2490	LiveLeaves(true);
2399	2491	} else
2400		- if (event.getSource() == unliveleavesItem)
	2492	+ if (source == unliveleavesItem)
2401	2493	{
2402	2494	LiveLeaves(false);
2403	2495	} else
2404		- if (event.getSource() == supportleavesItem)
	2496	+ if (source == supportleavesItem)
2405	2497	{
2406	2498	SupportLeaves(true);
2407	2499	} else
2408		- if (event.getSource() == unsupportleavesItem)
	2500	+ if (source == unsupportleavesItem)
2409	2501	{
2410	2502	SupportLeaves(false);
2411	2503	} else
2412		- if (event.getSource() == hideleavesItem)
	2504	+ if (source == hideleavesItem)
2413	2505	{
2414	2506	HideLeaves(true);
2415	2507	} else
2416		- if (event.getSource() == showleavesItem)
	2508	+ if (source == showleavesItem)
2417	2509	{
2418	2510	HideLeaves(false);
2419	2511	} else
2420		- if (event.getSource() == markleavesItem)
	2512	+ if (source == markleavesItem)
2421	2513	{
2422	2514	MarkLeaves(true);
2423	2515	} else
2424		- if (event.getSource() == unmarkleavesItem)
	2516	+ if (source == unmarkleavesItem)
2425	2517	{
2426	2518	MarkLeaves(false);
2427	2519	} else
2428		- if (event.getSource() == flipVItem)
	2520	+ if (source == flipVItem)
2429	2521	{
2430	2522	FlipV(true);
2431	2523	} else
2432		- if (event.getSource() == unflipVItem)
	2524	+ if (source == unflipVItem)
2433	2525	{
2434	2526	FlipV(false);
2435	2527	} else
2436		- if (event.getSource() == lowTexturesItem)
	2528	+ if (source == lowTexturesItem)
2437	2529	{
2438	2530	SetTexRes(0);
2439	2531	} else
2440		- if (event.getSource() == normalTexturesItem)
	2532	+ if (source == normalTexturesItem)
2441	2533	{
2442	2534	SetTexRes(1);
2443	2535	} else
2444		- if (event.getSource() == highTexturesItem)
	2536	+ if (source == highTexturesItem)
2445	2537	{
2446	2538	SetTexRes(2);
2447	2539	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	2540	+ if (source == veryhighTexturesItem)
2449	2541	{
2450	2542	SetTexRes(3);
2451	2543	} else
2452		- if (event.getSource() == maxTexturesItem)
	2544	+ if (source == maxTexturesItem)
2453	2545	{
2454	2546	SetTexRes(4);
2455	2547	} else
2456		- if (event.getSource() == panoTexturesItem)
	2548	+ if (source == panoTexturesItem)
2457	2549	{
2458	2550	SetTexRes(5);
2459	2551	} else
2460		- if (event.getSource() == reverseNormalsItem)
	2552	+ if (source == reverseNormalsItem)
2461	2553	{
2462	2554	ReverseNormals();
2463	2555	} else
2464		- if (event.getSource() == parseverticesItem)
	2556	+ if (source == parseverticesItem)
2465	2557	{
2466	2558	ParseVertices();
2467	2559	} else
2468		- if (event.getSource() == textureFieldItem)
	2560	+ if (source == textureFieldItem)
2469	2561	{
2470	2562	TextureVertices();
2471	2563	} else
2472		- if (event.getSource() == alignItem)
	2564	+ if (source == alignItem)
2473	2565	{
2474	2566	Align();
2475	2567	} else
2476		- if (event.getSource() == mirrorItem)
	2568	+ if (source == mirrorItem)
2477	2569	{
2478	2570	MirrorPoses();
2479	2571	} else
2480		- if (event.getSource() == reduceMorphItem)
	2572	+ if (source == reduceMorphItem)
2481	2573	{
2482	2574	MeshReduction(false);
2483	2575	} else
2484		- if (event.getSource() == reduce34MorphItem)
	2576	+ if (source == reduce34MorphItem)
2485	2577	{
2486	2578	MeshReduction(true);
2487	2579	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	2580	+ if (source == reverseTrianglesItem)
2489	2581	{
2490	2582	ReverseTriangles();
2491	2583	} else
2492		- if (event.getSource() == reduceMeshItem)
	2584	+ if (source == reduceMeshItem)
2493	2585	{
2494	2586	ReduceMesh(false);
2495	2587	} else
2496		- if (event.getSource() == reduce34MeshItem)
	2588	+ if (source == reduce34MeshItem)
2497	2589	{
2498	2590	ReduceMesh(true);
2499	2591	} else
2500		- if (event.getSource() == increaseMeshItem)
	2592	+ if (source == increaseMeshItem)
2501	2593	{
2502	2594	IncreaseMesh();
2503	2595	} else
2504		- if (event.getSource() == clipMeshItem)
	2596	+ if (source == clipMeshItem)
2505	2597	{
2506	2598	ClipMesh();
2507	2599	} else
2508		- if (event.getSource() == smoothMeshItem)
	2600	+ if (source == smoothMeshItem)
2509	2601	{
2510	2602	SmoothMesh();
2511	2603	} else
2512		- if (event.getSource() == transformgeometryItem)
	2604	+ if (source == transformgeometryItem)
2513	2605	{
2514	2606	TransformGeometry();
2515	2607	} else
2516		- if (event.getSource() == resetTransformItem)
	2608	+ if (source == resetTransformItem)
2517	2609	{
2518	2610	ResetTransform();
2519	2611	} else
2520		- if (event.getSource() == resetCentroidItem)
	2612	+ if (source == resetCentroidItem)
2521	2613	{
2522	2614	ResetCentroid();
2523	2615	} else
2524		- if (event.getSource() == resetParentItem)
	2616	+ if (source == resetParentItem)
2525	2617	{
2526	2618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	2619	{
..	..	@@ -2531,7 +2623,7 @@
2531	2623
2532	2624	refreshContents();
2533	2625	} else
2534		- if (event.getSource() == repairParentItem)
	2626	+ if (source == repairParentItem)
2535	2627	{
2536	2628	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	2629	{
..	..	@@ -2545,7 +2637,21 @@
2545	2637
2546	2638	refreshContents();
2547	2639	} else
2548		- if (event.getSource() == sortbysizeItem)
	2640	+ if (source == repairShadowItem)
	2641	+ {
	2642	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2643	+ {
	2644	+ Object3D obj = (Object3D)e.nextElement();
	2645	+ obj.RepairShadow();
	2646	+// for (int i=0; i<obj.size(); i++)
	2647	+// {
	2648	+// obj.get(i).parent = obj;
	2649	+// }
	2650	+ }
	2651	+
	2652	+ refreshContents();
	2653	+ } else
	2654	+ if (source == sortbysizeItem)
2549	2655	{
2550	2656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	2657	{
..	..	@@ -2557,7 +2663,7 @@
2557	2663	ResetModel();
2558	2664	refreshContents();
2559	2665	} else
2560		- if (event.getSource() == sortbynameItem)
	2666	+ if (source == sortbynameItem)
2561	2667	{
2562	2668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	2669	{
..	..	@@ -2569,7 +2675,7 @@
2569	2675	ResetModel();
2570	2676	refreshContents();
2571	2677	} else
2572		- if (event.getSource() == attachPigmentItem)
	2678	+ if (source == attachPigmentItem)
2573	2679	{
2574	2680	String texture = GetFile("Attach pigment");
2575	2681	Object3D obj;
..	..	@@ -2581,7 +2687,7 @@
2581	2687
2582	2688	refreshContents();
2583	2689	} else
2584		- if (event.getSource() == detachPigmentItem)
	2690	+ if (source == detachPigmentItem)
2585	2691	{
2586	2692	Object3D obj;
2587	2693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +2698,7 @@
2592	2698
2593	2699	refreshContents();
2594	2700	} else
2595		- if (event.getSource() == attachBumpItem)
	2701	+ if (source == attachBumpItem)
2596	2702	{
2597	2703	String texture = GetFile("Attach bump");
2598	2704	Object3D obj;
..	..	@@ -2604,7 +2710,7 @@
2604	2710
2605	2711	refreshContents();
2606	2712	} else
2607		- if (event.getSource() == detachBumpItem)
	2713	+ if (source == detachBumpItem)
2608	2714	{
2609	2715	Object3D obj;
2610	2716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2615,7 +2721,7 @@
2615	2721
2616	2722	refreshContents();
2617	2723	} else
2618		- if (event.getSource() == pigmentBumpItem)
	2724	+ if (source == pigmentBumpItem)
2619	2725	{
2620	2726	Object3D obj;
2621	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +2732,195 @@
2626	2732
2627	2733	refreshContents();
2628	2734	} else
2629		- if (event.getSource() == flashSelectionButton)
	2735	+ if (source == flashSelectionButton)
2630	2736	{
2631	2737	CameraPane.flash = true;
2632	2738	refreshContents();
2633	2739	} else
2634		- if (event.getSource() == oneButton)
	2740	+ if (source == oneButton)
2635	2741	{
2636	2742	} else
2637		- if (event.getSource() == twoButton)
	2743	+ if (source == twoButton)
2638	2744	{
2639	2745	radio.layout = twoButton;
2640	2746	// bug
2641	2747	//gridPanel.setDividerLocation(1.0);
2642	2748	//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();
	2749	+// bigThree.remove(scenePanel);
	2750	+// bigThree.remove(centralPanel);
	2751	+// bigThree.remove(XYZPanel);
	2752	+// aWindowConstraints.gridx = 0;
	2753	+// aWindowConstraints.gridy = 0;
	2754	+// aWindowConstraints.gridwidth = 1;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2757	+// aWindowConstraints.weightx = 0;
	2758	+// aWindowConstraints.weighty = 1;
	2759	+// //bigThree.add(jtp, aWindowConstraints);
	2760	+// aWindowConstraints.weightx = 1;
	2761	+// aWindowConstraints.gridwidth = 3;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.gridx = 1;
	2764	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2765	+// bigThree.add(centralPanel, aWindowConstraints);
	2766	+// aWindowConstraints.weightx = 0;
	2767	+// aWindowConstraints.gridx = 4;
	2768	+// aWindowConstraints.gridwidth = 1;
	2769	+// // aConstraints.gridheight = 3;
	2770	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2771	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2772	+// scenePanel.setVisible(false);
	2773	+// centralPanel.setVisible(true);
	2774	+// XYZPanel.setVisible(false);
	2775	+ bigThree.ClearUI();
	2776	+ bigThree.add(centralPanel);
	2777	+ bigThree.FlushUI();
2667	2778	} else
2668		- if (event.getSource() == threeButton)
	2779	+ if (source == threeButton)
2669	2780	{
2670	2781	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();
	2782	+
	2783	+// bigThree.remove(scenePanel);
	2784	+// bigThree.remove(centralPanel);
	2785	+// bigThree.remove(XYZPanel);
	2786	+// aWindowConstraints.gridx = 0;
	2787	+// aWindowConstraints.gridy = 0;
	2788	+// aWindowConstraints.gridwidth = 1;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2791	+// aWindowConstraints.weightx = 0;
	2792	+// aWindowConstraints.weighty = 1;
	2793	+// //bigThree.add(jtp, aWindowConstraints);
	2794	+// aWindowConstraints.weightx = 1;
	2795	+// aWindowConstraints.gridwidth = 3;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aWindowConstraints.gridx = 1;
	2798	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2799	+// bigThree.add(centralPanel, aWindowConstraints);
	2800	+// aWindowConstraints.weightx = 0;
	2801	+// aWindowConstraints.gridx = 4;
	2802	+// aWindowConstraints.gridwidth = 1;
	2803	+// // aConstraints.gridheight = 3;
	2804	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2805	+// bigThree.add(XYZPanel, aWindowConstraints);
	2806	+// bigThree.validate();
	2807	+// scenePanel.setVisible(false);
	2808	+// centralPanel.setVisible(true);
	2809	+// XYZPanel.setVisible(true);
	2810	+ bigThree.ClearUI();
	2811	+ bigThree.add(centralPanel);
	2812	+ bigThree.add(XYZPanel);
	2813	+ bigThree.FlushUI();
2695	2814	} else
2696		- if (event.getSource() == fourButton)
	2815	+ if (source == fourButton)
2697	2816	{
2698	2817	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();
	2818	+
	2819	+// bigThree.remove(scenePanel);
	2820	+// bigThree.remove(centralPanel);
	2821	+// bigThree.remove(XYZPanel);
	2822	+// aWindowConstraints.gridx = 0;
	2823	+// aWindowConstraints.gridy = 0;
	2824	+// aWindowConstraints.gridwidth = 1;
	2825	+// // aWindowConstraints.gridheight = 3;
	2826	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2827	+// aWindowConstraints.weightx = 1;
	2828	+// aWindowConstraints.weighty = 1;
	2829	+// bigThree.add(scenePanel, aWindowConstraints);
	2830	+// aWindowConstraints.weightx = 1;
	2831	+// aWindowConstraints.gridwidth = 3;
	2832	+// // aConstraints.gridheight = 3;
	2833	+// aWindowConstraints.gridx = 1;
	2834	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2835	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2836	+// aWindowConstraints.weightx = 0;
	2837	+// aWindowConstraints.gridx = 4;
	2838	+// aWindowConstraints.gridwidth = 1;
	2839	+// // aWindowConstraints.gridheight = 3;
	2840	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2841	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2842	+// bigThree.validate();
	2843	+// scenePanel.setVisible(true);
	2844	+// centralPanel.setVisible(false);
	2845	+// XYZPanel.setVisible(false);
	2846	+ bigThree.ClearUI();
	2847	+ bigThree.add(scenePanel);
	2848	+ bigThree.FlushUI();
2723	2849	} else
2724		- if (event.getSource() == sixButton)
	2850	+ if (source == sixButton)
2725	2851	{
2726	2852	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();
	2853	+
	2854	+// bigThree.remove(scenePanel);
	2855	+// bigThree.remove(centralPanel);
	2856	+// bigThree.remove(XYZPanel);
	2857	+// aWindowConstraints.gridx = 0;
	2858	+// aWindowConstraints.gridy = 0;
	2859	+// aWindowConstraints.gridwidth = 1;
	2860	+// // aConstraints.gridheight = 3;
	2861	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2862	+// aWindowConstraints.weightx = 0;
	2863	+// aWindowConstraints.weighty = 1;
	2864	+// bigThree.add(scenePanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 1;
	2866	+// aWindowConstraints.gridwidth = 3;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.gridx = 1;
	2869	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2870	+// bigThree.add(centralPanel, aWindowConstraints);
	2871	+// aWindowConstraints.weightx = 0;
	2872	+// aWindowConstraints.gridx = 4;
	2873	+// aWindowConstraints.gridwidth = 1;
	2874	+// // aWindowConstraints.gridheight = 3;
	2875	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2876	+// //bigThree.add(XYZPanel, aConstraints);
	2877	+// bigThree.validate();
	2878	+// scenePanel.setVisible(true);
	2879	+// centralPanel.setVisible(true);
	2880	+// XYZPanel.setVisible(false);
	2881	+ bigThree.ClearUI();
	2882	+ bigThree.add(scenePanel);
	2883	+ bigThree.add(centralPanel);
	2884	+ bigThree.FlushUI();
2751	2885	} else
2752		- if (event.getSource() == sevenButton)
	2886	+ if (source == sevenButton)
2753	2887	{
2754	2888	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();
	2889	+
	2890	+// bigThree.remove(scenePanel);
	2891	+// bigThree.remove(centralPanel);
	2892	+// bigThree.remove(XYZPanel);
	2893	+// aWindowConstraints.gridx = 0;
	2894	+// aWindowConstraints.gridy = 0;
	2895	+// aWindowConstraints.gridwidth = 1;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2898	+// aWindowConstraints.weightx = 0;
	2899	+// aWindowConstraints.weighty = 1;
	2900	+// bigThree.add(scenePanel, aWindowConstraints);
	2901	+// aWindowConstraints.weightx = 1;
	2902	+// aWindowConstraints.gridwidth = 3;
	2903	+// // aWindowConstraints.gridheight = 3;
	2904	+// aWindowConstraints.gridx = 1;
	2905	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2906	+// bigThree.add(centralPanel, aWindowConstraints);
	2907	+// aWindowConstraints.weightx = 0;
	2908	+// aWindowConstraints.gridx = 4;
	2909	+// aWindowConstraints.gridwidth = 1;
	2910	+// // aConstraints.gridheight = 3;
	2911	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2912	+// bigThree.add(XYZPanel, aWindowConstraints);
	2913	+// bigThree.validate();
	2914	+// scenePanel.setVisible(true);
	2915	+// centralPanel.setVisible(true);
	2916	+// XYZPanel.setVisible(true);
	2917	+ bigThree.ClearUI();
	2918	+ bigThree.add(scenePanel);
	2919	+ bigThree.add(centralPanel);
	2920	+ bigThree.add(XYZPanel);
	2921	+ bigThree.FlushUI();
2779	2922	} else
2780		- if (event.getSource() == rootButton)
	2923	+ if (source == rootButton)
2781	2924	{
2782	2925	Object3D obj;
2783	2926	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2789,7 +2932,7 @@
2789	2932
2790	2933	refreshContents(true);
2791	2934	} else
2792		- if (event.getSource() == closeButton)
	2935	+ if (source == closeButton)
2793	2936	{
2794	2937	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	2938	cRadio ab;
..	..	@@ -2810,11 +2953,11 @@
2810	2953	}
2811	2954	refreshContents(true);
2812	2955	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2956	+ if (source == editItem \|\| source == editButton)
2814	2957	{
2815	2958	EditSelection(false);
2816	2959	} else
2817		- if (event.getSource() == uneditButton)
	2960	+ if (source == uneditButton)
2818	2961	{
2819	2962	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	2963	{
..	..	@@ -2826,12 +2969,12 @@
2826	2969
2827	2970	child.editWindow = null; // ???????????
2828	2971	}
2829		- objEditor.ctrlPanel.revalidate();
	2972	+ objEditor.ctrlPanel.FlushUI();
2830	2973	//objEditor.jTree.clearSelection();
2831	2974	//objEditor.ResetSliders();
2832	2975	refreshContents(true);
2833	2976	} else
2834		- if (event.getSource() == clearPanelButton)
	2977	+ if (source == clearPanelButton)
2835	2978	{
2836	2979	assert(copy == group);
2837	2980	//copy.ClearUI();
..	..	@@ -2842,7 +2985,7 @@
2842	2985	listUI.clear();
2843	2986	refreshContents(true);
2844	2987	} else
2845		- if (event.getSource() == allParamsButton)
	2988	+ if (source == allParamsButton)
2846	2989	{
2847	2990	assert(copy == group);
2848	2991
..	..	@@ -2863,19 +3006,19 @@
2863	3006
2864	3007	refreshContents(true);
2865	3008	} else
2866		- if (event.getSource() == unselectButton)
	3009	+ if (source == unselectButton)
2867	3010	{
2868	3011	objEditor.jTree.clearSelection();
2869	3012	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	3013	objEditor.ResetSliders();
2871	3014	refreshContents(true);
2872	3015	} else
2873		- if(event.getSource() instanceof cRadio)
	3016	+ if(source instanceof cRadio)
2874	3017	{
2875	3018	group.parent = keepparent;
2876	3019	group.attributes = 0;
2877	3020	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	3021	+ /cRadio/ radio = (cRadio)source;
2879	3022	Object3D obj = radio.GetObject();
2880	3023	System.out.println("Edit " + obj);
2881	3024	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +3038,7 @@
2895	3038	}
2896	3039
2897	3040	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	3041	+ //Globals.theRenderer.object = group;
2899	3042	if(!useclient)
2900	3043	{
2901	3044	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,7 +3047,8 @@
2904	3047	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	3048	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	3049	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	3050	+ //cameraView.lighttouched = true;
	3051	+ Globals.lighttouched = true;
2908	3052	topView.object = group;
2909	3053	frontView.object = group;
2910	3054	sideView.object = group;
..	..	@@ -2940,7 +3084,7 @@
2940	3084	if (useclient)
2941	3085	{
2942	3086	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	3087	+ Globals.lighttouched = true;
2944	3088	//topView.object = client;
2945	3089	//frontView.object = client;
2946	3090	//sideView.object = client;
..	..	@@ -2948,7 +3092,7 @@
2948	3092	else
2949	3093	{
2950	3094	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	3095	+ Globals.lighttouched = true;
2952	3096	//topView.object = group;
2953	3097	//frontView.object = group;
2954	3098	//sideView.object = group;
..	..	@@ -3456,7 +3600,7 @@
3456	3600	String pigment = Object3D.GetPigment(tex);
3457	3601	//String bump = Object3D.GetBump(tex);
3458	3602
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3603	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3460	3604
3461	3605	double s = v.s;
3462	3606
..	..	@@ -3544,11 +3688,11 @@
3544	3688
3545	3689	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3546	3690
3547		- boolean random = CameraPane.RANDOM;
3548		- CameraPane.RANDOM = false; // parse all random nodes
	3691	+ boolean random = CameraPane.SWITCH;
	3692	+ CameraPane.SWITCH = false; // parse all random nodes
3549	3693	lowres.linkVerticesThis(null);
3550	3694	lowres.linkVerticesThis(sn);
3551		- CameraPane.RANDOM = random;
	3695	+ CameraPane.SWITCH = random;
3552	3696
3553	3697	System.err.flush();
3554	3698
..	..	@@ -3757,7 +3901,7 @@
3757	3901	group.selection.RelinkToSupport(); // july 2014
3758	3902	System.out.println("DONE.");
3759	3903	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3904	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	3905	}
3762	3906
3763	3907	void ReduceMesh(boolean reduction34)
..	..	@@ -4033,25 +4177,25 @@
4033	4177	System.err.println("info : " + child.GetPath());
4034	4178	}
4035	4179	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	4180	+// else
	4181	+// {
	4182	+// objEditor.SetMaterial(group); // .GetMaterial());
	4183	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4184	+// System.err.println("info : " + group.GetPath());
	4185	+// }
4042	4186
4043	4187	objEditor.SetText(); // jan 2014
4044	4188
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4189	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
4046	4190	CameraPane.flash = true;
4047	4191
4048	4192	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
4049	4193	// a camera
4050	4194	{
4051	4195	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;
	4196	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4197	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4198	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	4199	}
4056	4200
4057	4201	refreshContents();
..	..	@@ -4306,7 +4450,7 @@
4306	4450	refreshContents();
4307	4451	}
4308	4452
4309		- void pasteInto(boolean copyit)
	4453	+ void pasteInto(boolean copyit, boolean clone)
4310	4454	{
4311	4455	// if (GrafreeD.clipboard == null)
4312	4456	// return;
..	..	@@ -4335,7 +4479,14 @@
4335	4479	if (copyit)
4336	4480	{
4337	4481	// paste(false);
4338		- CloneClipboard(false); // sept 2014
	4482	+ if (clone)
	4483	+ {
	4484	+ CloneClipboard(false); // sept 2014
	4485	+ }
	4486	+ else
	4487	+ {
	4488	+ paste(false);
	4489	+ }
4339	4490	}
4340	4491	else
4341	4492	{
..	..	@@ -4879,10 +5030,12 @@
4879	5030	cButton flashSelectionButton;
4880	5031	cButton editButton;
4881	5032	cButton uneditButton;
	5033	+ JCheckBox allParamsButton;
4882	5034	cButton clearpanelButton;
4883		- cButton allParamsButton;
4884	5035	cButton unselectButton;
4885	5036
	5037	+ cButton oneStepButton;
	5038	+
4886	5039	cButton screenfitButton;
4887	5040	cButton screenfitpointButton;
4888	5041	cButton snapobjectButton;
..	..	@@ -4937,6 +5090,7 @@
4937	5090	private MenuItem mergeGeometriesItem;
4938	5091	private MenuItem copyItem;
4939	5092	private MenuItem pasteItem;
	5093	+ private MenuItem pasteIntoItem;
4940	5094	private MenuItem pasteLinkItem;
4941	5095	private MenuItem pasteCloneItem;
4942	5096	private MenuItem pasteExpandItem;
..	..	@@ -5009,6 +5163,7 @@
5009	5163
5010	5164	private MenuItem resetParentItem;
5011	5165	private MenuItem repairParentItem;
	5166	+ private MenuItem repairShadowItem;
5012	5167	private MenuItem sortbysizeItem;
5013	5168	private MenuItem sortbynameItem;
5014	5169
..	..	@@ -5033,7 +5188,7 @@
5033	5188	private MenuItem blobItem;
5034	5189	private MenuItem latheItem;
5035	5190	private MenuItem bezierItem;
5036		- private MenuItem checkerItem;
	5191	+ private MenuItem overlayItem;
5037	5192	private MenuItem meshItem;
5038	5193	// private MenuItem meshGroupItem;
5039	5194	private MenuItem springItem;