~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,17 +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);
	246	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	247	+ relinkverticesItem.addActionListener(this);
	248	+
	249	+ if (Globals.ADVANCED)
	250	+ {
222	251	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	252	setMasterItem.addActionListener(this);
	253	+ }
224	254
225	255	oe.menuBar.add(menu = new Menu("Group"));
226	256	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +261,38 @@
231	261	frontItem.addActionListener(this);
232	262	compositeItem = menu.add(new MenuItem("Composite"));
233	263	compositeItem.addActionListener(this);
	264	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	265	+ hideItem.addActionListener(this);
	266	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	267	+ ungroupItem.addActionListener(this);
234	268	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	269	+ randomItem = menu.add(new MenuItem("Switch node"));
236	270	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
241	271	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	272	switchGeoItem.addActionListener(this);
243	273	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	274	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	275	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	285	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	286	scriptNodeItem.addActionListener(this);
249	287	cameraItem = menu.add(new MenuItem("Camera"));
250	288	cameraItem.addActionListener(this);
	289	+ }
251	290
252	291	oe.menuBar.add(menu = new Menu("Object"));
253	292	textureItem = menu.add(new MenuItem("Texture"));
254	293	textureItem.addActionListener(this);
	294	+ billboardItem = menu.add(new MenuItem("Billboard"));
	295	+ billboardItem.addActionListener(this);
255	296	csgItem = menu.add(new MenuItem("CSG"));
256	297	csgItem.addActionListener(this);
257	298	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +301,25 @@
260	301	shadowYItem.addActionListener(this);
261	302	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	303	shadowZItem.addActionListener(this);
	304	+ if (Globals.ADVANCED)
	305	+ {
	306	+ menu.add("-");
263	307	linkerItem = menu.add(new MenuItem("Linker"));
264	308	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	309	attributeItem = menu.add(new MenuItem("Attribute"));
268	310	attributeItem.addActionListener(this);
	311	+ templateItem = menu.add(new MenuItem("Template"));
	312	+ templateItem.addActionListener(this);
269	313	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	314	pointflowItem.addActionListener(this);
	315	+ }
271	316	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	317	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	318	resetTransformItem.addActionListener(this);
276	319	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	320	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	321	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	322	+ transformgeometryItem.addActionListener(this);
280	323
281	324	oe.menuBar.add(menu = new Menu("Geometry"));
282	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +328,13 @@
285	328	genNormalsORGANItem.addActionListener(this);
286	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	330	genNormalsCADItem.addActionListener(this);
	331	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	332	+ genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
288	338	stripifyItem = menu.add(new MenuItem("Stripify"));
289	339	stripifyItem.addActionListener(this);
290	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,10 +356,14 @@
306	356	reduce34MeshItem.addActionListener(this);
307	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	358	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
313	367
314	368	oe.menuBar.add(menu = new Menu("Attributes"));
315	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -319,10 +373,13 @@
319	373	liveleavesItem.addActionListener(this);
320	374	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	375	unliveleavesItem.addActionListener(this);
	376	+ if (Globals.ADVANCED)
	377	+ {
322	378	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	379	supportleavesItem.addActionListener(this);
324	380	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	381	unsupportleavesItem.addActionListener(this);
	382	+ }
326	383	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	384	hideleavesItem.addActionListener(this);
328	385	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -365,6 +422,8 @@
365	422	sortbysizeItem.addActionListener(this);
366	423	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	424	sortbynameItem.addActionListener(this);
	425	+ if (Globals.ADVANCED)
	426	+ {
368	427	menu.add("-");
369	428	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	429	extractGeometriesItem.addActionListener(this);
..	..	@@ -374,20 +433,23 @@
374	433	shareGeometriesItem.addActionListener(this);
375	434	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376	435	mergeGeometriesItem.addActionListener(this);
	436	+ }
377	437
378	438	oe.menuBar.add(menu = new Menu("Insert"));
379	439	buildCreateMenu(menu);
380	440
381		-
382	441	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	442	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
388	443	importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	444	+ menu.add("-");
	445	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
390	446	import3DSItem.addActionListener(this);
	447	+ menu.add("-");
	448	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	449	+ importVRMLX3DItem.addActionListener(this);
	450	+ menu.add("-");
	451	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	452	+ importGFDItem.addActionListener(this);
391	453
392	454	oe.menuBar.add(menu = new Menu("Tools"));
393	455	buildToolsMenu(menu);
..	..	@@ -423,150 +485,98 @@
423	485	oe.radioPanel.add(dummyButton);
424	486	oe.buttonGroup.add(dummyButton);
425	487	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	488	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	489
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	490	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	491	+ liveCB.setToolTipText("Enabled animation");
431	492	liveCB.addItemListener(this);
432	493
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	494	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	495	+ oneStepButton.setToolTipText("Animate one step forward");
	496	+ oneStepButton.addActionListener(this);
	497	+
	498	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	499	+ fastCB.setToolTipText("Fast mode");
451	500	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	501	+
	502	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	503	+ trackCB.setToolTipText("Enable tracking");
493	504	trackCB.addItemListener(this);
494	505
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	506	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	507	+ screenfitButton.setToolTipText("Screen fit");
497	508	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	509	+
499	510	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	511	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	512
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	513	+ if (Globals.ADVANCED)
	514	+ {
	515	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	516	+ snapobjectButton.addActionListener(this);
	517	+ snapobjectButton.setToolTipText("Snap Object");
	518	+ }
	519	+
	520	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	521	+ flashSelectionButton.setToolTipText("Show selection");
512	522	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	523
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	524	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	525	+
	526	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	527	+ twoButton.setToolTipText("Show center view only");
519	528	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
521	530	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	531	+ fourButton.setToolTipText("Show left panel only");
	532	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	533	+ sixButton.setToolTipText("2-column layout left");
523	534	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	535	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	536	+ threeButton.setToolTipText("2-column layout right");
525	537	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	538	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	539	+ sevenButton.setToolTipText("3-column layout");
527	540	sevenButton.addActionListener(this);
528	541	//
529	542
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	544	+ rootButton.setToolTipText("Edit selection in new tab");
531	545	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	546	+
	547	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	548	+ closeButton.setToolTipText("Close tab");
534	549	closeButton.addActionListener(this);
535	550	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	551	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	552
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	553	+ cGridBag commandsPanel = new cGridBag();
	554	+
	555	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	556	+ editButton.setToolTipText("Edit selection");
541	557	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	558
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	559	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	560	+ uneditButton.setToolTipText("Unedit selection");
547	561	uneditButton.addActionListener(this);
548	562
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	563	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	564	+ allParamsButton.setToolTipText("Edit all params");
561	565	allParamsButton.addActionListener(this);
562	566
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	567	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	568	+ clearPanelButton.setToolTipText("Clear edit panel");
	569	+ clearPanelButton.addActionListener(this);
	570	+
	571	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	572	+ unselectButton.setToolTipText("Unselect");
568	573	unselectButton.addActionListener(this);
569	574
	575	+ commandsPanel.preferredHeight = 1;
	576	+
	577	+ oe.treePanel.add(commandsPanel);
	578	+ oe.treePanel.Return();
	579	+
570	580	// oe.aConstraints.gridx += 1;
571	581	// oe.aConstraints.weighty = 0;
572	582	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +588,37 @@
578	588	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	589	// gcButton.addActionListener(this);
580	590
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	591	+ cGridBag jSPPanel = new cGridBag();
	592	+
	593	+ JScrollPane jSP;
592	594	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	595	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	596	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	597	+
	598	+ oe.treePanel.add(jSPPanel);
	599	+ oe.treePanel.Return();
599	600
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	601	+ cGridBag copyOptionsPanel = new cGridBag();
	602	+
	603	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	604	+ colorCB.setToolTipText("Copy color when dropped");
604	605	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	606	+
	607	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	608	+ materialCB.setToolTipText("Copy material when dropped");
607	609	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	610	+
	611	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	612	+ textureCB.setToolTipText("Copy texture when dropped");
610	613	textureCB.addItemListener(this);
611	614
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	615	+ copyOptionsPanel.preferredHeight = 1;
	616	+ oe.treePanel.add(copyOptionsPanel);
	617	+ oe.treePanel.Return();
614	618
	619	+// mainPanel.setDividerLocation(0.5); //1.0);
	620	+// mainPanel.setResizeWeight(0.5);
	621	+
