~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,
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -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,27 +185,37 @@
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"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	211	+ if (Globals.ADVANCED)
	212	+ {
197	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	214	revertMeshItem.addActionListener(this);
199	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	216	resetreferencesItem.addActionListener(this);
201	217	menu.add("-");
	218	+ }
202	219	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	220	overwriteGeoItem.addActionListener(this);
204	221	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,48 +227,68 @@
210	227	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	228	overwriteUVItem.addActionListener(this);
212	229	menu.add("-");
	230	+ if (Globals.ADVANCED)
	231	+ {
213	232	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	233	generateMeshItem.addActionListener(this);
215	234	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	235	poseMeshItem.addActionListener(this);
217	236	menu.add("-");
	237	+ }
218	238	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	239	resetsupportItem.addActionListener(this);
220	240	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	241	linkverticesItem.addActionListener(this);
	242	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	243	+ relinkverticesItem.addActionListener(this);
	244	+
	245	+ if (Globals.ADVANCED)
	246	+ {
222	247	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	248	setMasterItem.addActionListener(this);
	249	+ }
224	250
225	251	oe.menuBar.add(menu = new Menu("Group"));
226	252	grabItem = menu.add(new MenuItem("Grab"));
227	253	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	254	backItem = menu.add(new MenuItem("Back"));
231	255	backItem.addActionListener(this);
	256	+ frontItem = menu.add(new MenuItem("Front"));
	257	+ frontItem.addActionListener(this);
232	258	compositeItem = menu.add(new MenuItem("Composite"));
233	259	compositeItem.addActionListener(this);
	260	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	261	+ hideItem.addActionListener(this);
	262	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	263	+ ungroupItem.addActionListener(this);
234	264	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	265	+ randomItem = menu.add(new MenuItem("Switch node"));
236	266	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	267	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	268	switchGeoItem.addActionListener(this);
243	269	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	270	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	271	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	272	morphItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ menu.add("-");
	277	+ physicsItem = menu.add(new MenuItem("Physics"));
	278	+ physicsItem.addActionListener(this);
	279	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	280	+ frameselectorItem.addActionListener(this);
247	281	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	282	scriptNodeItem.addActionListener(this);
249	283	cameraItem = menu.add(new MenuItem("Camera"));
250	284	cameraItem.addActionListener(this);
	285	+ }
251	286
252	287	oe.menuBar.add(menu = new Menu("Object"));
253	288	textureItem = menu.add(new MenuItem("Texture"));
254	289	textureItem.addActionListener(this);
	290	+ billboardItem = menu.add(new MenuItem("Billboard"));
	291	+ billboardItem.addActionListener(this);
255	292	csgItem = menu.add(new MenuItem("CSG"));
256	293	csgItem.addActionListener(this);
257	294	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +297,29 @@
260	297	shadowYItem.addActionListener(this);
261	298	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	299	shadowZItem.addActionListener(this);
	300	+ if (Globals.ADVANCED)
	301	+ {
	302	+ menu.add("-");
263	303	linkerItem = menu.add(new MenuItem("Linker"));
264	304	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	305	attributeItem = menu.add(new MenuItem("Attribute"));
268	306	attributeItem.addActionListener(this);
	307	+ templateItem = menu.add(new MenuItem("Template"));
	308	+ templateItem.addActionListener(this);
269	309	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	310	pointflowItem.addActionListener(this);
	311	+ }
271	312	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	313	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	314	resetTransformItem.addActionListener(this);
276	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	316	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	317	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	318	+ resetCentroidXZItem.addActionListener(this);
	319	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	320	+ transformGeometryItem.addActionListener(this);
	321	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	322	+ transformChildrenItem.addActionListener(this);
280	323
281	324	oe.menuBar.add(menu = new Menu("Geometry"));
282	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +328,13 @@
285	328	genNormalsORGANItem.addActionListener(this);
286	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	330	genNormalsCADItem.addActionListener(this);
	331	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	332	+ genNormalsMESHItem.addActionListener(this);
	333	+ if (Globals.ADVANCED)
	334	+ {
	335	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	336	+ genNormalsMINEItem.addActionListener(this);
	337	+ }
288	338	stripifyItem = menu.add(new MenuItem("Stripify"));
289	339	stripifyItem.addActionListener(this);
290	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +356,34 @@
306	356	reduce34MeshItem.addActionListener(this);
307	357	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	358	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	359	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	360	clipMeshItem.addActionListener(this);
	361	+
	362	+ if (Globals.ADVANCED)
	363	+ {
	364	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	365	+ smoothMeshItem.addActionListener(this);
	366	+ }
313	367
314	368	oe.menuBar.add(menu = new Menu("Attributes"));
315	369	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	370	clearMaterialsItem.addActionListener(this);
	371	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	372	+ resetAllItem.addActionListener(this);
	373	+ stepAllItem = menu.add(new MenuItem("Step All"));
	374	+ stepAllItem.addActionListener(this);
317	375	menu.add("-");
318	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	377	liveleavesItem.addActionListener(this);
320	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
322	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	383	supportleavesItem.addActionListener(this);
324	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	385	unsupportleavesItem.addActionListener(this);
	386	+ }
326	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	388	hideleavesItem.addActionListener(this);
328	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -366,28 +427,34 @@
366	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	428	sortbynameItem.addActionListener(this);
368	429	menu.add("-");
	430	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	431	+ shareGeometriesItem.addActionListener(this);
	432	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	433	+ mergeGeometriesItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ // Pretty much the same as duplicate and clone.
369	437	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	438	extractGeometriesItem.addActionListener(this);
371	439	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	440	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	441	+ }
377	442
378	443	oe.menuBar.add(menu = new Menu("Insert"));
379	444	buildCreateMenu(menu);
380	445
381		-
382	446	oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
388	448	importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
390	451	import3DSItem.addActionListener(this);
	452	+ menu.add("-");
	453	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	454	+ importVRMLX3DItem.addActionListener(this);
	455	+ menu.add("-");
	456	+ importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
	457	+ importGFDItem.addActionListener(this);
391	458
392	459	oe.menuBar.add(menu = new Menu("Tools"));
393	460	buildToolsMenu(menu);
..	..	@@ -423,150 +490,98 @@
423	490	oe.radioPanel.add(dummyButton);
424	491	oe.buttonGroup.add(dummyButton);
425	492	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	494
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	495	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	496	+ liveCB.setToolTipText("Enable animation");
431	497	liveCB.addItemListener(this);
432	498
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	499	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	500	+ oneStepButton.setToolTipText("Animate one step forward");
	501	+ oneStepButton.addActionListener(this);
	502	+
	503	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	504	+ fastCB.setToolTipText("Fast mode");
451	505	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	506	+
	507	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	508	+ trackCB.setToolTipText("Enable tracking");
493	509	trackCB.addItemListener(this);
494	510
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
497	513	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	514	+
499	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	516	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	517
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	518	+ if (Globals.ADVANCED)
	519	+ {
	520	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	521	+ snapobjectButton.addActionListener(this);
	522	+ snapobjectButton.setToolTipText("Snap Object");
	523	+ }
	524	+
	525	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	526	+ flashSelectionButton.setToolTipText("Show selection");
512	527	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	528
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	529	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	530	+
	531	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	532	+ twoButton.setToolTipText("Show center view only");
519	533	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	535	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	536	+ fourButton.setToolTipText("Show left panel only");
	537	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	538	+ sixButton.setToolTipText("2-column layout left");
523	539	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	540	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	541	+ threeButton.setToolTipText("2-column layout right");
525	542	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	543	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	544	+ sevenButton.setToolTipText("3-column layout");
527	545	sevenButton.addActionListener(this);
528	546	//
529	547
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	548	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	549	+ rootButton.setToolTipText("Edit selection in new tab");
531	550	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	551	+
	552	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	553	+ closeButton.setToolTipText("Close tab");
534	554	closeButton.addActionListener(this);
535	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	556	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	557
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	558	+ cGridBag commandsPanel = new cGridBag();
	559	+
	560	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ editButton.setToolTipText("Edit selection");
541	562	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	563
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
547	566	uneditButton.addActionListener(this);
548	567
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	568	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	569	+ allParamsButton.setToolTipText("Edit all params");
561	570	allParamsButton.addActionListener(this);
562	571
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	572	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ clearPanelButton.setToolTipText("Clear edit panel");
	574	+ clearPanelButton.addActionListener(this);
	575	+
	576	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ unselectButton.setToolTipText("Unselect");
568	578	unselectButton.addActionListener(this);
569	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
570	585	// oe.aConstraints.gridx += 1;
571	586	// oe.aConstraints.weighty = 0;
572	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +593,37 @@
578	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	594	// gcButton.addActionListener(this);
580	595
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
592	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	600	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	601	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
599	605
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	606	+ cGridBag copyOptionsPanel = new cGridBag();
	607	+
	608	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	609	+ colorCB.setToolTipText("Copy color when dropped");
604	610	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	611	+
	612	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	613	+ materialCB.setToolTipText("Copy material when dropped");
607	614	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	615	+
	616	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	617	+ textureCB.setToolTipText("Copy texture when dropped");
610	618	textureCB.addItemListener(this);
611	619
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
614	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
615	627	//jList.addListSelectionListener(this);
616	628	oe.jTree.addTreeSelectionListener(this);
617	629	//jTree.setRootVisible(false);
..	..	@@ -633,18 +645,91 @@
633	645	radio.layout = sevenButton;
634	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	647	}
	648	+
	649	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	650	+ {
	651	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	652	+ boxCB.setToolTipText("Display bounding boxes");
	653	+ boxCB.addItemListener(this);
	654	+
	655	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	656	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	657	+ zoomBoxCB.addItemListener(this);
	658	+
	659	+ if (true) // Globals.ADVANCED)
	660	+ {
	661	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	662	+ supportCB.setToolTipText("Enable rigging");
	663	+ supportCB.addItemListener(this);
	664	+
	665	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	666	+ // localCB.addItemListener(this);
	667	+
	668	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	669	+ crowdCB.setToolTipText("Used for crowds");
	670	+ crowdCB.addItemListener(this);
	671	+
	672	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	673	+ smoothCB.setToolTipText("Snapping delay");
	674	+ smoothCB.addItemListener(this);
	675	+
	676	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	677	+ slowCB.setToolTipText("Smooth interpolation");
	678	+ slowCB.addItemListener(this);
	679	+
	680	+// constraints.gridy += 1;
	681	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	682	+// speakerMocapCB.addItemListener(this);
	683	+
	684	+ if (false)
	685	+ {
	686	+ // handled in scripts
	687	+ //constraints.gridy += 1;
	688	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	689	+ speakerCameraCB.addItemListener(this);
	690	+
	691	+ //constraints.gridy += 1;
	692	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	693	+ speakerFocusCB.addItemListener(this);
	694	+
	695	+ //constraints.gridy += 1;
	696	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	697	+ smoothfocusCB.addItemListener(this);
	698	+ }
	699	+
	700	+//constraints.gridx += 1;
	701	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	702	+// debugCB.addItemListener(this);
	703	+
	704	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	705	+ oeilCB.addItemListener(this);
	706	+
	707	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	708	+ lookAtCB.setToolTipText("Look-at target");
	709	+ lookAtCB.addItemListener(this);
	710	+
	711	+ }
	712	+
	713	+ cGridBag fill = new cGridBag();
	714	+
	715	+ fill.preferredHeight = 200;
	716	+
	717	+ panel.add(fill);
	718	+
	719	+ }
