~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
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		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -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,26 +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);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
193		- resetMeshItem.addActionListener(this);
194		- stepAllItem = menu.add(new MenuItem("Step All"));
195		- stepAllItem.addActionListener(this);
	208	+ }
	209	+
	210	+ oe.menuBar.add(menu = new Menu("Setting"));
	211	+ if (Globals.ADVANCED)
	212	+ {
196	213	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	214	revertMeshItem.addActionListener(this);
198	215	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	216	resetreferencesItem.addActionListener(this);
200	217	menu.add("-");
	218	+ }
201	219	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	220	overwriteGeoItem.addActionListener(this);
203	221	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +227,68 @@
209	227	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	228	overwriteUVItem.addActionListener(this);
211	229	menu.add("-");
	230	+ if (Globals.ADVANCED)
	231	+ {
212	232	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	233	generateMeshItem.addActionListener(this);
214	234	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	235	poseMeshItem.addActionListener(this);
216	236	menu.add("-");
	237	+ }
217	238	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	239	resetsupportItem.addActionListener(this);
219	240	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	241	linkverticesItem.addActionListener(this);
	242	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	243	+ relinkverticesItem.addActionListener(this);
	244	+
	245	+ if (Globals.ADVANCED)
	246	+ {
221	247	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	248	setMasterItem.addActionListener(this);
	249	+ }
223	250
224		- oe.menuBar.add(menu = new Menu("Object"));
	251	+ oe.menuBar.add(menu = new Menu("Group"));
225	252	grabItem = menu.add(new MenuItem("Grab"));
226	253	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	254	backItem = menu.add(new MenuItem("Back"));
230	255	backItem.addActionListener(this);
	256	+ frontItem = menu.add(new MenuItem("Front"));
	257	+ frontItem.addActionListener(this);
231	258	compositeItem = menu.add(new MenuItem("Composite"));
232	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);
233	264	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	265	+ randomItem = menu.add(new MenuItem("Switch node"));
235	266	randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
240	267	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	268	switchGeoItem.addActionListener(this);
242	269	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	270	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	271	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	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);
246	281	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	282	scriptNodeItem.addActionListener(this);
248	283	cameraItem = menu.add(new MenuItem("Camera"));
249	284	cameraItem.addActionListener(this);
250		- menu.add("-");
	285	+ }
	286	+
	287	+ oe.menuBar.add(menu = new Menu("Object"));
251	288	textureItem = menu.add(new MenuItem("Texture"));
252	289	textureItem.addActionListener(this);
	290	+ billboardItem = menu.add(new MenuItem("Billboard"));
	291	+ billboardItem.addActionListener(this);
253	292	csgItem = menu.add(new MenuItem("CSG"));
254	293	csgItem.addActionListener(this);
255	294	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +297,29 @@
258	297	shadowYItem.addActionListener(this);
259	298	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	299	shadowZItem.addActionListener(this);
	300	+ if (Globals.ADVANCED)
	301	+ {
	302	+ menu.add("-");
261	303	linkerItem = menu.add(new MenuItem("Linker"));
262	304	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	305	attributeItem = menu.add(new MenuItem("Attribute"));
266	306	attributeItem.addActionListener(this);
	307	+ templateItem = menu.add(new MenuItem("Template"));
	308	+ templateItem.addActionListener(this);
267	309	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	310	pointflowItem.addActionListener(this);
	311	+ }
269	312	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	313	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	314	resetTransformItem.addActionListener(this);
274	315	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	316	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- 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);
278	323
279	324	oe.menuBar.add(menu = new Menu("Geometry"));
280	325	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +328,13 @@
283	328	genNormalsORGANItem.addActionListener(this);
284	329	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	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	+ }
286	338	stripifyItem = menu.add(new MenuItem("Stripify"));
287	339	stripifyItem.addActionListener(this);
288	340	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +344,6 @@
292	344	untrimItem = menu.add(new MenuItem("Untrim"));
293	345	untrimItem.addActionListener(this);
294	346	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	347	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	348	clearColorsItem.addActionListener(this);
299	349	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +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	+ }
	367	+
	368	+ oe.menuBar.add(menu = new Menu("Attributes"));
	369	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	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);
313	375	menu.add("-");
314	376	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	377	liveleavesItem.addActionListener(this);
316	378	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	379	unliveleavesItem.addActionListener(this);
	380	+ if (Globals.ADVANCED)
	381	+ {
318	382	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	383	supportleavesItem.addActionListener(this);
320	384	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	385	unsupportleavesItem.addActionListener(this);
	386	+ }
322	387	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	388	hideleavesItem.addActionListener(this);
324	389	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -332,27 +397,18 @@
332	397	flipVItem.addActionListener(this);
333	398	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	399	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	400	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	401	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	402	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	403	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	404	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	405	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	406	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	407	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	408	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	409	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	410	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	411	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	412
357	413	oe.menuBar.add(menu = new Menu("Selection"));
358	414	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +426,37 @@
370	426	sortbysizeItem.addActionListener(this);
371	427	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	428	sortbynameItem.addActionListener(this);
	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.
	437	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	438	+ extractGeometriesItem.addActionListener(this);
	439	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	440	+ cloneGeometriesItem.addActionListener(this);
	441	+ }
	442	+
373	443	oe.menuBar.add(menu = new Menu("Insert"));
374	444	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	445	+
	446	+ oe.menuBar.add(menu = new Menu("Include"));
	447	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	448	+ importOBJItem.addActionListener(this);
	449	+ menu.add("-");
	450	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	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);
	458	+
	459	+ oe.menuBar.add(menu = new Menu("Tools"));
376	460	buildToolsMenu(menu);
377	461	}
378	462
..	..	@@ -406,150 +490,98 @@
406	490	oe.radioPanel.add(dummyButton);
407	491	oe.buttonGroup.add(dummyButton);
408	492	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	493	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	494
413		- 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");
414	497	liveCB.addItemListener(this);
415	498
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- 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");
434	505	fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
441		-
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- 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");
476	509	trackCB.addItemListener(this);
477	510
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	511	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	512	+ screenfitButton.setToolTipText("Screen fit");
480	513	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	514	+
482	515	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	516	// screenfitpointButton.addActionListener(this);
484		-// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486		- snapobjectButton.addActionListener(this);
487		- oe.aConstraints.gridx += 1;
488	517
489		- //aConstraints.gridx = 0;
490		- //aConstraints.gridy += 1;
491		- oe.aConstraints.weighty = 0;
492		- oe.aConstraints.gridwidth = 1;
493		-
494		- 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");
495	527	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	528
500		- //
501		- 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");
502	533	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	534	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	535	fourButton.addActionListener(this);
505		- 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");
506	539	sixButton.addActionListener(this);
507		- 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");
508	542	threeButton.addActionListener(this);
509		- 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");
510	545	sevenButton.addActionListener(this);
511	546	//
512	547
513		- 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");
514	550	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- 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");
517	554	closeButton.addActionListener(this);
518	555	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	556	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	557
522		- oe.aConstraints.gridx = 1; //
523		- 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");
524	562	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	563
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	564	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ uneditButton.setToolTipText("Unedit selection");
530	566	uneditButton.addActionListener(this);
531	567
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537		- clearPanelButton.addActionListener(this);
538		-
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- 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");
544	570	allParamsButton.addActionListener(this);
545	571
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- 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");
551	578	unselectButton.addActionListener(this);
552	579
	580	+ commandsPanel.preferredHeight = 1;
	581	+
	582	+ oe.treePanel.add(commandsPanel);
	583	+ oe.treePanel.Return();
	584	+
553	585	// oe.aConstraints.gridx += 1;
554	586	// oe.aConstraints.weighty = 0;
555	587	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +593,37 @@
561	593	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	594	// gcButton.addActionListener(this);
563	595
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	596	+ cGridBag jSPPanel = new cGridBag();
	597	+
	598	+ JScrollPane jSP;
575	599	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- 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);
577	601	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	602	+
	603	+ oe.treePanel.add(jSPPanel);
	604	+ oe.treePanel.Return();
582	605
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- 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");
587	610	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- 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");
590	614	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- 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");
593	618	textureCB.addItemListener(this);
594	619
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	620	+ copyOptionsPanel.preferredHeight = 1;
	621	+ oe.treePanel.add(copyOptionsPanel);
	622	+ oe.treePanel.Return();
597	623
	624	+// mainPanel.setDividerLocation(0.5); //1.0);
	625	+// mainPanel.setResizeWeight(0.5);
	626	+