615	622	//jList.addListSelectionListener(this);
616	623	oe.jTree.addTreeSelectionListener(this);
617	624	//jTree.setRootVisible(false);
..	..	@@ -633,17 +640,89 @@
633	640	radio.layout = sevenButton;
634	641	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	642	}
	643	+
	644	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	645	+ {
	646	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	647	+ boxCB.setToolTipText("Display bounding boxes");
	648	+ boxCB.addItemListener(this);
	649	+
	650	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	651	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	652	+ zoomBoxCB.addItemListener(this);
	653	+
	654	+ if (Globals.ADVANCED)
	655	+ {
	656	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	657	+ supportCB.setToolTipText("Enable rigging");
	658	+ supportCB.addItemListener(this);
	659	+
	660	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	661	+ // localCB.addItemListener(this);
	662	+
	663	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	664	+ crowdCB.setToolTipText("Used for crowds");
	665	+ crowdCB.addItemListener(this);
	666	+
	667	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	668	+ smoothCB.setToolTipText("Snapping delay");
	669	+ smoothCB.addItemListener(this);
	670	+
	671	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	672	+ slowCB.setToolTipText("Smooth interpolation");
	673	+ slowCB.addItemListener(this);
	674	+
	675	+// constraints.gridy += 1;
	676	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	677	+// speakerMocapCB.addItemListener(this);
	678	+
	679	+ if (false)
	680	+ {
	681	+ // handled in scripts
	682	+ //constraints.gridy += 1;
	683	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	684	+ speakerCameraCB.addItemListener(this);
	685	+
	686	+ //constraints.gridy += 1;
	687	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	688	+ speakerFocusCB.addItemListener(this);
	689	+
	690	+ //constraints.gridy += 1;
	691	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	692	+ smoothfocusCB.addItemListener(this);
	693	+ }
	694	+
	695	+//constraints.gridx += 1;
	696	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	697	+// debugCB.addItemListener(this);
	698	+
	699	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	700	+ oeilCB.addItemListener(this);
	701	+
	702	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	703	+ lookAtCB.setToolTipText("Look-at target");
	704	+ lookAtCB.addItemListener(this);
	705	+
	706	+ }
	707	+
	708	+ cGridBag fill = new cGridBag();
	709	+
	710	+ fill.preferredHeight = 200;
	711	+
	712	+ panel.add(fill);
	713	+
	714	+ }
636	715
637	716	void EditObject(Object3D obj)
638	717	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	718	+ cRadio radioButton = new cRadio(obj.name);
	719	+ radioButton.SetObject(obj);
	720	+ radioButton.layout = sevenButton;
	721	+ radioButton.SetCamera(cameraView.renderCamera, false);
	722	+ radioButton.addActionListener(this);
	723	+ radioPanel.add(radioButton);
	724	+ buttonGroup.add(radioButton);
	725	+ radioButton.doClick();
647	726	}
648	727	void SetupViews(ObjEditor oe)
649	728	{
..	..	@@ -663,6 +742,7 @@
663	742	JCheckBox fastCB;
664	743	JCheckBox slowCB;
665	744	JCheckBox boxCB;
	745	+ JCheckBox zoomBoxCB;
666	746	JCheckBox trackCB;
667	747	JCheckBox smoothfocusCB;
668	748	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +785,7 @@
705	785	dropAttributes \|= Object3D.TEXTURE;
706	786	else
707	787	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	788	+ } else if(e.getSource() == liveCB)
710	789	{
711	790	cameraView.ToggleLive();
712	791	}
..	..	@@ -743,6 +822,10 @@
743	822	Recompile();
744	823	cameraView.repaint();
745	824	// refreshContents();
	825	+ }
	826	+ else if(e.getSource() == zoomBoxCB)
	827	+ {
	828	+ cameraView.ToggleZoomBoxMode();
746	829	}
747	830	else if(e.getSource() == smoothfocusCB)
748	831	{
..	..	@@ -911,11 +994,11 @@
911	994	{
912	995	loadClipboard(true);
913	996	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	997	+ pasteInto(false, false);
915	998	} else {
916	999	loadClipboard(false);
917	1000	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1001	+ pasteInto(false, false); // true); // ???
919	1002	}
920	1003	}
921	1004	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1116,37 @@
1033	1116	torusItem.addActionListener(this);
1034	1117	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1118	superItem.addActionListener(this);
	1119	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1120	+ kleinItem.addActionListener(this);
1036	1121	particleItem = menu.add(new MenuItem("Particle system"));
1037	1122	particleItem.addActionListener(this);
	1123	+ if (Globals.ADVANCED)
	1124	+ {
1038	1125	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1126	ragdollItem.addActionListener(this);
1040	1127	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1128	ragdoll2Item.addActionListener(this);
	1129	+ }
1042	1130	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1131	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1132	meshItem.addActionListener(this);
1045	1133	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1134	// meshGroupItem.addActionListener(this);
	1135	+ if (Globals.ADVANCED)
	1136	+ {
1047	1137	springItem = menu.add(new MenuItem("Spring"));
1048	1138	springItem.addActionListener(this);
1049	1139	flagItem = menu.add(new MenuItem("Flag"));
1050	1140	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1141	blobItem = menu.add(new MenuItem("Blob"));
1056	1142	blobItem.addActionListener(this);
1057	1143	latheItem = menu.add(new MenuItem("Lathe"));
1058	1144	latheItem.addActionListener(this);
	1145	+ }
	1146	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1147	+ bezierItem.addActionListener(this);
	1148	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1149	+ overlayItem.addActionListener(this);
1059	1150	lightItem = menu.add(new MenuItem("Light"));
1060	1151	lightItem.addActionListener(this);
1061	1152	menu.add("-");
..	..	@@ -1065,34 +1156,39 @@
1065	1156	loopItem.addActionListener(this);
1066	1157	doubleItem = menu.add(new MenuItem("Fork"));
1067	1158	doubleItem.addActionListener(this);
	1159	+ if (Globals.ADVANCED)
	1160	+ {
1068	1161	tripleItem = menu.add(new MenuItem("Trident"));
1069	1162	tripleItem.addActionListener(this);
	1163	+ }
1070	1164	}
1071	1165
1072	1166	void buildToolsMenu(Menu menu)
1073	1167	{
1074	1168	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1169	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1170	+ animationItem.setState(Globals.ANIMATION);
1077	1171
1078	1172	menu.add("-");
1079	1173	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1174	parseverticesItem.addActionListener(this);
1081	1175	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1176	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1177	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1178	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1179	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1180	reduceMorphItem.addActionListener(this);
1089	1181	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1182	reduce34MorphItem.addActionListener(this);
1091		-
	1183	+ menu.add("-");
1092	1184	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1185	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1186
	1187	+ if (Globals.ADVANCED)
	1188	+ {
	1189	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1190	+ mirrorItem.addActionListener(this);
	1191	+ menu.add("-");
1096	1192	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1193	memoryItem.addActionListener(this);
1098	1194	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1202,8 @@
1106	1202	resetParentItem.addActionListener(this);
1107	1203	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1204	repairParentItem.addActionListener(this);
	1205	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1206	+ repairShadowItem.addActionListener(this);
1109	1207	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1208	invariantsItem.addActionListener(this);
1111	1209	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1211,7 @@
1113	1211	menu.add("-");
1114	1212	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1213	editScriptItem.addActionListener(this);
	1214	+ }
1116	1215	}
1117	1216
1118	1217	void ScreenFit()
..	..	@@ -1466,6 +1565,7 @@
1466	1565	//
1467	1566	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1567	{
	1568	+ Object source = event.getSource();
1469	1569	/*
1470	1570	if (event.getSource() == nameField)
1471	1571	{
..	..	@@ -1477,11 +1577,11 @@
1477	1577	}
1478	1578	else
1479	1579	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1580	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1581	{
1482	1582	ScreenFit();
1483	1583	} else
1484		- if (event.getSource() == switchItem)
	1584	+ if (source == switchItem)
1485	1585	{
1486	1586	cVector v1 = new cVector();
1487	1587	cVector v2 = new cVector();
..	..	@@ -1490,11 +1590,11 @@
1490	1590	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1591	objEditor.cameraView.repaint();
1492	1592	} else
1493		- if (event.getSource() == rectoidItem)
	1593	+ if (source == rectoidItem)
1494	1594	{
1495	1595	makeSomething(new Box());
1496	1596	} else
1497		- if (event.getSource() == particleItem)
	1597	+ if (source == particleItem)
1498	1598	{
1499	1599	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1600	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1615,9 @@
1515	1615	applyExample(particleGeom, "SMOKE");
1516	1616	makeSomething(particleGeom);
1517	1617	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1618	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1619	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1620	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1621
1522	1622	ragdoll.toParent = LA.newMatrix();
1523	1623	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1635,7 @@
1535	1635	} else
1536	1636	/*
1537	1637	*/
1538		- if (event.getSource() == heightFieldItem)
	1638	+ if (source == heightFieldItem)
1539	1639	{
1540	1640	Object3D obj = new Object3D();
1541	1641
..	..	@@ -1573,27 +1673,31 @@
1573	1673
1574	1674	makeSomething(obj);
1575	1675	} else
1576		- if (event.getSource() == gridItem)
	1676	+ if (source == gridItem)
1577	1677	{
1578	1678	makeSomething(new Grid());
1579	1679	} else
1580		- if (event.getSource() == ellipsoidItem)
	1680	+ if (source == ellipsoidItem)
1581	1681	{
1582	1682	makeSomething(new Sphere());
1583	1683	} else
1584		- if (event.getSource() == coneItem)
	1684	+ if (source == coneItem)
1585	1685	{
1586	1686	makeSomething(new Cone());
1587	1687	} else
1588		- if (event.getSource() == torusItem)
	1688	+ if (source == torusItem)
1589	1689	{
1590	1690	makeSomething(new Torus());
1591	1691	} else
1592		- if (event.getSource() == superItem)
	1692	+ if (source == superItem)
1593	1693	{
1594	1694	makeSomething(new Superellipsoid());
1595	1695	} else
1596		- if (event.getSource() == blobItem)
	1696	+ if (source == kleinItem)
	1697	+ {
	1698	+ makeSomething(new Klein());
	1699	+ } else
	1700	+ if (source == blobItem)
1597	1701	{
1598	1702	Blob blob = new Blob();
1599	1703	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1705,15 @@
1601	1705	//blob.retile();
1602	1706	makeSomething(blob);
1603	1707	} else
1604		- if (event.getSource() == latheItem)
	1708	+ if (source == latheItem)
1605	1709	{
1606	1710	makeSomething(new Lathe());
1607	1711	} else
1608		- if (event.getSource() == bezierItem)
	1712	+ if (source == bezierItem)
1609	1713	{
1610	1714	makeSomething(new BezierSurface());
1611	1715	} else
1612		- if (event.getSource() == checkerItem)
	1716	+ if (source == overlayItem)
1613	1717	{
1614	1718	/*
1615	1719	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1728,7 @@
1624	1728	*/
1625	1729	makeSomething(new Checker());
1626	1730	} else
1627		- if (event.getSource() == meshItem)
	1731	+ if (source == meshItem)
1628	1732	{
1629	1733	Object3D itemtomake = new Object3D();
1630	1734	Object3D child;
..	..	@@ -1645,35 +1749,35 @@
1645	1749	makeSomething(child);
1646	1750	}
1647	1751	} else
1648		- if (event.getSource() == springItem)
	1752	+ if (source == springItem)
