~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -149,6 +150,8 @@
149	150
150	151	void SetupMenu2(ObjEditor oe)
151	152	{
	153	+ if (Globals.ADVANCED)
	154	+ {
152	155	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	156	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	157	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,36 +163,48 @@
160	163	lookAtItem.addActionListener(this);
161	164	//lookFromItem.addActinoListener(this);
162	165	//switchItem.addActionListener(this);
	166	+ }
	167	+
163	168	Menu menu;
164	169	oe.menuBar.add(menu = new Menu("Edit"));
165	170	//editItem = menu.add(new MenuItem("Edit"));
166	171	//editItem.addActionListener(this);
167	172	duplicateItem = menu.add(new MenuItem("Duplicate"));
168	173	duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175	174	cutItem = menu.add(new MenuItem("Cut"));
176	175	cutItem.addActionListener(this);
177	176	copyItem = menu.add(new MenuItem("Copy"));
178	177	copyItem.addActionListener(this);
179	178	pasteItem = menu.add(new MenuItem("Paste"));
180	179	pasteItem.addActionListener(this);
	180	+ menu.add("-");
	181	+ cloneItem = menu.add(new MenuItem("Clone"));
	182	+ cloneItem.addActionListener(this);
	183	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	184	+ cloneSupportItem.addActionListener(this);
	185	+ menu.add("-");
	186	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	187	+ pasteIntoItem.addActionListener(this);
181	188	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	189	pasteLinkItem.addActionListener(this);
183	190	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	191	pasteCloneItem.addActionListener(this);
185	192	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	193	// pasteExpandItem.addActionListener(this);
	194	+ menu.add("-");
187	195	clearItem = menu.add(new MenuItem("Clear"));
188	196	clearItem.addActionListener(this);
	197	+
	198	+ if (Globals.ADVANCED)
	199	+ {
	200	+ // Deletes the cameras...
189	201	clearAllItem = menu.add(new MenuItem("Clear All"));
190	202	clearAllItem.addActionListener(this);
	203	+ }
191	204
192	205	oe.menuBar.add(menu = new Menu("Setting"));
	206	+ if (Globals.ADVANCED)
	207	+ {
193	208	resetMeshItem = menu.add(new MenuItem("Reset All"));
194	209	resetMeshItem.addActionListener(this);
195	210	stepAllItem = menu.add(new MenuItem("Step All"));
..	..	@@ -199,6 +214,7 @@
199	214	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	215	resetreferencesItem.addActionListener(this);
201	216	menu.add("-");
	217	+ }
202	218	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	219	overwriteGeoItem.addActionListener(this);
204	220	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +226,26 @@
210	226	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	227	overwriteUVItem.addActionListener(this);
212	228	menu.add("-");
	229	+ if (Globals.ADVANCED)
	230	+ {
213	231	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	232	generateMeshItem.addActionListener(this);
215	233	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	234	poseMeshItem.addActionListener(this);
217	235	menu.add("-");
	236	+ }
218	237	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	238	resetsupportItem.addActionListener(this);
220	239	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	240	linkverticesItem.addActionListener(this);
	241	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	242	+ relinkverticesItem.addActionListener(this);
	243	+
	244	+ if (Globals.ADVANCED)
	245	+ {
222	246	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	247	setMasterItem.addActionListener(this);
	248	+ }
224	249
225	250	oe.menuBar.add(menu = new Menu("Group"));
226	251	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,27 +256,37 @@
231	256	frontItem.addActionListener(this);
232	257	compositeItem = menu.add(new MenuItem("Composite"));
233	258	compositeItem.addActionListener(this);
	259	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	260	+ hideItem.addActionListener(this);
	261	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	262	+ ungroupItem.addActionListener(this);
234	263	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	264	+ randomItem = menu.add(new MenuItem("Switch node"));
236	265	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	266	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	267	switchGeoItem.addActionListener(this);
243	268	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	269	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	270	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	271	morphItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
	275	+ physicsItem = menu.add(new MenuItem("Physics"));
	276	+ physicsItem.addActionListener(this);
	277	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	278	+ frameselectorItem.addActionListener(this);
247	279	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	280	scriptNodeItem.addActionListener(this);
249	281	cameraItem = menu.add(new MenuItem("Camera"));
250	282	cameraItem.addActionListener(this);
	283	+ }
251	284
252	285	oe.menuBar.add(menu = new Menu("Object"));
253	286	textureItem = menu.add(new MenuItem("Texture"));
254	287	textureItem.addActionListener(this);
	288	+ billboardItem = menu.add(new MenuItem("Billboard"));
	289	+ billboardItem.addActionListener(this);
255	290	csgItem = menu.add(new MenuItem("CSG"));
256	291	csgItem.addActionListener(this);
257	292	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +295,24 @@
260	295	shadowYItem.addActionListener(this);
261	296	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	297	shadowZItem.addActionListener(this);
	298	+ if (Globals.ADVANCED)
	299	+ {
263	300	linkerItem = menu.add(new MenuItem("Linker"));
264	301	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	302	attributeItem = menu.add(new MenuItem("Attribute"));
268	303	attributeItem.addActionListener(this);
	304	+ templateItem = menu.add(new MenuItem("Template"));
	305	+ templateItem.addActionListener(this);
269	306	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	307	pointflowItem.addActionListener(this);
271	308	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
	309	+ }
274	310	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	311	resetTransformItem.addActionListener(this);
276	312	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	313	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	314	+ transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
	315	+ transformgeometryItem.addActionListener(this);
280	316
281	317	oe.menuBar.add(menu = new Menu("Geometry"));
282	318	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +323,11 @@
287	323	genNormalsCADItem.addActionListener(this);
288	324	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	325	genNormalsMESHItem.addActionListener(this);
	326	+ if (Globals.ADVANCED)
	327	+ {
	328	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	329	+ genNormalsMINEItem.addActionListener(this);
	330	+ }
290	331	stripifyItem = menu.add(new MenuItem("Stripify"));
291	332	stripifyItem.addActionListener(this);
292	333	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,10 +349,14 @@
308	349	reduce34MeshItem.addActionListener(this);
309	350	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	351	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	352	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	353	clipMeshItem.addActionListener(this);
	354	+
	355	+ if (Globals.ADVANCED)
	356	+ {
	357	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	358	+ smoothMeshItem.addActionListener(this);
	359	+ }
315	360
316	361	oe.menuBar.add(menu = new Menu("Attributes"));
317	362	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
..	..	@@ -321,10 +366,13 @@
321	366	liveleavesItem.addActionListener(this);
322	367	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	368	unliveleavesItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
324	371	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	372	supportleavesItem.addActionListener(this);
326	373	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	374	unsupportleavesItem.addActionListener(this);
	375	+ }
328	376	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	377	hideleavesItem.addActionListener(this);
330	378	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -367,6 +415,8 @@
367	415	sortbysizeItem.addActionListener(this);
368	416	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	417	sortbynameItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
370	420	menu.add("-");
371	421	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	422	extractGeometriesItem.addActionListener(this);
..	..	@@ -376,11 +426,11 @@
376	426	shareGeometriesItem.addActionListener(this);
377	427	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378	428	mergeGeometriesItem.addActionListener(this);
	429	+ }
379	430
380	431	oe.menuBar.add(menu = new Menu("Insert"));
381	432	buildCreateMenu(menu);
382	433
383		-
384	434	oe.menuBar.add(menu = new Menu("Include"));
385	435	importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386	436	importGFDItem.addActionListener(this);
..	..	@@ -425,150 +475,98 @@
425	475	oe.radioPanel.add(dummyButton);
426	476	oe.buttonGroup.add(dummyButton);
427	477	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	478	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	479
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	480	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	481	+ liveCB.setToolTipText("Enabled animation");
433	482	liveCB.addItemListener(this);
434	483
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);
	484	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	485	+ oneStepButton.setToolTipText("Animate one step forward");
	486	+ oneStepButton.addActionListener(this);
	487	+
	488	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	489	+ fastCB.setToolTipText("Fast mode");
453	490	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);
	491	+
	492	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	493	+ trackCB.setToolTipText("Enable tracking");
495	494	trackCB.addItemListener(this);
496	495
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	496	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	497	+ screenfitButton.setToolTipText("Screen fit");
499	498	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	499	+
501	500	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	501	// 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	502
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);
	503	+ if (Globals.ADVANCED)
	504	+ {
	505	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	506	+ snapobjectButton.addActionListener(this);
	507	+ snapobjectButton.setToolTipText("Snap Object");
	508	+ }
	509	+
	510	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	511	+ flashSelectionButton.setToolTipText("Show selection");
514	512	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	513
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	514	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	515	+
	516	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	517	+ twoButton.setToolTipText("Show center view only");
521	518	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	519	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
523	520	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	521	+ fourButton.setToolTipText("Show left panel only");
	522	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	523	+ sixButton.setToolTipText("2-column layout left");
525	524	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	525	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	526	+ threeButton.setToolTipText("2-column layout right");
527	527	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	528	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	529	+ sevenButton.setToolTipText("3-column layout");
529	530	sevenButton.addActionListener(this);
530	531	//
531	532
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	533	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	534	+ rootButton.setToolTipText("Edit selection in new tab");
533	535	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	536	+
	537	+ oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	538	+ closeButton.setToolTipText("Close tab");