598	627	//jList.addListSelectionListener(this);
599	628	oe.jTree.addTreeSelectionListener(this);
600	629	//jTree.setRootVisible(false);
..	..	@@ -616,17 +645,89 @@
616	645	radio.layout = sevenButton;
617	646	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	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	+ }
619	720
620	721	void EditObject(Object3D obj)
621	722	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- 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();
630	731	}
631	732	void SetupViews(ObjEditor oe)
632	733	{
..	..	@@ -646,6 +747,7 @@
646	747	JCheckBox fastCB;
647	748	JCheckBox slowCB;
648	749	JCheckBox boxCB;
	750	+ JCheckBox zoomBoxCB;
649	751	JCheckBox trackCB;
650	752	JCheckBox smoothfocusCB;
651	753	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +790,7 @@
688	790	dropAttributes \|= Object3D.TEXTURE;
689	791	else
690	792	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	793	+ } else if(e.getSource() == liveCB)
693	794	{
694	795	cameraView.ToggleLive();
695	796	}
..	..	@@ -726,6 +827,10 @@
726	827	Recompile();
727	828	cameraView.repaint();
728	829	// refreshContents();
	830	+ }
	831	+ else if(e.getSource() == zoomBoxCB)
	832	+ {
	833	+ cameraView.ToggleZoomBoxMode();
729	834	}
730	835	else if(e.getSource() == smoothfocusCB)
731	836	{
..	..	@@ -840,7 +945,9 @@
840	945	// objEditor.DropFile((java.io.File[]) object, true);
841	946	// return;
842	947	// }
843		- if (string.charAt(0) == '/')
	948	+
	949	+ // File path for Mac and Windows
	950	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	951	{
845	952	// file(s)
846	953	String[] names = string.split("\n");
..	..	@@ -867,7 +974,7 @@
867	974
868	975	flashIt = false;
869	976	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	977	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	978	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	979
873	980	if (group.selection.size() == 1)
..	..	@@ -894,11 +1001,11 @@
894	1001	{
895	1002	loadClipboard(true);
896	1003	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1004	+ pasteInto(false, false);
898	1005	} else {
899	1006	loadClipboard(false);
900	1007	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1008	+ pasteInto(false, false); // true); // ???
902	1009	}
903	1010	}
904	1011	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1109,8 @@
1002	1109
1003	1110	void buildCreateMenu(Menu menu)
1004	1111	{
	1112	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1113	+ //heightFieldItem.addActionListener(this);
1005	1114	gridItem = menu.add(new MenuItem("Grid"));
1006	1115	gridItem.addActionListener(this);
1007	1116	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1123,37 @@
1014	1123	torusItem.addActionListener(this);
1015	1124	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1125	superItem.addActionListener(this);
	1126	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1127	+ kleinItem.addActionListener(this);
1017	1128	particleItem = menu.add(new MenuItem("Particle system"));
1018	1129	particleItem.addActionListener(this);
	1130	+ if (Globals.ADVANCED)
	1131	+ {
1019	1132	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1133	ragdollItem.addActionListener(this);
1021	1134	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1135	ragdoll2Item.addActionListener(this);
	1136	+ }
1023	1137	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1138	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1139	meshItem.addActionListener(this);
1026	1140	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1141	// meshGroupItem.addActionListener(this);
	1142	+ if (Globals.ADVANCED)
	1143	+ {
1028	1144	springItem = menu.add(new MenuItem("Spring"));
1029	1145	springItem.addActionListener(this);
1030	1146	flagItem = menu.add(new MenuItem("Flag"));
1031	1147	flagItem.addActionListener(this);
1032		- bezierItem = menu.add(new MenuItem("Patch"));
1033		- bezierItem.addActionListener(this);
1034		- checkerItem = menu.add(new MenuItem("Checker"));
1035		- checkerItem.addActionListener(this);
1036	1148	blobItem = menu.add(new MenuItem("Blob"));
1037	1149	blobItem.addActionListener(this);
1038	1150	latheItem = menu.add(new MenuItem("Lathe"));
1039	1151	latheItem.addActionListener(this);
	1152	+ }
	1153	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1154	+ bezierItem.addActionListener(this);
	1155	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1156	+ overlayItem.addActionListener(this);
1040	1157	lightItem = menu.add(new MenuItem("Light"));
1041	1158	lightItem.addActionListener(this);
1042	1159	menu.add("-");
..	..	@@ -1046,41 +1163,39 @@
1046	1163	loopItem.addActionListener(this);
1047	1164	doubleItem = menu.add(new MenuItem("Fork"));
1048	1165	doubleItem.addActionListener(this);
	1166	+ if (Globals.ADVANCED)
	1167	+ {
1049	1168	tripleItem = menu.add(new MenuItem("Trident"));
1050	1169	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
	1170	+ }
1060	1171	}
1061	1172
1062	1173	void buildToolsMenu(Menu menu)
1063	1174	{
1064	1175	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1176	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1177	+ animationItem.setState(Globals.ANIMATION);
1067	1178
1068	1179	menu.add("-");
1069	1180	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1181	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1182	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1183	+ textureFieldItem.addActionListener(this);
	1184	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1185	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1186	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1187	reduceMorphItem.addActionListener(this);
1077	1188	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1189	reduce34MorphItem.addActionListener(this);
1079		-
	1190	+ menu.add("-");
1080	1191	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1192	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1193
	1194	+ if (Globals.ADVANCED)
	1195	+ {
	1196	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1197	+ mirrorItem.addActionListener(this);
	1198	+ menu.add("-");
1084	1199	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1200	memoryItem.addActionListener(this);
1086	1201	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1094,6 +1209,8 @@
1094	1209	resetParentItem.addActionListener(this);
1095	1210	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1211	repairParentItem.addActionListener(this);
	1212	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1213	+ repairShadowItem.addActionListener(this);
1097	1214	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1215	invariantsItem.addActionListener(this);
1099	1216	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1218,7 @@
1101	1218	menu.add("-");
1102	1219	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1220	editScriptItem.addActionListener(this);
	1221	+ }
1104	1222	}
1105	1223
1106	1224	void ScreenFit()
..	..	@@ -1429,9 +1547,9 @@
1429	1547
1430	1548	void Overwrite(int mask)
1431	1549	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1550	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1551	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1552	+ Object3D content = Grafreed.clipboard.get(0);
1435	1553
1436	1554	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1555	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1572,7 @@
1454	1572	//
1455	1573	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1574	{
	1575	+ Object source = event.getSource();
1457	1576	/*
1458	1577	if (event.getSource() == nameField)
1459	1578	{
..	..	@@ -1465,11 +1584,11 @@
1465	1584	}
1466	1585	else
1467	1586	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1587	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1588	{
1470	1589	ScreenFit();
1471	1590	} else
1472		- if (event.getSource() == switchItem)
	1591	+ if (source == switchItem)
1473	1592	{
1474	1593	cVector v1 = new cVector();
1475	1594	cVector v2 = new cVector();
..	..	@@ -1478,11 +1597,11 @@
1478	1597	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1598	objEditor.cameraView.repaint();
1480	1599	} else
1481		- if (event.getSource() == rectoidItem)
	1600	+ if (source == rectoidItem)
1482	1601	{
1483	1602	makeSomething(new Box());
1484	1603	} else
1485		- if (event.getSource() == particleItem)
	1604	+ if (source == particleItem)
1486	1605	{
1487	1606	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1607	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1622,9 @@
1503	1622	applyExample(particleGeom, "SMOKE");
1504	1623	makeSomething(particleGeom);
1505	1624	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1625	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1626	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1627	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1628
1510	1629	ragdoll.toParent = LA.newMatrix();
1511	1630	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1640,71 @@
1521	1640	makeSomething(ragdoll);
1522	1641	//makeSomething(new VehicleDemo());
1523	1642	} else
1524		- if (event.getSource() == gridItem)
	1643	+ /*
	1644	+ */
	1645	+ if (source == heightFieldItem)
	1646	+ {
	1647	+ Object3D obj = new Object3D();
	1648	+
	1649	+ obj.CreateMaterial();
	1650	+ obj.bRep = new BoundaryRep();
	1651	+
	1652	+ obj.bRep.CreateMesh(new iHeightField()
	1653	+ {
	1654	+ public double f(double x, double y)
	1655	+ {
	1656	+ // The Mandelbrot set is represented by coloring
	1657	+ // each point (x,y) according to the number of
	1658	+ // iterations it takes before the while loop in
	1659	+ // this method ends. For points that are actually
	1660	+ // in the Mandelbrot set, or very close to it, the
	1661	+ // count will reach the maximum value, 80. These
	1662	+ // points will be colored purple. All other colors
	1663	+ // represent points that are definitely NOT in the set.
	1664	+ x -= 600;
	1665	+ y -= 500;
	1666	+ x /= 200;
	1667	+ y /= 200;
	1668	+ int count = 0;
	1669	+ double zx = x;
	1670	+ double zy = y;
	1671	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1672	+ double new_zx = zxzx - zyzy + x;
	1673	+ zy = 2zxzy + y;
	1674	+ zx = new_zx;
	1675	+ count++;
	1676	+ }
	1677	+ return count; // Math.sqrt(count);
	1678	+ }
	1679	+ }, 1000,1000);
	1680	+
	1681	+ makeSomething(obj);
	1682	+ } else
	1683	+ if (source == gridItem)
1525	1684	{
1526	1685	makeSomething(new Grid());
1527	1686	} else
1528		- if (event.getSource() == ellipsoidItem)
	1687	+ if (source == ellipsoidItem)
1529	1688	{
1530	1689	makeSomething(new Sphere());
1531	1690	} else
1532		- if (event.getSource() == coneItem)
	1691	+ if (source == coneItem)
1533	1692	{
1534	1693	makeSomething(new Cone());
1535	1694	} else
1536		- if (event.getSource() == torusItem)
	1695	+ if (source == torusItem)
1537	1696	{
1538	1697	makeSomething(new Torus());
1539	1698	} else
1540		- if (event.getSource() == superItem)
	1699	+ if (source == superItem)
1541	1700	{
1542	1701	makeSomething(new Superellipsoid());
1543	1702	} else
1544		- if (event.getSource() == blobItem)
	1703	+ if (source == kleinItem)
	1704	+ {
	1705	+ makeSomething(new Klein());
	1706	+ } else
	1707	+ if (source == blobItem)
1545	1708	{
1546	1709	Blob blob = new Blob();
1547	1710	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1712,15 @@
1549	1712	//blob.retile();
1550	1713	makeSomething(blob);
1551	1714	} else
1552		- if (event.getSource() == latheItem)
	1715	+ if (source == latheItem)
1553	1716	{
1554	1717	makeSomething(new Lathe());
1555	1718	} else
1556		- if (event.getSource() == bezierItem)
	1719	+ if (source == bezierItem)
1557	1720	{
1558	1721	makeSomething(new BezierSurface());
1559	1722	} else
1560		- if (event.getSource() == checkerItem)
	1723	+ if (source == overlayItem)
1561	1724	{
1562	1725	/*
1563	1726	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1733,9 @@
1570	1733	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1734	LA.matInvert(obj.toParent, obj.fromParent);
1572	1735	*/
1573		- makeSomething(new CheckerIG());
	1736	+ makeSomething(new Checker());
1574	1737	} else
1575		- if (event.getSource() == meshItem)
	1738	+ if (source == meshItem)
1576	1739	{
1577	1740	Object3D itemtomake = new Object3D();
1578	1741	Object3D child;
..	..	@@ -1593,35 +1756,35 @@
1593	1756	makeSomething(child);
1594	1757	}
1595	1758	} else
1596		- if (event.getSource() == springItem)
	1759	+ if (source == springItem)
1597	1760	{
1598	1761	cSpring s = new cSpring();
1599	1762	s.setup();
1600	1763	makeSomething(s);
1601	1764	} else
1602		- if (event.getSource() == flagItem)
	1765	+ if (source == flagItem)
1603	1766	{
1604	1767	cSpring s = new cFlag();
1605	1768	s.setup();
1606	1769	makeSomething(s);
1607	1770	} else
1608		- if (event.getSource() == lightItem)
	1771	+ if (source == lightItem)
1609	1772	{
1610	1773	makeSomething(new Light());
1611	1774	} else
1612		- if (event.getSource() == csgItem)
	1775	+ if (source == csgItem)
1613	1776	{
1614	1777	group(new CSG());
1615	1778	} else
1616		- if (event.getSource() == templateItem)
	1779	+ if (source == templateItem)
1617	1780	{
1618	1781	group(new cTemplate());
1619	1782	} else
1620		- if (event.getSource() == attributeItem)
	1783	+ if (source == attributeItem)
1621	1784	{
1622	1785	makeSomething(new Attribute());
1623	1786	} else
1624		- if (event.getSource() == pointflowItem)
	1787	+ if (source == pointflowItem)
1625	1788	{
1626	1789	makeSomething(new PointFlow());
1627	1790	} else
..	..	@@ -1633,7 +1796,7 @@
1633	1796	} else
1634	1797	*/
1635	1798
1636		- if (event.getSource() == superLoopItem)
	1799	+ if (source == superLoopItem)