1649	1753	{
1650	1754	cSpring s = new cSpring();
1651	1755	s.setup();
1652	1756	makeSomething(s);
1653	1757	} else
1654		- if (event.getSource() == flagItem)
	1758	+ if (source == flagItem)
1655	1759	{
1656	1760	cSpring s = new cFlag();
1657	1761	s.setup();
1658	1762	makeSomething(s);
1659	1763	} else
1660		- if (event.getSource() == lightItem)
	1764	+ if (source == lightItem)
1661	1765	{
1662	1766	makeSomething(new Light());
1663	1767	} else
1664		- if (event.getSource() == csgItem)
	1768	+ if (source == csgItem)
1665	1769	{
1666	1770	group(new CSG());
1667	1771	} else
1668		- if (event.getSource() == templateItem)
	1772	+ if (source == templateItem)
1669	1773	{
1670	1774	group(new cTemplate());
1671	1775	} else
1672		- if (event.getSource() == attributeItem)
	1776	+ if (source == attributeItem)
1673	1777	{
1674	1778	makeSomething(new Attribute());
1675	1779	} else
1676		- if (event.getSource() == pointflowItem)
	1780	+ if (source == pointflowItem)
1677	1781	{
1678	1782	makeSomething(new PointFlow());
1679	1783	} else
..	..	@@ -1685,7 +1789,7 @@
1685	1789	} else
1686	1790	*/
1687	1791
1688		- if (event.getSource() == superLoopItem)
	1792	+ if (source == superLoopItem)
1689	1793	{
1690	1794	Composite g = new cGroup();
1691	1795	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1811,7 @@
1707	1811
1708	1812	group(g);
1709	1813	} else
1710		- if (event.getSource() == loopItem)
	1814	+ if (source == loopItem)
1711	1815	{
1712	1816	Composite csg = new GroupLeaf();
1713	1817	csg.count = 5;
..	..	@@ -1716,7 +1820,7 @@
1716	1820	csg.addChild(child);
1717	1821	child.addChild(csg);
1718	1822	} else
1719		- if (event.getSource() == doubleItem)
	1823	+ if (source == doubleItem)
1720	1824	{
1721	1825	Composite csg = new GroupLeaf();
1722	1826	csg.count = 5;
..	..	@@ -1728,7 +1832,7 @@
1728	1832	csg.addChild(child);
1729	1833	child.addChild(csg);
1730	1834	} else
1731		- if (event.getSource() == tripleItem)
	1835	+ if (source == tripleItem)
1732	1836	{
1733	1837	Composite csg = new GroupLeaf();
1734	1838	csg.count = 4;
..	..	@@ -1744,70 +1848,83 @@
1744	1848	child.addChild(csg);
1745	1849	} else
1746	1850
1747		- if (event.getSource() == importGFDItem)
	1851	+ if (source == importGFDItem)
1748	1852	{
1749	1853	ImportGFD();
1750	1854	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1855	+ if (source == importVRMLX3DItem)
1752	1856	{
1753	1857	ImportVRMLX3D();
1754	1858	} else
1755		- if (event.getSource() == import3DSItem)
	1859	+ if (source == import3DSItem)
1756	1860	{
1757	1861	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1862	} else
1759		- if (event.getSource() == importOBJItem)
	1863	+ if (source == importOBJItem)
1760	1864	{
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1865	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1866	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1867	+ browser.setVisible(true);
	1868	+ String filename = browser.getFile();
	1869	+ if (filename != null && filename.length() > 0)
	1870	+ {
	1871	+ String fullname = browser.getDirectory() + filename;
	1872	+ makeSomething(ReadOBJ(fullname), true);
	1873	+ }
1762	1874	} else
1763		- if (event.getSource() == computeAOItem)
	1875	+ if (source == computeAOItem)
1764	1876	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1877	+ Globals.drawMode = CameraPane.OCCLUSION;
	1878	+ Globals.theRenderer.repaint();
1767	1879	} else
1768		- if (event.getSource() == recompileItem)
	1880	+ if (source == recompileItem)
1769	1881	{
1770	1882	Recompile();
1771	1883	refreshContents();
1772	1884	} else
1773		- if (event.getSource() == editScriptItem)
	1885	+ if (source == editScriptItem)
1774	1886	{
1775	1887	OpenDialog();
1776	1888	refreshContents();
1777	1889	} else
1778		- if (event.getSource() == invariantsItem)
	1890	+ if (source == invariantsItem)
1779	1891	{
1780	1892	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	1893	+ GrafreeD.grafreeD.universe.invariants();
1782	1894	} else
1783		- if (event.getSource() == memoryItem)
	1895	+ if (source == memoryItem)
1784	1896	{
1785	1897	//System.out.println("Invariants:");
1786	1898	PrintMemory();
1787	1899	} else
1788		- if (event.getSource() == pathItem)
	1900	+ if (source == pathItem)
1789	1901	{
1790	1902	PrintPath();
1791	1903	} else
1792		- if (event.getSource() == analyzeItem)
	1904	+ if (source == analyzeItem)
1793	1905	{
1794	1906	AnalyzeObject();
1795	1907	} else
1796		- if (event.getSource() == dumpItem)
	1908	+ if (source == dumpItem)
1797	1909	{
1798	1910	DumpObject();
1799	1911	} else
1800		- if (event.getSource() == screenfitButton)
	1912	+ if (source == oneStepButton)
	1913	+ {
	1914	+ Globals.ONESTEP = true;
	1915	+ cameraView.repaint();
	1916	+ } else
	1917	+ if (source == screenfitButton)
1801	1918	{
1802	1919	//Reload(lastConverter, lastFilename, true);
1803	1920	ScreenFit();
1804	1921	} else
1805		- if (event.getSource() == screenfitpointButton)
	1922	+ if (source == screenfitpointButton)
1806	1923	{
1807	1924	//Reload(lastConverter, lastFilename, true);
1808	1925	ScreenFitPoint();
1809	1926	} else
1810		- if (event.getSource() == snapobjectButton)
	1927	+ if (source == snapobjectButton)
1811	1928	{
1812	1929	//Reload(lastConverter, lastFilename, true);
1813	1930	SnapObject();
..	..	@@ -1818,13 +1935,13 @@
1818	1935	// Recompile();
1819	1936	// refreshContents();
1820	1937	// } else
1821		- if (event.getSource() == gcButton)
	1938	+ if (source == gcButton)
1822	1939	{
1823	1940	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1941	System.gc();
1825	1942	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1943	} else
1827		- if (event.getSource() == editLeafItem)
	1944	+ if (source == editLeafItem)
1828	1945	{
1829	1946	Object3D obj;
1830	1947	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +1955,66 @@
1838	1955	}
1839	1956	refreshContents(true);
1840	1957	} else
1841		- if (event.getSource() == openWindowItem)
	1958	+ if (source == openWindowItem)
