~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,110 +482,98 @@
433	482	oe.radioPanel.add(dummyButton);
434	483	oe.buttonGroup.add(dummyButton);
435	484	*/
436		- aConstraints.gridy += 1;
437		-
438	485	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	486
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
442		-
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	487	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
444	488	liveCB.setToolTipText("Enabled animation");
445	489	liveCB.addItemListener(this);
446	490
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), 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");
	497	+ fastCB.addItemListener(this);
	498	+
	499	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
449	500	trackCB.setToolTipText("Enable tracking");
450	501	trackCB.addItemListener(this);
451	502
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	503	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
454	504	screenfitButton.setToolTipText("Screen fit");
455	505	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	506	+
457	507	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	508	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	509
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- 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);
471	518	flashSelectionButton.setToolTipText("Show selection");
472	519	flashSelectionButton.addActionListener(this);
473	520
474		- oe.toolbarPanel.add(new cButton(" ", false));
	521	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	522
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	523	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
482	524	twoButton.setToolTipText("Show center view only");
483	525	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	526	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
485	527	fourButton.addActionListener(this);
486	528	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488	530	sixButton.setToolTipText("2-column layout left");
489	531	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	532	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
491	533	threeButton.setToolTipText("2-column layout right");
492	534	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
494	536	sevenButton.setToolTipText("3-column layout");
495	537	sevenButton.addActionListener(this);
496	538	//
497	539
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	540	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	541	+ rootButton.setToolTipText("Edit selection in new tab");
500	542	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	543	+
	544	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
503	545	closeButton.setToolTipText("Close tab");
504	546	closeButton.addActionListener(this);
505	547	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	548	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	549
509		- oe.aConstraints.gridx = 1; //
510		- 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");
511	554	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	555
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	556	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	557	+ uneditButton.setToolTipText("Unedit selection");
517	558	uneditButton.addActionListener(this);
518	559
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- 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");
531	562	allParamsButton.addActionListener(this);
532	563
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- 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");
538	570	unselectButton.addActionListener(this);
539	571
	572	+ commandsPanel.preferredHeight = 1;
	573	+
	574	+ oe.treePanel.add(commandsPanel);
	575	+ oe.treePanel.Return();
	576	+
540	577	// oe.aConstraints.gridx += 1;
541	578	// oe.aConstraints.weighty = 0;
542	579	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +585,37 @@
548	585	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	586	// gcButton.addActionListener(this);
550	587
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	588	+ cGridBag jSPPanel = new cGridBag();
	589	+
	590	+ JScrollPane jSP;
562	591	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- 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);
564	593	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	594	+
	595	+ oe.treePanel.add(jSPPanel);
	596	+ oe.treePanel.Return();
569	597
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- 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");
574	602	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- 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");
577	606	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- 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");
580	610	textureCB.addItemListener(this);
581	611
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	612	+ copyOptionsPanel.preferredHeight = 1;
	613	+ oe.treePanel.add(copyOptionsPanel);
	614	+ oe.treePanel.Return();
584	615
	616	+// mainPanel.setDividerLocation(0.5); //1.0);
	617	+// mainPanel.setResizeWeight(0.5);
	618	+
585	619	//jList.addListSelectionListener(this);
586	620	oe.jTree.addTreeSelectionListener(this);
587	621	//jTree.setRootVisible(false);
..	..	@@ -604,45 +638,37 @@
604	638	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	639	}
606	640
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	641	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	642	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	643	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	644	boxCB.setToolTipText("Display bounding boxes");
640	645	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	646	+
	647	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	648	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	649	zoomBoxCB.addItemListener(this);
645	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	+
646	672	// constraints.gridy += 1;
647	673	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	674	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +676,16 @@
650	676	if (false)
651	677	{
652	678	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	679	+ //constraints.gridy += 1;
	680	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	681	speakerCameraCB.addItemListener(this);
656	682
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	683	+ //constraints.gridy += 1;
	684	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	685	speakerFocusCB.addItemListener(this);
660	686
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	687	+ //constraints.gridy += 1;
	688	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	689	smoothfocusCB.addItemListener(this);
664	690	}
665	691
..	..	@@ -667,14 +693,20 @@
667	693	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	694	// debugCB.addItemListener(this);
669	695
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	696	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
672	697	oeilCB.addItemListener(this);
673	698
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	699	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	700	lookAtCB.setToolTipText("Look-at target");
677	701	lookAtCB.addItemListener(this);
	702	+
	703	+ }
	704	+
	705	+ cGridBag fill = new cGridBag();
	706	+
	707	+ fill.preferredHeight = 200;
	708	+
	709	+ panel.add(fill);
678	710
679	711	}
680	712
..	..	@@ -959,11 +991,11 @@
959	991	{
960	992	loadClipboard(true);
961	993	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	994	+ pasteInto(false, false);
963	995	} else {
964	996	loadClipboard(false);
965	997	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	998	+ pasteInto(false, false); // true); // ???
967	999	}
968	1000	}
969	1001	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1117,33 @@
1085	1117	kleinItem.addActionListener(this);
1086	1118	particleItem = menu.add(new MenuItem("Particle system"));
1087	1119	particleItem.addActionListener(this);
	1120	+ if (Globals.ADVANCED)
	1121	+ {
1088	1122	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1123	ragdollItem.addActionListener(this);
1090	1124	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1125	ragdoll2Item.addActionListener(this);
	1126	+ }
