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