636	720
637	721	void EditObject(Object3D obj)
638	722	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	723	+ cRadio radioButton = new cRadio(obj.name);
	724	+ radioButton.SetObject(obj);
	725	+ radioButton.layout = sevenButton;
	726	+ radioButton.SetCamera(cameraView.renderCamera, false);
	727	+ radioButton.addActionListener(this);
	728	+ radioPanel.add(radioButton);
	729	+ buttonGroup.add(radioButton);
	730	+ radioButton.doClick();
647	731	}
	732	+
648	733	void SetupViews(ObjEditor oe)
649	734	{
650	735	oe.SetupViews();
..	..	@@ -663,6 +748,7 @@
663	748	JCheckBox fastCB;
664	749	JCheckBox slowCB;
665	750	JCheckBox boxCB;
	751	+ JCheckBox zoomBoxCB;
666	752	JCheckBox trackCB;
667	753	JCheckBox smoothfocusCB;
668	754	// JCheckBox speakerMocapCB;
..	..	@@ -705,8 +791,7 @@
705	791	dropAttributes \|= Object3D.TEXTURE;
706	792	else
707	793	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	794	+ } else if(e.getSource() == liveCB)
710	795	{
711	796	cameraView.ToggleLive();
712	797	}
..	..	@@ -743,6 +828,10 @@
743	828	Recompile();
744	829	cameraView.repaint();
745	830	// refreshContents();
	831	+ }
	832	+ else if(e.getSource() == zoomBoxCB)
	833	+ {
	834	+ cameraView.ToggleZoomBoxMode();
746	835	}
747	836	else if(e.getSource() == smoothfocusCB)
748	837	{
..	..	@@ -857,7 +946,9 @@
857	946	// objEditor.DropFile((java.io.File[]) object, true);
858	947	// return;
859	948	// }
860		- if (string.charAt(0) == '/')
	949	+
	950	+ // File path for Mac and Windows
	951	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	952	{
862	953	// file(s)
863	954	String[] names = string.split("\n");
..	..	@@ -884,7 +975,7 @@
884	975
885	976	flashIt = false;
886	977	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	978	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	979	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	980
890	981	if (group.selection.size() == 1)
..	..	@@ -911,11 +1002,11 @@
911	1002	{
912	1003	loadClipboard(true);
913	1004	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1005	+ pasteInto(false, false);
915	1006	} else {
916	1007	loadClipboard(false);
917	1008	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1009	+ pasteInto(false, false); // true); // ???
919	1010	}
920	1011	}
921	1012	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1124,37 @@
1033	1124	torusItem.addActionListener(this);
1034	1125	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1126	superItem.addActionListener(this);
	1127	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1128	+ kleinItem.addActionListener(this);
1036	1129	particleItem = menu.add(new MenuItem("Particle system"));
1037	1130	particleItem.addActionListener(this);
	1131	+ if (Globals.ADVANCED)
	1132	+ {
1038	1133	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1134	ragdollItem.addActionListener(this);
1040	1135	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1136	ragdoll2Item.addActionListener(this);
	1137	+ }
1042	1138	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1139	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1140	meshItem.addActionListener(this);
1045	1141	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1142	// meshGroupItem.addActionListener(this);
	1143	+ if (Globals.ADVANCED)
	1144	+ {
1047	1145	springItem = menu.add(new MenuItem("Spring"));
1048	1146	springItem.addActionListener(this);
1049	1147	flagItem = menu.add(new MenuItem("Flag"));
1050	1148	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1149	blobItem = menu.add(new MenuItem("Blob"));
1056	1150	blobItem.addActionListener(this);
1057	1151	latheItem = menu.add(new MenuItem("Lathe"));
1058	1152	latheItem.addActionListener(this);
	1153	+ }
	1154	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1155	+ bezierItem.addActionListener(this);
	1156	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1157	+ overlayItem.addActionListener(this);
1059	1158	lightItem = menu.add(new MenuItem("Light"));
1060	1159	lightItem.addActionListener(this);
1061	1160	menu.add("-");
..	..	@@ -1065,34 +1164,39 @@
1065	1164	loopItem.addActionListener(this);
1066	1165	doubleItem = menu.add(new MenuItem("Fork"));
1067	1166	doubleItem.addActionListener(this);
	1167	+ if (Globals.ADVANCED)
	1168	+ {
1068	1169	tripleItem = menu.add(new MenuItem("Trident"));
1069	1170	tripleItem.addActionListener(this);
	1171	+ }
1070	1172	}
1071	1173
1072	1174	void buildToolsMenu(Menu menu)
1073	1175	{
1074	1176	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1177	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1178	+ animationItem.setState(Globals.ANIMATION);
1077	1179
1078	1180	menu.add("-");
1079	1181	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1182	parseverticesItem.addActionListener(this);
1081	1183	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1184	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1185	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1186	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1187	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1188	reduceMorphItem.addActionListener(this);
1089	1189	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1190	reduce34MorphItem.addActionListener(this);
1091		-
	1191	+ menu.add("-");
1092	1192	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1193	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1194
	1195	+ if (Globals.ADVANCED)
	1196	+ {
	1197	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1198	+ mirrorItem.addActionListener(this);
	1199	+ menu.add("-");
1096	1200	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1201	memoryItem.addActionListener(this);
1098	1202	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1106,6 +1210,8 @@
1106	1210	resetParentItem.addActionListener(this);
1107	1211	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1212	repairParentItem.addActionListener(this);
	1213	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1214	+ repairShadowItem.addActionListener(this);
1109	1215	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1216	invariantsItem.addActionListener(this);
1111	1217	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1219,7 @@
1113	1219	menu.add("-");
1114	1220	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1221	editScriptItem.addActionListener(this);
	1222	+ }
1116	1223	}
1117	1224
1118	1225	void ScreenFit()
..	..	@@ -1441,9 +1548,9 @@
1441	1548
1442	1549	void Overwrite(int mask)
1443	1550	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1551	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1552	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1553	+ Object3D content = Grafreed.clipboard.get(0);
1447	1554
1448	1555	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1556	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1573,7 @@
1466	1573	//
1467	1574	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1575	{
	1576	+ Object source = event.getSource();
1469	1577	/*
1470	1578	if (event.getSource() == nameField)
1471	1579	{
..	..	@@ -1477,11 +1585,11 @@
1477	1585	}
1478	1586	else
1479	1587	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1588	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1589	{
1482	1590	ScreenFit();
1483	1591	} else
1484		- if (event.getSource() == switchItem)
	1592	+ if (source == switchItem)
1485	1593	{
1486	1594	cVector v1 = new cVector();
1487	1595	cVector v2 = new cVector();
..	..	@@ -1490,11 +1598,11 @@
1490	1598	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1599	objEditor.cameraView.repaint();
1492	1600	} else
1493		- if (event.getSource() == rectoidItem)
	1601	+ if (source == rectoidItem)
1494	1602	{
1495	1603	makeSomething(new Box());
1496	1604	} else
1497		- if (event.getSource() == particleItem)
	1605	+ if (source == particleItem)
1498	1606	{
1499	1607	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1608	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1623,9 @@
1515	1623	applyExample(particleGeom, "SMOKE");
1516	1624	makeSomething(particleGeom);
1517	1625	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1626	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1627	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1628	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1629
1522	1630	ragdoll.toParent = LA.newMatrix();
1523	1631	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1643,7 @@
1535	1643	} else
1536	1644	/*
1537	1645	*/
1538		- if (event.getSource() == heightFieldItem)
	1646	+ if (source == heightFieldItem)
1539	1647	{
1540	1648	Object3D obj = new Object3D();
1541	1649
..	..	@@ -1573,27 +1681,31 @@
1573	1681
1574	1682	makeSomething(obj);
1575	1683	} else
1576		- if (event.getSource() == gridItem)
	1684	+ if (source == gridItem)
1577	1685	{
1578	1686	makeSomething(new Grid());
1579	1687	} else
1580		- if (event.getSource() == ellipsoidItem)
	1688	+ if (source == ellipsoidItem)
1581	1689	{
1582	1690	makeSomething(new Sphere());
1583	1691	} else
1584		- if (event.getSource() == coneItem)
	1692	+ if (source == coneItem)
1585	1693	{
1586	1694	makeSomething(new Cone());
1587	1695	} else
1588		- if (event.getSource() == torusItem)
	1696	+ if (source == torusItem)
1589	1697	{
1590	1698	makeSomething(new Torus());
1591	1699	} else
1592		- if (event.getSource() == superItem)
	1700	+ if (source == superItem)
1593	1701	{
1594	1702	makeSomething(new Superellipsoid());
1595	1703	} else
1596		- if (event.getSource() == blobItem)
	1704	+ if (source == kleinItem)
	1705	+ {
	1706	+ makeSomething(new Klein());
	1707	+ } else
	1708	+ if (source == blobItem)
1597	1709	{
1598	1710	Blob blob = new Blob();
1599	1711	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1713,15 @@
1601	1713	//blob.retile();
1602	1714	makeSomething(blob);
1603	1715	} else
1604		- if (event.getSource() == latheItem)
	1716	+ if (source == latheItem)
1605	1717	{
1606	1718	makeSomething(new Lathe());
1607	1719	} else
1608		- if (event.getSource() == bezierItem)
	1720	+ if (source == bezierItem)
1609	1721	{
1610	1722	makeSomething(new BezierSurface());
1611	1723	} else
1612		- if (event.getSource() == checkerItem)
	1724	+ if (source == overlayItem)
1613	1725	{
1614	1726	/*
1615	1727	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1736,7 @@
1624	1736	*/
1625	1737	makeSomething(new Checker());
1626	1738	} else
1627		- if (event.getSource() == meshItem)
	1739	+ if (source == meshItem)
1628	1740	{
1629	1741	Object3D itemtomake = new Object3D();
1630	1742	Object3D child;
..	..	@@ -1645,35 +1757,35 @@
1645	1757	makeSomething(child);
1646	1758	}
1647	1759	} else
1648		- if (event.getSource() == springItem)
	1760	+ if (source == springItem)