1092	1127	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1128	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1129	meshItem.addActionListener(this);
1095	1130	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1131	// meshGroupItem.addActionListener(this);
	1132	+ if (Globals.ADVANCED)
	1133	+ {
1097	1134	springItem = menu.add(new MenuItem("Spring"));
1098	1135	springItem.addActionListener(this);
1099	1136	flagItem = menu.add(new MenuItem("Flag"));
1100	1137	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1138	blobItem = menu.add(new MenuItem("Blob"));
1106	1139	blobItem.addActionListener(this);
1107	1140	latheItem = menu.add(new MenuItem("Lathe"));
1108	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);
1109	1147	lightItem = menu.add(new MenuItem("Light"));
1110	1148	lightItem.addActionListener(this);
1111	1149	menu.add("-");
..	..	@@ -1115,34 +1153,39 @@
1115	1153	loopItem.addActionListener(this);
1116	1154	doubleItem = menu.add(new MenuItem("Fork"));
1117	1155	doubleItem.addActionListener(this);
	1156	+ if (Globals.ADVANCED)
	1157	+ {
1118	1158	tripleItem = menu.add(new MenuItem("Trident"));
1119	1159	tripleItem.addActionListener(this);
	1160	+ }
1120	1161	}
1121	1162
1122	1163	void buildToolsMenu(Menu menu)
1123	1164	{
1124	1165	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1166	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1167	+ animationItem.setState(Globals.ANIMATION);
1127	1168
1128	1169	menu.add("-");
1129	1170	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1171	parseverticesItem.addActionListener(this);
1131	1172	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1173	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1174	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1175	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1176	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1177	reduceMorphItem.addActionListener(this);
1139	1178	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1179	reduce34MorphItem.addActionListener(this);
1141		-
	1180	+ menu.add("-");
1142	1181	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1182	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1183
	1184	+ if (Globals.ADVANCED)
	1185	+ {
	1186	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1187	+ mirrorItem.addActionListener(this);
	1188	+ menu.add("-");
1146	1189	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1190	memoryItem.addActionListener(this);
1148	1191	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1165,6 +1208,7 @@
1165	1208	menu.add("-");
1166	1209	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1210	editScriptItem.addActionListener(this);
	1211	+ }
1168	1212	}
1169	1213
1170	1214	void ScreenFit()
..	..	@@ -1518,6 +1562,7 @@
1518	1562	//
1519	1563	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1564	{
	1565	+ Object source = event.getSource();
1521	1566	/*
1522	1567	if (event.getSource() == nameField)
1523	1568	{
..	..	@@ -1529,11 +1574,11 @@
1529	1574	}
1530	1575	else
1531	1576	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1577	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1578	{
1534	1579	ScreenFit();
1535	1580	} else
1536		- if (event.getSource() == switchItem)
	1581	+ if (source == switchItem)
1537	1582	{
1538	1583	cVector v1 = new cVector();
1539	1584	cVector v2 = new cVector();
..	..	@@ -1542,11 +1587,11 @@
1542	1587	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1588	objEditor.cameraView.repaint();
1544	1589	} else
1545		- if (event.getSource() == rectoidItem)
	1590	+ if (source == rectoidItem)
1546	1591	{
1547	1592	makeSomething(new Box());
1548	1593	} else
1549		- if (event.getSource() == particleItem)
	1594	+ if (source == particleItem)
1550	1595	{
1551	1596	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1597	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1612,9 @@
1567	1612	applyExample(particleGeom, "SMOKE");
1568	1613	makeSomething(particleGeom);
1569	1614	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1615	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1616	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1617	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1618
1574	1619	ragdoll.toParent = LA.newMatrix();
1575	1620	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1632,7 @@
1587	1632	} else
1588	1633	/*
1589	1634	*/
1590		- if (event.getSource() == heightFieldItem)
	1635	+ if (source == heightFieldItem)
1591	1636	{
1592	1637	Object3D obj = new Object3D();
1593	1638
..	..	@@ -1625,31 +1670,31 @@
1625	1670
1626	1671	makeSomething(obj);
1627	1672	} else
1628		- if (event.getSource() == gridItem)
	1673	+ if (source == gridItem)
1629	1674	{
1630	1675	makeSomething(new Grid());
1631	1676	} else
1632		- if (event.getSource() == ellipsoidItem)
	1677	+ if (source == ellipsoidItem)
1633	1678	{
1634	1679	makeSomething(new Sphere());
1635	1680	} else
1636		- if (event.getSource() == coneItem)
	1681	+ if (source == coneItem)
1637	1682	{
1638	1683	makeSomething(new Cone());
1639	1684	} else
1640		- if (event.getSource() == torusItem)
	1685	+ if (source == torusItem)
1641	1686	{
1642	1687	makeSomething(new Torus());
1643	1688	} else
1644		- if (event.getSource() == superItem)
	1689	+ if (source == superItem)
1645	1690	{
1646	1691	makeSomething(new Superellipsoid());
1647	1692	} else
1648		- if (event.getSource() == kleinItem)
	1693	+ if (source == kleinItem)
1649	1694	{
1650	1695	makeSomething(new Klein());
1651	1696	} else
1652		- if (event.getSource() == blobItem)
	1697	+ if (source == blobItem)
1653	1698	{
1654	1699	Blob blob = new Blob();
1655	1700	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1702,15 @@
1657	1702	//blob.retile();
1658	1703	makeSomething(blob);
1659	1704	} else
1660		- if (event.getSource() == latheItem)
	1705	+ if (source == latheItem)
1661	1706	{
1662	1707	makeSomething(new Lathe());
1663	1708	} else
1664		- if (event.getSource() == bezierItem)
	1709	+ if (source == bezierItem)
1665	1710	{
1666	1711	makeSomething(new BezierSurface());
1667	1712	} else
1668		- if (event.getSource() == checkerItem)
	1713	+ if (source == overlayItem)
1669	1714	{
1670	1715	/*
1671	1716	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1725,7 @@
1680	1725	*/
1681	1726	makeSomething(new Checker());
1682	1727	} else
1683		- if (event.getSource() == meshItem)
	1728	+ if (source == meshItem)
1684	1729	{
1685	1730	Object3D itemtomake = new Object3D();
1686	1731	Object3D child;
..	..	@@ -1701,35 +1746,35 @@
1701	1746	makeSomething(child);
1702	1747	}
1703	1748	} else
1704		- if (event.getSource() == springItem)
	1749	+ if (source == springItem)