536	539	closeButton.addActionListener(this);
537	540	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	541	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	542
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	543	+ cGridBag commandsPanel = new cGridBag();
	544	+
	545	+ commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	546	+ editButton.setToolTipText("Edit selection");
543	547	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	548
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	549	+ commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	550	+ uneditButton.setToolTipText("Unedit selection");
549	551	uneditButton.addActionListener(this);
550	552
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);
	553	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	554	+ allParamsButton.setToolTipText("Edit all params");
563	555	allParamsButton.addActionListener(this);
564	556
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);
	557	+ commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	558	+ clearPanelButton.setToolTipText("Clear edit panel");
	559	+ clearPanelButton.addActionListener(this);
	560	+
	561	+ commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	562	+ unselectButton.setToolTipText("Unselect");
570	563	unselectButton.addActionListener(this);
571	564
	565	+ commandsPanel.preferredHeight = 1;
	566	+
	567	+ oe.treePanel.add(commandsPanel);
	568	+ oe.treePanel.Return();
	569	+
572	570	// oe.aConstraints.gridx += 1;
573	571	// oe.aConstraints.weighty = 0;
574	572	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +578,37 @@
580	578	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	579	// gcButton.addActionListener(this);
582	580
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;
	581	+ cGridBag jSPPanel = new cGridBag();
	582	+
	583	+ JScrollPane jSP;
594	584	//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);
	585	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	586	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	587	+
	588	+ oe.treePanel.add(jSPPanel);
	589	+ oe.treePanel.Return();
601	590
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);
	591	+ cGridBag copyOptionsPanel = new cGridBag();
	592	+
	593	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	594	+ colorCB.setToolTipText("Copy color when dropped");
606	595	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	596	+
	597	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	598	+ materialCB.setToolTipText("Copy material when dropped");
609	599	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	600	+
	601	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	602	+ textureCB.setToolTipText("Copy texture when dropped");
612	603	textureCB.addItemListener(this);
613	604
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	605	+ copyOptionsPanel.preferredHeight = 1;
	606	+ oe.treePanel.add(copyOptionsPanel);
	607	+ oe.treePanel.Return();
616	608
	609	+// mainPanel.setDividerLocation(0.5); //1.0);
	610	+// mainPanel.setResizeWeight(0.5);
	611	+
617	612	//jList.addListSelectionListener(this);
618	613	oe.jTree.addTreeSelectionListener(this);
619	614	//jTree.setRootVisible(false);
..	..	@@ -635,17 +630,89 @@
635	630	radio.layout = sevenButton;
636	631	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	632	}
	633	+
	634	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	635	+ {
	636	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	637	+ boxCB.setToolTipText("Display bounding boxes");
	638	+ boxCB.addItemListener(this);
	639	+
	640	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	641	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	642	+ zoomBoxCB.addItemListener(this);
	643	+
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	647	+ supportCB.setToolTipText("Enable rigging");
	648	+ supportCB.addItemListener(this);
	649	+
	650	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	651	+ // localCB.addItemListener(this);
	652	+
	653	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	654	+ crowdCB.setToolTipText("Used for crowds");
	655	+ crowdCB.addItemListener(this);
	656	+
	657	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	658	+ smoothCB.setToolTipText("Snapping delay");
	659	+ smoothCB.addItemListener(this);
	660	+
	661	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	662	+ slowCB.setToolTipText("Smooth interpolation");
	663	+ slowCB.addItemListener(this);
	664	+
	665	+// constraints.gridy += 1;
	666	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	667	+// speakerMocapCB.addItemListener(this);
	668	+
	669	+ if (false)
	670	+ {
	671	+ // handled in scripts
	672	+ //constraints.gridy += 1;
	673	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	674	+ speakerCameraCB.addItemListener(this);
	675	+
	676	+ //constraints.gridy += 1;
	677	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	678	+ speakerFocusCB.addItemListener(this);
	679	+
	680	+ //constraints.gridy += 1;
	681	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	682	+ smoothfocusCB.addItemListener(this);
	683	+ }
	684	+
	685	+//constraints.gridx += 1;
	686	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	687	+// debugCB.addItemListener(this);
	688	+
	689	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	690	+ oeilCB.addItemListener(this);
	691	+
	692	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	693	+ lookAtCB.setToolTipText("Look-at target");
	694	+ lookAtCB.addItemListener(this);
	695	+
	696	+ }
	697	+
	698	+ cGridBag fill = new cGridBag();
	699	+
	700	+ fill.preferredHeight = 200;
	701	+
	702	+ panel.add(fill);
	703	+
	704	+ }
638	705
639	706	void EditObject(Object3D obj)
640	707	{
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();
	708	+ cRadio radioButton = new cRadio(obj.name);
	709	+ radioButton.SetObject(obj);
	710	+ radioButton.layout = sevenButton;
	711	+ radioButton.SetCamera(cameraView.renderCamera, false);
	712	+ radioButton.addActionListener(this);
	713	+ radioPanel.add(radioButton);
	714	+ buttonGroup.add(radioButton);
	715	+ radioButton.doClick();
649	716	}
650	717	void SetupViews(ObjEditor oe)
651	718	{
..	..	@@ -665,6 +732,7 @@
665	732	JCheckBox fastCB;
666	733	JCheckBox slowCB;
667	734	JCheckBox boxCB;
	735	+ JCheckBox zoomBoxCB;
668	736	JCheckBox trackCB;
669	737	JCheckBox smoothfocusCB;
670	738	// JCheckBox speakerMocapCB;
..	..	@@ -707,8 +775,7 @@
707	775	dropAttributes \|= Object3D.TEXTURE;
708	776	else
709	777	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	778	+ } else if(e.getSource() == liveCB)
712	779	{
713	780	cameraView.ToggleLive();
714	781	}
..	..	@@ -745,6 +812,10 @@
745	812	Recompile();
746	813	cameraView.repaint();
747	814	// refreshContents();
	815	+ }
	816	+ else if(e.getSource() == zoomBoxCB)
	817	+ {
	818	+ cameraView.ToggleZoomBoxMode();
748	819	}
749	820	else if(e.getSource() == smoothfocusCB)
750	821	{
..	..	@@ -913,11 +984,11 @@
913	984	{
914	985	loadClipboard(true);
915	986	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	987	+ pasteInto(false, false);
917	988	} else {
918	989	loadClipboard(false);
919	990	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	991	+ pasteInto(false, false); // true); // ???
921	992	}
922	993	}
923	994	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1106,37 @@
1035	1106	torusItem.addActionListener(this);
1036	1107	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1108	superItem.addActionListener(this);
	1109	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1110	+ kleinItem.addActionListener(this);
1038	1111	particleItem = menu.add(new MenuItem("Particle system"));
1039	1112	particleItem.addActionListener(this);
	1113	+ if (Globals.ADVANCED)
	1114	+ {
1040	1115	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1116	ragdollItem.addActionListener(this);
1042	1117	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1118	ragdoll2Item.addActionListener(this);
	1119	+ }
1044	1120	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1121	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1122	meshItem.addActionListener(this);
1047	1123	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1124	// meshGroupItem.addActionListener(this);
	1125	+ if (Globals.ADVANCED)
	1126	+ {
1049	1127	springItem = menu.add(new MenuItem("Spring"));
1050	1128	springItem.addActionListener(this);
1051	1129	flagItem = menu.add(new MenuItem("Flag"));
1052	1130	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	1131	blobItem = menu.add(new MenuItem("Blob"));
1058	1132	blobItem.addActionListener(this);
1059	1133	latheItem = menu.add(new MenuItem("Lathe"));
1060	1134	latheItem.addActionListener(this);
	1135	+ }
	1136	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1137	+ bezierItem.addActionListener(this);
	1138	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1139	+ overlayItem.addActionListener(this);
1061	1140	lightItem = menu.add(new MenuItem("Light"));
1062	1141	lightItem.addActionListener(this);
1063	1142	menu.add("-");
..	..	@@ -1067,25 +1146,26 @@
1067	1146	loopItem.addActionListener(this);
1068	1147	doubleItem = menu.add(new MenuItem("Fork"));
1069	1148	doubleItem.addActionListener(this);
	1149	+ if (Globals.ADVANCED)
	1150	+ {
1070	1151	tripleItem = menu.add(new MenuItem("Trident"));
1071	1152	tripleItem.addActionListener(this);
	1153	+ }