1637	1800	{
1638	1801	Composite g = new cGroup();
1639	1802	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1818,7 @@
1655	1818
1656	1819	group(g);
1657	1820	} else
1658		- if (event.getSource() == loopItem)
	1821	+ if (source == loopItem)
1659	1822	{
1660	1823	Composite csg = new GroupLeaf();
1661	1824	csg.count = 5;
..	..	@@ -1664,7 +1827,7 @@
1664	1827	csg.addChild(child);
1665	1828	child.addChild(csg);
1666	1829	} else
1667		- if (event.getSource() == doubleItem)
	1830	+ if (source == doubleItem)
1668	1831	{
1669	1832	Composite csg = new GroupLeaf();
1670	1833	csg.count = 5;
..	..	@@ -1676,7 +1839,7 @@
1676	1839	csg.addChild(child);
1677	1840	child.addChild(csg);
1678	1841	} else
1679		- if (event.getSource() == tripleItem)
	1842	+ if (source == tripleItem)
1680	1843	{
1681	1844	Composite csg = new GroupLeaf();
1682	1845	csg.count = 4;
..	..	@@ -1692,70 +1855,83 @@
1692	1855	child.addChild(csg);
1693	1856	} else
1694	1857
1695		- if (event.getSource() == importGFDItem)
	1858	+ if (source == importGFDItem)
1696	1859	{
1697	1860	ImportGFD();
1698	1861	} else
1699		- if (event.getSource() == importVRMLX3DItem)
	1862	+ if (source == importVRMLX3DItem)
1700	1863	{
1701	1864	ImportVRMLX3D();
1702	1865	} else
1703		- if (event.getSource() == import3DSItem)
	1866	+ if (source == import3DSItem)
1704	1867	{
1705	1868	objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706	1869	} else
1707		- if (event.getSource() == importOBJItem)
	1870	+ if (source == importOBJItem)
1708	1871	{
1709		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1872	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	1873	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	1874	+ browser.setVisible(true);
	1875	+ String filename = browser.getFile();
	1876	+ if (filename != null && filename.length() > 0)
	1877	+ {
	1878	+ String fullname = browser.getDirectory() + filename;
	1879	+ makeSomething(ReadOBJ(fullname), true);
	1880	+ }
1710	1881	} else
1711		- if (event.getSource() == computeAOItem)
	1882	+ if (source == computeAOItem)
1712	1883	{
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
	1884	+ Globals.drawMode = CameraPane.OCCLUSION;
	1885	+ Globals.theRenderer.repaint();
1715	1886	} else
1716		- if (event.getSource() == recompileItem)
	1887	+ if (source == recompileItem)
1717	1888	{
1718	1889	Recompile();
1719	1890	refreshContents();
1720	1891	} else
1721		- if (event.getSource() == editScriptItem)
	1892	+ if (source == editScriptItem)
1722	1893	{
1723	1894	OpenDialog();
1724	1895	refreshContents();
1725	1896	} else
1726		- if (event.getSource() == invariantsItem)
	1897	+ if (source == invariantsItem)
1727	1898	{
1728	1899	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1900	+ Grafreed.grafreeD.universe.invariants();
1730	1901	} else
1731		- if (event.getSource() == memoryItem)
	1902	+ if (source == memoryItem)
1732	1903	{
1733	1904	//System.out.println("Invariants:");
1734	1905	PrintMemory();
1735	1906	} else
1736		- if (event.getSource() == pathItem)
	1907	+ if (source == pathItem)
1737	1908	{
1738	1909	PrintPath();
1739	1910	} else
1740		- if (event.getSource() == analyzeItem)
	1911	+ if (source == analyzeItem)
1741	1912	{
1742	1913	AnalyzeObject();
1743	1914	} else
1744		- if (event.getSource() == dumpItem)
	1915	+ if (source == dumpItem)
1745	1916	{
1746	1917	DumpObject();
1747	1918	} else
1748		- if (event.getSource() == screenfitButton)
	1919	+ if (source == oneStepButton)
	1920	+ {
	1921	+ Globals.ONESTEP = true;
	1922	+ cameraView.repaint();
	1923	+ } else
	1924	+ if (source == screenfitButton)
1749	1925	{
1750	1926	//Reload(lastConverter, lastFilename, true);
1751	1927	ScreenFit();
1752	1928	} else
1753		- if (event.getSource() == screenfitpointButton)
	1929	+ if (source == screenfitpointButton)
1754	1930	{
1755	1931	//Reload(lastConverter, lastFilename, true);
1756	1932	ScreenFitPoint();
1757	1933	} else
1758		- if (event.getSource() == snapobjectButton)
	1934	+ if (source == snapobjectButton)
1759	1935	{
1760	1936	//Reload(lastConverter, lastFilename, true);
1761	1937	SnapObject();
..	..	@@ -1766,13 +1942,13 @@
1766	1942	// Recompile();
1767	1943	// refreshContents();
1768	1944	// } else
1769		- if (event.getSource() == gcButton)
	1945	+ if (source == gcButton)
1770	1946	{
1771	1947	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1948	System.gc();
1773	1949	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1950	} else
1775		- if (event.getSource() == editLeafItem)
	1951	+ if (source == editLeafItem)
1776	1952	{
1777	1953	Object3D obj;
1778	1954	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +1962,70 @@
1786	1962	}
1787	1963	refreshContents(true);
1788	1964	} else
1789		- if (event.getSource() == openWindowItem)
	1965	+ if (source == openWindowItem)
1790	1966	{
1791	1967	EditSelection(true);
1792	1968	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	1969	+ if (source == cutItem \|\| source == clearButton)
1794	1970	{
1795	1971	loadClipboard(true);
1796	1972	} else
1797		- if (event.getSource() == duplicateItem)
	1973	+ if (source == duplicateItem)
1798	1974	{
1799		- Object3D keep = GraphreeD.clipboard;
	1975	+ Object3D keep = Grafreed.clipboard;
1800	1976	loadClipboard(false);
1801	1977	paste(false);
1802		- GraphreeD.clipboard = keep;
	1978	+ Grafreed.clipboard = keep;
1803	1979	} else
1804		- if (event.getSource() == cloneItem)
	1980	+ if (source == cloneItem)
1805	1981	{
1806	1982	CloneSelection(false);
1807	1983	} else
1808		- if (event.getSource() == cloneSupportItem)
	1984	+ if (source == cloneSupportItem)
1809	1985	{
1810	1986	CloneSelection(true);
1811	1987	} else
1812		- if (event.getSource() == copyItem)
	1988	+ if (source == copyItem)
1813	1989	{
1814	1990	loadClipboard(false);
1815	1991	} else
1816		- if (event.getSource() == pasteItem)
	1992	+ if (source == pasteItem)
1817	1993	{
1818	1994	paste(false);
1819	1995	} else
1820		- if (event.getSource() == pasteLinkItem)
	1996	+ if (source == pasteIntoItem)
1821	1997	{
1822		- pasteInto(false);
	1998	+ pasteInto(true, false);
1823	1999	} else
1824		- if (event.getSource() == pasteCloneItem)
	2000	+ if (source == pasteLinkItem)
1825	2001	{
1826		- pasteInto(true);
	2002	+ pasteInto(false, false);
1827	2003	} else
1828		- if (event.getSource() == pasteExpandItem)
	2004	+ if (source == pasteCloneItem)
	2005	+ {
	2006	+ pasteInto(true, true);
	2007	+ } else
	2008	+ if (source == pasteExpandItem)
1829	2009	{
1830	2010	paste(true);
1831	2011	} else
1832		- if (event.getSource() == synchronizeItem)
	2012	+ if (source == synchronizeItem)
1833	2013	{
1834	2014	Overwrite(Object3D.TRANSFORM);
1835	2015	} else
1836		- if (event.getSource() == overwriteNameItem)
	2016	+ if (source == overwriteNameItem)
1837	2017	{
1838	2018	Overwrite(Object3D.NAME);
1839	2019	} else
1840		- if (event.getSource() == overwriteUVItem)
	2020	+ if (source == overwriteUVItem)
1841	2021	{
1842	2022	Overwrite(Object3D.UV);
1843	2023	} else
1844		- if (event.getSource() == overwriteMatItem)
	2024	+ if (source == overwriteMatItem)
1845	2025	{
	2026	+ /* july 2015
1846	2027	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2028	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2029	else
1849	2030	{
1850	2031	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2037,16 @@
1856	2037	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2038	}
1858	2039	}
	2040	+ */
	2041	+
	2042	+ Overwrite(dropAttributes);
1859	2043	}
1860		- if (event.getSource() == overwriteGeoItem)
	2044	+ if (source == overwriteGeoItem)
1861	2045	{
1862	2046	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2047	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2048	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2049	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2050	//
1867	2051	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2052	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2058,7 @@
1874	2058	// refreshContents();
1875	2059	// }
1876	2060	} else
1877		- if (event.getSource() == generateMeshItem)
	2061	+ if (source == generateMeshItem)
1878	2062	{
1879	2063	//if (group.selection.size() == 1)
1880	2064	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2069,7 @@
1885	2069	ResetModel();
1886	2070	refreshContents();
1887	2071	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2072	+ if (source == extractGeometriesItem)
1889	2073	{
1890	2074	boolean one = false;
1891	2075
..	..	@@ -1912,7 +2096,7 @@
1912	2096	ResetModel();
1913	2097	refreshContents();
1914	2098	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2099	+ if (source == cloneGeometriesItem)
1916	2100	{
1917	2101	boolean one = false;
1918	2102
..	..	@@ -1938,32 +2122,37 @@
1938	2122	ResetModel();
1939	2123	refreshContents();
1940	2124	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2125	+ if (source == shareGeometriesItem)
1942	2126	{
1943	2127	boolean one = false;
1944	2128
1945	2129	if (group.selection.size() == 1)
1946	2130	one = true;
1947	2131
	2132	+ Object3D merge = null;
	2133	+
1948	2134	Object3D content = new cGroup();
1949	2135
1950	2136	for (int i=0; i<group.selection.size(); i++)
1951	2137	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2138	+ merge = new Merge(group.selection.get(i));
1953	2139
1954	2140	if (one)
1955		- makeSomething(sel, false);
	2141	+ makeSomething(merge, false);
1956	2142	else
1957		- content.addChild(sel);
	2143	+ content.addChild(merge);
1958	2144	}
1959	2145
1960	2146	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2147	+ makeSomething(content, true);
	2148	+ else
	2149	+ {
	2150	+ ResetModel();
	2151	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2152	+ refreshContents();
	2153	+ }
1965	2154	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2155	+ if (source == mergeGeometriesItem)
1967	2156	{
1968	2157	boolean one = false;
1969	2158
..	..	@@ -1993,11 +2182,11 @@
1993	2182	ResetModel();
1994	2183	refreshContents();
1995	2184	} else
1996		- if (event.getSource() == linkverticesItem)
	2185	+ if (source == linkverticesItem)
1997	2186	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2187	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2188	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2189	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2190	//
2002	2191	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2192	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2195,48 @@
2006	2195	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2196	// refreshContents();
2008	2197	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2198	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2199	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2200	+ Object3D content = Grafreed.clipboard.get(0);
2012	2201
2013	2202	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2203	content = ((cGroup)content).get(0);
2015	2204
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2205	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2206	for (int i=0; i<group.selection.size(); i++)
2018	2207	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2208	+ boolean random = CameraPane.SWITCH;
	2209	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2210	group.selection.get(i).linkVerticesThis(content);
2022	2211	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2212	+ CameraPane.SWITCH = random;
2024	2213	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2214	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2215	refreshContents();
2027	2216	}
2028	2217	} else
2029		- if (event.getSource() == resetsupportItem)
	2218	+ if (source == resetsupportItem)
2030	2219	{
2031	2220	for (int i=0; i<group.selection.size(); i++)
2032	2221	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2222	+ boolean random = CameraPane.SWITCH;
	2223	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2224	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2225	+ CameraPane.SWITCH = random;
2037	2226	}
2038	2227
2039	2228	refreshContents();
2040	2229	} else
2041		- if (event.getSource() == resetreferencesItem)
	2230	+ if (source == relinkverticesItem)
	2231	+ {
	2232	+ boolean random = CameraPane.SWITCH;
	2233	+ CameraPane.SWITCH = false; // parse all random nodes
	2234	+ group.selection.RelinkToSupport();
	2235	+ CameraPane.SWITCH = random;
	2236	+
	2237	+ refreshContents();
	2238	+ } else
	2239	+ if (source == resetreferencesItem)
2042	2240	{
2043	2241	for (int i=0; i<group.selection.size(); i++)
2044	2242	{
..	..	@@ -2047,11 +2245,11 @@
2047	2245
2048	2246	refreshContents();
2049	2247	} else
2050		- if (event.getSource() == setMasterItem)
	2248	+ if (source == setMasterItem)
2051	2249	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2250	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2251	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2252	+ Object3D content = Grafreed.clipboard.get(0);
2055	2253
2056	2254	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2255	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2258,13 @@
2060	2258	refreshContents();
2061	2259	}
2062	2260	} else
2063		- if (event.getSource() == poseMeshItem)
	2261	+ if (source == poseMeshItem)
