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