1072	1154	}
1073	1155
1074	1156	void buildToolsMenu(Menu menu)
1075	1157	{
1076	1158	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1159	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1160	+ animationItem.setState(Globals.ANIMATION);
1079	1161
1080	1162	menu.add("-");
1081	1163	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1164	parseverticesItem.addActionListener(this);
1083	1165	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1166	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1167	+ alignItem = menu.add(new MenuItem("Align Object"));
1086	1168	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1169	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1170	reduceMorphItem.addActionListener(this);
1091	1171	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
..	..	@@ -1093,8 +1173,12 @@
1093	1173
1094	1174	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1175	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1176
	1177	+ if (Globals.ADVANCED)
	1178	+ {
	1179	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1180	+ mirrorItem.addActionListener(this);
	1181	+ menu.add("-");
1098	1182	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1183	memoryItem.addActionListener(this);
1100	1184	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1108,6 +1192,8 @@
1108	1192	resetParentItem.addActionListener(this);
1109	1193	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1194	repairParentItem.addActionListener(this);
	1195	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1196	+ repairShadowItem.addActionListener(this);
1111	1197	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1198	invariantsItem.addActionListener(this);
1113	1199	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1201,7 @@
1115	1201	menu.add("-");
1116	1202	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1203	editScriptItem.addActionListener(this);
	1204	+ }
1118	1205	}
1119	1206
1120	1207	void ScreenFit()
..	..	@@ -1468,6 +1555,7 @@
1468	1555	//
1469	1556	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1557	{
	1558	+ Object source = event.getSource();
1471	1559	/*
1472	1560	if (event.getSource() == nameField)
1473	1561	{
..	..	@@ -1479,11 +1567,11 @@
1479	1567	}
1480	1568	else
1481	1569	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1570	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1571	{
1484	1572	ScreenFit();
1485	1573	} else
1486		- if (event.getSource() == switchItem)
	1574	+ if (source == switchItem)
1487	1575	{
1488	1576	cVector v1 = new cVector();
1489	1577	cVector v2 = new cVector();
..	..	@@ -1492,11 +1580,11 @@
1492	1580	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1581	objEditor.cameraView.repaint();
1494	1582	} else
1495		- if (event.getSource() == rectoidItem)
	1583	+ if (source == rectoidItem)
1496	1584	{
1497	1585	makeSomething(new Box());
1498	1586	} else
1499		- if (event.getSource() == particleItem)
	1587	+ if (source == particleItem)
1500	1588	{
1501	1589	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1590	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1605,9 @@
1517	1605	applyExample(particleGeom, "SMOKE");
1518	1606	makeSomething(particleGeom);
1519	1607	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1608	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1609	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1610	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1611
1524	1612	ragdoll.toParent = LA.newMatrix();
1525	1613	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1625,7 @@
1537	1625	} else
1538	1626	/*
1539	1627	*/
1540		- if (event.getSource() == heightFieldItem)
	1628	+ if (source == heightFieldItem)
1541	1629	{
1542	1630	Object3D obj = new Object3D();
1543	1631
..	..	@@ -1575,27 +1663,31 @@
1575	1663
1576	1664	makeSomething(obj);
1577	1665	} else
1578		- if (event.getSource() == gridItem)
	1666	+ if (source == gridItem)
1579	1667	{
1580	1668	makeSomething(new Grid());
1581	1669	} else
1582		- if (event.getSource() == ellipsoidItem)
	1670	+ if (source == ellipsoidItem)
1583	1671	{
1584	1672	makeSomething(new Sphere());
1585	1673	} else
1586		- if (event.getSource() == coneItem)
	1674	+ if (source == coneItem)
1587	1675	{
1588	1676	makeSomething(new Cone());
1589	1677	} else
1590		- if (event.getSource() == torusItem)
	1678	+ if (source == torusItem)
1591	1679	{
1592	1680	makeSomething(new Torus());
1593	1681	} else
1594		- if (event.getSource() == superItem)
	1682	+ if (source == superItem)
1595	1683	{
1596	1684	makeSomething(new Superellipsoid());
1597	1685	} else
1598		- if (event.getSource() == blobItem)
	1686	+ if (source == kleinItem)
	1687	+ {
	1688	+ makeSomething(new Klein());
	1689	+ } else
	1690	+ if (source == blobItem)
1599	1691	{
1600	1692	Blob blob = new Blob();
1601	1693	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1695,15 @@
1603	1695	//blob.retile();
1604	1696	makeSomething(blob);
1605	1697	} else
1606		- if (event.getSource() == latheItem)
	1698	+ if (source == latheItem)
1607	1699	{
1608	1700	makeSomething(new Lathe());
1609	1701	} else
1610		- if (event.getSource() == bezierItem)
	1702	+ if (source == bezierItem)
1611	1703	{
1612	1704	makeSomething(new BezierSurface());
1613	1705	} else
1614		- if (event.getSource() == checkerItem)
	1706	+ if (source == overlayItem)
1615	1707	{
1616	1708	/*
1617	1709	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1718,7 @@
1626	1718	*/
1627	1719	makeSomething(new Checker());
1628	1720	} else
1629		- if (event.getSource() == meshItem)
	1721	+ if (source == meshItem)
1630	1722	{
1631	1723	Object3D itemtomake = new Object3D();
1632	1724	Object3D child;
..	..	@@ -1647,35 +1739,35 @@
1647	1739	makeSomething(child);
1648	1740	}
1649	1741	} else
1650		- if (event.getSource() == springItem)
	1742	+ if (source == springItem)
1651	1743	{
1652	1744	cSpring s = new cSpring();
1653	1745	s.setup();
1654	1746	makeSomething(s);
1655	1747	} else
1656		- if (event.getSource() == flagItem)
	1748	+ if (source == flagItem)
1657	1749	{
1658	1750	cSpring s = new cFlag();
1659	1751	s.setup();
1660	1752	makeSomething(s);
1661	1753	} else
1662		- if (event.getSource() == lightItem)
	1754	+ if (source == lightItem)
1663	1755	{
1664	1756	makeSomething(new Light());
1665	1757	} else
1666		- if (event.getSource() == csgItem)
	1758	+ if (source == csgItem)
1667	1759	{
1668	1760	group(new CSG());
1669	1761	} else
1670		- if (event.getSource() == templateItem)
	1762	+ if (source == templateItem)
1671	1763	{
1672	1764	group(new cTemplate());
1673	1765	} else
1674		- if (event.getSource() == attributeItem)
	1766	+ if (source == attributeItem)
1675	1767	{
1676	1768	makeSomething(new Attribute());
1677	1769	} else
1678		- if (event.getSource() == pointflowItem)
	1770	+ if (source == pointflowItem)
1679	1771	{
1680	1772	makeSomething(new PointFlow());
1681	1773	} else
..	..	@@ -1687,7 +1779,7 @@
1687	1779	} else
1688	1780	*/
1689	1781
1690		- if (event.getSource() == superLoopItem)
	1782	+ if (source == superLoopItem)
1691	1783	{
1692	1784	Composite g = new cGroup();
1693	1785	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1801,7 @@
1709	1801
1710	1802	group(g);
1711	1803	} else
1712		- if (event.getSource() == loopItem)
	1804	+ if (source == loopItem)
1713	1805	{
1714	1806	Composite csg = new GroupLeaf();
1715	1807	csg.count = 5;
..	..	@@ -1718,7 +1810,7 @@
1718	1810	csg.addChild(child);
1719	1811	child.addChild(csg);
1720	1812	} else
1721		- if (event.getSource() == doubleItem)
	1813	+ if (source == doubleItem)
1722	1814	{
1723	1815	Composite csg = new GroupLeaf();
1724	1816	csg.count = 5;
..	..	@@ -1730,7 +1822,7 @@
1730	1822	csg.addChild(child);
1731	1823	child.addChild(csg);
1732	1824	} else
1733		- if (event.getSource() == tripleItem)
	1825	+ if (source == tripleItem)
1734	1826	{
1735	1827	Composite csg = new GroupLeaf();
1736	1828	csg.count = 4;
..	..	@@ -1746,70 +1838,75 @@
1746	1838	child.addChild(csg);
1747	1839	} else
1748	1840
1749		- if (event.getSource() == importGFDItem)
	1841	+ if (source == importGFDItem)
1750	1842	{
1751	1843	ImportGFD();
1752	1844	} else
1753		- if (event.getSource() == importVRMLX3DItem)
	1845	+ if (source == importVRMLX3DItem)
1754	1846	{
1755	1847	ImportVRMLX3D();
1756	1848	} else
1757		- if (event.getSource() == import3DSItem)
	1849	+ if (source == import3DSItem)
1758	1850	{
1759	1851	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760	1852	} else
1761		- if (event.getSource() == importOBJItem)
	1853	+ if (source == importOBJItem)
1762	1854	{
1763	1855	objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764	1856	} else
1765		- if (event.getSource() == computeAOItem)
	1857	+ if (source == computeAOItem)
1766	1858	{
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
	1859	+ Globals.drawMode = CameraPane.OCCLUSION;
	1860	+ Globals.theRenderer.repaint();
1769	1861	} else
1770		- if (event.getSource() == recompileItem)
	1862	+ if (source == recompileItem)
1771	1863	{
1772	1864	Recompile();
1773	1865	refreshContents();
1774	1866	} else
1775		- if (event.getSource() == editScriptItem)
	1867	+ if (source == editScriptItem)
1776	1868	{
1777	1869	OpenDialog();
1778	1870	refreshContents();
1779	1871	} else
1780		- if (event.getSource() == invariantsItem)
	1872	+ if (source == invariantsItem)