1705	1750	{
1706	1751	cSpring s = new cSpring();
1707	1752	s.setup();
1708	1753	makeSomething(s);
1709	1754	} else
1710		- if (event.getSource() == flagItem)
	1755	+ if (source == flagItem)
1711	1756	{
1712	1757	cSpring s = new cFlag();
1713	1758	s.setup();
1714	1759	makeSomething(s);
1715	1760	} else
1716		- if (event.getSource() == lightItem)
	1761	+ if (source == lightItem)
1717	1762	{
1718	1763	makeSomething(new Light());
1719	1764	} else
1720		- if (event.getSource() == csgItem)
	1765	+ if (source == csgItem)
1721	1766	{
1722	1767	group(new CSG());
1723	1768	} else
1724		- if (event.getSource() == templateItem)
	1769	+ if (source == templateItem)
1725	1770	{
1726	1771	group(new cTemplate());
1727	1772	} else
1728		- if (event.getSource() == attributeItem)
	1773	+ if (source == attributeItem)
1729	1774	{
1730	1775	makeSomething(new Attribute());
1731	1776	} else
1732		- if (event.getSource() == pointflowItem)
	1777	+ if (source == pointflowItem)
1733	1778	{
1734	1779	makeSomething(new PointFlow());
1735	1780	} else
..	..	@@ -1741,7 +1786,7 @@
1741	1786	} else
1742	1787	*/
1743	1788
1744		- if (event.getSource() == superLoopItem)
	1789	+ if (source == superLoopItem)
1745	1790	{
1746	1791	Composite g = new cGroup();
1747	1792	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1808,7 @@
1763	1808
1764	1809	group(g);
1765	1810	} else
1766		- if (event.getSource() == loopItem)
	1811	+ if (source == loopItem)
1767	1812	{
1768	1813	Composite csg = new GroupLeaf();
1769	1814	csg.count = 5;
..	..	@@ -1772,7 +1817,7 @@
1772	1817	csg.addChild(child);
1773	1818	child.addChild(csg);
1774	1819	} else
1775		- if (event.getSource() == doubleItem)
	1820	+ if (source == doubleItem)
1776	1821	{
1777	1822	Composite csg = new GroupLeaf();
1778	1823	csg.count = 5;
..	..	@@ -1784,7 +1829,7 @@
1784	1829	csg.addChild(child);
1785	1830	child.addChild(csg);
1786	1831	} else
1787		- if (event.getSource() == tripleItem)
	1832	+ if (source == tripleItem)
1788	1833	{
1789	1834	Composite csg = new GroupLeaf();
1790	1835	csg.count = 4;
..	..	@@ -1800,70 +1845,75 @@
1800	1845	child.addChild(csg);
1801	1846	} else
1802	1847
1803		- if (event.getSource() == importGFDItem)
	1848	+ if (source == importGFDItem)
1804	1849	{
1805	1850	ImportGFD();
1806	1851	} else
1807		- if (event.getSource() == importVRMLX3DItem)
	1852	+ if (source == importVRMLX3DItem)
1808	1853	{
1809	1854	ImportVRMLX3D();
1810	1855	} else
1811		- if (event.getSource() == import3DSItem)
	1856	+ if (source == import3DSItem)
1812	1857	{
1813	1858	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814	1859	} else
1815		- if (event.getSource() == importOBJItem)
	1860	+ if (source == importOBJItem)
1816	1861	{
1817	1862	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818	1863	} else
1819		- if (event.getSource() == computeAOItem)
	1864	+ if (source == computeAOItem)
1820	1865	{
1821	1866	Globals.drawMode = CameraPane.OCCLUSION;
1822	1867	Globals.theRenderer.repaint();
1823	1868	} else
1824		- if (event.getSource() == recompileItem)
	1869	+ if (source == recompileItem)
1825	1870	{
1826	1871	Recompile();
1827	1872	refreshContents();
1828	1873	} else
1829		- if (event.getSource() == editScriptItem)
	1874	+ if (source == editScriptItem)
1830	1875	{
1831	1876	OpenDialog();
1832	1877	refreshContents();
1833	1878	} else
1834		- if (event.getSource() == invariantsItem)
	1879	+ if (source == invariantsItem)
1835	1880	{
1836	1881	System.out.println("Invariants:");
1837	1882	GrafreeD.grafreeD.universe.invariants();
1838	1883	} else
1839		- if (event.getSource() == memoryItem)
	1884	+ if (source == memoryItem)
1840	1885	{
1841	1886	//System.out.println("Invariants:");
1842	1887	PrintMemory();
1843	1888	} else
1844		- if (event.getSource() == pathItem)
	1889	+ if (source == pathItem)
1845	1890	{
1846	1891	PrintPath();
1847	1892	} else
1848		- if (event.getSource() == analyzeItem)
	1893	+ if (source == analyzeItem)
1849	1894	{
1850	1895	AnalyzeObject();
1851	1896	} else
1852		- if (event.getSource() == dumpItem)
	1897	+ if (source == dumpItem)
1853	1898	{
1854	1899	DumpObject();
1855	1900	} else
1856		- if (event.getSource() == screenfitButton)
	1901	+ if (source == oneStepButton)
	1902	+ {
	1903	+ Globals.ONESTEP = true;
	1904	+ cameraView.repaint();
	1905	+ } else
	1906	+ if (source == screenfitButton)
1857	1907	{
1858	1908	//Reload(lastConverter, lastFilename, true);
1859	1909	ScreenFit();
1860	1910	} else
1861		- if (event.getSource() == screenfitpointButton)
	1911	+ if (source == screenfitpointButton)
1862	1912	{
1863	1913	//Reload(lastConverter, lastFilename, true);
1864	1914	ScreenFitPoint();
1865	1915	} else
1866		- if (event.getSource() == snapobjectButton)
	1916	+ if (source == snapobjectButton)
