~nbriere/GrafreeD.git - Noware Git Repository

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