1781	1873	{
1782	1874	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	1875	+ GrafreeD.grafreeD.universe.invariants();
1784	1876	} else
1785		- if (event.getSource() == memoryItem)
	1877	+ if (source == memoryItem)
1786	1878	{
1787	1879	//System.out.println("Invariants:");
1788	1880	PrintMemory();
1789	1881	} else
1790		- if (event.getSource() == pathItem)
	1882	+ if (source == pathItem)
1791	1883	{
1792	1884	PrintPath();
1793	1885	} else
1794		- if (event.getSource() == analyzeItem)
	1886	+ if (source == analyzeItem)
1795	1887	{
1796	1888	AnalyzeObject();
1797	1889	} else
1798		- if (event.getSource() == dumpItem)
	1890	+ if (source == dumpItem)
1799	1891	{
1800	1892	DumpObject();
1801	1893	} else
1802		- if (event.getSource() == screenfitButton)
	1894	+ if (source == oneStepButton)
	1895	+ {
	1896	+ Globals.ONESTEP = true;
	1897	+ cameraView.repaint();
	1898	+ } else
	1899	+ if (source == screenfitButton)
1803	1900	{
1804	1901	//Reload(lastConverter, lastFilename, true);
1805	1902	ScreenFit();
1806	1903	} else
1807		- if (event.getSource() == screenfitpointButton)
	1904	+ if (source == screenfitpointButton)
1808	1905	{
1809	1906	//Reload(lastConverter, lastFilename, true);
1810	1907	ScreenFitPoint();
1811	1908	} else
1812		- if (event.getSource() == snapobjectButton)
	1909	+ if (source == snapobjectButton)
1813	1910	{
1814	1911	//Reload(lastConverter, lastFilename, true);
1815	1912	SnapObject();
..	..	@@ -1820,13 +1917,13 @@
1820	1917	// Recompile();
1821	1918	// refreshContents();
1822	1919	// } else
1823		- if (event.getSource() == gcButton)
	1920	+ if (source == gcButton)
1824	1921	{
1825	1922	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1923	System.gc();
1827	1924	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	1925	} else
1829		- if (event.getSource() == editLeafItem)
	1926	+ if (source == editLeafItem)
1830	1927	{
1831	1928	Object3D obj;
1832	1929	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +1937,66 @@
1840	1937	}
1841	1938	refreshContents(true);
1842	1939	} else
1843		- if (event.getSource() == openWindowItem)
	1940	+ if (source == openWindowItem)