1842	1959	{
1843	1960	EditSelection(true);
1844	1961	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1962	+ if (source == cutItem \|\| source == clearButton)
1846	1963	{
1847	1964	loadClipboard(true);
1848	1965	} else
1849		- if (event.getSource() == duplicateItem)
	1966	+ if (source == duplicateItem)
1850	1967	{
1851	1968	Object3D keep = GrafreeD.clipboard;
1852	1969	loadClipboard(false);
1853	1970	paste(false);
1854	1971	GrafreeD.clipboard = keep;
1855	1972	} else
1856		- if (event.getSource() == cloneItem)
	1973	+ if (source == cloneItem)
1857	1974	{
1858	1975	CloneSelection(false);
1859	1976	} else
1860		- if (event.getSource() == cloneSupportItem)
	1977	+ if (source == cloneSupportItem)
1861	1978	{
1862	1979	CloneSelection(true);
1863	1980	} else
1864		- if (event.getSource() == copyItem)
	1981	+ if (source == copyItem)
1865	1982	{
1866	1983	loadClipboard(false);
1867	1984	} else
1868		- if (event.getSource() == pasteItem)
	1985	+ if (source == pasteItem)
1869	1986	{
1870	1987	paste(false);
1871	1988	} else
1872		- if (event.getSource() == pasteLinkItem)
	1989	+ if (source == pasteIntoItem)
1873	1990	{
1874		- pasteInto(false);
	1991	+ pasteInto(true, false);
1875	1992	} else
1876		- if (event.getSource() == pasteCloneItem)
	1993	+ if (source == pasteLinkItem)
1877	1994	{
1878		- pasteInto(true);
	1995	+ pasteInto(false, false);
1879	1996	} else
1880		- if (event.getSource() == pasteExpandItem)
	1997	+ if (source == pasteCloneItem)
	1998	+ {
	1999	+ pasteInto(true, true);
	2000	+ } else
	2001	+ if (source == pasteExpandItem)
1881	2002	{
1882	2003	paste(true);
1883	2004	} else
1884		- if (event.getSource() == synchronizeItem)
	2005	+ if (source == synchronizeItem)
1885	2006	{
1886	2007	Overwrite(Object3D.TRANSFORM);
1887	2008	} else
1888		- if (event.getSource() == overwriteNameItem)
	2009	+ if (source == overwriteNameItem)
1889	2010	{
1890	2011	Overwrite(Object3D.NAME);
1891	2012	} else
1892		- if (event.getSource() == overwriteUVItem)
	2013	+ if (source == overwriteUVItem)
1893	2014	{
1894	2015	Overwrite(Object3D.UV);
1895	2016	} else
1896		- if (event.getSource() == overwriteMatItem)
	2017	+ if (source == overwriteMatItem)
1897	2018	{
1898	2019	/* july 2015
1899	2020	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2034,7 @@
1913	2034
1914	2035	Overwrite(dropAttributes);
1915	2036	}
1916		- if (event.getSource() == overwriteGeoItem)
	2037	+ if (source == overwriteGeoItem)
1917	2038	{
1918	2039	Overwrite(Object3D.GEOMETRY);
1919	2040	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2051,7 @@
1930	2051	// refreshContents();
1931	2052	// }
1932	2053	} else
1933		- if (event.getSource() == generateMeshItem)
	2054	+ if (source == generateMeshItem)
1934	2055	{
1935	2056	//if (group.selection.size() == 1)
1936	2057	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2062,7 @@
1941	2062	ResetModel();
1942	2063	refreshContents();
1943	2064	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2065	+ if (source == extractGeometriesItem)
1945	2066	{
1946	2067	boolean one = false;
1947	2068
..	..	@@ -1968,7 +2089,7 @@
1968	2089	ResetModel();
1969	2090	refreshContents();
1970	2091	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2092	+ if (source == cloneGeometriesItem)
1972	2093	{
1973	2094	boolean one = false;
1974	2095
..	..	@@ -1994,32 +2115,37 @@
1994	2115	ResetModel();
1995	2116	refreshContents();
1996	2117	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2118	+ if (source == shareGeometriesItem)
1998	2119	{
1999	2120	boolean one = false;
2000	2121
2001	2122	if (group.selection.size() == 1)
2002	2123	one = true;
2003	2124
	2125	+ Object3D merge = null;
	2126	+
2004	2127	Object3D content = new cGroup();
2005	2128
2006	2129	for (int i=0; i<group.selection.size(); i++)
2007	2130	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2131	+ merge = new Merge(group.selection.get(i));
2009	2132
2010	2133	if (one)
2011		- makeSomething(sel, false);
	2134	+ makeSomething(merge, false);
2012	2135	else
2013		- content.addChild(sel);
	2136	+ content.addChild(merge);
2014	2137	}
2015	2138
2016	2139	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2140	+ makeSomething(content, true);
	2141	+ else
	2142	+ {
	2143	+ ResetModel();
	2144	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2145	+ refreshContents();
	2146	+ }
2021	2147	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2148	+ if (source == mergeGeometriesItem)
2023	2149	{
2024	2150	boolean one = false;
2025	2151
..	..	@@ -2049,7 +2175,7 @@
2049	2175	ResetModel();
2050	2176	refreshContents();
2051	2177	} else
2052		- if (event.getSource() == linkverticesItem)
	2178	+ if (source == linkverticesItem)
2053	2179	{
2054	2180	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2181	// {
..	..	@@ -2069,32 +2195,41 @@
2069	2195	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2196	content = ((cGroup)content).get(0);
2071	2197
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2198	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2199	for (int i=0; i<group.selection.size(); i++)
2074	2200	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2201	+ boolean random = CameraPane.SWITCH;
	2202	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2203	group.selection.get(i).linkVerticesThis(content);
2078	2204	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2205	+ CameraPane.SWITCH = random;
2080	2206	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2207	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2208	refreshContents();
2083	2209	}
2084	2210	} else
2085		- if (event.getSource() == resetsupportItem)
	2211	+ if (source == resetsupportItem)
2086	2212	{
2087	2213	for (int i=0; i<group.selection.size(); i++)
2088	2214	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2215	+ boolean random = CameraPane.SWITCH;
	2216	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2217	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2218	+ CameraPane.SWITCH = random;
2093	2219	}
2094	2220
2095	2221	refreshContents();
2096	2222	} else
2097		- if (event.getSource() == resetreferencesItem)
	2223	+ if (source == relinkverticesItem)
	2224	+ {
	2225	+ boolean random = CameraPane.SWITCH;
	2226	+ CameraPane.SWITCH = false; // parse all random nodes
	2227	+ group.selection.RelinkToSupport();
	2228	+ CameraPane.SWITCH = random;
	2229	+
	2230	+ refreshContents();
	2231	+ } else
	2232	+ if (source == resetreferencesItem)
2098	2233	{
2099	2234	for (int i=0; i<group.selection.size(); i++)
2100	2235	{
..	..	@@ -2103,7 +2238,7 @@
2103	2238
2104	2239	refreshContents();
2105	2240	} else
2106		- if (event.getSource() == setMasterItem)
	2241	+ if (source == setMasterItem)
2107	2242	{
2108	2243	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2109	2244	{
..	..	@@ -2116,7 +2251,7 @@
2116	2251	refreshContents();
2117	2252	}
2118	2253	} else
2119		- if (event.getSource() == poseMeshItem)
	2254	+ if (source == poseMeshItem)
2120	2255	{
2121	2256	if (group.selection.size() == 1)
2122	2257	{
..	..	@@ -2135,19 +2270,19 @@
2135	2270	}
2136	2271
2137	2272	} else
2138		- if (event.getSource() == revertMeshItem)
	2273	+ if (source == revertMeshItem)
2139	2274	{
2140	2275	RevertMeshes();
2141	2276	} else
2142		- if (event.getSource() == resetMeshItem)
	2277	+ if (source == resetMeshItem)
2143	2278	{
2144	2279	ResetAll();
2145	2280	} else
2146		- if (event.getSource() == stepAllItem)
	2281	+ if (source == stepAllItem)
2147	2282	{
2148	2283	StepAll();
2149	2284	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2285	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2286	{
2152	2287	//int indices[] = jList.getSelectedIndices();
2153	2288	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2290,46 @@
2155	2290
2156	2291	ClearSelection(false);
2157	2292	} else
2158		- if (event.getSource() == clearAllItem)
	2293	+ if (source == clearAllItem)
2159	2294	{
2160	2295	ClearSelection(true);
2161	2296	} else
2162		- if (event.getSource() == grabItem)
	2297	+ if (source == grabItem)
2163	2298	{
2164	2299	group(new cGroup(), true);
2165	2300	} else
2166		- if (event.getSource() == frontItem)
	2301	+ if (source == hideItem)
	2302	+ {
	2303	+ group(new HiddenObject());
	2304	+ } else
	2305	+ if (source == frontItem)
2167	2306	{
2168	2307	front();
2169	2308	} else
2170		- if (event.getSource() == backItem)
	2309	+ if (source == backItem)
2171	2310	{
2172	2311	back();
2173	2312	} else
2174		- if (event.getSource() == cameraItem)
	2313	+ if (source == cameraItem)
2175	2314	{
2176	2315	makeSomething(new Camera());
2177	2316	} else
2178		- if (event.getSource() == compositeItem)
	2317	+ if (source == compositeItem)
2179	2318	{
2180	2319	group(new Composite());
2181	2320	} else
2182		- if (event.getSource() == randomItem)
	2321	+ if (source == randomItem)
2183	2322	{
2184	2323	RandomNode random = new RandomNode();
2185	2324	group(random);
2186	2325	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2326	+ random.name = random.get(0).name + "Switch";
2188	2327	} else
2189		- if (event.getSource() == physicsItem)
	2328	+ if (source == physicsItem)
2190	2329	{
2191	2330	group(new PhysicsNode());
2192	2331	} else
2193		- if (event.getSource() == frameselectorItem)
	2332	+ if (source == frameselectorItem)
2194	2333	{
2195	2334	for (int i=0; i<group.selection.size(); i++)
2196	2335	{
..	..	@@ -2202,7 +2341,7 @@
2202	2341	ResetModel();
2203	2342	refreshContents();
2204	2343	} else
2205		- if (event.getSource() == switchGeoItem)
	2344	+ if (source == switchGeoItem)
2206	2345	{
2207	2346	for (int i=0; i<group.selection.size(); i++)
2208	2347	{
..	..	@@ -2214,7 +2353,7 @@
2214	2353	ResetModel();
2215	2354	refreshContents();
2216	2355	} else
2217		- if (event.getSource() == switchTransfoItem)
	2356	+ if (source == switchTransfoItem)
2218	2357	{
2219	2358	for (int i=0; i<group.selection.size(); i++)
2220	2359	{
..	..	@@ -2226,7 +2365,7 @@
2226	2365	ResetModel();
2227	2366	refreshContents();
2228	2367	} else
2229		- if (event.getSource() == morphItem)
	2368	+ if (source == morphItem)
2230	2369	{
2231	2370	for (int i=0; i<group.selection.size(); i++)
2232	2371	{
..	..	@@ -2238,7 +2377,7 @@
2238	2377	ResetModel();
2239	2378	refreshContents();
2240	2379	} else
2241		- if (event.getSource() == scriptNodeItem)
	2380	+ if (source == scriptNodeItem)
2242	2381	{
2243	2382	boolean atleastone = false;
2244	2383
..	..	@@ -2277,195 +2416,215 @@
2277	2416	}
2278	2417	}
2279	2418	} else
2280		- if (event.getSource() == linkerItem)
	2419	+ if (source == linkerItem)
2281	2420	{
2282	2421	group(new cLinker());
2283	2422	} else
2284		- if (event.getSource() == textureItem)
	2423	+ if (source == textureItem)
2285	2424	{
2286	2425	group(new TextureNode());
2287	2426	} else
2288		- if (event.getSource() == shadowXItem)
	2427	+ if (source == billboardItem)
	2428	+ {
	2429	+ group(new BillboardNode());
	2430	+ } else
	2431	+ if (source == shadowXItem)
2289	2432	{
2290	2433	CastShadow(0);
2291	2434	} else
2292		- if (event.getSource() == shadowYItem)
	2435	+ if (source == shadowYItem)
2293	2436	{
2294	2437	CastShadow(1);
2295	2438	} else
2296		- if (event.getSource() == shadowZItem)
	2439	+ if (source == shadowZItem)
2297	2440	{
2298	2441	CastShadow(2);
2299	2442	} else
2300		- if (event.getSource() == ungroupItem)
	2443	+ if (source == ungroupItem)
2301	2444	{
2302		- ungroup();
	2445	+ //ungroup();
	2446	+ for (int i=0; i<group.selection.size(); i++)
	2447	+ {
	2448	+ Ungroup(group.selection.get(i));
	2449	+ }
	2450	+
	2451	+ ClearSelection(false);
	2452	+
	2453	+ refreshContents();
2303	2454	} else
2304		- if (event.getSource() == genUVItem)
	2455	+ if (source == genUVItem)
2305	2456	{
2306	2457	GenUV();
2307	2458	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2459	+ if (source == genNormalsCADItem)
2309	2460	{
2310	2461	GenNormals(true);
2311	2462	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2463	+ if (source == genNormalsMESHItem)
	2464	+ {
	2465	+ GenNormals(true); // TODO
	2466	+ } else
	2467	+ if (source == genNormalsORGANItem)
2313	2468	{
2314	2469	GenNormals(false);
2315	2470	} else
2316		- if (event.getSource() == stripifyItem)
	2471	+ if (source == genNormalsMINEItem)
	2472	+ {
	2473	+ GenNormalsMINE();
	2474	+ } else
	2475	+ if (source == stripifyItem)
2317	2476	{
2318	2477	Stripify();
2319	2478	} else
2320		- if (event.getSource() == unstripifyItem)
	2479	+ if (source == unstripifyItem)
2321	2480	{
2322	2481	Unstripify();
2323	2482	} else
2324		- if (event.getSource() == trimItem)
	2483	+ if (source == trimItem)
2325	2484	{
2326	2485	Trim();
2327	2486	} else
2328		- if (event.getSource() == untrimItem)
	2487	+ if (source == untrimItem)
2329	2488	{
2330	2489	Untrim();
2331	2490	} else
2332		- if (event.getSource() == clearColorsItem)
	2491	+ if (source == clearColorsItem)
2333	2492	{
2334	2493	ClearColors();
2335	2494	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2495	+ if (source == clearMaterialsItem)
2337	2496	{
2338	2497	ClearMaterials();
2339	2498	} else
2340		- if (event.getSource() == liveleavesItem)
	2499	+ if (source == liveleavesItem)
2341	2500	{
2342	2501	LiveLeaves(true);
2343	2502	} else
2344		- if (event.getSource() == unliveleavesItem)
	2503	+ if (source == unliveleavesItem)
2345	2504	{
2346	2505	LiveLeaves(false);
2347	2506	} else
2348		- if (event.getSource() == supportleavesItem)
	2507	+ if (source == supportleavesItem)
2349	2508	{
2350	2509	SupportLeaves(true);
2351	2510	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2511	+ if (source == unsupportleavesItem)
2353	2512	{
2354	2513	SupportLeaves(false);
2355	2514	} else
2356		- if (event.getSource() == hideleavesItem)
	2515	+ if (source == hideleavesItem)
2357	2516	{
2358	2517	HideLeaves(true);
2359	2518	} else
2360		- if (event.getSource() == showleavesItem)
	2519	+ if (source == showleavesItem)
2361	2520	{
2362	2521	HideLeaves(false);
2363	2522	} else
2364		- if (event.getSource() == markleavesItem)
	2523	+ if (source == markleavesItem)
2365	2524	{
2366	2525	MarkLeaves(true);
2367	2526	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2527	+ if (source == unmarkleavesItem)
2369	2528	{
2370	2529	MarkLeaves(false);
2371	2530	} else
2372		- if (event.getSource() == flipVItem)
	2531	+ if (source == flipVItem)
2373	2532	{
2374	2533	FlipV(true);
2375	2534	} else
2376		- if (event.getSource() == unflipVItem)
	2535	+ if (source == unflipVItem)
2377	2536	{
2378	2537	FlipV(false);
2379	2538	} else
2380		- if (event.getSource() == lowTexturesItem)
	2539	+ if (source == lowTexturesItem)
2381	2540	{
2382	2541	SetTexRes(0);
2383	2542	} else
2384		- if (event.getSource() == normalTexturesItem)
	2543	+ if (source == normalTexturesItem)
2385	2544	{
2386	2545	SetTexRes(1);
2387	2546	} else
2388		- if (event.getSource() == highTexturesItem)
	2547	+ if (source == highTexturesItem)
2389	2548	{
2390	2549	SetTexRes(2);
2391	2550	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2551	+ if (source == veryhighTexturesItem)
2393	2552	{
2394	2553	SetTexRes(3);
2395	2554	} else
2396		- if (event.getSource() == maxTexturesItem)
	2555	+ if (source == maxTexturesItem)
2397	2556	{
2398	2557	SetTexRes(4);
2399	2558	} else
2400		- if (event.getSource() == panoTexturesItem)
	2559	+ if (source == panoTexturesItem)
2401	2560	{
2402	2561	SetTexRes(5);
2403	2562	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2563	+ if (source == reverseNormalsItem)
2405	2564	{
2406	2565	ReverseNormals();
2407	2566	} else
2408		- if (event.getSource() == parseverticesItem)
	2567	+ if (source == parseverticesItem)
2409	2568	{
2410	2569	ParseVertices();
2411	2570	} else
2412		- if (event.getSource() == textureFieldItem)
	2571	+ if (source == textureFieldItem)
2413	2572	{
2414	2573	TextureVertices();
2415	2574	} else
2416		- if (event.getSource() == alignItem)
	2575	+ if (source == alignItem)
2417	2576	{
2418	2577	Align();
2419	2578	} else
2420		- if (event.getSource() == mirrorItem)
	2579	+ if (source == mirrorItem)
2421	2580	{
2422	2581	MirrorPoses();
2423	2582	} else
2424		- if (event.getSource() == reduceMorphItem)
	2583	+ if (source == reduceMorphItem)
2425	2584	{
2426	2585	MeshReduction(false);
2427	2586	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2587	+ if (source == reduce34MorphItem)
2429	2588	{
2430	2589	MeshReduction(true);
2431	2590	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2591	+ if (source == reverseTrianglesItem)
2433	2592	{
2434	2593	ReverseTriangles();
2435	2594	} else
2436		- if (event.getSource() == reduceMeshItem)
	2595	+ if (source == reduceMeshItem)
2437	2596	{
2438	2597	ReduceMesh(false);
2439	2598	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2599	+ if (source == reduce34MeshItem)
2441	2600	{
2442	2601	ReduceMesh(true);
2443	2602	} else
2444		- if (event.getSource() == increaseMeshItem)
	2603	+ if (source == increaseMeshItem)
2445	2604	{
2446	2605	IncreaseMesh();
2447	2606	} else
2448		- if (event.getSource() == clipMeshItem)
	2607	+ if (source == clipMeshItem)
2449	2608	{
2450	2609	ClipMesh();
2451	2610	} else
2452		- if (event.getSource() == smoothMeshItem)
	2611	+ if (source == smoothMeshItem)
2453	2612	{
2454	2613	SmoothMesh();
2455	2614	} else
2456		- if (event.getSource() == transformgeometryItem)
	2615	+ if (source == transformgeometryItem)
2457	2616	{
2458	2617	TransformGeometry();
2459	2618	} else
2460		- if (event.getSource() == resetTransformItem)
	2619	+ if (source == resetTransformItem)
2461	2620	{
2462	2621	ResetTransform();
2463	2622	} else
2464		- if (event.getSource() == resetCentroidItem)
	2623	+ if (source == resetCentroidItem)
2465	2624	{
2466	2625	ResetCentroid();
2467	2626	} else
2468		- if (event.getSource() == resetParentItem)
	2627	+ if (source == resetParentItem)
2469	2628	{
2470	2629	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2630	{
..	..	@@ -2475,7 +2634,7 @@
2475	2634
2476	2635	refreshContents();
2477	2636	} else
2478		- if (event.getSource() == repairParentItem)
	2637	+ if (source == repairParentItem)
2479	2638	{
2480	2639	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2640	{
..	..	@@ -2489,7 +2648,21 @@
2489	2648
2490	2649	refreshContents();
2491	2650	} else
2492		- if (event.getSource() == sortbysizeItem)
	2651	+ if (source == repairShadowItem)
	2652	+ {
	2653	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2654	+ {
	2655	+ Object3D obj = (Object3D)e.nextElement();
	2656	+ obj.RepairShadow();
	2657	+// for (int i=0; i<obj.size(); i++)
	2658	+// {
	2659	+// obj.get(i).parent = obj;
	2660	+// }
	2661	+ }
	2662	+
	2663	+ refreshContents();
	2664	+ } else
	2665	+ if (source == sortbysizeItem)
2493	2666	{
2494	2667	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2668	{
..	..	@@ -2501,7 +2674,7 @@
2501	2674	ResetModel();
2502	2675	refreshContents();
2503	2676	} else
2504		- if (event.getSource() == sortbynameItem)
	2677	+ if (source == sortbynameItem)
2505	2678	{
2506	2679	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2680	{
..	..	@@ -2513,7 +2686,7 @@
2513	2686	ResetModel();
2514	2687	refreshContents();
2515	2688	} else
2516		- if (event.getSource() == attachPigmentItem)
	2689	+ if (source == attachPigmentItem)
2517	2690	{
2518	2691	String texture = GetFile("Attach pigment");
2519	2692	Object3D obj;
..	..	@@ -2525,7 +2698,7 @@
2525	2698
2526	2699	refreshContents();
2527	2700	} else
2528		- if (event.getSource() == detachPigmentItem)
	2701	+ if (source == detachPigmentItem)
2529	2702	{
2530	2703	Object3D obj;
2531	2704	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2709,7 @@
2536	2709
2537	2710	refreshContents();
2538	2711	} else
2539		- if (event.getSource() == attachBumpItem)
	2712	+ if (source == attachBumpItem)
2540	2713	{
2541	2714	String texture = GetFile("Attach bump");
2542	2715	Object3D obj;
..	..	@@ -2548,7 +2721,7 @@
2548	2721
2549	2722	refreshContents();
2550	2723	} else
2551		- if (event.getSource() == detachBumpItem)
	2724	+ if (source == detachBumpItem)
2552	2725	{
2553	2726	Object3D obj;
2554	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2732,7 @@
2559	2732
2560	2733	refreshContents();
2561	2734	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2735	+ if (source == pigmentBumpItem)
2563	2736	{
2564	2737	Object3D obj;
2565	2738	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2743,195 @@
2570	2743
2571	2744	refreshContents();
2572	2745	} else
2573		- if (event.getSource() == flashSelectionButton)
	2746	+ if (source == flashSelectionButton)
2574	2747	{
2575	2748	CameraPane.flash = true;
2576	2749	refreshContents();
2577	2750	} else
2578		- if (event.getSource() == oneButton)
	2751	+ if (source == oneButton)
2579	2752	{
2580	2753	} else
2581		- if (event.getSource() == twoButton)
	2754	+ if (source == twoButton)
2582	2755	{
2583	2756	radio.layout = twoButton;
2584	2757	// bug
2585	2758	//gridPanel.setDividerLocation(1.0);
2586	2759	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	2760	+// bigThree.remove(scenePanel);
	2761	+// bigThree.remove(centralPanel);
	2762	+// bigThree.remove(XYZPanel);
	2763	+// aWindowConstraints.gridx = 0;
	2764	+// aWindowConstraints.gridy = 0;
	2765	+// aWindowConstraints.gridwidth = 1;
	2766	+// // aConstraints.gridheight = 3;
	2767	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2768	+// aWindowConstraints.weightx = 0;
	2769	+// aWindowConstraints.weighty = 1;
	2770	+// //bigThree.add(jtp, aWindowConstraints);
	2771	+// aWindowConstraints.weightx = 1;
	2772	+// aWindowConstraints.gridwidth = 3;
	2773	+// // aConstraints.gridheight = 3;
	2774	+// aWindowConstraints.gridx = 1;
	2775	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2776	+// bigThree.add(centralPanel, aWindowConstraints);
	2777	+// aWindowConstraints.weightx = 0;
	2778	+// aWindowConstraints.gridx = 4;
	2779	+// aWindowConstraints.gridwidth = 1;
	2780	+// // aConstraints.gridheight = 3;
	2781	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2782	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2783	+// scenePanel.setVisible(false);
	2784	+// centralPanel.setVisible(true);
	2785	+// XYZPanel.setVisible(false);
	2786	+ bigThree.ClearUI();
	2787	+ bigThree.add(centralPanel);
	2788	+ bigThree.FlushUI();
2611	2789	} else
2612		- if (event.getSource() == threeButton)
	2790	+ if (source == threeButton)
2613	2791	{
2614	2792	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	2793	+
	2794	+// bigThree.remove(scenePanel);
	2795	+// bigThree.remove(centralPanel);
	2796	+// bigThree.remove(XYZPanel);
	2797	+// aWindowConstraints.gridx = 0;
	2798	+// aWindowConstraints.gridy = 0;
	2799	+// aWindowConstraints.gridwidth = 1;
	2800	+// // aConstraints.gridheight = 3;
	2801	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2802	+// aWindowConstraints.weightx = 0;
	2803	+// aWindowConstraints.weighty = 1;
	2804	+// //bigThree.add(jtp, aWindowConstraints);
	2805	+// aWindowConstraints.weightx = 1;
	2806	+// aWindowConstraints.gridwidth = 3;
	2807	+// // aConstraints.gridheight = 3;
	2808	+// aWindowConstraints.gridx = 1;
	2809	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2810	+// bigThree.add(centralPanel, aWindowConstraints);
	2811	+// aWindowConstraints.weightx = 0;
	2812	+// aWindowConstraints.gridx = 4;
	2813	+// aWindowConstraints.gridwidth = 1;
	2814	+// // aConstraints.gridheight = 3;
	2815	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2816	+// bigThree.add(XYZPanel, aWindowConstraints);
	2817	+// bigThree.validate();
	2818	+// scenePanel.setVisible(false);
	2819	+// centralPanel.setVisible(true);
	2820	+// XYZPanel.setVisible(true);
	2821	+ bigThree.ClearUI();
	2822	+ bigThree.add(centralPanel);
	2823	+ bigThree.add(XYZPanel);
	2824	+ bigThree.FlushUI();
2639	2825	} else
2640		- if (event.getSource() == fourButton)
	2826	+ if (source == fourButton)
2641	2827	{
2642	2828	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	2829	+
	2830	+// bigThree.remove(scenePanel);
	2831	+// bigThree.remove(centralPanel);
	2832	+// bigThree.remove(XYZPanel);
	2833	+// aWindowConstraints.gridx = 0;
	2834	+// aWindowConstraints.gridy = 0;
	2835	+// aWindowConstraints.gridwidth = 1;
	2836	+// // aWindowConstraints.gridheight = 3;
	2837	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2838	+// aWindowConstraints.weightx = 1;
	2839	+// aWindowConstraints.weighty = 1;
	2840	+// bigThree.add(scenePanel, aWindowConstraints);
	2841	+// aWindowConstraints.weightx = 1;
	2842	+// aWindowConstraints.gridwidth = 3;
	2843	+// // aConstraints.gridheight = 3;
	2844	+// aWindowConstraints.gridx = 1;
	2845	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2846	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2847	+// aWindowConstraints.weightx = 0;
	2848	+// aWindowConstraints.gridx = 4;
	2849	+// aWindowConstraints.gridwidth = 1;
	2850	+// // aWindowConstraints.gridheight = 3;
	2851	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2852	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2853	+// bigThree.validate();
	2854	+// scenePanel.setVisible(true);
	2855	+// centralPanel.setVisible(false);
	2856	+// XYZPanel.setVisible(false);
	2857	+ bigThree.ClearUI();
	2858	+ bigThree.add(scenePanel);
	2859	+ bigThree.FlushUI();
2667	2860	} else
2668		- if (event.getSource() == sixButton)
	2861	+ if (source == sixButton)
2669	2862	{
2670	2863	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	2864	+
	2865	+// bigThree.remove(scenePanel);
	2866	+// bigThree.remove(centralPanel);
	2867	+// bigThree.remove(XYZPanel);
	2868	+// aWindowConstraints.gridx = 0;
	2869	+// aWindowConstraints.gridy = 0;
	2870	+// aWindowConstraints.gridwidth = 1;
	2871	+// // aConstraints.gridheight = 3;
	2872	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2873	+// aWindowConstraints.weightx = 0;
	2874	+// aWindowConstraints.weighty = 1;
	2875	+// bigThree.add(scenePanel, aWindowConstraints);
	2876	+// aWindowConstraints.weightx = 1;
	2877	+// aWindowConstraints.gridwidth = 3;
	2878	+// // aWindowConstraints.gridheight = 3;
	2879	+// aWindowConstraints.gridx = 1;
	2880	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2881	+// bigThree.add(centralPanel, aWindowConstraints);
	2882	+// aWindowConstraints.weightx = 0;
	2883	+// aWindowConstraints.gridx = 4;
	2884	+// aWindowConstraints.gridwidth = 1;
	2885	+// // aWindowConstraints.gridheight = 3;
	2886	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2887	+// //bigThree.add(XYZPanel, aConstraints);
	2888	+// bigThree.validate();
	2889	+// scenePanel.setVisible(true);
	2890	+// centralPanel.setVisible(true);
	2891	+// XYZPanel.setVisible(false);
	2892	+ bigThree.ClearUI();
	2893	+ bigThree.add(scenePanel);
	2894	+ bigThree.add(centralPanel);
	2895	+ bigThree.FlushUI();
2695	2896	} else
2696		- if (event.getSource() == sevenButton)
	2897	+ if (source == sevenButton)
2697	2898	{
2698	2899	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	2900	+
	2901	+// bigThree.remove(scenePanel);
	2902	+// bigThree.remove(centralPanel);
	2903	+// bigThree.remove(XYZPanel);
	2904	+// aWindowConstraints.gridx = 0;
	2905	+// aWindowConstraints.gridy = 0;
	2906	+// aWindowConstraints.gridwidth = 1;
	2907	+// // aWindowConstraints.gridheight = 3;
	2908	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2909	+// aWindowConstraints.weightx = 0;
	2910	+// aWindowConstraints.weighty = 1;
	2911	+// bigThree.add(scenePanel, aWindowConstraints);
	2912	+// aWindowConstraints.weightx = 1;
	2913	+// aWindowConstraints.gridwidth = 3;
	2914	+// // aWindowConstraints.gridheight = 3;
	2915	+// aWindowConstraints.gridx = 1;
	2916	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2917	+// bigThree.add(centralPanel, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 0;
	2919	+// aWindowConstraints.gridx = 4;
	2920	+// aWindowConstraints.gridwidth = 1;
	2921	+// // aConstraints.gridheight = 3;
	2922	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2923	+// bigThree.add(XYZPanel, aWindowConstraints);
	2924	+// bigThree.validate();
	2925	+// scenePanel.setVisible(true);
	2926	+// centralPanel.setVisible(true);
	2927	+// XYZPanel.setVisible(true);
	2928	+ bigThree.ClearUI();
	2929	+ bigThree.add(scenePanel);
	2930	+ bigThree.add(centralPanel);
	2931	+ bigThree.add(XYZPanel);
	2932	+ bigThree.FlushUI();
2723	2933	} else
2724		- if (event.getSource() == rootButton)
	2934	+ if (source == rootButton)
2725	2935	{
2726	2936	Object3D obj;
2727	2937	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2733,7 +2943,7 @@
2733	2943
2734	2944	refreshContents(true);
2735	2945	} else
2736		- if (event.getSource() == closeButton)
	2946	+ if (source == closeButton)
2737	2947	{
2738	2948	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	2949	cRadio ab;
..	..	@@ -2754,11 +2964,11 @@
2754	2964	}
2755	2965	refreshContents(true);
2756	2966	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2967	+ if (source == editItem \|\| source == editButton)
2758	2968	{
2759	2969	EditSelection(false);
2760	2970	} else
2761		- if (event.getSource() == uneditButton)
	2971	+ if (source == uneditButton)
2762	2972	{
2763	2973	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	2974	{
..	..	@@ -2770,12 +2980,12 @@
2770	2980
2771	2981	child.editWindow = null; // ???????????
2772	2982	}
2773		- objEditor.ctrlPanel.revalidate();
	2983	+ objEditor.ctrlPanel.FlushUI();
2774	2984	//objEditor.jTree.clearSelection();
2775	2985	//objEditor.ResetSliders();
2776	2986	refreshContents(true);
2777	2987	} else
2778		- if (event.getSource() == clearPanelButton)
	2988	+ if (source == clearPanelButton)
2779	2989	{
2780	2990	assert(copy == group);
2781	2991	//copy.ClearUI();
..	..	@@ -2786,7 +2996,7 @@
2786	2996	listUI.clear();
2787	2997	refreshContents(true);
2788	2998	} else
2789		- if (event.getSource() == allParamsButton)
	2999	+ if (source == allParamsButton)
2790	3000	{
2791	3001	assert(copy == group);
2792	3002
..	..	@@ -2807,19 +3017,19 @@
2807	3017
2808	3018	refreshContents(true);
2809	3019	} else
2810		- if (event.getSource() == unselectButton)
	3020	+ if (source == unselectButton)
2811	3021	{
2812	3022	objEditor.jTree.clearSelection();
2813	3023	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3024	objEditor.ResetSliders();
2815	3025	refreshContents(true);
2816	3026	} else
2817		- if(event.getSource() instanceof cRadio)
	3027	+ if(source instanceof cRadio)
2818	3028	{
2819	3029	group.parent = keepparent;
2820	3030	group.attributes = 0;
2821	3031	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3032	+ /cRadio/ radio = (cRadio)source;
2823	3033	Object3D obj = radio.GetObject();
2824	3034	System.out.println("Edit " + obj);
2825	3035	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3049,7 @@
2839	3049	}
2840	3050
2841	3051	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3052	+ //Globals.theRenderer.object = group;
2843	3053	if(!useclient)
2844	3054	{
2845	3055	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,7 +3058,8 @@
2848	3058	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3059	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3060	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3061	+ //cameraView.lighttouched = true;
	3062	+ Globals.lighttouched = true;
2852	3063	topView.object = group;
2853	3064	frontView.object = group;
2854	3065	sideView.object = group;
..	..	@@ -2884,7 +3095,7 @@
2884	3095	if (useclient)
2885	3096	{
2886	3097	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3098	+ Globals.lighttouched = true;
2888	3099	//topView.object = client;
2889	3100	//frontView.object = client;
2890	3101	//sideView.object = client;
..	..	@@ -2892,7 +3103,7 @@
2892	3103	else
2893	3104	{
2894	3105	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3106	+ Globals.lighttouched = true;
2896	3107	//topView.object = group;
2897	3108	//frontView.object = group;
2898	3109	//sideView.object = group;
..	..	@@ -3173,6 +3384,13 @@
3173	3384	refreshContents();
3174	3385	}
3175	3386
	3387	+ void GenNormalsMINE()
	3388	+ {
	3389	+ group.selection.GenNormalsMINE();
	3390	+
	3391	+ refreshContents();
	3392	+ }
	3393	+
3176	3394	void Stripify()
3177	3395	{
3178	3396	group.StripifyS();
..	..	@@ -3393,7 +3611,7 @@
3393	3611	String pigment = Object3D.GetPigment(tex);
3394	3612	//String bump = Object3D.GetBump(tex);
3395	3613
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3614	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3397	3615
3398	3616	double s = v.s;
3399	3617
..	..	@@ -3441,12 +3659,26 @@
3441	3659
3442	3660	void Align()
3443	3661	{
	3662	+ if (group.selection.size() == 0)
	3663	+ return;
	3664	+
	3665	+ cVector bbmin = new cVector();
	3666	+ cVector bbmax = new cVector();
	3667	+
	3668	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3669	+
	3670	+ double dx = bbmax.x - bbmin.x;
	3671	+ double dy = bbmax.y - bbmin.y;
	3672	+ double dz = bbmax.z - bbmin.z;
	3673	+
	3674	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3675	+
3444	3676	for (int i=0; i<group.selection.size(); i++)
3445	3677	{
3446	3678	Object3D obj = group.selection.get(i);
3447	3679
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3680	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3681	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	3682	}
3451	3683
3452	3684	refreshContents();
..	..	@@ -3467,11 +3699,11 @@
3467	3699
3468	3700	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	3701
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	3702	+ boolean random = CameraPane.SWITCH;
	3703	+ CameraPane.SWITCH = false; // parse all random nodes
3472	3704	lowres.linkVerticesThis(null);
3473	3705	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	3706	+ CameraPane.SWITCH = random;
3475	3707
3476	3708	System.err.flush();
3477	3709
..	..	@@ -3680,7 +3912,7 @@
3680	3912	group.selection.RelinkToSupport(); // july 2014
3681	3913	System.out.println("DONE.");
3682	3914	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3915	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	3916	}
3685	3917
3686	3918	void ReduceMesh(boolean reduction34)
..	..	@@ -3956,25 +4188,25 @@
3956	4188	System.err.println("info : " + child.GetPath());
3957	4189	}
3958	4190	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4191	+// else
	4192	+// {
	4193	+// objEditor.SetMaterial(group); // .GetMaterial());
	4194	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4195	+// System.err.println("info : " + group.GetPath());
	4196	+// }
3965	4197
3966	4198	objEditor.SetText(); // jan 2014
3967	4199
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4200	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3969	4201	CameraPane.flash = true;
3970	4202
3971	4203	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3972	4204	// a camera
3973	4205	{
3974	4206	CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4207	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4208	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4209	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4210	}
3979	4211
3980	4212	refreshContents();
..	..	@@ -4229,7 +4461,7 @@
4229	4461	refreshContents();
4230	4462	}
4231	4463
4232		- void pasteInto(boolean copyit)
	4464	+ void pasteInto(boolean copyit, boolean clone)
4233	4465	{
4234	4466	// if (GrafreeD.clipboard == null)
4235	4467	// return;
..	..	@@ -4258,7 +4490,14 @@
4258	4490	if (copyit)
4259	4491	{
4260	4492	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4493	+ if (clone)
	4494	+ {
	4495	+ CloneClipboard(false); // sept 2014
	4496	+ }
	4497	+ else
	4498	+ {
	4499	+ paste(false);
	4500	+ }
4262	4501	}
4263	4502	else
4264	4503	{
..	..	@@ -4468,6 +4707,26 @@
4468	4707	makeSomething(csg);
4469	4708	}
4470	4709
	4710	+ void Ungroup(Object3D g)
	4711	+ {
	4712	+ if (g instanceof HiddenObject)
	4713	+ {
	4714	+ HiddenObject h = (HiddenObject) g;
	4715	+
	4716	+ for (int i=0; i<h.ActualSize(); i++)
	4717	+ {
	4718	+ objEditor.makeSomething(h.get(i), false);
	4719	+ }
	4720	+ }
	4721	+ else
	4722	+ {
	4723	+ for (int i=0; i<g.Size(); i++)
	4724	+ {
	4725	+ objEditor.makeSomething(g.get(i), false);
	4726	+ }
	4727	+ }
	4728	+ }
	4729	+
4471	4730	void ungroup()
4472	4731	{
4473	4732	/*
..	..	@@ -4782,10 +5041,12 @@
4782	5041	cButton flashSelectionButton;
4783	5042	cButton editButton;
4784	5043	cButton uneditButton;
	5044	+ JCheckBox allParamsButton;
4785	5045	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5046	cButton unselectButton;
4788	5047
	5048	+ cButton oneStepButton;
	5049	+
4789	5050	cButton screenfitButton;
4790	5051	cButton screenfitpointButton;
4791	5052	cButton snapobjectButton;
..	..	@@ -4827,6 +5088,7 @@
4827	5088	private MenuItem resetsupportItem;
4828	5089	private MenuItem resetreferencesItem;
4829	5090	private MenuItem linkverticesItem;
	5091	+ private MenuItem relinkverticesItem;
4830	5092	private MenuItem setMasterItem;
4831	5093	private MenuItem resetMeshItem;
4832	5094	private MenuItem stepAllItem;
..	..	@@ -4839,14 +5101,17 @@
4839	5101	private MenuItem mergeGeometriesItem;
4840	5102	private MenuItem copyItem;
4841	5103	private MenuItem pasteItem;
	5104	+ private MenuItem pasteIntoItem;
4842	5105	private MenuItem pasteLinkItem;
4843	5106	private MenuItem pasteCloneItem;
4844	5107	private MenuItem pasteExpandItem;
4845	5108	private MenuItem clearItem;
4846	5109	private MenuItem clearAllItem;
4847	5110	private MenuItem genUVItem;
	5111	+ private MenuItem genNormalsMESHItem;
4848	5112	private MenuItem genNormalsCADItem;
4849	5113	private MenuItem genNormalsORGANItem;
	5114	+ private MenuItem genNormalsMINEItem;
4850	5115	private MenuItem stripifyItem;
4851	5116	private MenuItem unstripifyItem;
4852	5117	private MenuItem trimItem;
..	..	@@ -4888,6 +5153,7 @@
4888	5153	private MenuItem resetCentroidItem;
4889	5154	private MenuItem transformgeometryItem;
4890	5155	private MenuItem resetTransformItem;
	5156	+ private MenuItem hideItem;
4891	5157	private MenuItem grabItem;
4892	5158	private MenuItem backItem;
4893	5159	private MenuItem frontItem;
..	..	@@ -4908,6 +5174,7 @@
4908	5174
4909	5175	private MenuItem resetParentItem;
4910	5176	private MenuItem repairParentItem;
	5177	+ private MenuItem repairShadowItem;
4911	5178	private MenuItem sortbysizeItem;
4912	5179	private MenuItem sortbynameItem;
4913	5180
..	..	@@ -4928,10 +5195,11 @@
4928	5195	private MenuItem coneItem;
4929	5196	private MenuItem torusItem;
4930	5197	private MenuItem superItem;
	5198	+ private MenuItem kleinItem;
4931	5199	private MenuItem blobItem;
4932	5200	private MenuItem latheItem;
4933	5201	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5202	+ private MenuItem overlayItem;
4935	5203	private MenuItem meshItem;
4936	5204	// private MenuItem meshGroupItem;
4937	5205	private MenuItem springItem;
..	..	@@ -4940,6 +5208,7 @@
4940	5208	private MenuItem csgItem;
4941	5209	private MenuItem templateItem;
4942	5210	private MenuItem textureItem;
	5211	+ private MenuItem billboardItem;
4943	5212	private MenuItem shadowXItem;
4944	5213	private MenuItem shadowYItem;
4945	5214	private MenuItem shadowZItem;