2064	2262	{
2065	2263	if (group.selection.size() == 1)
2066	2264	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2265	+ if (Grafreed.clipboard.size() == 1)
2068	2266	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2267	+ Object3D content = Grafreed.clipboard.get(0);
2070	2268
2071	2269	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2270	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2277,19 @@
2079	2277	}
2080	2278
2081	2279	} else
2082		- if (event.getSource() == revertMeshItem)
	2280	+ if (source == revertMeshItem)
2083	2281	{
2084	2282	RevertMeshes();
2085	2283	} else
2086		- if (event.getSource() == resetMeshItem)
	2284	+ if (source == resetAllItem)
2087	2285	{
2088	2286	ResetAll();
2089	2287	} else
2090		- if (event.getSource() == stepAllItem)
	2288	+ if (source == stepAllItem)
2091	2289	{
2092	2290	StepAll();
2093	2291	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2292	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2293	{
2096	2294	//int indices[] = jList.getSelectedIndices();
2097	2295	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2297,46 @@
2099	2297
2100	2298	ClearSelection(false);
2101	2299	} else
2102		- if (event.getSource() == clearAllItem)
	2300	+ if (source == clearAllItem)
2103	2301	{
2104	2302	ClearSelection(true);
2105	2303	} else
2106		- if (event.getSource() == grabItem)
	2304	+ if (source == grabItem)
2107	2305	{
2108	2306	group(new cGroup(), true);
2109	2307	} else
2110		- if (event.getSource() == frontItem)
	2308	+ if (source == hideItem)
	2309	+ {
	2310	+ group(new HiddenObject());
	2311	+ } else
	2312	+ if (source == frontItem)
2111	2313	{
2112	2314	front();
2113	2315	} else
2114		- if (event.getSource() == backItem)
	2316	+ if (source == backItem)
2115	2317	{
2116	2318	back();
2117	2319	} else
2118		- if (event.getSource() == cameraItem)
	2320	+ if (source == cameraItem)
2119	2321	{
2120	2322	makeSomething(new Camera());
2121	2323	} else
2122		- if (event.getSource() == compositeItem)
	2324	+ if (source == compositeItem)
2123	2325	{
2124	2326	group(new Composite());
2125	2327	} else
2126		- if (event.getSource() == randomItem)
	2328	+ if (source == randomItem)
2127	2329	{
2128	2330	RandomNode random = new RandomNode();
2129	2331	group(random);
2130	2332	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2333	+ random.name = random.get(0).name + "Switch";
2132	2334	} else
2133		- if (event.getSource() == physicsItem)
	2335	+ if (source == physicsItem)
2134	2336	{
2135	2337	group(new PhysicsNode());
2136	2338	} else
2137		- if (event.getSource() == frameselectorItem)
	2339	+ if (source == frameselectorItem)
2138	2340	{
2139	2341	for (int i=0; i<group.selection.size(); i++)
2140	2342	{
..	..	@@ -2146,7 +2348,7 @@
2146	2348	ResetModel();
2147	2349	refreshContents();
2148	2350	} else
2149		- if (event.getSource() == switchGeoItem)
	2351	+ if (source == switchGeoItem)
2150	2352	{
2151	2353	for (int i=0; i<group.selection.size(); i++)
2152	2354	{
..	..	@@ -2158,7 +2360,7 @@
2158	2360	ResetModel();
2159	2361	refreshContents();
2160	2362	} else
2161		- if (event.getSource() == switchTransfoItem)
	2363	+ if (source == switchTransfoItem)
2162	2364	{
2163	2365	for (int i=0; i<group.selection.size(); i++)
2164	2366	{
..	..	@@ -2170,7 +2372,7 @@
2170	2372	ResetModel();
2171	2373	refreshContents();
2172	2374	} else
2173		- if (event.getSource() == morphItem)
	2375	+ if (source == morphItem)
2174	2376	{
2175	2377	for (int i=0; i<group.selection.size(); i++)
2176	2378	{
..	..	@@ -2182,7 +2384,7 @@
2182	2384	ResetModel();
2183	2385	refreshContents();
2184	2386	} else
2185		- if (event.getSource() == scriptNodeItem)
	2387	+ if (source == scriptNodeItem)
2186	2388	{
2187	2389	boolean atleastone = false;
2188	2390
..	..	@@ -2221,191 +2423,223 @@
2221	2423	}
2222	2424	}
2223	2425	} else
2224		- if (event.getSource() == linkerItem)
	2426	+ if (source == linkerItem)
2225	2427	{
2226	2428	group(new cLinker());
2227	2429	} else
2228		- if (event.getSource() == textureItem)
	2430	+ if (source == textureItem)
2229	2431	{
2230	2432	group(new TextureNode());
2231	2433	} else
2232		- if (event.getSource() == shadowXItem)
	2434	+ if (source == billboardItem)
	2435	+ {
	2436	+ group(new BillboardNode());
	2437	+ } else
	2438	+ if (source == shadowXItem)
2233	2439	{
2234	2440	CastShadow(0);
2235	2441	} else
2236		- if (event.getSource() == shadowYItem)
	2442	+ if (source == shadowYItem)
2237	2443	{
2238	2444	CastShadow(1);
2239	2445	} else
2240		- if (event.getSource() == shadowZItem)
	2446	+ if (source == shadowZItem)
2241	2447	{
2242	2448	CastShadow(2);
2243	2449	} else
2244		- if (event.getSource() == ungroupItem)
	2450	+ if (source == ungroupItem)
2245	2451	{
2246		- ungroup();
	2452	+ //ungroup();
	2453	+ for (int i=0; i<group.selection.size(); i++)
	2454	+ {
	2455	+ Ungroup(group.selection.get(i));
	2456	+ }
	2457	+
	2458	+ ClearSelection(false);
	2459	+
	2460	+ refreshContents();
2247	2461	} else
2248		- if (event.getSource() == genUVItem)
	2462	+ if (source == genUVItem)
2249	2463	{
2250	2464	GenUV();
2251	2465	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2466	+ if (source == genNormalsCADItem)
2253	2467	{
2254	2468	GenNormals(true);
2255	2469	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2470	+ if (source == genNormalsMESHItem)
	2471	+ {
	2472	+ GenNormals(true); // TODO
	2473	+ } else
	2474	+ if (source == genNormalsORGANItem)
2257	2475	{
2258	2476	GenNormals(false);
2259	2477	} else
2260		- if (event.getSource() == stripifyItem)
	2478	+ if (source == genNormalsMINEItem)
	2479	+ {
	2480	+ GenNormalsMINE();
	2481	+ } else
	2482	+ if (source == stripifyItem)
2261	2483	{
2262	2484	Stripify();
2263	2485	} else
2264		- if (event.getSource() == unstripifyItem)
	2486	+ if (source == unstripifyItem)
2265	2487	{
2266	2488	Unstripify();
2267	2489	} else
2268		- if (event.getSource() == trimItem)
	2490	+ if (source == trimItem)
2269	2491	{
2270	2492	Trim();
2271	2493	} else
2272		- if (event.getSource() == untrimItem)
	2494	+ if (source == untrimItem)
2273	2495	{
2274	2496	Untrim();
2275	2497	} else
2276		- if (event.getSource() == clearColorsItem)
	2498	+ if (source == clearColorsItem)
2277	2499	{
2278	2500	ClearColors();
2279	2501	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2502	+ if (source == clearMaterialsItem)
2281	2503	{
2282	2504	ClearMaterials();
2283	2505	} else
2284		- if (event.getSource() == liveleavesItem)
	2506	+ if (source == liveleavesItem)
2285	2507	{
2286	2508	LiveLeaves(true);
2287	2509	} else
2288		- if (event.getSource() == unliveleavesItem)
	2510	+ if (source == unliveleavesItem)
2289	2511	{
2290	2512	LiveLeaves(false);
2291	2513	} else
2292		- if (event.getSource() == supportleavesItem)
	2514	+ if (source == supportleavesItem)
2293	2515	{
2294	2516	SupportLeaves(true);
2295	2517	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2518	+ if (source == unsupportleavesItem)
2297	2519	{
2298	2520	SupportLeaves(false);
2299	2521	} else
2300		- if (event.getSource() == hideleavesItem)
	2522	+ if (source == hideleavesItem)
2301	2523	{
2302	2524	HideLeaves(true);
2303	2525	} else
2304		- if (event.getSource() == showleavesItem)
	2526	+ if (source == showleavesItem)
2305	2527	{
2306	2528	HideLeaves(false);
2307	2529	} else
2308		- if (event.getSource() == markleavesItem)
	2530	+ if (source == markleavesItem)
2309	2531	{
2310	2532	MarkLeaves(true);
2311	2533	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2534	+ if (source == unmarkleavesItem)
2313	2535	{
2314	2536	MarkLeaves(false);
2315	2537	} else
2316		- if (event.getSource() == flipVItem)
	2538	+ if (source == flipVItem)
2317	2539	{
2318	2540	FlipV(true);
2319	2541	} else
2320		- if (event.getSource() == unflipVItem)
	2542	+ if (source == unflipVItem)
2321	2543	{
2322	2544	FlipV(false);
2323	2545	} else
2324		- if (event.getSource() == lowTexturesItem)
	2546	+ if (source == lowTexturesItem)
2325	2547	{
2326	2548	SetTexRes(0);
2327	2549	} else
2328		- if (event.getSource() == normalTexturesItem)
	2550	+ if (source == normalTexturesItem)
2329	2551	{
2330	2552	SetTexRes(1);
2331	2553	} else
2332		- if (event.getSource() == highTexturesItem)
	2554	+ if (source == highTexturesItem)
2333	2555	{
2334	2556	SetTexRes(2);
2335	2557	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2558	+ if (source == veryhighTexturesItem)
2337	2559	{
2338	2560	SetTexRes(3);
2339	2561	} else
2340		- if (event.getSource() == maxTexturesItem)
	2562	+ if (source == maxTexturesItem)
2341	2563	{
2342	2564	SetTexRes(4);
2343	2565	} else
2344		- if (event.getSource() == panoTexturesItem)
	2566	+ if (source == panoTexturesItem)
2345	2567	{
2346	2568	SetTexRes(5);
2347	2569	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2570	+ if (source == reverseNormalsItem)
2349	2571	{
2350	2572	ReverseNormals();
2351	2573	} else
2352		- if (event.getSource() == parseverticesItem)
	2574	+ if (source == parseverticesItem)
2353	2575	{
2354	2576	ParseVertices();
2355	2577	} else
2356		- if (event.getSource() == alignItem)
	2578	+ if (source == textureFieldItem)
	2579	+ {
	2580	+ TextureVertices();
	2581	+ } else
	2582	+ if (source == alignItem)
2357	2583	{
2358	2584	Align();
2359	2585	} else
2360		- if (event.getSource() == mirrorItem)
	2586	+ if (source == mirrorItem)
2361	2587	{
2362	2588	MirrorPoses();
2363	2589	} else
2364		- if (event.getSource() == reduceMorphItem)
	2590	+ if (source == reduceMorphItem)
2365	2591	{
2366	2592	MeshReduction(false);
2367	2593	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2594	+ if (source == reduce34MorphItem)
2369	2595	{
2370	2596	MeshReduction(true);
2371	2597	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2598	+ if (source == reverseTrianglesItem)
2373	2599	{
2374	2600	ReverseTriangles();
2375	2601	} else
2376		- if (event.getSource() == reduceMeshItem)
	2602	+ if (source == reduceMeshItem)
2377	2603	{
2378	2604	ReduceMesh(false);
2379	2605	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2606	+ if (source == reduce34MeshItem)
2381	2607	{
2382	2608	ReduceMesh(true);
2383	2609	} else
2384		- if (event.getSource() == increaseMeshItem)
	2610	+ if (source == increaseMeshItem)
2385	2611	{
2386	2612	IncreaseMesh();
2387	2613	} else
2388		- if (event.getSource() == clipMeshItem)
	2614	+ if (source == clipMeshItem)
2389	2615	{
2390	2616	ClipMesh();
2391	2617	} else
2392		- if (event.getSource() == smoothMeshItem)
	2618	+ if (source == smoothMeshItem)
2393	2619	{
2394	2620	SmoothMesh();
2395	2621	} else
2396		- if (event.getSource() == transformgeometryItem)
	2622	+ if (source == transformGeometryItem)
2397	2623	{
2398	2624	TransformGeometry();
2399	2625	} else
2400		- if (event.getSource() == resetTransformItem)
	2626	+ if (source == transformChildrenItem)
	2627	+ {
	2628	+ TransformChildren();
	2629	+ } else
	2630	+ if (source == resetTransformItem)
2401	2631	{
2402	2632	ResetTransform();
2403	2633	} else
2404		- if (event.getSource() == resetCentroidItem)
	2634	+ if (source == resetCentroidItem)
2405	2635	{
2406		- ResetCentroid();
	2636	+ ResetCentroid(true);
2407	2637	} else
2408		- if (event.getSource() == resetParentItem)
	2638	+ if (source == resetCentroidXZItem)
	2639	+ {
	2640	+ ResetCentroid(false);
	2641	+ } else
	2642	+ if (source == resetParentItem)
2409	2643	{
2410	2644	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2645	{
..	..	@@ -2415,7 +2649,7 @@
2415	2649
2416	2650	refreshContents();
2417	2651	} else
2418		- if (event.getSource() == repairParentItem)
	2652	+ if (source == repairParentItem)
2419	2653	{
2420	2654	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2655	{
..	..	@@ -2429,7 +2663,21 @@
2429	2663
2430	2664	refreshContents();
2431	2665	} else
2432		- if (event.getSource() == sortbysizeItem)
	2666	+ if (source == repairShadowItem)
	2667	+ {
	2668	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2669	+ {
	2670	+ Object3D obj = (Object3D)e.nextElement();
	2671	+ obj.RepairShadow();
	2672	+// for (int i=0; i<obj.size(); i++)
	2673	+// {
	2674	+// obj.get(i).parent = obj;
	2675	+// }
	2676	+ }
	2677	+
	2678	+ refreshContents();
	2679	+ } else
	2680	+ if (source == sortbysizeItem)
2433	2681	{
2434	2682	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2683	{
..	..	@@ -2441,7 +2689,7 @@
2441	2689	ResetModel();
2442	2690	refreshContents();
2443	2691	} else
2444		- if (event.getSource() == sortbynameItem)
	2692	+ if (source == sortbynameItem)
2445	2693	{
2446	2694	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2695	{
..	..	@@ -2453,7 +2701,7 @@
2453	2701	ResetModel();
2454	2702	refreshContents();
2455	2703	} else
2456		- if (event.getSource() == attachPigmentItem)
	2704	+ if (source == attachPigmentItem)
2457	2705	{
2458	2706	String texture = GetFile("Attach pigment");
2459	2707	Object3D obj;
..	..	@@ -2465,7 +2713,7 @@
2465	2713
2466	2714	refreshContents();
2467	2715	} else
2468		- if (event.getSource() == detachPigmentItem)
	2716	+ if (source == detachPigmentItem)
2469	2717	{
2470	2718	Object3D obj;
2471	2719	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2724,7 @@
2476	2724
2477	2725	refreshContents();
2478	2726	} else
2479		- if (event.getSource() == attachBumpItem)
	2727	+ if (source == attachBumpItem)
2480	2728	{
2481	2729	String texture = GetFile("Attach bump");
2482	2730	Object3D obj;
..	..	@@ -2488,7 +2736,7 @@
2488	2736
2489	2737	refreshContents();
2490	2738	} else
2491		- if (event.getSource() == detachBumpItem)
	2739	+ if (source == detachBumpItem)
2492	2740	{
2493	2741	Object3D obj;
2494	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2747,7 @@
2499	2747
2500	2748	refreshContents();
2501	2749	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2750	+ if (source == pigmentBumpItem)
2503	2751	{
2504	2752	Object3D obj;
2505	2753	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2758,195 @@
2510	2758
2511	2759	refreshContents();
2512	2760	} else
2513		- if (event.getSource() == flashSelectionButton)
	2761	+ if (source == flashSelectionButton)
2514	2762	{
2515	2763	CameraPane.flash = true;
2516	2764	refreshContents();
2517	2765	} else
2518		- if (event.getSource() == oneButton)
	2766	+ if (source == oneButton)
2519	2767	{
2520	2768	} else
2521		- if (event.getSource() == twoButton)
	2769	+ if (source == twoButton)
2522	2770	{
2523	2771	radio.layout = twoButton;
2524	2772	// bug
2525	2773	//gridPanel.setDividerLocation(1.0);
2526	2774	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	2775	+// bigThree.remove(scenePanel);
	2776	+// bigThree.remove(centralPanel);
	2777	+// bigThree.remove(XYZPanel);
	2778	+// aWindowConstraints.gridx = 0;
	2779	+// aWindowConstraints.gridy = 0;
	2780	+// aWindowConstraints.gridwidth = 1;
	2781	+// // aConstraints.gridheight = 3;
	2782	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2783	+// aWindowConstraints.weightx = 0;
	2784	+// aWindowConstraints.weighty = 1;
	2785	+// //bigThree.add(jtp, aWindowConstraints);
	2786	+// aWindowConstraints.weightx = 1;
	2787	+// aWindowConstraints.gridwidth = 3;
	2788	+// // aConstraints.gridheight = 3;
	2789	+// aWindowConstraints.gridx = 1;
	2790	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2791	+// bigThree.add(centralPanel, aWindowConstraints);
	2792	+// aWindowConstraints.weightx = 0;
	2793	+// aWindowConstraints.gridx = 4;
	2794	+// aWindowConstraints.gridwidth = 1;
	2795	+// // aConstraints.gridheight = 3;
	2796	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2797	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2798	+// scenePanel.setVisible(false);
	2799	+// centralPanel.setVisible(true);
	2800	+// XYZPanel.setVisible(false);
	2801	+ bigThree.ClearUI();
	2802	+ bigThree.add(centralPanel);
	2803	+ bigThree.FlushUI();
2551	2804	} else
2552		- if (event.getSource() == threeButton)
	2805	+ if (source == threeButton)
2553	2806	{
2554	2807	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	2808	+
	2809	+// bigThree.remove(scenePanel);
	2810	+// bigThree.remove(centralPanel);
	2811	+// bigThree.remove(XYZPanel);
	2812	+// aWindowConstraints.gridx = 0;
	2813	+// aWindowConstraints.gridy = 0;
	2814	+// aWindowConstraints.gridwidth = 1;
	2815	+// // aConstraints.gridheight = 3;
	2816	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2817	+// aWindowConstraints.weightx = 0;
	2818	+// aWindowConstraints.weighty = 1;
	2819	+// //bigThree.add(jtp, aWindowConstraints);
	2820	+// aWindowConstraints.weightx = 1;
	2821	+// aWindowConstraints.gridwidth = 3;
	2822	+// // aConstraints.gridheight = 3;
	2823	+// aWindowConstraints.gridx = 1;
	2824	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2825	+// bigThree.add(centralPanel, aWindowConstraints);
	2826	+// aWindowConstraints.weightx = 0;
	2827	+// aWindowConstraints.gridx = 4;
	2828	+// aWindowConstraints.gridwidth = 1;
	2829	+// // aConstraints.gridheight = 3;
	2830	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2831	+// bigThree.add(XYZPanel, aWindowConstraints);
	2832	+// bigThree.validate();
	2833	+// scenePanel.setVisible(false);
	2834	+// centralPanel.setVisible(true);
	2835	+// XYZPanel.setVisible(true);
	2836	+ bigThree.ClearUI();
	2837	+ bigThree.add(centralPanel);
	2838	+ bigThree.add(XYZPanel);
	2839	+ bigThree.FlushUI();
2579	2840	} else
2580		- if (event.getSource() == fourButton)
	2841	+ if (source == fourButton)
2581	2842	{
2582	2843	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
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		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2844	+
	2845	+// bigThree.remove(scenePanel);
	2846	+// bigThree.remove(centralPanel);
	2847	+// bigThree.remove(XYZPanel);
	2848	+// aWindowConstraints.gridx = 0;
	2849	+// aWindowConstraints.gridy = 0;
	2850	+// aWindowConstraints.gridwidth = 1;
	2851	+// // aWindowConstraints.gridheight = 3;
	2852	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2853	+// aWindowConstraints.weightx = 1;
	2854	+// aWindowConstraints.weighty = 1;
	2855	+// bigThree.add(scenePanel, aWindowConstraints);
	2856	+// aWindowConstraints.weightx = 1;
	2857	+// aWindowConstraints.gridwidth = 3;
	2858	+// // aConstraints.gridheight = 3;
	2859	+// aWindowConstraints.gridx = 1;
	2860	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2861	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2862	+// aWindowConstraints.weightx = 0;
	2863	+// aWindowConstraints.gridx = 4;
	2864	+// aWindowConstraints.gridwidth = 1;
	2865	+// // aWindowConstraints.gridheight = 3;
	2866	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2867	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2868	+// bigThree.validate();
	2869	+// scenePanel.setVisible(true);
	2870	+// centralPanel.setVisible(false);
	2871	+// XYZPanel.setVisible(false);
	2872	+ bigThree.ClearUI();
	2873	+ bigThree.add(scenePanel);
	2874	+ bigThree.FlushUI();
2607	2875	} else
2608		- if (event.getSource() == sixButton)
	2876	+ if (source == sixButton)
2609	2877	{
2610	2878	radio.layout = sixButton;
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		- // aWindowConstraints.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		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	2879	+
	2880	+// bigThree.remove(scenePanel);
	2881	+// bigThree.remove(centralPanel);
	2882	+// bigThree.remove(XYZPanel);
	2883	+// aWindowConstraints.gridx = 0;
	2884	+// aWindowConstraints.gridy = 0;
	2885	+// aWindowConstraints.gridwidth = 1;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2888	+// aWindowConstraints.weightx = 0;
	2889	+// aWindowConstraints.weighty = 1;
	2890	+// bigThree.add(scenePanel, aWindowConstraints);
	2891	+// aWindowConstraints.weightx = 1;
	2892	+// aWindowConstraints.gridwidth = 3;
	2893	+// // aWindowConstraints.gridheight = 3;
	2894	+// aWindowConstraints.gridx = 1;
	2895	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2896	+// bigThree.add(centralPanel, aWindowConstraints);
	2897	+// aWindowConstraints.weightx = 0;
	2898	+// aWindowConstraints.gridx = 4;
	2899	+// aWindowConstraints.gridwidth = 1;
	2900	+// // aWindowConstraints.gridheight = 3;
	2901	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2902	+// //bigThree.add(XYZPanel, aConstraints);
	2903	+// bigThree.validate();
	2904	+// scenePanel.setVisible(true);
	2905	+// centralPanel.setVisible(true);
	2906	+// XYZPanel.setVisible(false);
	2907	+ bigThree.ClearUI();
	2908	+ bigThree.add(scenePanel);
	2909	+ bigThree.add(centralPanel);
	2910	+ bigThree.FlushUI();
2635	2911	} else
2636		- if (event.getSource() == sevenButton)
	2912	+ if (source == sevenButton)
2637	2913	{
2638	2914	radio.layout = sevenButton;
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.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.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		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2915	+
	2916	+// bigThree.remove(scenePanel);
	2917	+// bigThree.remove(centralPanel);
	2918	+// bigThree.remove(XYZPanel);
	2919	+// aWindowConstraints.gridx = 0;
	2920	+// aWindowConstraints.gridy = 0;
	2921	+// aWindowConstraints.gridwidth = 1;
	2922	+// // aWindowConstraints.gridheight = 3;
	2923	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.weighty = 1;
	2926	+// bigThree.add(scenePanel, aWindowConstraints);
	2927	+// aWindowConstraints.weightx = 1;
	2928	+// aWindowConstraints.gridwidth = 3;
	2929	+// // aWindowConstraints.gridheight = 3;
	2930	+// aWindowConstraints.gridx = 1;
	2931	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2932	+// bigThree.add(centralPanel, aWindowConstraints);
	2933	+// aWindowConstraints.weightx = 0;
	2934	+// aWindowConstraints.gridx = 4;
	2935	+// aWindowConstraints.gridwidth = 1;
	2936	+// // aConstraints.gridheight = 3;
	2937	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2938	+// bigThree.add(XYZPanel, aWindowConstraints);
	2939	+// bigThree.validate();
	2940	+// scenePanel.setVisible(true);
	2941	+// centralPanel.setVisible(true);
	2942	+// XYZPanel.setVisible(true);
	2943	+ bigThree.ClearUI();
	2944	+ bigThree.add(scenePanel);
	2945	+ bigThree.add(centralPanel);
	2946	+ bigThree.add(XYZPanel);
	2947	+ bigThree.FlushUI();
2663	2948	} else
2664		- if (event.getSource() == rootButton)
	2949	+ if (source == rootButton)
2665	2950	{
2666	2951	Object3D obj;
2667	2952	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +2958,7 @@
2673	2958
2674	2959	refreshContents(true);
2675	2960	} else
2676		- if (event.getSource() == closeButton)
	2961	+ if (source == closeButton)
2677	2962	{
2678	2963	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	2964	cRadio ab;
..	..	@@ -2694,11 +2979,11 @@
2694	2979	}
2695	2980	refreshContents(true);
2696	2981	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	2982	+ if (source == editItem \|\| source == editButton)
2698	2983	{
2699	2984	EditSelection(false);
2700	2985	} else
2701		- if (event.getSource() == uneditButton)
	2986	+ if (source == uneditButton)
2702	2987	{
2703	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	2989	{
..	..	@@ -2710,12 +2995,12 @@
2710	2995
2711	2996	child.editWindow = null; // ???????????
2712	2997	}
2713		- objEditor.ctrlPanel.revalidate();
	2998	+ objEditor.ctrlPanel.FlushUI();
2714	2999	//objEditor.jTree.clearSelection();
2715	3000	//objEditor.ResetSliders();
2716	3001	refreshContents(true);
2717	3002	} else
2718		- if (event.getSource() == clearPanelButton)
	3003	+ if (source == clearPanelButton)
2719	3004	{
2720	3005	assert(copy == group);
2721	3006	//copy.ClearUI();
..	..	@@ -2726,7 +3011,7 @@
2726	3011	listUI.clear();
2727	3012	refreshContents(true);
2728	3013	} else
2729		- if (event.getSource() == allParamsButton)
	3014	+ if (source == allParamsButton)
2730	3015	{
2731	3016	assert(copy == group);
2732	3017
..	..	@@ -2747,19 +3032,19 @@
2747	3032
2748	3033	refreshContents(true);
2749	3034	} else
2750		- if (event.getSource() == unselectButton)
	3035	+ if (source == unselectButton)
2751	3036	{
2752	3037	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3038	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3039	objEditor.ResetSliders();
2755	3040	refreshContents(true);
2756	3041	} else
2757		- if(event.getSource() instanceof cRadio)
	3042	+ if(source instanceof cRadio)
2758	3043	{
2759	3044	group.parent = keepparent;
2760	3045	group.attributes = 0;
2761	3046	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3047	+ /cRadio/ radio = (cRadio)source;
2763	3048	Object3D obj = radio.GetObject();
2764	3049	System.out.println("Edit " + obj);
2765	3050	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3064,7 @@
2779	3064	}
2780	3065
2781	3066	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3067	+ //Globals.theRenderer.object = group;
2783	3068	if(!useclient)
2784	3069	{
2785	3070	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,7 +3073,8 @@
2788	3073	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3074	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3075	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3076	+ //cameraView.lighttouched = true;
	3077	+ Globals.lighttouched = true;
2792	3078	topView.object = group;
2793	3079	frontView.object = group;
2794	3080	sideView.object = group;
..	..	@@ -2824,7 +3110,7 @@
2824	3110	if (useclient)
2825	3111	{
2826	3112	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3113	+ Globals.lighttouched = true;
2828	3114	//topView.object = client;
2829	3115	//frontView.object = client;
2830	3116	//sideView.object = client;
..	..	@@ -2832,7 +3118,7 @@
2832	3118	else
2833	3119	{
2834	3120	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3121	+ Globals.lighttouched = true;
2836	3122	//topView.object = group;
2837	3123	//frontView.object = group;
2838	3124	//sideView.object = group;
..	..	@@ -2867,6 +3153,28 @@
2867	3153	refreshContents();
2868	3154	}
2869	3155
	3156	+ void TransformChildren()
	3157	+ {
	3158	+ Object3D obj;
	3159	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3160	+ {
	3161	+ obj = (Object3D)e.nextElement();
	3162	+ obj.KeepTextureMatrices();
	3163	+ obj.TransformChildren();
	3164	+ obj.RestoreTextureMatrices();
	3165	+
	3166	+// if (obj.parent == null)
	3167	+// {
	3168	+// System.out.println("NULL PARENT!");
	3169	+// new Exception().printStackTrace();
	3170	+// }
	3171	+// else
	3172	+// TouchTransform(obj);
	3173	+// //obj.parent.Touch();
	3174	+ }
	3175	+
	3176	+ refreshContents();
	3177	+ }
2870	3178
2871	3179	void ResetTransform()
2872	3180	{
..	..	@@ -2979,7 +3287,7 @@
2979	3287	refreshContents();
2980	3288	}
2981	3289
2982		- void ResetCentroid()
	3290	+ void ResetCentroid(boolean full)
2983	3291	{
2984	3292	Object3D obj;
2985	3293	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3302,16 @@
2994	3302	LA.matIdentity(Object3D.mat);
2995	3303	obj.getBounds(minima, maxima, false);
2996	3304	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3305	+ if (full)
	3306	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3307	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3308	obj.TransformMesh(Object3D.mat);
	3309	+
3000	3310	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3311	+ if (full)
	3312	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3313	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3314	+
3003	3315	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3316	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3317	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3065,9 +3377,9 @@
3065	3377	obj = (Object3D)e.nextElement();
3066	3378
3067	3379	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3380	+ Grafreed.AnalyzeObject(obj);
3069	3381	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3382	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3383
3072	3384	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3385	}
..	..	@@ -3109,6 +3421,13 @@
3109	3421	void GenNormals(boolean crease)
3110	3422	{
3111	3423	group.GenNormalsS(crease);
	3424	+
	3425	+ refreshContents();
	3426	+ }
	3427	+
	3428	+ void GenNormalsMINE()
	3429	+ {
	3430	+ group.selection.GenNormalsMINE();
3112	3431
3113	3432	refreshContents();
3114	3433	}
..	..	@@ -3157,104 +3476,259 @@
3157	3476
3158	3477	//Object3D buffer;
3159	3478	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	3479	+// BoundaryRep temprep;
	3480	+// Object3D nodes;
	3481	+// Vector<Vertex> vertices;
	3482	+//
	3483	+// cGroup buffer;
	3484	+//
	3485	+// public void Vertex(Object3D node, Vertex v)
	3486	+// {
	3487	+//// vertices.add(v);
	3488	+//// nodes.addElement(node);
	3489	+////
	3490	+//// if (temprep.GetCache(v) != null)
	3491	+//// {
	3492	+//// temprep.Remove(v);
	3493	+//// } else
	3494	+//// {
	3495	+//// temprep.Remember(v);
	3496	+//// }
	3497	+//
	3498	+// //Object3D node = nodes.get(index);
	3499	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3500	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3501	+//
	3502	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3503	+//
	3504	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3505	+//
	3506	+// cGroup g = new cGroup();
	3507	+//
	3508	+// if (g.toParent == null)
	3509	+// {
	3510	+// g.toParent = LA.newMatrix();
	3511	+// g.fromParent = LA.newMatrix();
	3512	+// }
	3513	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3514	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3515	+//
	3516	+// g.add(GrafreeD.clipboard);
	3517	+//
	3518	+// buffer.add(g);
	3519	+// }
	3520	+//
	3521	+// public void Face(Object3D node, Face f)
	3522	+// {
	3523	+//
	3524	+// }
	3525	+//
	3526	+// void ParseVerticesOld() // ??
	3527	+// {
	3528	+// //if (group.selection.size() != 1)
	3529	+// // return;
	3530	+//
	3531	+// temprep = new BoundaryRep();
	3532	+// nodes = new Object3D();
	3533	+// vertices = new Vector<Vertex>();
	3534	+//
	3535	+// boolean epsequal = GrafreeD.epsequal;
	3536	+// GrafreeD.epsequal = true;
	3537	+//
	3538	+// for (int i=0; i<group.selection.size(); i++)
	3539	+// {
	3540	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3541	+//
	3542	+// group.selection.get(i).Parse(
	3543	+//this );
	3544	+//
	3545	+// int repsize = temprep.VertexCount();
	3546	+// int tablesize = temprep.vertextable.size();
	3547	+// int nodesize = nodes.size();
	3548	+//
	3549	+// assert(vertices.size() == nodes.size());
	3550	+//
	3551	+// temprep.vertextable.elements();
	3552	+//
	3553	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3554	+//
	3555	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3556	+// {
	3557	+// cGroup g = new cGroup();
	3558	+//
	3559	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3560	+//
	3561	+// Object3D node = nodes.get(index);
	3562	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3563	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3564	+//
	3565	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3566	+//
	3567	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3568	+//
	3569	+// if (g.toParent == null)
	3570	+// {
	3571	+// g.toParent = LA.newMatrix();
	3572	+// g.fromParent = LA.newMatrix();
	3573	+// }
	3574	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3575	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3576	+//
	3577	+// g.add(GrafreeD.clipboard);
	3578	+//
	3579	+// buffer.add(g);
	3580	+// }
	3581	+//
	3582	+// makeSomething(buffer, i==group.selection.size()-1);
	3583	+// }
	3584	+//
	3585	+// GrafreeD.epsequal = epsequal;
	3586	+//
	3587	+// //buffer = null;
	3588	+// temprep = null;
	3589	+// nodes = null;
	3590	+//
	3591	+// refreshContents();
	3592	+// }
	3593	+
3184	3594	void ParseVertices()
3185	3595	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	3596	+ boolean epsequal = Grafreed.epsequal;
	3597	+ Grafreed.epsequal = true;
3195	3598
3196	3599	for (int i=0; i<group.selection.size(); i++)
3197	3600	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3601	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3602
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3603	+ group.selection.get(i).Parse(
	3604	+
	3605	+ new iParse()
	3606	+ {
	3607	+ public void Vertex(Object3D node, Vertex v)
	3608	+ {
	3609	+ temp.set(v);
	3610	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3611
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3612	+ cGroup g = new cGroup();
3211	3613
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3614	+ if (g.toParent == null)
	3615	+ {
	3616	+ g.toParent = LA.newMatrix();
	3617	+ g.fromParent = LA.newMatrix();
	3618	+ }
	3619	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3620	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3621
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3622	+ g.add(Grafreed.clipboard);
3220	3623
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3624	+ buffer.add(g);
	3625	+ }
3232	3626
3233		- g.add(GraphreeD.clipboard);
	3627	+ public void Face(Object3D node, Face f)
	3628	+ {
3234	3629
3235		- buffer.add(g);
3236		- }
	3630	+ }
	3631	+ }
	3632	+ );
3237	3633
3238	3634	makeSomething(buffer, i==group.selection.size()-1);
3239	3635	}
3240	3636
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3637	+ Grafreed.epsequal = epsequal;
3246	3638
3247	3639	refreshContents();
3248	3640	}
3249		-
	3641	+
	3642	+ void TextureVertices()
	3643	+ {
	3644	+ for (int i=0; i<group.selection.size(); i++)
	3645	+ {
	3646	+ group.selection.get(i).Parse(
	3647	+ new iParse()
	3648	+ {
	3649	+ public void Vertex(Object3D node, Vertex v)
	3650	+ {
	3651	+ cTexture tex = node.GetTextures();
	3652	+ String pigment = Object3D.GetPigment(tex);
	3653	+ //String bump = Object3D.GetBump(tex);
	3654	+
	3655	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3656	+
	3657	+ try
	3658	+ {
	3659	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3660	+ }
	3661	+ catch (Exception e)
	3662	+ {
	3663	+ System.err.println("FAIL: " + node);
	3664	+ }
	3665	+
	3666	+ double s = v.s;
	3667	+
	3668	+ if (s == 1)
	3669	+ s = 0;
	3670	+
	3671	+ double t = v.t;
	3672	+
	3673	+ if (t == 1)
	3674	+ t = 0;
	3675	+
	3676	+ int indexs = (int) (texturedata.getWidth() * s);
	3677	+ int indext = (int) (texturedata.getHeight() * t);
	3678	+
	3679	+ int index = indext * texturedata.getWidth() + indexs;
	3680	+
	3681	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3682	+
	3683	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3684	+
	3685	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3686	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3687	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3688	+ scale /= 3;
	3689	+
	3690	+ scale /= 0xFF;
	3691	+ // c'est quoi ca? scale /= 4;
	3692	+
	3693	+ //v.AO = scale;
	3694	+
	3695	+ v.x += v.norm.x * scale;
	3696	+ v.y += v.norm.y * scale;
	3697	+ v.z += v.norm.z * scale;
	3698	+ }
	3699	+
	3700	+ public void Face(Object3D node, Face f)
	3701	+ {
	3702	+ }
	3703	+ }
	3704	+ );
	3705	+ }
	3706	+
	3707	+ refreshContents();
	3708	+ }
	3709	+
3250	3710	void Align()
3251	3711	{
	3712	+ if (group.selection.size() == 0)
	3713	+ return;
	3714	+
	3715	+ cVector bbmin = new cVector();
	3716	+ cVector bbmax = new cVector();
	3717	+
	3718	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3719	+
	3720	+ double dx = bbmax.x - bbmin.x;
	3721	+ double dy = bbmax.y - bbmin.y;
	3722	+ double dz = bbmax.z - bbmin.z;
	3723	+
	3724	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3725	+
3252	3726	for (int i=0; i<group.selection.size(); i++)
3253	3727	{
3254	3728	Object3D obj = group.selection.get(i);
3255	3729
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3730	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3731	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3732	}
3259	3733
3260	3734	refreshContents();
..	..	@@ -3267,7 +3741,7 @@
3267	3741	// ref.SaveSupports();
3268	3742	// Object3D par = ref.parent;
3269	3743	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3744	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3745	// ref.parent = par;
3272	3746	// ref.RestoreSupports();
3273	3747
..	..	@@ -3275,11 +3749,11 @@
3275	3749
3276	3750	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3751
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3752	+ boolean random = CameraPane.SWITCH;
	3753	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3754	lowres.linkVerticesThis(null);
3281	3755	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3756	+ CameraPane.SWITCH = random;
3283	3757
3284	3758	System.err.flush();
3285	3759
..	..	@@ -3297,7 +3771,7 @@
3297	3771	// lowres.SaveSupports();
3298	3772	// par = lowres.parent;
3299	3773	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3774	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3775	Object3D newlow = CloneObject(lowres, false);
3302	3776	newlow.name = sn.switchobject.get(i).name;
3303	3777	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3793,7 @@
3319	3793	return;
3320	3794
3321	3795	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3796	+ Object3D ref = Grafreed.clipboard.get(0);
3323	3797
3324	3798	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3799
..	..	@@ -3488,7 +3962,7 @@
3488	3962	group.selection.RelinkToSupport(); // july 2014
3489	3963	System.out.println("DONE.");
3490	3964	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	3965	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	3966	}
3493	3967
3494	3968	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +3987,20 @@
3513	3987
3514	3988	void ClipMesh()
3515	3989	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	3990	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	3991	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	3992	+ Object3D content = Grafreed.clipboard.get(0);
3519	3993
3520	3994	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	3995	content = ((cGroup)content).get(0);
3522	3996
3523	3997	// for (int i=0; i<group.selection.size(); i++)
3524	3998	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	3999	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4000	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4001	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4002	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4003	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4004	System.out.println("DONE.");
3531	4005	refreshContents();
3532	4006	}
..	..	@@ -3764,25 +4238,25 @@
3764	4238	System.err.println("info : " + child.GetPath());
3765	4239	}
3766	4240	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4241	+// else
	4242	+// {
	4243	+// objEditor.SetMaterial(group); // .GetMaterial());
	4244	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4245	+// System.err.println("info : " + group.GetPath());
	4246	+// }
3773	4247
3774	4248	objEditor.SetText(); // jan 2014
3775	4249
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4250	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
3777	4251	CameraPane.flash = true;
3778	4252
3779	4253	if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
3780	4254	// a camera
3781	4255	{
3782	4256	CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4257	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4258	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4259	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4260	}
3787	4261
3788	4262	refreshContents();
..	..	@@ -3864,12 +4338,12 @@
3864	4338	{
3865	4339	if (group.selection.isEmpty())
3866	4340	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4341	+ Grafreed.clipboardIsTempGroup = false;
3868	4342	Composite tGroup = null;
3869	4343	if (group.selection.size() > 0) // 1)
3870	4344	{
3871	4345	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4346	+ Grafreed.clipboardIsTempGroup = true;
3873	4347	}
3874	4348
3875	4349	if (cut)
..	..	@@ -3909,16 +4383,16 @@
3909	4383	//System.out.println("cut " + child);
3910	4384	//System.out.println("parent = " + child.parent);
3911	4385	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4386	+ if (Grafreed.clipboardIsTempGroup)
3913	4387	tGroup.add/Child/(tmp);
3914	4388	else
3915		- GraphreeD.clipboard = tmp;
	4389	+ Grafreed.clipboard = tmp;
3916	4390	}
3917	4391	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4392	+ if (Grafreed.clipboardIsTempGroup)
3919	4393	tGroup.add/Child/(child);
3920	4394	else
3921		- GraphreeD.clipboard = child;
	4395	+ Grafreed.clipboard = child;
3922	4396	}
3923	4397
3924	4398	//ResetModel();
..	..	@@ -3950,21 +4424,21 @@
3950	4424	//System.out.println("cut " + elem);
3951	4425	//System.out.println("parent = " + elem.parent);
3952	4426	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4427	+ if (Grafreed.clipboardIsTempGroup)
3954	4428	tGroup.add/Child/(tmp);
3955	4429	else
3956		- GraphreeD.clipboard = tmp;
	4430	+ Grafreed.clipboard = tmp;
3957	4431	}
3958	4432	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4433	+ if (Grafreed.clipboardIsTempGroup)
3960	4434	tGroup.add/Child/(child);
3961	4435	else
3962		- GraphreeD.clipboard = child;
	4436	+ Grafreed.clipboard = child;
3963	4437	}
3964	4438
3965	4439	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4440	+ if (Grafreed.clipboardIsTempGroup)
	4441	+ Grafreed.clipboard = tGroup;
3968	4442	if (cut)
3969	4443	{
3970	4444	ResetModel();
..	..	@@ -3974,11 +4448,11 @@
3974	4448
3975	4449	void paste(boolean expand)
3976	4450	{
3977		- // if (GraphreeD.clipboard == null)
	4451	+ // if (GrafreeD.clipboard == null)
3978	4452	// return;
3979	4453	boolean first = true;
3980	4454
3981		- if (GraphreeD.clipboardIsTempGroup)
	4455	+ if (Grafreed.clipboardIsTempGroup)
3982	4456	{
3983	4457	Composite temp;
3984	4458
..	..	@@ -3989,7 +4463,7 @@
3989	4463	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4464	*/
3991	4465	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4466	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4467	{
3994	4468	Object3D child = (Object3D)e.nextElement();
3995	4469
..	..	@@ -4003,7 +4477,7 @@
4003	4477	else
4004	4478	elem = child.deepCopy(); // ?
4005	4479	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4480	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4481	// elem = elem.get(0);
4008	4482	makeSomething(elem, true); // ?? first);
4009	4483	//group.addChild(elem);
..	..	@@ -4023,23 +4497,23 @@
4023	4497	//Object3D cb = Applet3D.clipboard;
4024	4498	//temp.addChild(cb);
4025	4499	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4500	+ assert(Grafreed.clipboard.parent == null);
	4501	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4502	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4503	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4504	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4505	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4506	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4507	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4508	}
4035	4509
4036	4510	ResetModel();
4037	4511	refreshContents();
4038	4512	}
4039	4513
4040		- void pasteInto(boolean copyit)
	4514	+ void pasteInto(boolean copyit, boolean clone)
4041	4515	{
4042		-// if (GraphreeD.clipboard == null)
	4516	+// if (GrafreeD.clipboard == null)
4043	4517	// return;
4044	4518
4045	4519	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4540,22 @@
4066	4540	if (copyit)
4067	4541	{
4068	4542	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4543	+ if (clone)
	4544	+ {
	4545	+ CloneClipboard(false); // sept 2014
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ paste(false);
	4550	+ }
4070	4551	}
4071	4552	else
4072	4553	{
4073	4554	boolean first = true;
4074	4555
4075		- if (GraphreeD.clipboardIsTempGroup)
	4556	+ if (Grafreed.clipboardIsTempGroup)
4076	4557	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4558	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4559	Object3D copy;
4079	4560	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4561	{
..	..	@@ -4084,7 +4565,7 @@
4084	4565	}
4085	4566	} else
4086	4567	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4568	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4569	}
4089	4570	}
4090	4571	}
..	..	@@ -4276,6 +4757,26 @@
4276	4757	makeSomething(csg);
4277	4758	}
4278	4759
	4760	+ void Ungroup(Object3D g)
	4761	+ {
	4762	+ if (g instanceof HiddenObject)
	4763	+ {
	4764	+ HiddenObject h = (HiddenObject) g;
	4765	+
	4766	+ for (int i=0; i<h.ActualSize(); i++)
	4767	+ {
	4768	+ objEditor.makeSomething(h.get(i), false);
	4769	+ }
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ for (int i=0; i<g.Size(); i++)
	4774	+ {
	4775	+ objEditor.makeSomething(g.get(i), false);
	4776	+ }
	4777	+ }
	4778	+ }
	4779	+
4279	4780	void ungroup()
4280	4781	{
4281	4782	/*
..	..	@@ -4471,7 +4972,7 @@
4471	4972
4472	4973	void ImportGFD()
4473	4974	{
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
	4975	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4475	4976	browser.show();
4476	4977	String filename = browser.getFile();
4477	4978	if (filename != null && filename.length() > 0)
..	..	@@ -4509,7 +5010,7 @@
4509	5010
4510	5011	void ImportVRMLX3D()
4511	5012	{
4512		- if (GraphreeD.standAlone)
	5013	+ if (Grafreed.standAlone)
4513	5014	{
4514	5015	/**/
4515	5016	FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
..	..	@@ -4526,7 +5027,7 @@
4526	5027
4527	5028	String GetFile(String dialogName)
4528	5029	{
4529		- if (GraphreeD.standAlone)
	5030	+ if (Grafreed.standAlone)
4530	5031	{
4531	5032	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5033	browser.show();
..	..	@@ -4590,10 +5091,12 @@
4590	5091	cButton flashSelectionButton;
4591	5092	cButton editButton;
4592	5093	cButton uneditButton;
	5094	+ JCheckBox allParamsButton;
4593	5095	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5096	cButton unselectButton;
4596	5097
	5098	+ cButton oneStepButton;
	5099	+
4597	5100	cButton screenfitButton;
4598	5101	cButton screenfitpointButton;
4599	5102	cButton snapobjectButton;
..	..	@@ -4635,8 +5138,9 @@
4635	5138	private MenuItem resetsupportItem;
4636	5139	private MenuItem resetreferencesItem;
4637	5140	private MenuItem linkverticesItem;
	5141	+ private MenuItem relinkverticesItem;
4638	5142	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5143	+ private MenuItem resetAllItem;
4640	5144	private MenuItem stepAllItem;
4641	5145	private MenuItem revertMeshItem;
4642	5146	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5151,17 @@
4647	5151	private MenuItem mergeGeometriesItem;
4648	5152	private MenuItem copyItem;
4649	5153	private MenuItem pasteItem;
	5154	+ private MenuItem pasteIntoItem;
4650	5155	private MenuItem pasteLinkItem;
4651	5156	private MenuItem pasteCloneItem;
4652	5157	private MenuItem pasteExpandItem;
4653	5158	private MenuItem clearItem;
4654	5159	private MenuItem clearAllItem;
4655	5160	private MenuItem genUVItem;
	5161	+ private MenuItem genNormalsMESHItem;
4656	5162	private MenuItem genNormalsCADItem;
4657	5163	private MenuItem genNormalsORGANItem;
	5164	+ private MenuItem genNormalsMINEItem;
4658	5165	private MenuItem stripifyItem;
4659	5166	private MenuItem unstripifyItem;
4660	5167	private MenuItem trimItem;
..	..	@@ -4694,8 +5201,11 @@
4694	5201	private MenuItem panoTexturesItem;
4695	5202
4696	5203	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5204	+ private MenuItem resetCentroidXZItem;
4698	5205	private MenuItem resetTransformItem;
	5206	+ private MenuItem transformGeometryItem;
	5207	+ private MenuItem transformChildrenItem;
	5208	+ private MenuItem hideItem;
4699	5209	private MenuItem grabItem;
4700	5210	private MenuItem backItem;
4701	5211	private MenuItem frontItem;
..	..	@@ -4716,6 +5226,7 @@
4716	5226
4717	5227	private MenuItem resetParentItem;
4718	5228	private MenuItem repairParentItem;
	5229	+ private MenuItem repairShadowItem;
4719	5230	private MenuItem sortbysizeItem;
4720	5231	private MenuItem sortbynameItem;
4721	5232
..	..	@@ -4728,16 +5239,19 @@
4728	5239	private MenuItem particleItem;
4729	5240	private MenuItem ragdollItem;
4730	5241	private MenuItem ragdoll2Item;
	5242	+ private MenuItem heightFieldItem;
	5243	+ private MenuItem textureFieldItem;
4731	5244	private MenuItem gridItem;
4732	5245	private MenuItem rectoidItem;
4733	5246	private MenuItem ellipsoidItem;
4734	5247	private MenuItem coneItem;
4735	5248	private MenuItem torusItem;
4736	5249	private MenuItem superItem;
	5250	+ private MenuItem kleinItem;
4737	5251	private MenuItem blobItem;
4738	5252	private MenuItem latheItem;
4739	5253	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5254	+ private MenuItem overlayItem;
4741	5255	private MenuItem meshItem;
4742	5256	// private MenuItem meshGroupItem;
4743	5257	private MenuItem springItem;
..	..	@@ -4746,6 +5260,7 @@
4746	5260	private MenuItem csgItem;
4747	5261	private MenuItem templateItem;
4748	5262	private MenuItem textureItem;
	5263	+ private MenuItem billboardItem;
4749	5264	private MenuItem shadowXItem;
4750	5265	private MenuItem shadowYItem;
4751	5266	private MenuItem shadowZItem;