1844	1941	{
1845	1942	EditSelection(true);
1846	1943	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1944	+ if (source == cutItem \|\| source == clearButton)
1848	1945	{
1849	1946	loadClipboard(true);
1850	1947	} else
1851		- if (event.getSource() == duplicateItem)
	1948	+ if (source == duplicateItem)
1852	1949	{
1853	1950	Object3D keep = GrafreeD.clipboard;
1854	1951	loadClipboard(false);
1855	1952	paste(false);
1856	1953	GrafreeD.clipboard = keep;
1857	1954	} else
1858		- if (event.getSource() == cloneItem)
	1955	+ if (source == cloneItem)
1859	1956	{
1860	1957	CloneSelection(false);
1861	1958	} else
1862		- if (event.getSource() == cloneSupportItem)
	1959	+ if (source == cloneSupportItem)
1863	1960	{
1864	1961	CloneSelection(true);
1865	1962	} else
1866		- if (event.getSource() == copyItem)
	1963	+ if (source == copyItem)
1867	1964	{
1868	1965	loadClipboard(false);
1869	1966	} else
1870		- if (event.getSource() == pasteItem)
	1967	+ if (source == pasteItem)
1871	1968	{
1872	1969	paste(false);
1873	1970	} else
1874		- if (event.getSource() == pasteLinkItem)
	1971	+ if (source == pasteIntoItem)
1875	1972	{
1876		- pasteInto(false);
	1973	+ pasteInto(true, false);
1877	1974	} else
1878		- if (event.getSource() == pasteCloneItem)
	1975	+ if (source == pasteLinkItem)
1879	1976	{
1880		- pasteInto(true);
	1977	+ pasteInto(false, false);
1881	1978	} else
1882		- if (event.getSource() == pasteExpandItem)
	1979	+ if (source == pasteCloneItem)
	1980	+ {
	1981	+ pasteInto(true, true);
	1982	+ } else
	1983	+ if (source == pasteExpandItem)
1883	1984	{
1884	1985	paste(true);
1885	1986	} else
1886		- if (event.getSource() == synchronizeItem)
	1987	+ if (source == synchronizeItem)
1887	1988	{
1888	1989	Overwrite(Object3D.TRANSFORM);
1889	1990	} else
1890		- if (event.getSource() == overwriteNameItem)
	1991	+ if (source == overwriteNameItem)
1891	1992	{
1892	1993	Overwrite(Object3D.NAME);
1893	1994	} else
1894		- if (event.getSource() == overwriteUVItem)
	1995	+ if (source == overwriteUVItem)
1895	1996	{
1896	1997	Overwrite(Object3D.UV);
1897	1998	} else
1898		- if (event.getSource() == overwriteMatItem)
	1999	+ if (source == overwriteMatItem)
1899	2000	{
1900	2001	/* july 2015
1901	2002	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2016,7 @@
1915	2016
1916	2017	Overwrite(dropAttributes);
1917	2018	}
1918		- if (event.getSource() == overwriteGeoItem)
	2019	+ if (source == overwriteGeoItem)
1919	2020	{
1920	2021	Overwrite(Object3D.GEOMETRY);
1921	2022	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2033,7 @@
1932	2033	// refreshContents();
1933	2034	// }
1934	2035	} else
1935		- if (event.getSource() == generateMeshItem)
	2036	+ if (source == generateMeshItem)
1936	2037	{
1937	2038	//if (group.selection.size() == 1)
1938	2039	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2044,7 @@
1943	2044	ResetModel();
1944	2045	refreshContents();
1945	2046	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2047	+ if (source == extractGeometriesItem)
1947	2048	{
1948	2049	boolean one = false;
1949	2050
..	..	@@ -1970,7 +2071,7 @@
1970	2071	ResetModel();
1971	2072	refreshContents();
1972	2073	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2074	+ if (source == cloneGeometriesItem)
1974	2075	{
1975	2076	boolean one = false;
1976	2077
..	..	@@ -1996,32 +2097,37 @@
1996	2097	ResetModel();
1997	2098	refreshContents();
1998	2099	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2100	+ if (source == shareGeometriesItem)
2000	2101	{
2001	2102	boolean one = false;
2002	2103
2003	2104	if (group.selection.size() == 1)
2004	2105	one = true;
2005	2106
	2107	+ Object3D merge = null;
	2108	+
2006	2109	Object3D content = new cGroup();
2007	2110
2008	2111	for (int i=0; i<group.selection.size(); i++)
2009	2112	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2113	+ merge = new Merge(group.selection.get(i));
2011	2114
2012	2115	if (one)
2013		- makeSomething(sel, false);
	2116	+ makeSomething(merge, false);
2014	2117	else
2015		- content.addChild(sel);
	2118	+ content.addChild(merge);
2016	2119	}
2017	2120
2018	2121	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2122	+ makeSomething(content, true);
	2123	+ else
	2124	+ {
	2125	+ ResetModel();
	2126	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2127	+ refreshContents();
	2128	+ }
2023	2129	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2130	+ if (source == mergeGeometriesItem)
2025	2131	{
2026	2132	boolean one = false;
2027	2133
..	..	@@ -2051,7 +2157,7 @@
2051	2157	ResetModel();
2052	2158	refreshContents();
2053	2159	} else
2054		- if (event.getSource() == linkverticesItem)
	2160	+ if (source == linkverticesItem)
2055	2161	{
2056	2162	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2163	// {
..	..	@@ -2071,32 +2177,41 @@
2071	2177	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2178	content = ((cGroup)content).get(0);
2073	2179
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2180	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2181	for (int i=0; i<group.selection.size(); i++)
2076	2182	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2183	+ boolean random = CameraPane.SWITCH;
	2184	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2185	group.selection.get(i).linkVerticesThis(content);
2080	2186	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2187	+ CameraPane.SWITCH = random;
2082	2188	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2189	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2190	refreshContents();
2085	2191	}
2086	2192	} else
2087		- if (event.getSource() == resetsupportItem)
	2193	+ if (source == resetsupportItem)
2088	2194	{
2089	2195	for (int i=0; i<group.selection.size(); i++)
2090	2196	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2197	+ boolean random = CameraPane.SWITCH;
	2198	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2199	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2200	+ CameraPane.SWITCH = random;
2095	2201	}
2096	2202
2097	2203	refreshContents();
2098	2204	} else
2099		- if (event.getSource() == resetreferencesItem)
	2205	+ if (source == relinkverticesItem)
	2206	+ {
	2207	+ boolean random = CameraPane.SWITCH;
	2208	+ CameraPane.SWITCH = false; // parse all random nodes
	2209	+ group.selection.RelinkToSupport();
	2210	+ CameraPane.SWITCH = random;
	2211	+
	2212	+ refreshContents();
	2213	+ } else
	2214	+ if (source == resetreferencesItem)
2100	2215	{
2101	2216	for (int i=0; i<group.selection.size(); i++)
2102	2217	{
..	..	@@ -2105,7 +2220,7 @@
2105	2220
2106	2221	refreshContents();
2107	2222	} else
2108		- if (event.getSource() == setMasterItem)
	2223	+ if (source == setMasterItem)
2109	2224	{
2110	2225	if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2111	2226	{
..	..	@@ -2118,7 +2233,7 @@
2118	2233	refreshContents();
2119	2234	}
2120	2235	} else
2121		- if (event.getSource() == poseMeshItem)
	2236	+ if (source == poseMeshItem)
2122	2237	{
2123	2238	if (group.selection.size() == 1)
2124	2239	{
..	..	@@ -2137,19 +2252,19 @@
2137	2252	}
2138	2253
2139	2254	} else
2140		- if (event.getSource() == revertMeshItem)
	2255	+ if (source == revertMeshItem)
2141	2256	{
2142	2257	RevertMeshes();
2143	2258	} else
2144		- if (event.getSource() == resetMeshItem)
	2259	+ if (source == resetMeshItem)
2145	2260	{
2146	2261	ResetAll();
2147	2262	} else
2148		- if (event.getSource() == stepAllItem)
	2263	+ if (source == stepAllItem)
2149	2264	{
2150	2265	StepAll();
2151	2266	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2267	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2268	{
2154	2269	//int indices[] = jList.getSelectedIndices();
2155	2270	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2272,46 @@
2157	2272
2158	2273	ClearSelection(false);
2159	2274	} else
2160		- if (event.getSource() == clearAllItem)
	2275	+ if (source == clearAllItem)
2161	2276	{
2162	2277	ClearSelection(true);
2163	2278	} else
2164		- if (event.getSource() == grabItem)
	2279	+ if (source == grabItem)
2165	2280	{
2166	2281	group(new cGroup(), true);
2167	2282	} else
2168		- if (event.getSource() == frontItem)
	2283	+ if (source == hideItem)
	2284	+ {
	2285	+ group(new HiddenObject());
	2286	+ } else
	2287	+ if (source == frontItem)
2169	2288	{
2170	2289	front();
2171	2290	} else
2172		- if (event.getSource() == backItem)
	2291	+ if (source == backItem)
2173	2292	{
2174	2293	back();
2175	2294	} else
2176		- if (event.getSource() == cameraItem)
	2295	+ if (source == cameraItem)
2177	2296	{
2178	2297	makeSomething(new Camera());
2179	2298	} else
2180		- if (event.getSource() == compositeItem)
	2299	+ if (source == compositeItem)
2181	2300	{
2182	2301	group(new Composite());
2183	2302	} else
2184		- if (event.getSource() == randomItem)
	2303	+ if (source == randomItem)
2185	2304	{
2186	2305	RandomNode random = new RandomNode();
2187	2306	group(random);
2188	2307	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2308	+ random.name = random.get(0).name + "Switch";
2190	2309	} else
2191		- if (event.getSource() == physicsItem)
	2310	+ if (source == physicsItem)
2192	2311	{
2193	2312	group(new PhysicsNode());
2194	2313	} else
2195		- if (event.getSource() == frameselectorItem)
	2314	+ if (source == frameselectorItem)
2196	2315	{
2197	2316	for (int i=0; i<group.selection.size(); i++)
2198	2317	{
..	..	@@ -2204,7 +2323,7 @@
2204	2323	ResetModel();
2205	2324	refreshContents();
2206	2325	} else
2207		- if (event.getSource() == switchGeoItem)
	2326	+ if (source == switchGeoItem)
2208	2327	{
2209	2328	for (int i=0; i<group.selection.size(); i++)
2210	2329	{
..	..	@@ -2216,7 +2335,7 @@
2216	2335	ResetModel();
2217	2336	refreshContents();
2218	2337	} else
2219		- if (event.getSource() == switchTransfoItem)
	2338	+ if (source == switchTransfoItem)
2220	2339	{
2221	2340	for (int i=0; i<group.selection.size(); i++)
2222	2341	{
..	..	@@ -2228,7 +2347,7 @@
2228	2347	ResetModel();
2229	2348	refreshContents();
2230	2349	} else
2231		- if (event.getSource() == morphItem)
	2350	+ if (source == morphItem)
2232	2351	{
2233	2352	for (int i=0; i<group.selection.size(); i++)
2234	2353	{
..	..	@@ -2240,7 +2359,7 @@
2240	2359	ResetModel();
2241	2360	refreshContents();
2242	2361	} else
2243		- if (event.getSource() == scriptNodeItem)
	2362	+ if (source == scriptNodeItem)
2244	2363	{
2245	2364	boolean atleastone = false;
2246	2365
..	..	@@ -2279,199 +2398,215 @@
2279	2398	}
2280	2399	}
2281	2400	} else
2282		- if (event.getSource() == linkerItem)
	2401	+ if (source == linkerItem)
2283	2402	{
2284	2403	group(new cLinker());
2285	2404	} else
2286		- if (event.getSource() == textureItem)
	2405	+ if (source == textureItem)
2287	2406	{
2288	2407	group(new TextureNode());
2289	2408	} else
2290		- if (event.getSource() == shadowXItem)
	2409	+ if (source == billboardItem)
	2410	+ {
	2411	+ group(new BillboardNode());
	2412	+ } else
	2413	+ if (source == shadowXItem)
2291	2414	{
2292	2415	CastShadow(0);
2293	2416	} else
2294		- if (event.getSource() == shadowYItem)
	2417	+ if (source == shadowYItem)
2295	2418	{
2296	2419	CastShadow(1);
2297	2420	} else
2298		- if (event.getSource() == shadowZItem)
	2421	+ if (source == shadowZItem)
2299	2422	{
2300	2423	CastShadow(2);
2301	2424	} else
2302		- if (event.getSource() == ungroupItem)
	2425	+ if (source == ungroupItem)
2303	2426	{
2304		- ungroup();
	2427	+ //ungroup();
	2428	+ for (int i=0; i<group.selection.size(); i++)
	2429	+ {
	2430	+ Ungroup(group.selection.get(i));
	2431	+ }
	2432	+
	2433	+ ClearSelection(false);
	2434	+
	2435	+ refreshContents();
2305	2436	} else
2306		- if (event.getSource() == genUVItem)
	2437	+ if (source == genUVItem)
2307	2438	{
2308	2439	GenUV();
2309	2440	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2441	+ if (source == genNormalsCADItem)
2311	2442	{
2312	2443	GenNormals(true);
2313	2444	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2445	+ if (source == genNormalsMESHItem)
2315	2446	{
2316	2447	GenNormals(true); // TODO
2317	2448	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2449	+ if (source == genNormalsORGANItem)
2319	2450	{
2320	2451	GenNormals(false);
2321	2452	} else
2322		- if (event.getSource() == stripifyItem)
	2453	+ if (source == genNormalsMINEItem)
	2454	+ {
	2455	+ GenNormalsMINE();
	2456	+ } else
	2457	+ if (source == stripifyItem)
2323	2458	{
2324	2459	Stripify();
2325	2460	} else
2326		- if (event.getSource() == unstripifyItem)
	2461	+ if (source == unstripifyItem)
2327	2462	{
2328	2463	Unstripify();
2329	2464	} else
2330		- if (event.getSource() == trimItem)
	2465	+ if (source == trimItem)
2331	2466	{
2332	2467	Trim();
2333	2468	} else
2334		- if (event.getSource() == untrimItem)
	2469	+ if (source == untrimItem)
2335	2470	{
2336	2471	Untrim();
2337	2472	} else
2338		- if (event.getSource() == clearColorsItem)
	2473	+ if (source == clearColorsItem)
2339	2474	{
2340	2475	ClearColors();
2341	2476	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2477	+ if (source == clearMaterialsItem)
2343	2478	{
2344	2479	ClearMaterials();
2345	2480	} else
2346		- if (event.getSource() == liveleavesItem)
	2481	+ if (source == liveleavesItem)
2347	2482	{
2348	2483	LiveLeaves(true);
2349	2484	} else
2350		- if (event.getSource() == unliveleavesItem)
	2485	+ if (source == unliveleavesItem)
2351	2486	{
2352	2487	LiveLeaves(false);
2353	2488	} else
2354		- if (event.getSource() == supportleavesItem)
	2489	+ if (source == supportleavesItem)
2355	2490	{
2356	2491	SupportLeaves(true);
2357	2492	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2493	+ if (source == unsupportleavesItem)
2359	2494	{
2360	2495	SupportLeaves(false);
2361	2496	} else
2362		- if (event.getSource() == hideleavesItem)
	2497	+ if (source == hideleavesItem)
2363	2498	{
2364	2499	HideLeaves(true);
2365	2500	} else
2366		- if (event.getSource() == showleavesItem)
	2501	+ if (source == showleavesItem)
2367	2502	{
2368	2503	HideLeaves(false);
2369	2504	} else
2370		- if (event.getSource() == markleavesItem)
	2505	+ if (source == markleavesItem)
2371	2506	{
2372	2507	MarkLeaves(true);
2373	2508	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2509	+ if (source == unmarkleavesItem)
2375	2510	{
2376	2511	MarkLeaves(false);
2377	2512	} else
2378		- if (event.getSource() == flipVItem)
	2513	+ if (source == flipVItem)
2379	2514	{
2380	2515	FlipV(true);
2381	2516	} else
2382		- if (event.getSource() == unflipVItem)
	2517	+ if (source == unflipVItem)
2383	2518	{
2384	2519	FlipV(false);
2385	2520	} else
2386		- if (event.getSource() == lowTexturesItem)
	2521	+ if (source == lowTexturesItem)
2387	2522	{
2388	2523	SetTexRes(0);
2389	2524	} else
2390		- if (event.getSource() == normalTexturesItem)
	2525	+ if (source == normalTexturesItem)
2391	2526	{
2392	2527	SetTexRes(1);
2393	2528	} else
2394		- if (event.getSource() == highTexturesItem)
	2529	+ if (source == highTexturesItem)
2395	2530	{
2396	2531	SetTexRes(2);
2397	2532	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2533	+ if (source == veryhighTexturesItem)
2399	2534	{
2400	2535	SetTexRes(3);
2401	2536	} else
2402		- if (event.getSource() == maxTexturesItem)
	2537	+ if (source == maxTexturesItem)
2403	2538	{
2404	2539	SetTexRes(4);
2405	2540	} else
2406		- if (event.getSource() == panoTexturesItem)
	2541	+ if (source == panoTexturesItem)
2407	2542	{
2408	2543	SetTexRes(5);
2409	2544	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2545	+ if (source == reverseNormalsItem)
2411	2546	{
2412	2547	ReverseNormals();
2413	2548	} else
2414		- if (event.getSource() == parseverticesItem)
	2549	+ if (source == parseverticesItem)
2415	2550	{
2416	2551	ParseVertices();
2417	2552	} else
2418		- if (event.getSource() == textureFieldItem)
	2553	+ if (source == textureFieldItem)
2419	2554	{
2420	2555	TextureVertices();
2421	2556	} else
2422		- if (event.getSource() == alignItem)
	2557	+ if (source == alignItem)
2423	2558	{
2424	2559	Align();
2425	2560	} else
2426		- if (event.getSource() == mirrorItem)
	2561	+ if (source == mirrorItem)
2427	2562	{
2428	2563	MirrorPoses();
2429	2564	} else
2430		- if (event.getSource() == reduceMorphItem)
	2565	+ if (source == reduceMorphItem)
2431	2566	{
2432	2567	MeshReduction(false);
2433	2568	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2569	+ if (source == reduce34MorphItem)
2435	2570	{
2436	2571	MeshReduction(true);
2437	2572	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2573	+ if (source == reverseTrianglesItem)
2439	2574	{
2440	2575	ReverseTriangles();
2441	2576	} else
2442		- if (event.getSource() == reduceMeshItem)
	2577	+ if (source == reduceMeshItem)
2443	2578	{
2444	2579	ReduceMesh(false);
2445	2580	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2581	+ if (source == reduce34MeshItem)
2447	2582	{
2448	2583	ReduceMesh(true);
2449	2584	} else
2450		- if (event.getSource() == increaseMeshItem)
	2585	+ if (source == increaseMeshItem)
2451	2586	{
2452	2587	IncreaseMesh();
2453	2588	} else
2454		- if (event.getSource() == clipMeshItem)
	2589	+ if (source == clipMeshItem)
2455	2590	{
2456	2591	ClipMesh();
2457	2592	} else
2458		- if (event.getSource() == smoothMeshItem)
	2593	+ if (source == smoothMeshItem)
2459	2594	{
2460	2595	SmoothMesh();
2461	2596	} else
2462		- if (event.getSource() == transformgeometryItem)
	2597	+ if (source == transformgeometryItem)
2463	2598	{
2464	2599	TransformGeometry();
2465	2600	} else
2466		- if (event.getSource() == resetTransformItem)
	2601	+ if (source == resetTransformItem)
2467	2602	{
2468	2603	ResetTransform();
2469	2604	} else
2470		- if (event.getSource() == resetCentroidItem)
	2605	+ if (source == resetCentroidItem)
2471	2606	{
2472	2607	ResetCentroid();
2473	2608	} else
2474		- if (event.getSource() == resetParentItem)
	2609	+ if (source == resetParentItem)
2475	2610	{
2476	2611	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2612	{
..	..	@@ -2481,7 +2616,7 @@
2481	2616
2482	2617	refreshContents();
2483	2618	} else
2484		- if (event.getSource() == repairParentItem)
	2619	+ if (source == repairParentItem)
2485	2620	{
2486	2621	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2622	{
..	..	@@ -2495,7 +2630,21 @@
2495	2630
2496	2631	refreshContents();
2497	2632	} else
2498		- if (event.getSource() == sortbysizeItem)
	2633	+ if (source == repairShadowItem)
	2634	+ {
	2635	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2636	+ {
	2637	+ Object3D obj = (Object3D)e.nextElement();
	2638	+ obj.RepairShadow();
	2639	+// for (int i=0; i<obj.size(); i++)
	2640	+// {
	2641	+// obj.get(i).parent = obj;
	2642	+// }
	2643	+ }
	2644	+
	2645	+ refreshContents();
	2646	+ } else
	2647	+ if (source == sortbysizeItem)
2499	2648	{
2500	2649	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2650	{
..	..	@@ -2507,7 +2656,7 @@
2507	2656	ResetModel();
2508	2657	refreshContents();
2509	2658	} else
2510		- if (event.getSource() == sortbynameItem)
	2659	+ if (source == sortbynameItem)
2511	2660	{
2512	2661	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2662	{
..	..	@@ -2519,7 +2668,7 @@
2519	2668	ResetModel();
2520	2669	refreshContents();
2521	2670	} else
2522		- if (event.getSource() == attachPigmentItem)
	2671	+ if (source == attachPigmentItem)
2523	2672	{
2524	2673	String texture = GetFile("Attach pigment");
2525	2674	Object3D obj;
..	..	@@ -2531,7 +2680,7 @@
2531	2680
2532	2681	refreshContents();
2533	2682	} else
2534		- if (event.getSource() == detachPigmentItem)
	2683	+ if (source == detachPigmentItem)
2535	2684	{
2536	2685	Object3D obj;
2537	2686	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2691,7 @@
2542	2691
2543	2692	refreshContents();
2544	2693	} else
2545		- if (event.getSource() == attachBumpItem)
	2694	+ if (source == attachBumpItem)
2546	2695	{
2547	2696	String texture = GetFile("Attach bump");
2548	2697	Object3D obj;
..	..	@@ -2554,7 +2703,7 @@
2554	2703
2555	2704	refreshContents();
2556	2705	} else
2557		- if (event.getSource() == detachBumpItem)
	2706	+ if (source == detachBumpItem)
2558	2707	{
2559	2708	Object3D obj;
2560	2709	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2714,7 @@
2565	2714
2566	2715	refreshContents();
2567	2716	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2717	+ if (source == pigmentBumpItem)
2569	2718	{
2570	2719	Object3D obj;
2571	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2725,195 @@
2576	2725
2577	2726	refreshContents();
2578	2727	} else
2579		- if (event.getSource() == flashSelectionButton)
	2728	+ if (source == flashSelectionButton)
2580	2729	{
2581	2730	CameraPane.flash = true;
2582	2731	refreshContents();
2583	2732	} else
2584		- if (event.getSource() == oneButton)
	2733	+ if (source == oneButton)
2585	2734	{
2586	2735	} else
2587		- if (event.getSource() == twoButton)
	2736	+ if (source == twoButton)
2588	2737	{
2589	2738	radio.layout = twoButton;
2590	2739	// bug
2591	2740	//gridPanel.setDividerLocation(1.0);
2592	2741	//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();
	2742	+// bigThree.remove(scenePanel);
	2743	+// bigThree.remove(centralPanel);
	2744	+// bigThree.remove(XYZPanel);
	2745	+// aWindowConstraints.gridx = 0;
	2746	+// aWindowConstraints.gridy = 0;
	2747	+// aWindowConstraints.gridwidth = 1;
	2748	+// // aConstraints.gridheight = 3;
	2749	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2750	+// aWindowConstraints.weightx = 0;
	2751	+// aWindowConstraints.weighty = 1;
	2752	+// //bigThree.add(jtp, aWindowConstraints);
	2753	+// aWindowConstraints.weightx = 1;
	2754	+// aWindowConstraints.gridwidth = 3;
	2755	+// // aConstraints.gridheight = 3;
	2756	+// aWindowConstraints.gridx = 1;
	2757	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2758	+// bigThree.add(centralPanel, aWindowConstraints);
	2759	+// aWindowConstraints.weightx = 0;
	2760	+// aWindowConstraints.gridx = 4;
	2761	+// aWindowConstraints.gridwidth = 1;
	2762	+// // aConstraints.gridheight = 3;
	2763	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2764	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2765	+// scenePanel.setVisible(false);
	2766	+// centralPanel.setVisible(true);
	2767	+// XYZPanel.setVisible(false);
	2768	+ bigThree.ClearUI();
	2769	+ bigThree.add(centralPanel);
	2770	+ bigThree.FlushUI();
2617	2771	} else
2618		- if (event.getSource() == threeButton)
	2772	+ if (source == threeButton)
2619	2773	{
2620	2774	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();
	2775	+
	2776	+// bigThree.remove(scenePanel);
	2777	+// bigThree.remove(centralPanel);
	2778	+// bigThree.remove(XYZPanel);
	2779	+// aWindowConstraints.gridx = 0;
	2780	+// aWindowConstraints.gridy = 0;
	2781	+// aWindowConstraints.gridwidth = 1;
	2782	+// // aConstraints.gridheight = 3;
	2783	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2784	+// aWindowConstraints.weightx = 0;
	2785	+// aWindowConstraints.weighty = 1;
	2786	+// //bigThree.add(jtp, aWindowConstraints);
	2787	+// aWindowConstraints.weightx = 1;
	2788	+// aWindowConstraints.gridwidth = 3;
	2789	+// // aConstraints.gridheight = 3;
	2790	+// aWindowConstraints.gridx = 1;
	2791	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2792	+// bigThree.add(centralPanel, aWindowConstraints);
	2793	+// aWindowConstraints.weightx = 0;
	2794	+// aWindowConstraints.gridx = 4;
	2795	+// aWindowConstraints.gridwidth = 1;
	2796	+// // aConstraints.gridheight = 3;
	2797	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// bigThree.validate();
	2800	+// scenePanel.setVisible(false);
	2801	+// centralPanel.setVisible(true);
	2802	+// XYZPanel.setVisible(true);
	2803	+ bigThree.ClearUI();
	2804	+ bigThree.add(centralPanel);
	2805	+ bigThree.add(XYZPanel);
	2806	+ bigThree.FlushUI();
2645	2807	} else
2646		- if (event.getSource() == fourButton)
	2808	+ if (source == fourButton)
2647	2809	{
2648	2810	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();
	2811	+
	2812	+// bigThree.remove(scenePanel);
	2813	+// bigThree.remove(centralPanel);
	2814	+// bigThree.remove(XYZPanel);
	2815	+// aWindowConstraints.gridx = 0;
	2816	+// aWindowConstraints.gridy = 0;
	2817	+// aWindowConstraints.gridwidth = 1;
	2818	+// // aWindowConstraints.gridheight = 3;
	2819	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.weighty = 1;
	2822	+// bigThree.add(scenePanel, aWindowConstraints);
	2823	+// aWindowConstraints.weightx = 1;
	2824	+// aWindowConstraints.gridwidth = 3;
	2825	+// // aConstraints.gridheight = 3;
	2826	+// aWindowConstraints.gridx = 1;
	2827	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2828	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2829	+// aWindowConstraints.weightx = 0;
	2830	+// aWindowConstraints.gridx = 4;
	2831	+// aWindowConstraints.gridwidth = 1;
	2832	+// // aWindowConstraints.gridheight = 3;
	2833	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2834	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2835	+// bigThree.validate();
	2836	+// scenePanel.setVisible(true);
	2837	+// centralPanel.setVisible(false);
	2838	+// XYZPanel.setVisible(false);
	2839	+ bigThree.ClearUI();
	2840	+ bigThree.add(scenePanel);
	2841	+ bigThree.FlushUI();
2673	2842	} else
2674		- if (event.getSource() == sixButton)
	2843	+ if (source == sixButton)
2675	2844	{
2676	2845	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();
	2846	+
	2847	+// bigThree.remove(scenePanel);
	2848	+// bigThree.remove(centralPanel);
	2849	+// bigThree.remove(XYZPanel);
	2850	+// aWindowConstraints.gridx = 0;
	2851	+// aWindowConstraints.gridy = 0;
	2852	+// aWindowConstraints.gridwidth = 1;
	2853	+// // aConstraints.gridheight = 3;
	2854	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2855	+// aWindowConstraints.weightx = 0;
	2856	+// aWindowConstraints.weighty = 1;
	2857	+// bigThree.add(scenePanel, aWindowConstraints);
	2858	+// aWindowConstraints.weightx = 1;
	2859	+// aWindowConstraints.gridwidth = 3;
	2860	+// // aWindowConstraints.gridheight = 3;
	2861	+// aWindowConstraints.gridx = 1;
	2862	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2863	+// bigThree.add(centralPanel, aWindowConstraints);
	2864	+// aWindowConstraints.weightx = 0;
	2865	+// aWindowConstraints.gridx = 4;
	2866	+// aWindowConstraints.gridwidth = 1;
	2867	+// // aWindowConstraints.gridheight = 3;
	2868	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2869	+// //bigThree.add(XYZPanel, aConstraints);
	2870	+// bigThree.validate();
	2871	+// scenePanel.setVisible(true);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(scenePanel);
	2876	+ bigThree.add(centralPanel);
	2877	+ bigThree.FlushUI();
2701	2878	} else
2702		- if (event.getSource() == sevenButton)
	2879	+ if (source == sevenButton)
2703	2880	{
2704	2881	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();
	2882	+
	2883	+// bigThree.remove(scenePanel);
	2884	+// bigThree.remove(centralPanel);
	2885	+// bigThree.remove(XYZPanel);
	2886	+// aWindowConstraints.gridx = 0;
	2887	+// aWindowConstraints.gridy = 0;
	2888	+// aWindowConstraints.gridwidth = 1;
	2889	+// // aWindowConstraints.gridheight = 3;
	2890	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2891	+// aWindowConstraints.weightx = 0;
	2892	+// aWindowConstraints.weighty = 1;
	2893	+// bigThree.add(scenePanel, aWindowConstraints);
	2894	+// aWindowConstraints.weightx = 1;
	2895	+// aWindowConstraints.gridwidth = 3;
	2896	+// // aWindowConstraints.gridheight = 3;
	2897	+// aWindowConstraints.gridx = 1;
	2898	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2899	+// bigThree.add(centralPanel, aWindowConstraints);
	2900	+// aWindowConstraints.weightx = 0;
	2901	+// aWindowConstraints.gridx = 4;
	2902	+// aWindowConstraints.gridwidth = 1;
	2903	+// // aConstraints.gridheight = 3;
	2904	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2905	+// bigThree.add(XYZPanel, aWindowConstraints);
	2906	+// bigThree.validate();
	2907	+// scenePanel.setVisible(true);
	2908	+// centralPanel.setVisible(true);
	2909	+// XYZPanel.setVisible(true);
	2910	+ bigThree.ClearUI();
	2911	+ bigThree.add(scenePanel);
	2912	+ bigThree.add(centralPanel);
	2913	+ bigThree.add(XYZPanel);
	2914	+ bigThree.FlushUI();
2729	2915	} else
2730		- if (event.getSource() == rootButton)
	2916	+ if (source == rootButton)
2731	2917	{
2732	2918	Object3D obj;
2733	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2739,7 +2925,7 @@
2739	2925
2740	2926	refreshContents(true);
2741	2927	} else
2742		- if (event.getSource() == closeButton)
	2928	+ if (source == closeButton)
2743	2929	{
2744	2930	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	2931	cRadio ab;
..	..	@@ -2760,11 +2946,11 @@
2760	2946	}
2761	2947	refreshContents(true);
2762	2948	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2949	+ if (source == editItem \|\| source == editButton)
2764	2950	{
2765	2951	EditSelection(false);
2766	2952	} else
2767		- if (event.getSource() == uneditButton)
	2953	+ if (source == uneditButton)
2768	2954	{
2769	2955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	2956	{
..	..	@@ -2776,12 +2962,12 @@
2776	2962
2777	2963	child.editWindow = null; // ???????????
2778	2964	}
2779		- objEditor.ctrlPanel.revalidate();
	2965	+ objEditor.ctrlPanel.FlushUI();
2780	2966	//objEditor.jTree.clearSelection();
2781	2967	//objEditor.ResetSliders();
2782	2968	refreshContents(true);
2783	2969	} else
2784		- if (event.getSource() == clearPanelButton)
	2970	+ if (source == clearPanelButton)
2785	2971	{
2786	2972	assert(copy == group);
2787	2973	//copy.ClearUI();
..	..	@@ -2792,7 +2978,7 @@
2792	2978	listUI.clear();
2793	2979	refreshContents(true);
2794	2980	} else
2795		- if (event.getSource() == allParamsButton)
	2981	+ if (source == allParamsButton)
2796	2982	{
2797	2983	assert(copy == group);
2798	2984
..	..	@@ -2813,19 +2999,19 @@
2813	2999
2814	3000	refreshContents(true);
2815	3001	} else
2816		- if (event.getSource() == unselectButton)
	3002	+ if (source == unselectButton)
2817	3003	{
2818	3004	objEditor.jTree.clearSelection();
2819	3005	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3006	objEditor.ResetSliders();
2821	3007	refreshContents(true);
2822	3008	} else
2823		- if(event.getSource() instanceof cRadio)
	3009	+ if(source instanceof cRadio)
2824	3010	{
2825	3011	group.parent = keepparent;
2826	3012	group.attributes = 0;
2827	3013	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3014	+ /cRadio/ radio = (cRadio)source;
2829	3015	Object3D obj = radio.GetObject();
2830	3016	System.out.println("Edit " + obj);
2831	3017	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3031,7 @@
2845	3031	}
2846	3032
2847	3033	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3034	+ //Globals.theRenderer.object = group;
2849	3035	if(!useclient)
2850	3036	{
2851	3037	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,7 +3040,8 @@
2854	3040	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3041	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3042	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3043	+ //cameraView.lighttouched = true;
	3044	+ Globals.lighttouched = true;
2858	3045	topView.object = group;
2859	3046	frontView.object = group;
2860	3047	sideView.object = group;
..	..	@@ -2890,7 +3077,7 @@
2890	3077	if (useclient)
2891	3078	{
2892	3079	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3080	+ Globals.lighttouched = true;
2894	3081	//topView.object = client;
2895	3082	//frontView.object = client;
2896	3083	//sideView.object = client;
..	..	@@ -2898,7 +3085,7 @@
2898	3085	else
2899	3086	{
2900	3087	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3088	+ Globals.lighttouched = true;
2902	3089	//topView.object = group;
2903	3090	//frontView.object = group;
2904	3091	//sideView.object = group;
..	..	@@ -3179,6 +3366,13 @@
3179	3366	refreshContents();
3180	3367	}
3181	3368
	3369	+ void GenNormalsMINE()
	3370	+ {
	3371	+ group.selection.GenNormalsMINE();
	3372	+
	3373	+ refreshContents();
	3374	+ }
	3375	+
3182	3376	void Stripify()
3183	3377	{
3184	3378	group.StripifyS();
..	..	@@ -3399,7 +3593,7 @@
3399	3593	String pigment = Object3D.GetPigment(tex);
3400	3594	//String bump = Object3D.GetBump(tex);
3401	3595
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3596	+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
3403	3597
3404	3598	double s = v.s;
3405	3599
..	..	@@ -3447,12 +3641,26 @@
3447	3641
3448	3642	void Align()
3449	3643	{
	3644	+ if (group.selection.size() == 0)
	3645	+ return;
	3646	+
	3647	+ cVector bbmin = new cVector();
	3648	+ cVector bbmax = new cVector();
	3649	+
	3650	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3651	+
	3652	+ double dx = bbmax.x - bbmin.x;
	3653	+ double dy = bbmax.y - bbmin.y;
	3654	+ double dz = bbmax.z - bbmin.z;
	3655	+
	3656	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3657	+
3450	3658	for (int i=0; i<group.selection.size(); i++)
3451	3659	{
3452	3660	Object3D obj = group.selection.get(i);
3453	3661
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3662	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3663	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3664	}
3457	3665
3458	3666	refreshContents();
..	..	@@ -3473,11 +3681,11 @@
3473	3681
3474	3682	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3683
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3684	+ boolean random = CameraPane.SWITCH;
	3685	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3686	lowres.linkVerticesThis(null);
3479	3687	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3688	+ CameraPane.SWITCH = random;
3481	3689
3482	3690	System.err.flush();
3483	3691
..	..	@@ -3686,7 +3894,7 @@
3686	3894	group.selection.RelinkToSupport(); // july 2014
3687	3895	System.out.println("DONE.");
3688	3896	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3897	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	3898	}
3691	3899
3692	3900	void ReduceMesh(boolean reduction34)
..	..	@@ -3962,25 +4170,25 @@
3962	4170	System.err.println("info : " + child.GetPath());
3963	4171	}
3964	4172	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4173	+// else
	4174	+// {
	4175	+// objEditor.SetMaterial(group); // .GetMaterial());
	4176	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4177	+// System.err.println("info : " + group.GetPath());
	4178	+// }
3971	4179
3972	4180	objEditor.SetText(); // jan 2014
3973	4181
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4182	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3975	4183	CameraPane.flash = true;
3976	4184
3977	4185	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3978	4186	// a camera
3979	4187	{
3980	4188	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;
	4189	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4190	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4191	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4192	}
3985	4193
3986	4194	refreshContents();
..	..	@@ -4235,7 +4443,7 @@
4235	4443	refreshContents();
4236	4444	}
4237	4445
4238		- void pasteInto(boolean copyit)
	4446	+ void pasteInto(boolean copyit, boolean clone)
4239	4447	{
4240	4448	// if (GrafreeD.clipboard == null)
4241	4449	// return;
..	..	@@ -4264,7 +4472,14 @@
4264	4472	if (copyit)
4265	4473	{
4266	4474	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4475	+ if (clone)
	4476	+ {
	4477	+ CloneClipboard(false); // sept 2014
	4478	+ }
	4479	+ else
	4480	+ {
	4481	+ paste(false);
	4482	+ }
4268	4483	}
4269	4484	else
4270	4485	{
..	..	@@ -4474,6 +4689,26 @@
4474	4689	makeSomething(csg);
4475	4690	}
4476	4691
	4692	+ void Ungroup(Object3D g)
	4693	+ {
	4694	+ if (g instanceof HiddenObject)
	4695	+ {
	4696	+ HiddenObject h = (HiddenObject) g;
	4697	+
	4698	+ for (int i=0; i<h.ActualSize(); i++)
	4699	+ {
	4700	+ objEditor.makeSomething(h.get(i), false);
	4701	+ }
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ for (int i=0; i<g.Size(); i++)
	4706	+ {
	4707	+ objEditor.makeSomething(g.get(i), false);
	4708	+ }
	4709	+ }
	4710	+ }
	4711	+
4477	4712	void ungroup()
4478	4713	{
4479	4714	/*
..	..	@@ -4788,10 +5023,12 @@
4788	5023	cButton flashSelectionButton;
4789	5024	cButton editButton;
4790	5025	cButton uneditButton;
	5026	+ JCheckBox allParamsButton;
4791	5027	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5028	cButton unselectButton;
4794	5029
	5030	+ cButton oneStepButton;
	5031	+
4795	5032	cButton screenfitButton;
4796	5033	cButton screenfitpointButton;
4797	5034	cButton snapobjectButton;
..	..	@@ -4833,6 +5070,7 @@
4833	5070	private MenuItem resetsupportItem;
4834	5071	private MenuItem resetreferencesItem;
4835	5072	private MenuItem linkverticesItem;
	5073	+ private MenuItem relinkverticesItem;
4836	5074	private MenuItem setMasterItem;
4837	5075	private MenuItem resetMeshItem;
4838	5076	private MenuItem stepAllItem;
..	..	@@ -4845,6 +5083,7 @@
4845	5083	private MenuItem mergeGeometriesItem;
4846	5084	private MenuItem copyItem;
4847	5085	private MenuItem pasteItem;
	5086	+ private MenuItem pasteIntoItem;
4848	5087	private MenuItem pasteLinkItem;
4849	5088	private MenuItem pasteCloneItem;
4850	5089	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5093,7 @@
4854	5093	private MenuItem genNormalsMESHItem;
4855	5094	private MenuItem genNormalsCADItem;
4856	5095	private MenuItem genNormalsORGANItem;
	5096	+ private MenuItem genNormalsMINEItem;
4857	5097	private MenuItem stripifyItem;
4858	5098	private MenuItem unstripifyItem;
4859	5099	private MenuItem trimItem;
..	..	@@ -4895,6 +5135,7 @@
4895	5135	private MenuItem resetCentroidItem;
4896	5136	private MenuItem transformgeometryItem;
4897	5137	private MenuItem resetTransformItem;
	5138	+ private MenuItem hideItem;
4898	5139	private MenuItem grabItem;
4899	5140	private MenuItem backItem;
4900	5141	private MenuItem frontItem;
..	..	@@ -4915,6 +5156,7 @@
4915	5156
4916	5157	private MenuItem resetParentItem;
4917	5158	private MenuItem repairParentItem;
	5159	+ private MenuItem repairShadowItem;
4918	5160	private MenuItem sortbysizeItem;
4919	5161	private MenuItem sortbynameItem;
4920	5162
..	..	@@ -4935,10 +5177,11 @@
4935	5177	private MenuItem coneItem;
4936	5178	private MenuItem torusItem;
4937	5179	private MenuItem superItem;
	5180	+ private MenuItem kleinItem;
4938	5181	private MenuItem blobItem;
4939	5182	private MenuItem latheItem;
4940	5183	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5184	+ private MenuItem overlayItem;
4942	5185	private MenuItem meshItem;
4943	5186	// private MenuItem meshGroupItem;
4944	5187	private MenuItem springItem;
..	..	@@ -4947,6 +5190,7 @@
4947	5190	private MenuItem csgItem;
4948	5191	private MenuItem templateItem;
4949	5192	private MenuItem textureItem;
	5193	+ private MenuItem billboardItem;
4950	5194	private MenuItem shadowXItem;
4951	5195	private MenuItem shadowYItem;
4952	5196	private MenuItem shadowZItem;