1649	1761	{
1650	1762	cSpring s = new cSpring();
1651	1763	s.setup();
1652	1764	makeSomething(s);
1653	1765	} else
1654		- if (event.getSource() == flagItem)
	1766	+ if (source == flagItem)
1655	1767	{
1656	1768	cSpring s = new cFlag();
1657	1769	s.setup();
1658	1770	makeSomething(s);
1659	1771	} else
1660		- if (event.getSource() == lightItem)
	1772	+ if (source == lightItem)
1661	1773	{
1662	1774	makeSomething(new Light());
1663	1775	} else
1664		- if (event.getSource() == csgItem)
	1776	+ if (source == csgItem)
1665	1777	{
1666	1778	group(new CSG());
1667	1779	} else
1668		- if (event.getSource() == templateItem)
	1780	+ if (source == templateItem)
1669	1781	{
1670	1782	group(new cTemplate());
1671	1783	} else
1672		- if (event.getSource() == attributeItem)
	1784	+ if (source == attributeItem)
1673	1785	{
1674	1786	makeSomething(new Attribute());
1675	1787	} else
1676		- if (event.getSource() == pointflowItem)
	1788	+ if (source == pointflowItem)
1677	1789	{
1678	1790	makeSomething(new PointFlow());
1679	1791	} else
..	..	@@ -1685,7 +1797,7 @@
1685	1797	} else
1686	1798	*/
1687	1799
1688		- if (event.getSource() == superLoopItem)
	1800	+ if (source == superLoopItem)
1689	1801	{
1690	1802	Composite g = new cGroup();
1691	1803	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1819,7 @@
1707	1819
1708	1820	group(g);
1709	1821	} else
1710		- if (event.getSource() == loopItem)
	1822	+ if (source == loopItem)
1711	1823	{
1712	1824	Composite csg = new GroupLeaf();
1713	1825	csg.count = 5;
..	..	@@ -1716,7 +1828,7 @@
1716	1828	csg.addChild(child);
1717	1829	child.addChild(csg);
1718	1830	} else
1719		- if (event.getSource() == doubleItem)
	1831	+ if (source == doubleItem)
1720	1832	{
1721	1833	Composite csg = new GroupLeaf();
1722	1834	csg.count = 5;
..	..	@@ -1728,7 +1840,7 @@
1728	1840	csg.addChild(child);
1729	1841	child.addChild(csg);
1730	1842	} else
1731		- if (event.getSource() == tripleItem)
	1843	+ if (source == tripleItem)
1732	1844	{
1733	1845	Composite csg = new GroupLeaf();
1734	1846	csg.count = 4;
..	..	@@ -1744,70 +1856,83 @@
1744	1856	child.addChild(csg);
1745	1857	} else
1746	1858
1747		- if (event.getSource() == importGFDItem)
	1859	+ if (source == importGFDItem)
1748	1860	{
1749	1861	ImportGFD();
1750	1862	} else
1751		- if (event.getSource() == importVRMLX3DItem)
	1863	+ if (source == importVRMLX3DItem)
1752	1864	{
1753	1865	ImportVRMLX3D();
1754	1866	} else
1755		- if (event.getSource() == import3DSItem)
	1867	+ if (source == import3DSItem)
1756	1868	{
1757	1869	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758	1870	} else
1759		- if (event.getSource() == importOBJItem)
	1871	+ if (source == importOBJItem)
1760	1872	{
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1874	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1875	+ browser.setVisible(true);
	1876	+ String filename = browser.getFile();
	1877	+ if (filename != null && filename.length() > 0)
	1878	+ {
	1879	+ String fullname = browser.getDirectory() + filename;
	1880	+ makeSomething(ReadOBJ(fullname), true);
	1881	+ }
1762	1882	} else
1763		- if (event.getSource() == computeAOItem)
	1883	+ if (source == computeAOItem)
1764	1884	{
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
	1885	+ Globals.drawMode = CameraPane.OCCLUSION;
	1886	+ Globals.theRenderer.repaint();
1767	1887	} else
1768		- if (event.getSource() == recompileItem)
	1888	+ if (source == recompileItem)
1769	1889	{
1770	1890	Recompile();
1771	1891	refreshContents();
1772	1892	} else
1773		- if (event.getSource() == editScriptItem)
	1893	+ if (source == editScriptItem)
1774	1894	{
1775	1895	OpenDialog();
1776	1896	refreshContents();
1777	1897	} else
1778		- if (event.getSource() == invariantsItem)
	1898	+ if (source == invariantsItem)
1779	1899	{
1780	1900	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1901	+ Grafreed.grafreeD.universe.invariants();
1782	1902	} else
1783		- if (event.getSource() == memoryItem)
	1903	+ if (source == memoryItem)
1784	1904	{
1785	1905	//System.out.println("Invariants:");
1786	1906	PrintMemory();
1787	1907	} else
1788		- if (event.getSource() == pathItem)
	1908	+ if (source == pathItem)
1789	1909	{
1790	1910	PrintPath();
1791	1911	} else
1792		- if (event.getSource() == analyzeItem)
	1912	+ if (source == analyzeItem)
1793	1913	{
1794	1914	AnalyzeObject();
1795	1915	} else
1796		- if (event.getSource() == dumpItem)
	1916	+ if (source == dumpItem)
1797	1917	{
1798	1918	DumpObject();
1799	1919	} else
1800		- if (event.getSource() == screenfitButton)
	1920	+ if (source == oneStepButton)
	1921	+ {
	1922	+ Globals.ONESTEP = true;
	1923	+ cameraView.repaint();
	1924	+ } else
	1925	+ if (source == screenfitButton)
1801	1926	{
1802	1927	//Reload(lastConverter, lastFilename, true);
1803	1928	ScreenFit();
1804	1929	} else
1805		- if (event.getSource() == screenfitpointButton)
	1930	+ if (source == screenfitpointButton)
1806	1931	{
1807	1932	//Reload(lastConverter, lastFilename, true);
1808	1933	ScreenFitPoint();
1809	1934	} else
1810		- if (event.getSource() == snapobjectButton)
	1935	+ if (source == snapobjectButton)
1811	1936	{
1812	1937	//Reload(lastConverter, lastFilename, true);
1813	1938	SnapObject();
..	..	@@ -1818,13 +1943,13 @@
1818	1943	// Recompile();
1819	1944	// refreshContents();
1820	1945	// } else
1821		- if (event.getSource() == gcButton)
	1946	+ if (source == gcButton)
1822	1947	{
1823	1948	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	1949	System.gc();
1825	1950	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	1951	} else
1827		- if (event.getSource() == editLeafItem)
	1952	+ if (source == editLeafItem)
1828	1953	{
1829	1954	Object3D obj;
1830	1955	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +1963,70 @@
1838	1963	}
1839	1964	refreshContents(true);
1840	1965	} else
1841		- if (event.getSource() == openWindowItem)
	1966	+ if (source == openWindowItem)