1867	1917	{
1868	1918	//Reload(lastConverter, lastFilename, true);
1869	1919	SnapObject();
..	..	@@ -1874,13 +1924,13 @@
1874	1924	// Recompile();
1875	1925	// refreshContents();
1876	1926	// } else
1877		- if (event.getSource() == gcButton)
	1927	+ if (source == gcButton)
1878	1928	{
1879	1929	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	1930	System.gc();
1881	1931	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	1932	} else
1883		- if (event.getSource() == editLeafItem)
	1933	+ if (source == editLeafItem)
1884	1934	{
1885	1935	Object3D obj;
1886	1936	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +1944,66 @@
1894	1944	}
1895	1945	refreshContents(true);
1896	1946	} else
1897		- if (event.getSource() == openWindowItem)
	1947	+ if (source == openWindowItem)
1898	1948	{
1899	1949	EditSelection(true);
1900	1950	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1951	+ if (source == cutItem \|\| source == clearButton)
1902	1952	{
1903	1953	loadClipboard(true);
1904	1954	} else
1905		- if (event.getSource() == duplicateItem)
	1955	+ if (source == duplicateItem)
1906	1956	{
1907	1957	Object3D keep = GrafreeD.clipboard;
1908	1958	loadClipboard(false);
1909	1959	paste(false);
1910	1960	GrafreeD.clipboard = keep;
1911	1961	} else
1912		- if (event.getSource() == cloneItem)
	1962	+ if (source == cloneItem)
1913	1963	{
1914	1964	CloneSelection(false);
1915	1965	} else
1916		- if (event.getSource() == cloneSupportItem)
	1966	+ if (source == cloneSupportItem)
1917	1967	{
1918	1968	CloneSelection(true);
1919	1969	} else
1920		- if (event.getSource() == copyItem)
	1970	+ if (source == copyItem)
1921	1971	{
1922	1972	loadClipboard(false);
1923	1973	} else
1924		- if (event.getSource() == pasteItem)
	1974	+ if (source == pasteItem)
1925	1975	{
1926	1976	paste(false);
1927	1977	} else
1928		- if (event.getSource() == pasteLinkItem)
	1978	+ if (source == pasteIntoItem)
1929	1979	{
1930		- pasteInto(false);
	1980	+ pasteInto(true, false);
1931	1981	} else
1932		- if (event.getSource() == pasteCloneItem)
	1982	+ if (source == pasteLinkItem)
1933	1983	{
1934		- pasteInto(true);
	1984	+ pasteInto(false, false);
1935	1985	} else
1936		- if (event.getSource() == pasteExpandItem)
	1986	+ if (source == pasteCloneItem)
	1987	+ {
	1988	+ pasteInto(true, true);
	1989	+ } else
	1990	+ if (source == pasteExpandItem)
1937	1991	{
1938	1992	paste(true);
1939	1993	} else
1940		- if (event.getSource() == synchronizeItem)
	1994	+ if (source == synchronizeItem)
1941	1995	{
1942	1996	Overwrite(Object3D.TRANSFORM);
1943	1997	} else
1944		- if (event.getSource() == overwriteNameItem)
	1998	+ if (source == overwriteNameItem)
1945	1999	{
1946	2000	Overwrite(Object3D.NAME);
1947	2001	} else
1948		- if (event.getSource() == overwriteUVItem)
	2002	+ if (source == overwriteUVItem)
1949	2003	{
1950	2004	Overwrite(Object3D.UV);
1951	2005	} else
1952		- if (event.getSource() == overwriteMatItem)
	2006	+ if (source == overwriteMatItem)
1953	2007	{
1954	2008	/* july 2015
1955	2009	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2023,7 @@
1969	2023
1970	2024	Overwrite(dropAttributes);
1971	2025	}
1972		- if (event.getSource() == overwriteGeoItem)
	2026	+ if (source == overwriteGeoItem)
1973	2027	{
1974	2028	Overwrite(Object3D.GEOMETRY);
1975	2029	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2040,7 @@
1986	2040	// refreshContents();
1987	2041	// }
1988	2042	} else
1989		- if (event.getSource() == generateMeshItem)
	2043	+ if (source == generateMeshItem)
1990	2044	{
1991	2045	//if (group.selection.size() == 1)
1992	2046	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2051,7 @@
1997	2051	ResetModel();
1998	2052	refreshContents();
1999	2053	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2054	+ if (source == extractGeometriesItem)
2001	2055	{
2002	2056	boolean one = false;
2003	2057
..	..	@@ -2024,7 +2078,7 @@
2024	2078	ResetModel();
2025	2079	refreshContents();
2026	2080	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2081	+ if (source == cloneGeometriesItem)
2028	2082	{
2029	2083	boolean one = false;
2030	2084
..	..	@@ -2050,7 +2104,7 @@
2050	2104	ResetModel();
2051	2105	refreshContents();
2052	2106	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2107	+ if (source == shareGeometriesItem)
2054	2108	{
2055	2109	boolean one = false;
2056	2110
..	..	@@ -2080,7 +2134,7 @@
2080	2134	refreshContents();
2081	2135	}
2082	2136	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2137	+ if (source == mergeGeometriesItem)
2084	2138	{
2085	2139	boolean one = false;
2086	2140
..	..	@@ -2110,7 +2164,7 @@
2110	2164	ResetModel();
2111	2165	refreshContents();
2112	2166	} else
2113		- if (event.getSource() == linkverticesItem)
	2167	+ if (source == linkverticesItem)
2114	2168	{
2115	2169	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2170	// {
..	..	@@ -2133,38 +2187,38 @@
2133	2187	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2188	for (int i=0; i<group.selection.size(); i++)
2135	2189	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2190	+ boolean random = CameraPane.SWITCH;
	2191	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2192	group.selection.get(i).linkVerticesThis(content);
2139	2193	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2194	+ CameraPane.SWITCH = random;
2141	2195	}
2142	2196	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2197	refreshContents();
2144	2198	}
2145	2199	} else
2146		- if (event.getSource() == resetsupportItem)
	2200	+ if (source == resetsupportItem)
2147	2201	{
2148	2202	for (int i=0; i<group.selection.size(); i++)
2149	2203	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2204	+ boolean random = CameraPane.SWITCH;
	2205	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2206	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2207	+ CameraPane.SWITCH = random;
2154	2208	}
2155	2209
2156	2210	refreshContents();
2157	2211	} else
2158		- if (event.getSource() == relinkverticesItem)
	2212	+ if (source == relinkverticesItem)
2159	2213	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2214	+ boolean random = CameraPane.SWITCH;
	2215	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2216	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2217	+ CameraPane.SWITCH = random;
2164	2218
2165	2219	refreshContents();
2166	2220	} else
2167		- if (event.getSource() == resetreferencesItem)
	2221	+ if (source == resetreferencesItem)
2168	2222	{
2169	2223	for (int i=0; i<group.selection.size(); i++)
2170	2224	{
..	..	@@ -2173,7 +2227,7 @@
2173	2227
2174	2228	refreshContents();
2175	2229	} else
2176		- if (event.getSource() == setMasterItem)
	2230	+ if (source == setMasterItem)
2177	2231	{
2178	2232	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2179	2233	{
..	..	@@ -2186,7 +2240,7 @@
2186	2240	refreshContents();
2187	2241	}
2188	2242	} else
2189		- if (event.getSource() == poseMeshItem)
	2243	+ if (source == poseMeshItem)
2190	2244	{
2191	2245	if (group.selection.size() == 1)
2192	2246	{
..	..	@@ -2205,19 +2259,19 @@
2205	2259	}
2206	2260
2207	2261	} else
2208		- if (event.getSource() == revertMeshItem)
	2262	+ if (source == revertMeshItem)
2209	2263	{
2210	2264	RevertMeshes();
2211	2265	} else
2212		- if (event.getSource() == resetMeshItem)
	2266	+ if (source == resetMeshItem)
2213	2267	{
2214	2268	ResetAll();
2215	2269	} else
2216		- if (event.getSource() == stepAllItem)
	2270	+ if (source == stepAllItem)
2217	2271	{
2218	2272	StepAll();
2219	2273	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2274	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2275	{
2222	2276	//int indices[] = jList.getSelectedIndices();
2223	2277	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2279,46 @@
2225	2279
2226	2280	ClearSelection(false);
2227	2281	} else
2228		- if (event.getSource() == clearAllItem)
	2282	+ if (source == clearAllItem)
2229	2283	{
2230	2284	ClearSelection(true);
2231	2285	} else
2232		- if (event.getSource() == grabItem)
	2286	+ if (source == grabItem)
2233	2287	{
2234	2288	group(new cGroup(), true);
2235	2289	} else
2236		- if (event.getSource() == hideItem)
	2290	+ if (source == hideItem)
2237	2291	{
2238	2292	group(new HiddenObject());
2239	2293	} else
2240		- if (event.getSource() == frontItem)
	2294	+ if (source == frontItem)
2241	2295	{
2242	2296	front();
2243	2297	} else
2244		- if (event.getSource() == backItem)
	2298	+ if (source == backItem)
2245	2299	{
2246	2300	back();
2247	2301	} else
2248		- if (event.getSource() == cameraItem)
	2302	+ if (source == cameraItem)
2249	2303	{
2250	2304	makeSomething(new Camera());
2251	2305	} else
2252		- if (event.getSource() == compositeItem)
	2306	+ if (source == compositeItem)
2253	2307	{
2254	2308	group(new Composite());
2255	2309	} else
2256		- if (event.getSource() == randomItem)
	2310	+ if (source == randomItem)
2257	2311	{
2258	2312	RandomNode random = new RandomNode();
2259	2313	group(random);
2260	2314	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2315	+ random.name = random.get(0).name + "Switch";
2262	2316	} else
2263		- if (event.getSource() == physicsItem)
	2317	+ if (source == physicsItem)
2264	2318	{
2265	2319	group(new PhysicsNode());
2266	2320	} else
2267		- if (event.getSource() == frameselectorItem)
	2321	+ if (source == frameselectorItem)
2268	2322	{
2269	2323	for (int i=0; i<group.selection.size(); i++)
2270	2324	{
..	..	@@ -2276,7 +2330,7 @@
2276	2330	ResetModel();
2277	2331	refreshContents();
2278	2332	} else
2279		- if (event.getSource() == switchGeoItem)
	2333	+ if (source == switchGeoItem)
2280	2334	{
2281	2335	for (int i=0; i<group.selection.size(); i++)
2282	2336	{
..	..	@@ -2288,7 +2342,7 @@
2288	2342	ResetModel();
2289	2343	refreshContents();
2290	2344	} else
2291		- if (event.getSource() == switchTransfoItem)
	2345	+ if (source == switchTransfoItem)
2292	2346	{
2293	2347	for (int i=0; i<group.selection.size(); i++)
2294	2348	{
..	..	@@ -2300,7 +2354,7 @@
2300	2354	ResetModel();
2301	2355	refreshContents();
2302	2356	} else
2303		- if (event.getSource() == morphItem)
	2357	+ if (source == morphItem)
2304	2358	{
2305	2359	for (int i=0; i<group.selection.size(); i++)
2306	2360	{
..	..	@@ -2312,7 +2366,7 @@
2312	2366	ResetModel();
2313	2367	refreshContents();
2314	2368	} else
2315		- if (event.getSource() == scriptNodeItem)
	2369	+ if (source == scriptNodeItem)
2316	2370	{
2317	2371	boolean atleastone = false;
2318	2372
..	..	@@ -2351,31 +2405,31 @@
2351	2405	}
2352	2406	}
2353	2407	} else
2354		- if (event.getSource() == linkerItem)
	2408	+ if (source == linkerItem)
2355	2409	{
2356	2410	group(new cLinker());
2357	2411	} else
2358		- if (event.getSource() == textureItem)
	2412	+ if (source == textureItem)
2359	2413	{
2360	2414	group(new TextureNode());
2361	2415	} else
2362		- if (event.getSource() == billboardItem)
	2416	+ if (source == billboardItem)
2363	2417	{
2364	2418	group(new BillboardNode());
2365	2419	} else
2366		- if (event.getSource() == shadowXItem)
	2420	+ if (source == shadowXItem)
2367	2421	{
2368	2422	CastShadow(0);
2369	2423	} else
2370		- if (event.getSource() == shadowYItem)
	2424	+ if (source == shadowYItem)
2371	2425	{
2372	2426	CastShadow(1);
2373	2427	} else
2374		- if (event.getSource() == shadowZItem)
	2428	+ if (source == shadowZItem)
2375	2429	{
2376	2430	CastShadow(2);
2377	2431	} else
2378		- if (event.getSource() == ungroupItem)
	2432	+ if (source == ungroupItem)
2379	2433	{
2380	2434	//ungroup();
2381	2435	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2441,179 @@
2387	2441
2388	2442	refreshContents();
2389	2443	} else
2390		- if (event.getSource() == genUVItem)
	2444	+ if (source == genUVItem)
2391	2445	{
2392	2446	GenUV();
2393	2447	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2448	+ if (source == genNormalsCADItem)
2395	2449	{
2396	2450	GenNormals(true);
2397	2451	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2452	+ if (source == genNormalsMESHItem)
2399	2453	{
2400	2454	GenNormals(true); // TODO
2401	2455	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2456	+ if (source == genNormalsORGANItem)
2403	2457	{
2404	2458	GenNormals(false);
2405	2459	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2460	+ if (source == genNormalsMINEItem)
2407	2461	{
2408	2462	GenNormalsMINE();
2409	2463	} else
2410		- if (event.getSource() == stripifyItem)
	2464	+ if (source == stripifyItem)
2411	2465	{
2412	2466	Stripify();
2413	2467	} else
2414		- if (event.getSource() == unstripifyItem)
	2468	+ if (source == unstripifyItem)
2415	2469	{
2416	2470	Unstripify();
2417	2471	} else
2418		- if (event.getSource() == trimItem)
	2472	+ if (source == trimItem)
2419	2473	{
2420	2474	Trim();
2421	2475	} else
2422		- if (event.getSource() == untrimItem)
	2476	+ if (source == untrimItem)
2423	2477	{
2424	2478	Untrim();
2425	2479	} else
2426		- if (event.getSource() == clearColorsItem)
	2480	+ if (source == clearColorsItem)
2427	2481	{
2428	2482	ClearColors();
2429	2483	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2484	+ if (source == clearMaterialsItem)
2431	2485	{
2432	2486	ClearMaterials();
2433	2487	} else
2434		- if (event.getSource() == liveleavesItem)
	2488	+ if (source == liveleavesItem)
2435	2489	{
2436	2490	LiveLeaves(true);
2437	2491	} else
2438		- if (event.getSource() == unliveleavesItem)
	2492	+ if (source == unliveleavesItem)
2439	2493	{
2440	2494	LiveLeaves(false);
2441	2495	} else
2442		- if (event.getSource() == supportleavesItem)
	2496	+ if (source == supportleavesItem)
2443	2497	{
2444	2498	SupportLeaves(true);
2445	2499	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2500	+ if (source == unsupportleavesItem)
2447	2501	{
2448	2502	SupportLeaves(false);
2449	2503	} else
2450		- if (event.getSource() == hideleavesItem)
	2504	+ if (source == hideleavesItem)
2451	2505	{
2452	2506	HideLeaves(true);
2453	2507	} else
2454		- if (event.getSource() == showleavesItem)
	2508	+ if (source == showleavesItem)
2455	2509	{
2456	2510	HideLeaves(false);
2457	2511	} else
2458		- if (event.getSource() == markleavesItem)
	2512	+ if (source == markleavesItem)
2459	2513	{
2460	2514	MarkLeaves(true);
2461	2515	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2516	+ if (source == unmarkleavesItem)
2463	2517	{
2464	2518	MarkLeaves(false);
2465	2519	} else
2466		- if (event.getSource() == flipVItem)
	2520	+ if (source == flipVItem)
2467	2521	{
2468	2522	FlipV(true);
2469	2523	} else
2470		- if (event.getSource() == unflipVItem)
	2524	+ if (source == unflipVItem)
2471	2525	{
2472	2526	FlipV(false);
2473	2527	} else
2474		- if (event.getSource() == lowTexturesItem)
	2528	+ if (source == lowTexturesItem)
2475	2529	{
2476	2530	SetTexRes(0);
2477	2531	} else
2478		- if (event.getSource() == normalTexturesItem)
	2532	+ if (source == normalTexturesItem)
2479	2533	{
2480	2534	SetTexRes(1);
2481	2535	} else
2482		- if (event.getSource() == highTexturesItem)
	2536	+ if (source == highTexturesItem)
2483	2537	{
2484	2538	SetTexRes(2);
2485	2539	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2540	+ if (source == veryhighTexturesItem)
2487	2541	{
2488	2542	SetTexRes(3);
2489	2543	} else
2490		- if (event.getSource() == maxTexturesItem)
	2544	+ if (source == maxTexturesItem)
2491	2545	{
2492	2546	SetTexRes(4);
2493	2547	} else
2494		- if (event.getSource() == panoTexturesItem)
	2548	+ if (source == panoTexturesItem)
2495	2549	{
2496	2550	SetTexRes(5);
2497	2551	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2552	+ if (source == reverseNormalsItem)
2499	2553	{
2500	2554	ReverseNormals();
2501	2555	} else
2502		- if (event.getSource() == parseverticesItem)
	2556	+ if (source == parseverticesItem)
2503	2557	{
2504	2558	ParseVertices();
2505	2559	} else
2506		- if (event.getSource() == textureFieldItem)
	2560	+ if (source == textureFieldItem)
2507	2561	{
2508	2562	TextureVertices();
2509	2563	} else
2510		- if (event.getSource() == alignItem)
	2564	+ if (source == alignItem)
2511	2565	{
2512	2566	Align();
2513	2567	} else
2514		- if (event.getSource() == mirrorItem)
	2568	+ if (source == mirrorItem)
2515	2569	{
2516	2570	MirrorPoses();
2517	2571	} else
2518		- if (event.getSource() == reduceMorphItem)
	2572	+ if (source == reduceMorphItem)
2519	2573	{
2520	2574	MeshReduction(false);
2521	2575	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2576	+ if (source == reduce34MorphItem)
2523	2577	{
2524	2578	MeshReduction(true);
2525	2579	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2580	+ if (source == reverseTrianglesItem)
2527	2581	{
2528	2582	ReverseTriangles();
2529	2583	} else
2530		- if (event.getSource() == reduceMeshItem)
	2584	+ if (source == reduceMeshItem)
2531	2585	{
2532	2586	ReduceMesh(false);
2533	2587	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2588	+ if (source == reduce34MeshItem)
2535	2589	{
2536	2590	ReduceMesh(true);
2537	2591	} else
2538		- if (event.getSource() == increaseMeshItem)
	2592	+ if (source == increaseMeshItem)
2539	2593	{
2540	2594	IncreaseMesh();
2541	2595	} else
2542		- if (event.getSource() == clipMeshItem)
	2596	+ if (source == clipMeshItem)
2543	2597	{
2544	2598	ClipMesh();
2545	2599	} else
2546		- if (event.getSource() == smoothMeshItem)
	2600	+ if (source == smoothMeshItem)
2547	2601	{
2548	2602	SmoothMesh();
2549	2603	} else
2550		- if (event.getSource() == transformgeometryItem)
	2604	+ if (source == transformgeometryItem)
2551	2605	{
2552	2606	TransformGeometry();
2553	2607	} else
2554		- if (event.getSource() == resetTransformItem)
	2608	+ if (source == resetTransformItem)
2555	2609	{
2556	2610	ResetTransform();
2557	2611	} else
2558		- if (event.getSource() == resetCentroidItem)
	2612	+ if (source == resetCentroidItem)
2559	2613	{
2560	2614	ResetCentroid();
2561	2615	} else
2562		- if (event.getSource() == resetParentItem)
	2616	+ if (source == resetParentItem)
2563	2617	{
2564	2618	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2619	{
..	..	@@ -2569,7 +2623,7 @@
2569	2623
2570	2624	refreshContents();
2571	2625	} else
2572		- if (event.getSource() == repairParentItem)
	2626	+ if (source == repairParentItem)
2573	2627	{
2574	2628	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2629	{
..	..	@@ -2583,7 +2637,7 @@
2583	2637
2584	2638	refreshContents();
2585	2639	} else
2586		- if (event.getSource() == repairShadowItem)
	2640	+ if (source == repairShadowItem)
2587	2641	{
2588	2642	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2643	{
..	..	@@ -2597,7 +2651,7 @@
2597	2651
2598	2652	refreshContents();
2599	2653	} else
2600		- if (event.getSource() == sortbysizeItem)
	2654	+ if (source == sortbysizeItem)
2601	2655	{
2602	2656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2657	{
..	..	@@ -2609,7 +2663,7 @@
2609	2663	ResetModel();
2610	2664	refreshContents();
2611	2665	} else
2612		- if (event.getSource() == sortbynameItem)
	2666	+ if (source == sortbynameItem)
2613	2667	{
2614	2668	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2669	{
..	..	@@ -2621,7 +2675,7 @@
2621	2675	ResetModel();
2622	2676	refreshContents();
2623	2677	} else
2624		- if (event.getSource() == attachPigmentItem)
	2678	+ if (source == attachPigmentItem)
2625	2679	{
2626	2680	String texture = GetFile("Attach pigment");
2627	2681	Object3D obj;
..	..	@@ -2633,7 +2687,7 @@
2633	2687
2634	2688	refreshContents();
2635	2689	} else
2636		- if (event.getSource() == detachPigmentItem)
	2690	+ if (source == detachPigmentItem)
2637	2691	{
2638	2692	Object3D obj;
2639	2693	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2698,7 @@
2644	2698
2645	2699	refreshContents();
2646	2700	} else
2647		- if (event.getSource() == attachBumpItem)
	2701	+ if (source == attachBumpItem)
2648	2702	{
2649	2703	String texture = GetFile("Attach bump");
2650	2704	Object3D obj;
..	..	@@ -2656,7 +2710,7 @@
2656	2710
2657	2711	refreshContents();
2658	2712	} else
2659		- if (event.getSource() == detachBumpItem)
	2713	+ if (source == detachBumpItem)
2660	2714	{
2661	2715	Object3D obj;
2662	2716	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2721,7 @@
2667	2721
2668	2722	refreshContents();
2669	2723	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2724	+ if (source == pigmentBumpItem)
2671	2725	{
2672	2726	Object3D obj;
2673	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2732,195 @@
2678	2732
2679	2733	refreshContents();
2680	2734	} else
2681		- if (event.getSource() == flashSelectionButton)
	2735	+ if (source == flashSelectionButton)
2682	2736	{
2683	2737	CameraPane.flash = true;
2684	2738	refreshContents();
2685	2739	} else
2686		- if (event.getSource() == oneButton)
	2740	+ if (source == oneButton)
2687	2741	{
2688	2742	} else
2689		- if (event.getSource() == twoButton)
	2743	+ if (source == twoButton)
2690	2744	{
2691	2745	radio.layout = twoButton;
2692	2746	// bug
2693	2747	//gridPanel.setDividerLocation(1.0);
2694	2748	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- 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();
2719	2778	} else
2720		- if (event.getSource() == threeButton)
	2779	+ if (source == threeButton)
2721	2780	{
2722	2781	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- 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();
2747	2814	} else
2748		- if (event.getSource() == fourButton)
	2815	+ if (source == fourButton)
2749	2816	{
2750	2817	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- 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();
2775	2849	} else
2776		- if (event.getSource() == sixButton)
	2850	+ if (source == sixButton)
2777	2851	{
2778	2852	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- 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();
2803	2885	} else
2804		- if (event.getSource() == sevenButton)
	2886	+ if (source == sevenButton)
2805	2887	{
2806	2888	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- 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();
2831	2922	} else
2832		- if (event.getSource() == rootButton)
	2923	+ if (source == rootButton)
2833	2924	{
2834	2925	Object3D obj;
2835	2926	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2841,7 +2932,7 @@
2841	2932
2842	2933	refreshContents(true);
2843	2934	} else
2844		- if (event.getSource() == closeButton)
	2935	+ if (source == closeButton)
2845	2936	{
2846	2937	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	2938	cRadio ab;
..	..	@@ -2862,11 +2953,11 @@
2862	2953	}
2863	2954	refreshContents(true);
2864	2955	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2956	+ if (source == editItem \|\| source == editButton)
2866	2957	{
2867	2958	EditSelection(false);
2868	2959	} else
2869		- if (event.getSource() == uneditButton)
	2960	+ if (source == uneditButton)
2870	2961	{
2871	2962	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	2963	{
..	..	@@ -2878,12 +2969,12 @@
2878	2969
2879	2970	child.editWindow = null; // ???????????
2880	2971	}
2881		- objEditor.ctrlPanel.revalidate();
	2972	+ objEditor.ctrlPanel.FlushUI();
2882	2973	//objEditor.jTree.clearSelection();
2883	2974	//objEditor.ResetSliders();
2884	2975	refreshContents(true);
2885	2976	} else
2886		- if (event.getSource() == clearPanelButton)
	2977	+ if (source == clearPanelButton)
2887	2978	{
2888	2979	assert(copy == group);
2889	2980	//copy.ClearUI();
..	..	@@ -2894,7 +2985,7 @@
2894	2985	listUI.clear();
2895	2986	refreshContents(true);
2896	2987	} else
2897		- if (event.getSource() == allParamsButton)
	2988	+ if (source == allParamsButton)
2898	2989	{
2899	2990	assert(copy == group);
2900	2991
..	..	@@ -2915,19 +3006,19 @@
2915	3006
2916	3007	refreshContents(true);
2917	3008	} else
2918		- if (event.getSource() == unselectButton)
	3009	+ if (source == unselectButton)
2919	3010	{
2920	3011	objEditor.jTree.clearSelection();
2921	3012	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3013	objEditor.ResetSliders();
2923	3014	refreshContents(true);
2924	3015	} else
2925		- if(event.getSource() instanceof cRadio)
	3016	+ if(source instanceof cRadio)
2926	3017	{
2927	3018	group.parent = keepparent;
2928	3019	group.attributes = 0;
2929	3020	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3021	+ /cRadio/ radio = (cRadio)source;
2931	3022	Object3D obj = radio.GetObject();
2932	3023	System.out.println("Edit " + obj);
2933	3024	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -3597,11 +3688,11 @@
3597	3688
3598	3689	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	3690
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	3691	+ boolean random = CameraPane.SWITCH;
	3692	+ CameraPane.SWITCH = false; // parse all random nodes
3602	3693	lowres.linkVerticesThis(null);
3603	3694	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	3695	+ CameraPane.SWITCH = random;
3605	3696
3606	3697	System.err.flush();
3607	3698
..	..	@@ -4086,12 +4177,12 @@
4086	4177	System.err.println("info : " + child.GetPath());
4087	4178	}
4088	4179	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4180	+// else
	4181	+// {
	4182	+// objEditor.SetMaterial(group); // .GetMaterial());
	4183	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4184	+// System.err.println("info : " + group.GetPath());
	4185	+// }
4095	4186
4096	4187	objEditor.SetText(); // jan 2014
4097	4188
..	..	@@ -4359,7 +4450,7 @@
4359	4450	refreshContents();
4360	4451	}
4361	4452
4362		- void pasteInto(boolean copyit)
	4453	+ void pasteInto(boolean copyit, boolean clone)
4363	4454	{
4364	4455	// if (GrafreeD.clipboard == null)
4365	4456	// return;
..	..	@@ -4388,7 +4479,14 @@
4388	4479	if (copyit)
4389	4480	{
4390	4481	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	4482	+ if (clone)
	4483	+ {
	4484	+ CloneClipboard(false); // sept 2014
	4485	+ }
	4486	+ else
	4487	+ {
	4488	+ paste(false);
	4489	+ }
4392	4490	}
4393	4491	else
4394	4492	{
..	..	@@ -4932,10 +5030,12 @@
4932	5030	cButton flashSelectionButton;
4933	5031	cButton editButton;
4934	5032	cButton uneditButton;
	5033	+ JCheckBox allParamsButton;
4935	5034	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5035	cButton unselectButton;
4938	5036
	5037	+ cButton oneStepButton;
	5038	+
4939	5039	cButton screenfitButton;
4940	5040	cButton screenfitpointButton;
4941	5041	cButton snapobjectButton;
..	..	@@ -4990,6 +5090,7 @@
4990	5090	private MenuItem mergeGeometriesItem;
4991	5091	private MenuItem copyItem;
4992	5092	private MenuItem pasteItem;
	5093	+ private MenuItem pasteIntoItem;
4993	5094	private MenuItem pasteLinkItem;
4994	5095	private MenuItem pasteCloneItem;
4995	5096	private MenuItem pasteExpandItem;
..	..	@@ -5087,7 +5188,7 @@
5087	5188	private MenuItem blobItem;
5088	5189	private MenuItem latheItem;
5089	5190	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5191	+ private MenuItem overlayItem;
5091	5192	private MenuItem meshItem;
5092	5193	// private MenuItem meshGroupItem;
5093	5194	private MenuItem springItem;