1842	1967	{
1843	1968	EditSelection(true);
1844	1969	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1970	+ if (source == cutItem \|\| source == clearButton)
1846	1971	{
1847	1972	loadClipboard(true);
1848	1973	} else
1849		- if (event.getSource() == duplicateItem)
	1974	+ if (source == duplicateItem)
1850	1975	{
1851		- Object3D keep = GraphreeD.clipboard;
	1976	+ Object3D keep = Grafreed.clipboard;
1852	1977	loadClipboard(false);
1853	1978	paste(false);
1854		- GraphreeD.clipboard = keep;
	1979	+ Grafreed.clipboard = keep;
1855	1980	} else
1856		- if (event.getSource() == cloneItem)
	1981	+ if (source == cloneItem)
1857	1982	{
1858	1983	CloneSelection(false);
1859	1984	} else
1860		- if (event.getSource() == cloneSupportItem)
	1985	+ if (source == cloneSupportItem)
1861	1986	{
1862	1987	CloneSelection(true);
1863	1988	} else
1864		- if (event.getSource() == copyItem)
	1989	+ if (source == copyItem)
1865	1990	{
1866	1991	loadClipboard(false);
1867	1992	} else
1868		- if (event.getSource() == pasteItem)
	1993	+ if (source == pasteItem)
1869	1994	{
1870	1995	paste(false);
1871	1996	} else
1872		- if (event.getSource() == pasteLinkItem)
	1997	+ if (source == pasteIntoItem)
1873	1998	{
1874		- pasteInto(false);
	1999	+ pasteInto(true, false);
1875	2000	} else
1876		- if (event.getSource() == pasteCloneItem)
	2001	+ if (source == pasteLinkItem)
1877	2002	{
1878		- pasteInto(true);
	2003	+ pasteInto(false, false);
1879	2004	} else
1880		- if (event.getSource() == pasteExpandItem)
	2005	+ if (source == pasteCloneItem)
	2006	+ {
	2007	+ pasteInto(true, true);
	2008	+ } else
	2009	+ if (source == pasteExpandItem)
1881	2010	{
1882	2011	paste(true);
1883	2012	} else
1884		- if (event.getSource() == synchronizeItem)
	2013	+ if (source == synchronizeItem)
1885	2014	{
1886	2015	Overwrite(Object3D.TRANSFORM);
1887	2016	} else
1888		- if (event.getSource() == overwriteNameItem)
	2017	+ if (source == overwriteNameItem)
1889	2018	{
1890	2019	Overwrite(Object3D.NAME);
1891	2020	} else
1892		- if (event.getSource() == overwriteUVItem)
	2021	+ if (source == overwriteUVItem)
1893	2022	{
1894	2023	Overwrite(Object3D.UV);
1895	2024	} else
1896		- if (event.getSource() == overwriteMatItem)
	2025	+ if (source == overwriteMatItem)
1897	2026	{
	2027	+ /* july 2015
1898	2028	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2029	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2030	else
1901	2031	{
1902	2032	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2038,16 @@
1908	2038	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2039	}
1910	2040	}
	2041	+ */
	2042	+
	2043	+ Overwrite(dropAttributes);
1911	2044	}
1912		- if (event.getSource() == overwriteGeoItem)
	2045	+ if (source == overwriteGeoItem)
1913	2046	{
1914	2047	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2048	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2049	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2050	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2051	//
1919	2052	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2053	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2059,7 @@
1926	2059	// refreshContents();
1927	2060	// }
1928	2061	} else
1929		- if (event.getSource() == generateMeshItem)
	2062	+ if (source == generateMeshItem)
1930	2063	{
1931	2064	//if (group.selection.size() == 1)
1932	2065	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2070,7 @@
1937	2070	ResetModel();
1938	2071	refreshContents();
1939	2072	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2073	+ if (source == extractGeometriesItem)
1941	2074	{
1942	2075	boolean one = false;
1943	2076
..	..	@@ -1964,7 +2097,7 @@
1964	2097	ResetModel();
1965	2098	refreshContents();
1966	2099	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2100	+ if (source == cloneGeometriesItem)
1968	2101	{
1969	2102	boolean one = false;
1970	2103
..	..	@@ -1990,32 +2123,37 @@
1990	2123	ResetModel();
1991	2124	refreshContents();
1992	2125	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2126	+ if (source == shareGeometriesItem)
1994	2127	{
1995	2128	boolean one = false;
1996	2129
1997	2130	if (group.selection.size() == 1)
1998	2131	one = true;
1999	2132
	2133	+ Object3D merge = null;
	2134	+
2000	2135	Object3D content = new cGroup();
2001	2136
2002	2137	for (int i=0; i<group.selection.size(); i++)
2003	2138	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2139	+ merge = new Merge(group.selection.get(i));
2005	2140
2006	2141	if (one)
2007		- makeSomething(sel, false);
	2142	+ makeSomething(merge, false);
2008	2143	else
2009		- content.addChild(sel);
	2144	+ content.addChild(merge);
2010	2145	}
2011	2146
2012	2147	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2148	+ makeSomething(content, true);
	2149	+ else
	2150	+ {
	2151	+ ResetModel();
	2152	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2153	+ refreshContents();
	2154	+ }
2017	2155	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2156	+ if (source == mergeGeometriesItem)
2019	2157	{
2020	2158	boolean one = false;
2021	2159
..	..	@@ -2045,11 +2183,11 @@
2045	2183	ResetModel();
2046	2184	refreshContents();
2047	2185	} else
2048		- if (event.getSource() == linkverticesItem)
	2186	+ if (source == linkverticesItem)
2049	2187	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2188	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2189	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2190	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2191	//
2054	2192	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2193	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2196,48 @@
2058	2196	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2197	// refreshContents();
2060	2198	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2199	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2200	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2201	+ Object3D content = Grafreed.clipboard.get(0);
2064	2202
2065	2203	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2204	content = ((cGroup)content).get(0);
2067	2205
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2206	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2207	for (int i=0; i<group.selection.size(); i++)
2070	2208	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2209	+ boolean random = CameraPane.SWITCH;
	2210	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2211	group.selection.get(i).linkVerticesThis(content);
2074	2212	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2213	+ CameraPane.SWITCH = random;
2076	2214	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2215	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2216	refreshContents();
2079	2217	}
2080	2218	} else
2081		- if (event.getSource() == resetsupportItem)
	2219	+ if (source == resetsupportItem)
2082	2220	{
2083	2221	for (int i=0; i<group.selection.size(); i++)
2084	2222	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2223	+ boolean random = CameraPane.SWITCH;
	2224	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2225	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2226	+ CameraPane.SWITCH = random;
2089	2227	}
2090	2228
2091	2229	refreshContents();
2092	2230	} else
2093		- if (event.getSource() == resetreferencesItem)
	2231	+ if (source == relinkverticesItem)
	2232	+ {
	2233	+ boolean random = CameraPane.SWITCH;
	2234	+ CameraPane.SWITCH = false; // parse all random nodes
	2235	+ group.selection.RelinkToSupport();
	2236	+ CameraPane.SWITCH = random;
	2237	+
	2238	+ refreshContents();
	2239	+ } else
	2240	+ if (source == resetreferencesItem)
2094	2241	{
2095	2242	for (int i=0; i<group.selection.size(); i++)
2096	2243	{
..	..	@@ -2099,11 +2246,11 @@
2099	2246
2100	2247	refreshContents();
2101	2248	} else
2102		- if (event.getSource() == setMasterItem)
	2249	+ if (source == setMasterItem)
2103	2250	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2251	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2252	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2253	+ Object3D content = Grafreed.clipboard.get(0);
2107	2254
2108	2255	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2256	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2259,13 @@
2112	2259	refreshContents();
2113	2260	}
2114	2261	} else
2115		- if (event.getSource() == poseMeshItem)
	2262	+ if (source == poseMeshItem)
2116	2263	{
2117	2264	if (group.selection.size() == 1)
2118	2265	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2266	+ if (Grafreed.clipboard.size() == 1)
2120	2267	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2268	+ Object3D content = Grafreed.clipboard.get(0);
2122	2269
2123	2270	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2271	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2278,19 @@
2131	2278	}
2132	2279
2133	2280	} else
2134		- if (event.getSource() == revertMeshItem)
	2281	+ if (source == revertMeshItem)
2135	2282	{
2136	2283	RevertMeshes();
2137	2284	} else
2138		- if (event.getSource() == resetMeshItem)
	2285	+ if (source == resetAllItem)
2139	2286	{
2140	2287	ResetAll();
2141	2288	} else
2142		- if (event.getSource() == stepAllItem)
	2289	+ if (source == stepAllItem)
2143	2290	{
2144	2291	StepAll();
2145	2292	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2293	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2294	{
2148	2295	//int indices[] = jList.getSelectedIndices();
2149	2296	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2298,46 @@
2151	2298
2152	2299	ClearSelection(false);
2153	2300	} else
2154		- if (event.getSource() == clearAllItem)
	2301	+ if (source == clearAllItem)
2155	2302	{
2156	2303	ClearSelection(true);
2157	2304	} else
2158		- if (event.getSource() == grabItem)
	2305	+ if (source == grabItem)
2159	2306	{
2160	2307	group(new cGroup(), true);
2161	2308	} else
2162		- if (event.getSource() == frontItem)
	2309	+ if (source == hideItem)
	2310	+ {
	2311	+ group(new HiddenObject());
	2312	+ } else
	2313	+ if (source == frontItem)
2163	2314	{
2164	2315	front();
2165	2316	} else
2166		- if (event.getSource() == backItem)
	2317	+ if (source == backItem)
2167	2318	{
2168	2319	back();
2169	2320	} else
2170		- if (event.getSource() == cameraItem)
	2321	+ if (source == cameraItem)
2171	2322	{
2172	2323	makeSomething(new Camera());
2173	2324	} else
2174		- if (event.getSource() == compositeItem)
	2325	+ if (source == compositeItem)
2175	2326	{
2176	2327	group(new Composite());
2177	2328	} else
2178		- if (event.getSource() == randomItem)
	2329	+ if (source == randomItem)
2179	2330	{
2180	2331	RandomNode random = new RandomNode();
2181	2332	group(random);
2182	2333	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2334	+ random.name = random.get(0).name + "Switch";
2184	2335	} else
2185		- if (event.getSource() == physicsItem)
	2336	+ if (source == physicsItem)
2186	2337	{
2187	2338	group(new PhysicsNode());
2188	2339	} else
2189		- if (event.getSource() == frameselectorItem)
	2340	+ if (source == frameselectorItem)
2190	2341	{
2191	2342	for (int i=0; i<group.selection.size(); i++)
2192	2343	{
..	..	@@ -2198,7 +2349,7 @@
2198	2349	ResetModel();
2199	2350	refreshContents();
2200	2351	} else
2201		- if (event.getSource() == switchGeoItem)
	2352	+ if (source == switchGeoItem)
2202	2353	{
2203	2354	for (int i=0; i<group.selection.size(); i++)
2204	2355	{
..	..	@@ -2210,7 +2361,7 @@
2210	2361	ResetModel();
2211	2362	refreshContents();
2212	2363	} else
2213		- if (event.getSource() == switchTransfoItem)
	2364	+ if (source == switchTransfoItem)
2214	2365	{
2215	2366	for (int i=0; i<group.selection.size(); i++)
2216	2367	{
..	..	@@ -2222,7 +2373,7 @@
2222	2373	ResetModel();
2223	2374	refreshContents();
2224	2375	} else
2225		- if (event.getSource() == morphItem)
	2376	+ if (source == morphItem)
2226	2377	{
2227	2378	for (int i=0; i<group.selection.size(); i++)
2228	2379	{
..	..	@@ -2234,7 +2385,7 @@
2234	2385	ResetModel();
2235	2386	refreshContents();
2236	2387	} else
2237		- if (event.getSource() == scriptNodeItem)
	2388	+ if (source == scriptNodeItem)
2238	2389	{
2239	2390	boolean atleastone = false;
2240	2391
..	..	@@ -2273,195 +2424,223 @@
2273	2424	}
2274	2425	}
2275	2426	} else
2276		- if (event.getSource() == linkerItem)
	2427	+ if (source == linkerItem)
2277	2428	{
2278	2429	group(new cLinker());
2279	2430	} else
2280		- if (event.getSource() == textureItem)
	2431	+ if (source == textureItem)
2281	2432	{
2282	2433	group(new TextureNode());
2283	2434	} else
2284		- if (event.getSource() == shadowXItem)
	2435	+ if (source == billboardItem)
	2436	+ {
	2437	+ group(new BillboardNode());
	2438	+ } else
	2439	+ if (source == shadowXItem)
2285	2440	{
2286	2441	CastShadow(0);
2287	2442	} else
2288		- if (event.getSource() == shadowYItem)
	2443	+ if (source == shadowYItem)
2289	2444	{
2290	2445	CastShadow(1);
2291	2446	} else
2292		- if (event.getSource() == shadowZItem)
	2447	+ if (source == shadowZItem)
2293	2448	{
2294	2449	CastShadow(2);
2295	2450	} else
2296		- if (event.getSource() == ungroupItem)
	2451	+ if (source == ungroupItem)
2297	2452	{
2298		- ungroup();
	2453	+ //ungroup();
	2454	+ for (int i=0; i<group.selection.size(); i++)
	2455	+ {
	2456	+ Ungroup(group.selection.get(i));
	2457	+ }
	2458	+
	2459	+ ClearSelection(false);
	2460	+
	2461	+ refreshContents();
2299	2462	} else
2300		- if (event.getSource() == genUVItem)
	2463	+ if (source == genUVItem)
2301	2464	{
2302	2465	GenUV();
2303	2466	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2467	+ if (source == genNormalsCADItem)
2305	2468	{
2306	2469	GenNormals(true);
2307	2470	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2471	+ if (source == genNormalsMESHItem)
	2472	+ {
	2473	+ GenNormals(true); // TODO
	2474	+ } else
	2475	+ if (source == genNormalsORGANItem)
2309	2476	{
2310	2477	GenNormals(false);
2311	2478	} else
2312		- if (event.getSource() == stripifyItem)
	2479	+ if (source == genNormalsMINEItem)
	2480	+ {
	2481	+ GenNormalsMINE();
	2482	+ } else
	2483	+ if (source == stripifyItem)
2313	2484	{
2314	2485	Stripify();
2315	2486	} else
2316		- if (event.getSource() == unstripifyItem)
	2487	+ if (source == unstripifyItem)
2317	2488	{
2318	2489	Unstripify();
2319	2490	} else
2320		- if (event.getSource() == trimItem)
	2491	+ if (source == trimItem)
2321	2492	{
2322	2493	Trim();
2323	2494	} else
2324		- if (event.getSource() == untrimItem)
	2495	+ if (source == untrimItem)
2325	2496	{
2326	2497	Untrim();
2327	2498	} else
2328		- if (event.getSource() == clearColorsItem)
	2499	+ if (source == clearColorsItem)
2329	2500	{
2330	2501	ClearColors();
2331	2502	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2503	+ if (source == clearMaterialsItem)
2333	2504	{
2334	2505	ClearMaterials();
2335	2506	} else
2336		- if (event.getSource() == liveleavesItem)
	2507	+ if (source == liveleavesItem)
2337	2508	{
2338	2509	LiveLeaves(true);
2339	2510	} else
2340		- if (event.getSource() == unliveleavesItem)
	2511	+ if (source == unliveleavesItem)
2341	2512	{
2342	2513	LiveLeaves(false);
2343	2514	} else
2344		- if (event.getSource() == supportleavesItem)
	2515	+ if (source == supportleavesItem)
2345	2516	{
2346	2517	SupportLeaves(true);
2347	2518	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2519	+ if (source == unsupportleavesItem)
2349	2520	{
2350	2521	SupportLeaves(false);
2351	2522	} else
2352		- if (event.getSource() == hideleavesItem)
	2523	+ if (source == hideleavesItem)
2353	2524	{
2354	2525	HideLeaves(true);
2355	2526	} else
2356		- if (event.getSource() == showleavesItem)
	2527	+ if (source == showleavesItem)
2357	2528	{
2358	2529	HideLeaves(false);
2359	2530	} else
2360		- if (event.getSource() == markleavesItem)
	2531	+ if (source == markleavesItem)
2361	2532	{
2362	2533	MarkLeaves(true);
2363	2534	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2535	+ if (source == unmarkleavesItem)
2365	2536	{
2366	2537	MarkLeaves(false);
2367	2538	} else
2368		- if (event.getSource() == flipVItem)
	2539	+ if (source == flipVItem)
2369	2540	{
2370	2541	FlipV(true);
2371	2542	} else
2372		- if (event.getSource() == unflipVItem)
	2543	+ if (source == unflipVItem)
2373	2544	{
2374	2545	FlipV(false);
2375	2546	} else
2376		- if (event.getSource() == lowTexturesItem)
	2547	+ if (source == lowTexturesItem)
2377	2548	{
2378	2549	SetTexRes(0);
2379	2550	} else
2380		- if (event.getSource() == normalTexturesItem)
	2551	+ if (source == normalTexturesItem)
2381	2552	{
2382	2553	SetTexRes(1);
2383	2554	} else
2384		- if (event.getSource() == highTexturesItem)
	2555	+ if (source == highTexturesItem)
2385	2556	{
2386	2557	SetTexRes(2);
2387	2558	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2559	+ if (source == veryhighTexturesItem)
2389	2560	{
2390	2561	SetTexRes(3);
2391	2562	} else
2392		- if (event.getSource() == maxTexturesItem)
	2563	+ if (source == maxTexturesItem)
2393	2564	{
2394	2565	SetTexRes(4);
2395	2566	} else
2396		- if (event.getSource() == panoTexturesItem)
	2567	+ if (source == panoTexturesItem)
2397	2568	{
2398	2569	SetTexRes(5);
2399	2570	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2571	+ if (source == reverseNormalsItem)
2401	2572	{
2402	2573	ReverseNormals();
2403	2574	} else
2404		- if (event.getSource() == parseverticesItem)
	2575	+ if (source == parseverticesItem)
2405	2576	{
2406	2577	ParseVertices();
2407	2578	} else
2408		- if (event.getSource() == textureFieldItem)
	2579	+ if (source == textureFieldItem)
2409	2580	{
2410	2581	TextureVertices();
2411	2582	} else
2412		- if (event.getSource() == alignItem)
	2583	+ if (source == alignItem)
2413	2584	{
2414	2585	Align();
2415	2586	} else
2416		- if (event.getSource() == mirrorItem)
	2587	+ if (source == mirrorItem)
2417	2588	{
2418	2589	MirrorPoses();
2419	2590	} else
2420		- if (event.getSource() == reduceMorphItem)
	2591	+ if (source == reduceMorphItem)
2421	2592	{
2422	2593	MeshReduction(false);
2423	2594	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2595	+ if (source == reduce34MorphItem)
2425	2596	{
2426	2597	MeshReduction(true);
2427	2598	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2599	+ if (source == reverseTrianglesItem)
2429	2600	{
2430	2601	ReverseTriangles();
2431	2602	} else
2432		- if (event.getSource() == reduceMeshItem)
	2603	+ if (source == reduceMeshItem)
2433	2604	{
2434	2605	ReduceMesh(false);
2435	2606	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2607	+ if (source == reduce34MeshItem)
2437	2608	{
2438	2609	ReduceMesh(true);
2439	2610	} else
2440		- if (event.getSource() == increaseMeshItem)
	2611	+ if (source == increaseMeshItem)
2441	2612	{
2442	2613	IncreaseMesh();
2443	2614	} else
2444		- if (event.getSource() == clipMeshItem)
	2615	+ if (source == clipMeshItem)
2445	2616	{
2446	2617	ClipMesh();
2447	2618	} else
2448		- if (event.getSource() == smoothMeshItem)
	2619	+ if (source == smoothMeshItem)
2449	2620	{
2450	2621	SmoothMesh();
2451	2622	} else
2452		- if (event.getSource() == transformgeometryItem)
	2623	+ if (source == transformGeometryItem)
2453	2624	{
2454	2625	TransformGeometry();
2455	2626	} else
2456		- if (event.getSource() == resetTransformItem)
	2627	+ if (source == transformChildrenItem)
	2628	+ {
	2629	+ TransformChildren();
	2630	+ } else
	2631	+ if (source == resetTransformItem)
2457	2632	{
2458	2633	ResetTransform();
2459	2634	} else
2460		- if (event.getSource() == resetCentroidItem)
	2635	+ if (source == resetCentroidItem)
2461	2636	{
2462		- ResetCentroid();
	2637	+ ResetCentroid(true);
2463	2638	} else
2464		- if (event.getSource() == resetParentItem)
	2639	+ if (source == resetCentroidXZItem)
	2640	+ {
	2641	+ ResetCentroid(false);
	2642	+ } else
	2643	+ if (source == resetParentItem)
2465	2644	{
2466	2645	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2646	{
..	..	@@ -2471,7 +2650,7 @@
2471	2650
2472	2651	refreshContents();
2473	2652	} else
2474		- if (event.getSource() == repairParentItem)
	2653	+ if (source == repairParentItem)
2475	2654	{
2476	2655	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2656	{
..	..	@@ -2485,7 +2664,21 @@
2485	2664
2486	2665	refreshContents();
2487	2666	} else
2488		- if (event.getSource() == sortbysizeItem)
	2667	+ if (source == repairShadowItem)
	2668	+ {
	2669	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2670	+ {
	2671	+ Object3D obj = (Object3D)e.nextElement();
	2672	+ obj.RepairShadow();
	2673	+// for (int i=0; i<obj.size(); i++)
	2674	+// {
	2675	+// obj.get(i).parent = obj;
	2676	+// }
	2677	+ }
	2678	+
	2679	+ refreshContents();
	2680	+ } else
	2681	+ if (source == sortbysizeItem)
2489	2682	{
2490	2683	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2684	{
..	..	@@ -2497,7 +2690,7 @@
2497	2690	ResetModel();
2498	2691	refreshContents();
2499	2692	} else
2500		- if (event.getSource() == sortbynameItem)
	2693	+ if (source == sortbynameItem)
2501	2694	{
2502	2695	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2696	{
..	..	@@ -2509,7 +2702,7 @@
2509	2702	ResetModel();
2510	2703	refreshContents();
2511	2704	} else
2512		- if (event.getSource() == attachPigmentItem)
	2705	+ if (source == attachPigmentItem)
2513	2706	{
2514	2707	String texture = GetFile("Attach pigment");
2515	2708	Object3D obj;
..	..	@@ -2521,7 +2714,7 @@
2521	2714
2522	2715	refreshContents();
2523	2716	} else
2524		- if (event.getSource() == detachPigmentItem)
	2717	+ if (source == detachPigmentItem)
2525	2718	{
2526	2719	Object3D obj;
2527	2720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2725,7 @@
2532	2725
2533	2726	refreshContents();
2534	2727	} else
2535		- if (event.getSource() == attachBumpItem)
	2728	+ if (source == attachBumpItem)
2536	2729	{
2537	2730	String texture = GetFile("Attach bump");
2538	2731	Object3D obj;
..	..	@@ -2544,7 +2737,7 @@
2544	2737
2545	2738	refreshContents();
2546	2739	} else
2547		- if (event.getSource() == detachBumpItem)
	2740	+ if (source == detachBumpItem)
2548	2741	{
2549	2742	Object3D obj;
2550	2743	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2748,7 @@
2555	2748
2556	2749	refreshContents();
2557	2750	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2751	+ if (source == pigmentBumpItem)
2559	2752	{
2560	2753	Object3D obj;
2561	2754	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2759,195 @@
2566	2759
2567	2760	refreshContents();
2568	2761	} else
2569		- if (event.getSource() == flashSelectionButton)
	2762	+ if (source == flashSelectionButton)
2570	2763	{
2571	2764	CameraPane.flash = true;
2572	2765	refreshContents();
2573	2766	} else
2574		- if (event.getSource() == oneButton)
	2767	+ if (source == oneButton)
2575	2768	{
2576	2769	} else
2577		- if (event.getSource() == twoButton)
	2770	+ if (source == twoButton)
2578	2771	{
2579	2772	radio.layout = twoButton;
2580	2773	// bug
2581	2774	//gridPanel.setDividerLocation(1.0);
2582	2775	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	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	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2798	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2799	+// scenePanel.setVisible(false);
	2800	+// centralPanel.setVisible(true);
	2801	+// XYZPanel.setVisible(false);
	2802	+ bigThree.ClearUI();
	2803	+ bigThree.add(centralPanel);
	2804	+ bigThree.FlushUI();
2607	2805	} else
2608		- if (event.getSource() == threeButton)
	2806	+ if (source == threeButton)
2609	2807	{
2610	2808	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	2809	+
	2810	+// bigThree.remove(scenePanel);
	2811	+// bigThree.remove(centralPanel);
	2812	+// bigThree.remove(XYZPanel);
	2813	+// aWindowConstraints.gridx = 0;
	2814	+// aWindowConstraints.gridy = 0;
	2815	+// aWindowConstraints.gridwidth = 1;
	2816	+// // aConstraints.gridheight = 3;
	2817	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2818	+// aWindowConstraints.weightx = 0;
	2819	+// aWindowConstraints.weighty = 1;
	2820	+// //bigThree.add(jtp, aWindowConstraints);
	2821	+// aWindowConstraints.weightx = 1;
	2822	+// aWindowConstraints.gridwidth = 3;
	2823	+// // aConstraints.gridheight = 3;
	2824	+// aWindowConstraints.gridx = 1;
	2825	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2826	+// bigThree.add(centralPanel, aWindowConstraints);
	2827	+// aWindowConstraints.weightx = 0;
	2828	+// aWindowConstraints.gridx = 4;
	2829	+// aWindowConstraints.gridwidth = 1;
	2830	+// // aConstraints.gridheight = 3;
	2831	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2832	+// bigThree.add(XYZPanel, aWindowConstraints);
	2833	+// bigThree.validate();
	2834	+// scenePanel.setVisible(false);
	2835	+// centralPanel.setVisible(true);
	2836	+// XYZPanel.setVisible(true);
	2837	+ bigThree.ClearUI();
	2838	+ bigThree.add(centralPanel);
	2839	+ bigThree.add(XYZPanel);
	2840	+ bigThree.FlushUI();
2635	2841	} else
2636		- if (event.getSource() == fourButton)
	2842	+ if (source == fourButton)
2637	2843	{
2638	2844	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2845	+
	2846	+// bigThree.remove(scenePanel);
	2847	+// bigThree.remove(centralPanel);
	2848	+// bigThree.remove(XYZPanel);
	2849	+// aWindowConstraints.gridx = 0;
	2850	+// aWindowConstraints.gridy = 0;
	2851	+// aWindowConstraints.gridwidth = 1;
	2852	+// // aWindowConstraints.gridheight = 3;
	2853	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2854	+// aWindowConstraints.weightx = 1;
	2855	+// aWindowConstraints.weighty = 1;
	2856	+// bigThree.add(scenePanel, aWindowConstraints);
	2857	+// aWindowConstraints.weightx = 1;
	2858	+// aWindowConstraints.gridwidth = 3;
	2859	+// // aConstraints.gridheight = 3;
	2860	+// aWindowConstraints.gridx = 1;
	2861	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2862	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2863	+// aWindowConstraints.weightx = 0;
	2864	+// aWindowConstraints.gridx = 4;
	2865	+// aWindowConstraints.gridwidth = 1;
	2866	+// // aWindowConstraints.gridheight = 3;
	2867	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2868	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2869	+// bigThree.validate();
	2870	+// scenePanel.setVisible(true);
	2871	+// centralPanel.setVisible(false);
	2872	+// XYZPanel.setVisible(false);
	2873	+ bigThree.ClearUI();
	2874	+ bigThree.add(scenePanel);
	2875	+ bigThree.FlushUI();
2663	2876	} else
2664		- if (event.getSource() == sixButton)
	2877	+ if (source == sixButton)
2665	2878	{
2666	2879	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	2880	+
	2881	+// bigThree.remove(scenePanel);
	2882	+// bigThree.remove(centralPanel);
	2883	+// bigThree.remove(XYZPanel);
	2884	+// aWindowConstraints.gridx = 0;
	2885	+// aWindowConstraints.gridy = 0;
	2886	+// aWindowConstraints.gridwidth = 1;
	2887	+// // aConstraints.gridheight = 3;
	2888	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2889	+// aWindowConstraints.weightx = 0;
	2890	+// aWindowConstraints.weighty = 1;
	2891	+// bigThree.add(scenePanel, aWindowConstraints);
	2892	+// aWindowConstraints.weightx = 1;
	2893	+// aWindowConstraints.gridwidth = 3;
	2894	+// // aWindowConstraints.gridheight = 3;
	2895	+// aWindowConstraints.gridx = 1;
	2896	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2897	+// bigThree.add(centralPanel, aWindowConstraints);
	2898	+// aWindowConstraints.weightx = 0;
	2899	+// aWindowConstraints.gridx = 4;
	2900	+// aWindowConstraints.gridwidth = 1;
	2901	+// // aWindowConstraints.gridheight = 3;
	2902	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2903	+// //bigThree.add(XYZPanel, aConstraints);
	2904	+// bigThree.validate();
	2905	+// scenePanel.setVisible(true);
	2906	+// centralPanel.setVisible(true);
	2907	+// XYZPanel.setVisible(false);
	2908	+ bigThree.ClearUI();
	2909	+ bigThree.add(scenePanel);
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.FlushUI();
2691	2912	} else
2692		- if (event.getSource() == sevenButton)
	2913	+ if (source == sevenButton)
2693	2914	{
2694	2915	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	2916	+
	2917	+// bigThree.remove(scenePanel);
	2918	+// bigThree.remove(centralPanel);
	2919	+// bigThree.remove(XYZPanel);
	2920	+// aWindowConstraints.gridx = 0;
	2921	+// aWindowConstraints.gridy = 0;
	2922	+// aWindowConstraints.gridwidth = 1;
	2923	+// // aWindowConstraints.gridheight = 3;
	2924	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2925	+// aWindowConstraints.weightx = 0;
	2926	+// aWindowConstraints.weighty = 1;
	2927	+// bigThree.add(scenePanel, aWindowConstraints);
	2928	+// aWindowConstraints.weightx = 1;
	2929	+// aWindowConstraints.gridwidth = 3;
	2930	+// // aWindowConstraints.gridheight = 3;
	2931	+// aWindowConstraints.gridx = 1;
	2932	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2933	+// bigThree.add(centralPanel, aWindowConstraints);
	2934	+// aWindowConstraints.weightx = 0;
	2935	+// aWindowConstraints.gridx = 4;
	2936	+// aWindowConstraints.gridwidth = 1;
	2937	+// // aConstraints.gridheight = 3;
	2938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2939	+// bigThree.add(XYZPanel, aWindowConstraints);
	2940	+// bigThree.validate();
	2941	+// scenePanel.setVisible(true);
	2942	+// centralPanel.setVisible(true);
	2943	+// XYZPanel.setVisible(true);
	2944	+ bigThree.ClearUI();
	2945	+ bigThree.add(scenePanel);
	2946	+ bigThree.add(centralPanel);
	2947	+ bigThree.add(XYZPanel);
	2948	+ bigThree.FlushUI();
2719	2949	} else
2720		- if (event.getSource() == rootButton)
	2950	+ if (source == rootButton)
2721	2951	{
2722	2952	Object3D obj;
2723	2953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2729,7 +2959,7 @@
2729	2959
2730	2960	refreshContents(true);
2731	2961	} else
2732		- if (event.getSource() == closeButton)
	2962	+ if (source == closeButton)
2733	2963	{
2734	2964	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	2965	cRadio ab;
..	..	@@ -2750,11 +2980,11 @@
2750	2980	}
2751	2981	refreshContents(true);
2752	2982	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2983	+ if (source == editItem \|\| source == editButton)
2754	2984	{
2755	2985	EditSelection(false);
2756	2986	} else
2757		- if (event.getSource() == uneditButton)
	2987	+ if (source == uneditButton)
2758	2988	{
2759	2989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	2990	{
..	..	@@ -2766,12 +2996,12 @@
2766	2996
2767	2997	child.editWindow = null; // ???????????
2768	2998	}
2769		- objEditor.ctrlPanel.revalidate();
	2999	+ objEditor.ctrlPanel.FlushUI();
2770	3000	//objEditor.jTree.clearSelection();
2771	3001	//objEditor.ResetSliders();
2772	3002	refreshContents(true);
2773	3003	} else
2774		- if (event.getSource() == clearPanelButton)
	3004	+ if (source == clearPanelButton)
2775	3005	{
2776	3006	assert(copy == group);
2777	3007	//copy.ClearUI();
..	..	@@ -2782,7 +3012,7 @@
2782	3012	listUI.clear();
2783	3013	refreshContents(true);
2784	3014	} else
2785		- if (event.getSource() == allParamsButton)
	3015	+ if (source == allParamsButton)
2786	3016	{
2787	3017	assert(copy == group);
2788	3018
..	..	@@ -2803,19 +3033,19 @@
2803	3033
2804	3034	refreshContents(true);
2805	3035	} else
2806		- if (event.getSource() == unselectButton)
	3036	+ if (source == unselectButton)
2807	3037	{
2808	3038	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3039	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3040	objEditor.ResetSliders();
2811	3041	refreshContents(true);
2812	3042	} else
2813		- if(event.getSource() instanceof cRadio)
	3043	+ if(source instanceof cRadio)
2814	3044	{
2815	3045	group.parent = keepparent;
2816	3046	group.attributes = 0;
2817	3047	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3048	+ /cRadio/ radio = (cRadio)source;
2819	3049	Object3D obj = radio.GetObject();
2820	3050	System.out.println("Edit " + obj);
2821	3051	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3065,7 @@
2835	3065	}
2836	3066
2837	3067	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3068	+ //Globals.theRenderer.object = group;
2839	3069	if(!useclient)
2840	3070	{
2841	3071	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3074,15 @@
2844	3074	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3075	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3076	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3077	+ //cameraView.lighttouched = true;
	3078	+ Globals.lighttouched = true;
2848	3079	topView.object = group;
2849	3080	frontView.object = group;
2850	3081	sideView.object = group;
2851	3082	}
2852		- group.editWindow = this;
	3083	+
	3084	+// fix "+" issue group.editWindow = this;
	3085	+
2853	3086	/*
2854	3087	currentLayout = radio.layout;
2855	3088	if (currentLayout == null)
..	..	@@ -2880,7 +3113,7 @@
2880	3113	if (useclient)
2881	3114	{
2882	3115	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3116	+ Globals.lighttouched = true;
2884	3117	//topView.object = client;
2885	3118	//frontView.object = client;
2886	3119	//sideView.object = client;
..	..	@@ -2888,7 +3121,7 @@
2888	3121	else
2889	3122	{
2890	3123	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3124	+ Globals.lighttouched = true;
2892	3125	//topView.object = group;
2893	3126	//frontView.object = group;
2894	3127	//sideView.object = group;
..	..	@@ -2923,6 +3156,28 @@
2923	3156	refreshContents();
2924	3157	}
2925	3158
	3159	+ void TransformChildren()
	3160	+ {
	3161	+ Object3D obj;
	3162	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3163	+ {
	3164	+ obj = (Object3D)e.nextElement();
	3165	+ obj.KeepTextureMatrices();
	3166	+ obj.TransformChildren();
	3167	+ obj.RestoreTextureMatrices();
	3168	+
	3169	+// if (obj.parent == null)
	3170	+// {
	3171	+// System.out.println("NULL PARENT!");
	3172	+// new Exception().printStackTrace();
	3173	+// }
	3174	+// else
	3175	+// TouchTransform(obj);
	3176	+// //obj.parent.Touch();
	3177	+ }
	3178	+
	3179	+ refreshContents();
	3180	+ }
2926	3181
2927	3182	void ResetTransform()
2928	3183	{
..	..	@@ -3035,7 +3290,7 @@
3035	3290	refreshContents();
3036	3291	}
3037	3292
3038		- void ResetCentroid()
	3293	+ void ResetCentroid(boolean full)
3039	3294	{
3040	3295	Object3D obj;
3041	3296	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3305,16 @@
3050	3305	LA.matIdentity(Object3D.mat);
3051	3306	obj.getBounds(minima, maxima, false);
3052	3307	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3308	+ if (full)
	3309	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3310	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3311	obj.TransformMesh(Object3D.mat);
	3312	+
3056	3313	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3314	+ if (full)
	3315	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3316	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3317	+
3059	3318	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3319	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3320	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3121,9 +3380,9 @@
3121	3380	obj = (Object3D)e.nextElement();
3122	3381
3123	3382	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3383	+ Grafreed.AnalyzeObject(obj);
3125	3384	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3385	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3386
3128	3387	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3388	}
..	..	@@ -3165,6 +3424,13 @@
3165	3424	void GenNormals(boolean crease)
3166	3425	{
3167	3426	group.GenNormalsS(crease);
	3427	+
	3428	+ refreshContents();
	3429	+ }
	3430	+
	3431	+ void GenNormalsMINE()
	3432	+ {
	3433	+ group.selection.GenNormalsMINE();
3168	3434
3169	3435	refreshContents();
3170	3436	}
..	..	@@ -3250,7 +3516,7 @@
3250	3516	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3517	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3518	//
3253		-// g.add(GraphreeD.clipboard);
	3519	+// g.add(GrafreeD.clipboard);
3254	3520	//
3255	3521	// buffer.add(g);
3256	3522	// }
..	..	@@ -3269,8 +3535,8 @@
3269	3535	// nodes = new Object3D();
3270	3536	// vertices = new Vector<Vertex>();
3271	3537	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3538	+// boolean epsequal = GrafreeD.epsequal;
	3539	+// GrafreeD.epsequal = true;
3274	3540	//
3275	3541	// for (int i=0; i<group.selection.size(); i++)
3276	3542	// {
..	..	@@ -3311,7 +3577,7 @@
3311	3577	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3578	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3579	//
3314		-// g.add(GraphreeD.clipboard);
	3580	+// g.add(GrafreeD.clipboard);
3315	3581	//
3316	3582	// buffer.add(g);
3317	3583	// }
..	..	@@ -3319,7 +3585,7 @@
3319	3585	// makeSomething(buffer, i==group.selection.size()-1);
3320	3586	// }
3321	3587	//
3322		-// GraphreeD.epsequal = epsequal;
	3588	+// GrafreeD.epsequal = epsequal;
3323	3589	//
3324	3590	// //buffer = null;
3325	3591	// temprep = null;
..	..	@@ -3330,8 +3596,8 @@
3330	3596
3331	3597	void ParseVertices()
3332	3598	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3599	+ boolean epsequal = Grafreed.epsequal;
	3600	+ Grafreed.epsequal = true;
3335	3601
3336	3602	for (int i=0; i<group.selection.size(); i++)
3337	3603	{
..	..	@@ -3356,7 +3622,7 @@
3356	3622	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3623	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3624
3359		- g.add(GraphreeD.clipboard);
	3625	+ g.add(Grafreed.clipboard);
3360	3626
3361	3627	buffer.add(g);
3362	3628	}
..	..	@@ -3371,7 +3637,7 @@
3371	3637	makeSomething(buffer, i==group.selection.size()-1);
3372	3638	}
3373	3639
3374		- GraphreeD.epsequal = epsequal;
	3640	+ Grafreed.epsequal = epsequal;
3375	3641
3376	3642	refreshContents();
3377	3643	}
..	..	@@ -3389,7 +3655,16 @@
3389	3655	String pigment = Object3D.GetPigment(tex);
3390	3656	//String bump = Object3D.GetBump(tex);
3391	3657
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3658	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3659	+
	3660	+ try
	3661	+ {
	3662	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3663	+ }
	3664	+ catch (Exception e)
	3665	+ {
	3666	+ System.err.println("FAIL: " + node);
	3667	+ }
3393	3668
3394	3669	double s = v.s;
3395	3670
..	..	@@ -3416,7 +3691,7 @@
3416	3691	scale /= 3;
3417	3692
3418	3693	scale /= 0xFF;
3419		- scale /= 4;
	3694	+ // c'est quoi ca? scale /= 4;
3420	3695
3421	3696	//v.AO = scale;
3422	3697
..	..	@@ -3437,12 +3712,26 @@
3437	3712
3438	3713	void Align()
3439	3714	{
	3715	+ if (group.selection.size() == 0)
	3716	+ return;
	3717	+
	3718	+ cVector bbmin = new cVector();
	3719	+ cVector bbmax = new cVector();
	3720	+
	3721	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3722	+
	3723	+ double dx = bbmax.x - bbmin.x;
	3724	+ double dy = bbmax.y - bbmin.y;
	3725	+ double dz = bbmax.z - bbmin.z;
	3726	+
	3727	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3728	+
3440	3729	for (int i=0; i<group.selection.size(); i++)
3441	3730	{
3442	3731	Object3D obj = group.selection.get(i);
3443	3732
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3733	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3734	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3735	}
3447	3736
3448	3737	refreshContents();
..	..	@@ -3455,7 +3744,7 @@
3455	3744	// ref.SaveSupports();
3456	3745	// Object3D par = ref.parent;
3457	3746	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3747	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3748	// ref.parent = par;
3460	3749	// ref.RestoreSupports();
3461	3750
..	..	@@ -3463,11 +3752,11 @@
3463	3752
3464	3753	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3754
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3755	+ boolean random = CameraPane.SWITCH;
	3756	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3757	lowres.linkVerticesThis(null);
3469	3758	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3759	+ CameraPane.SWITCH = random;
3471	3760
3472	3761	System.err.flush();
3473	3762
..	..	@@ -3485,7 +3774,7 @@
3485	3774	// lowres.SaveSupports();
3486	3775	// par = lowres.parent;
3487	3776	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3777	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3778	Object3D newlow = CloneObject(lowres, false);
3490	3779	newlow.name = sn.switchobject.get(i).name;
3491	3780	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3796,7 @@
3507	3796	return;
3508	3797
3509	3798	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3799	+ Object3D ref = Grafreed.clipboard.get(0);
3511	3800
3512	3801	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3802
..	..	@@ -3676,7 +3965,7 @@
3676	3965	group.selection.RelinkToSupport(); // july 2014
3677	3966	System.out.println("DONE.");
3678	3967	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3968	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	3969	}
3681	3970
3682	3971	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +3990,20 @@
3701	3990
3702	3991	void ClipMesh()
3703	3992	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3993	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	3994	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	3995	+ Object3D content = Grafreed.clipboard.get(0);
3707	3996
3708	3997	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	3998	content = ((cGroup)content).get(0);
3710	3999
3711	4000	// for (int i=0; i<group.selection.size(); i++)
3712	4001	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4002	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4003	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4004	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4005	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4006	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4007	System.out.println("DONE.");
3719	4008	refreshContents();
3720	4009	}
..	..	@@ -3847,7 +4136,7 @@
3847	4136	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4137
3849	4138	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4139	+ if(elem != group \|\| !newWindow)
3851	4140	{
3852	4141	// if (!(elem instanceof Composite))
3853	4142	// newWindow = false;
..	..	@@ -3952,25 +4241,25 @@
3952	4241	System.err.println("info : " + child.GetPath());
3953	4242	}
3954	4243	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4244	+// else
	4245	+// {
	4246	+// objEditor.SetMaterial(group); // .GetMaterial());
	4247	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4248	+// System.err.println("info : " + group.GetPath());
	4249	+// }
3961	4250
3962	4251	objEditor.SetText(); // jan 2014
3963	4252
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4253	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3965	4254	CameraPane.flash = true;
3966	4255
3967	4256	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3968	4257	// a camera
3969	4258	{
3970	4259	CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4260	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4261	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4262	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4263	}
3975	4264
3976	4265	refreshContents();
..	..	@@ -4052,12 +4341,12 @@
4052	4341	{
4053	4342	if (group.selection.isEmpty())
4054	4343	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4344	+ Grafreed.clipboardIsTempGroup = false;
4056	4345	Composite tGroup = null;
4057	4346	if (group.selection.size() > 0) // 1)
4058	4347	{
4059	4348	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4349	+ Grafreed.clipboardIsTempGroup = true;
4061	4350	}
4062	4351
4063	4352	if (cut)
..	..	@@ -4097,16 +4386,16 @@
4097	4386	//System.out.println("cut " + child);
4098	4387	//System.out.println("parent = " + child.parent);
4099	4388	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4389	+ if (Grafreed.clipboardIsTempGroup)
4101	4390	tGroup.add/Child/(tmp);
4102	4391	else
4103		- GraphreeD.clipboard = tmp;
	4392	+ Grafreed.clipboard = tmp;
4104	4393	}
4105	4394	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4395	+ if (Grafreed.clipboardIsTempGroup)
4107	4396	tGroup.add/Child/(child);
4108	4397	else
4109		- GraphreeD.clipboard = child;
	4398	+ Grafreed.clipboard = child;
4110	4399	}
4111	4400
4112	4401	//ResetModel();
..	..	@@ -4138,21 +4427,21 @@
4138	4427	//System.out.println("cut " + elem);
4139	4428	//System.out.println("parent = " + elem.parent);
4140	4429	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4430	+ if (Grafreed.clipboardIsTempGroup)
4142	4431	tGroup.add/Child/(tmp);
4143	4432	else
4144		- GraphreeD.clipboard = tmp;
	4433	+ Grafreed.clipboard = tmp;
4145	4434	}
4146	4435	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4436	+ if (Grafreed.clipboardIsTempGroup)
4148	4437	tGroup.add/Child/(child);
4149	4438	else
4150		- GraphreeD.clipboard = child;
	4439	+ Grafreed.clipboard = child;
4151	4440	}
4152	4441
4153	4442	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4443	+ if (Grafreed.clipboardIsTempGroup)
	4444	+ Grafreed.clipboard = tGroup;
4156	4445	if (cut)
4157	4446	{
4158	4447	ResetModel();
..	..	@@ -4162,11 +4451,11 @@
4162	4451
4163	4452	void paste(boolean expand)
4164	4453	{
4165		- // if (GraphreeD.clipboard == null)
	4454	+ // if (GrafreeD.clipboard == null)
4166	4455	// return;
4167	4456	boolean first = true;
4168	4457
4169		- if (GraphreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
4170	4459	{
4171	4460	Composite temp;
4172	4461
..	..	@@ -4177,7 +4466,7 @@
4177	4466	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4467	*/
4179	4468	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4469	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4470	{
4182	4471	Object3D child = (Object3D)e.nextElement();
4183	4472
..	..	@@ -4191,7 +4480,7 @@
4191	4480	else
4192	4481	elem = child.deepCopy(); // ?
4193	4482	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4483	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4484	// elem = elem.get(0);
4196	4485	makeSomething(elem, true); // ?? first);
4197	4486	//group.addChild(elem);
..	..	@@ -4211,23 +4500,23 @@
4211	4500	//Object3D cb = Applet3D.clipboard;
4212	4501	//temp.addChild(cb);
4213	4502	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4503	+ assert(Grafreed.clipboard.parent == null);
	4504	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4505	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4506	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4507	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4508	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4509	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4510	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4511	}
4223	4512
4224	4513	ResetModel();
4225	4514	refreshContents();
4226	4515	}
4227	4516
4228		- void pasteInto(boolean copyit)
	4517	+ void pasteInto(boolean copyit, boolean clone)
4229	4518	{
4230		-// if (GraphreeD.clipboard == null)
	4519	+// if (GrafreeD.clipboard == null)
4231	4520	// return;
4232	4521
4233	4522	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4543,22 @@
4254	4543	if (copyit)
4255	4544	{
4256	4545	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4546	+ if (clone)
	4547	+ {
	4548	+ CloneClipboard(false); // sept 2014
	4549	+ }
	4550	+ else
	4551	+ {
	4552	+ paste(false);
	4553	+ }
4258	4554	}
4259	4555	else
4260	4556	{
4261	4557	boolean first = true;
4262	4558
4263		- if (GraphreeD.clipboardIsTempGroup)
	4559	+ if (Grafreed.clipboardIsTempGroup)
4264	4560	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4561	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4562	Object3D copy;
4267	4563	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4564	{
..	..	@@ -4272,7 +4568,7 @@
4272	4568	}
4273	4569	} else
4274	4570	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4571	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4572	}
4277	4573	}
4278	4574	}
..	..	@@ -4464,6 +4760,26 @@
4464	4760	makeSomething(csg);
4465	4761	}
4466	4762
	4763	+ void Ungroup(Object3D g)
	4764	+ {
	4765	+ if (g instanceof HiddenObject)
	4766	+ {
	4767	+ HiddenObject h = (HiddenObject) g;
	4768	+
	4769	+ for (int i=0; i<h.ActualSize(); i++)
	4770	+ {
	4771	+ objEditor.makeSomething(h.get(i), false);
	4772	+ }
	4773	+ }
	4774	+ else
	4775	+ {
	4776	+ for (int i=0; i<g.Size(); i++)
	4777	+ {
	4778	+ objEditor.makeSomething(g.get(i), false);
	4779	+ }
	4780	+ }
	4781	+ }
	4782	+
4467	4783	void ungroup()
4468	4784	{
4469	4785	/*
..	..	@@ -4659,7 +4975,7 @@
4659	4975
4660	4976	void ImportGFD()
4661	4977	{
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4978	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4663	4979	browser.show();
4664	4980	String filename = browser.getFile();
4665	4981	if (filename != null && filename.length() > 0)
..	..	@@ -4697,7 +5013,7 @@
4697	5013
4698	5014	void ImportVRMLX3D()
4699	5015	{
4700		- if (GraphreeD.standAlone)
	5016	+ if (Grafreed.standAlone)
4701	5017	{
4702	5018	/**/
4703	5019	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4714,7 +5030,7 @@
4714	5030
4715	5031	String GetFile(String dialogName)
4716	5032	{
4717		- if (GraphreeD.standAlone)
	5033	+ if (Grafreed.standAlone)
4718	5034	{
4719	5035	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5036	browser.show();
..	..	@@ -4778,10 +5094,12 @@
4778	5094	cButton flashSelectionButton;
4779	5095	cButton editButton;
4780	5096	cButton uneditButton;
	5097	+ JCheckBox allParamsButton;
4781	5098	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5099	cButton unselectButton;
4784	5100
	5101	+ cButton oneStepButton;
	5102	+
4785	5103	cButton screenfitButton;
4786	5104	cButton screenfitpointButton;
4787	5105	cButton snapobjectButton;
..	..	@@ -4823,8 +5141,9 @@
4823	5141	private MenuItem resetsupportItem;
4824	5142	private MenuItem resetreferencesItem;
4825	5143	private MenuItem linkverticesItem;
	5144	+ private MenuItem relinkverticesItem;
4826	5145	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5146	+ private MenuItem resetAllItem;
4828	5147	private MenuItem stepAllItem;
4829	5148	private MenuItem revertMeshItem;
4830	5149	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5154,17 @@
4835	5154	private MenuItem mergeGeometriesItem;
4836	5155	private MenuItem copyItem;
4837	5156	private MenuItem pasteItem;
	5157	+ private MenuItem pasteIntoItem;
4838	5158	private MenuItem pasteLinkItem;
4839	5159	private MenuItem pasteCloneItem;
4840	5160	private MenuItem pasteExpandItem;
4841	5161	private MenuItem clearItem;
4842	5162	private MenuItem clearAllItem;
4843	5163	private MenuItem genUVItem;
	5164	+ private MenuItem genNormalsMESHItem;
4844	5165	private MenuItem genNormalsCADItem;
4845	5166	private MenuItem genNormalsORGANItem;
	5167	+ private MenuItem genNormalsMINEItem;
4846	5168	private MenuItem stripifyItem;
4847	5169	private MenuItem unstripifyItem;
4848	5170	private MenuItem trimItem;
..	..	@@ -4882,8 +5204,11 @@
4882	5204	private MenuItem panoTexturesItem;
4883	5205
4884	5206	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5207	+ private MenuItem resetCentroidXZItem;
4886	5208	private MenuItem resetTransformItem;
	5209	+ private MenuItem transformGeometryItem;
	5210	+ private MenuItem transformChildrenItem;
	5211	+ private MenuItem hideItem;
4887	5212	private MenuItem grabItem;
4888	5213	private MenuItem backItem;
4889	5214	private MenuItem frontItem;
..	..	@@ -4904,6 +5229,7 @@
4904	5229
4905	5230	private MenuItem resetParentItem;
4906	5231	private MenuItem repairParentItem;
	5232	+ private MenuItem repairShadowItem;
4907	5233	private MenuItem sortbysizeItem;
4908	5234	private MenuItem sortbynameItem;
4909	5235
..	..	@@ -4924,10 +5250,11 @@
4924	5250	private MenuItem coneItem;
4925	5251	private MenuItem torusItem;
4926	5252	private MenuItem superItem;
	5253	+ private MenuItem kleinItem;
4927	5254	private MenuItem blobItem;
4928	5255	private MenuItem latheItem;
4929	5256	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5257	+ private MenuItem overlayItem;
4931	5258	private MenuItem meshItem;
4932	5259	// private MenuItem meshGroupItem;
4933	5260	private MenuItem springItem;
..	..	@@ -4936,6 +5263,7 @@
4936	5263	private MenuItem csgItem;
4937	5264	private MenuItem templateItem;
4938	5265	private MenuItem textureItem;
	5266	+ private MenuItem billboardItem;
4939	5267	private MenuItem shadowXItem;
4940	5268	private MenuItem shadowYItem;
4941	5269	private MenuItem shadowZItem;