~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,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -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
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,44 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- 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);
	286	+ }
	287	+
	288	+ oe.menuBar.add(menu = new Menu("Setting"));
	289	+ if (Globals.ADVANCED)
	290	+ {
196	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	292	revertMeshItem.addActionListener(this);
198	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	294	resetreferencesItem.addActionListener(this);
200	295	menu.add("-");
	296	+ }
201	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	298	overwriteGeoItem.addActionListener(this);
203	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +305,68 @@
209	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	306	overwriteUVItem.addActionListener(this);
211	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
212	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	311	generateMeshItem.addActionListener(this);
214	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	313	poseMeshItem.addActionListener(this);
216	314	menu.add("-");
	315	+ }
217	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	317	resetsupportItem.addActionListener(this);
219	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
221	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	326	setMasterItem.addActionListener(this);
	327	+ }
223	328
224		- oe.menuBar.add(menu = new Menu("Object"));
	329	+ oe.menuBar.add(menu = new Menu("Group"));
225	330	grabItem = menu.add(new MenuItem("Grab"));
226	331	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	332	backItem = menu.add(new MenuItem("Back"));
230	333	backItem.addActionListener(this);
	334	+ frontItem = menu.add(new MenuItem("Front"));
	335	+ frontItem.addActionListener(this);
231	336	compositeItem = menu.add(new MenuItem("Composite"));
232	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
233	342	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
235	344	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	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	346	switchGeoItem.addActionListener(this);
242	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	348	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
246	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	360	scriptNodeItem.addActionListener(this);
248	361	cameraItem = menu.add(new MenuItem("Camera"));
249	362	cameraItem.addActionListener(this);
250		- menu.add("-");
	363	+ }
	364	+
	365	+ oe.menuBar.add(menu = new Menu("Object"));
251	366	textureItem = menu.add(new MenuItem("Texture"));
252	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
253	370	csgItem = menu.add(new MenuItem("CSG"));
254	371	csgItem.addActionListener(this);
255	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +375,29 @@
258	375	shadowYItem.addActionListener(this);
259	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
261	381	linkerItem = menu.add(new MenuItem("Linker"));
262	382	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	383	attributeItem = menu.add(new MenuItem("Attribute"));
266	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
267	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	388	pointflowItem.addActionListener(this);
	389	+ }
269	390	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	392	resetTransformItem.addActionListener(this);
274	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	394	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
278	401
279	402	oe.menuBar.add(menu = new Menu("Geometry"));
280	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +406,13 @@
283	406	genNormalsORGANItem.addActionListener(this);
284	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
286	416	stripifyItem = menu.add(new MenuItem("Stripify"));
287	417	stripifyItem.addActionListener(this);
288	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +422,6 @@
292	422	untrimItem = menu.add(new MenuItem("Untrim"));
293	423	untrimItem.addActionListener(this);
294	424	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	425	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	426	clearColorsItem.addActionListener(this);
299	427	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
	445	+
	446	+ oe.menuBar.add(menu = new Menu("Attributes"));
	447	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	448	+ clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
313	453	menu.add("-");
314	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	455	liveleavesItem.addActionListener(this);
316	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
318	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	461	supportleavesItem.addActionListener(this);
320	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	463	unsupportleavesItem.addActionListener(this);
	464	+ }
322	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	466	hideleavesItem.addActionListener(this);
324	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +470,31 @@
327	470	markleavesItem.addActionListener(this);
328	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
330	481	menu.add("-");
331	482	flipVItem = menu.add(new MenuItem("Flip V"));
332	483	flipVItem.addActionListener(this);
333	484	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	485	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	486	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	487	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	488	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	489	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	490	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	491	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	492	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	493	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	494	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	495	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	496	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	497	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	498
357	499	oe.menuBar.add(menu = new Menu("Selection"));
358	500	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +512,24 @@
370	512	sortbysizeItem.addActionListener(this);
371	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	514	sortbynameItem.addActionListener(this);
	515	+ menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
	523	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	524	+ extractGeometriesItem.addActionListener(this);
	525	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	526	+ cloneGeometriesItem.addActionListener(this);
	527	+ }
	528	+
373	529	oe.menuBar.add(menu = new Menu("Insert"));
374	530	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	531	+
	532	+ oe.menuBar.add(menu = new Menu("Tools"));
376	533	buildToolsMenu(menu);
377	534	}
378	535
..	..	@@ -406,150 +563,110 @@
406	563	oe.radioPanel.add(dummyButton);
407	564	oe.buttonGroup.add(dummyButton);
408	565	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	566	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	567
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	568	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ undoButton.setToolTipText("Undo changes");
	570	+ undoButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	573	+ redoButton.setToolTipText("Redo changes");
	574	+ redoButton.addActionListener(this);
	575	+
	576	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ saveButton.setToolTipText("Save changes");
	578	+ saveButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	581	+ liveCB.setToolTipText("Enable animation");
414	582	liveCB.addItemListener(this);
415	583
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);
	584	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ oneStepButton.setToolTipText("Animate one step forward");
	586	+ oneStepButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	589	+ fastCB.setToolTipText("Fast mode");
434	590	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);
	591	+
	592	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	593	+ trackCB.setToolTipText("Enable tracking");
476	594	trackCB.addItemListener(this);
477	595
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	596	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ screenfitButton.setToolTipText("Screen fit");
480	598	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	599	+
482	600	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	601	// 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	602
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);
	603	+ if (Globals.ADVANCED)
	604	+ {
	605	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ snapobjectButton.addActionListener(this);
	607	+ snapobjectButton.setToolTipText("Snap Object");
	608	+ }
	609	+
	610	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ flashSelectionButton.setToolTipText("Show selection");
495	612	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	613
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	614	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	615	+
	616	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ twoButton.setToolTipText("Show center view only");
502	618	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	620	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	621	+ fourButton.setToolTipText("Show left panel only");
	622	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ sixButton.setToolTipText("2-column layout left");
506	624	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ threeButton.setToolTipText("2-column layout right");
508	627	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	628	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ sevenButton.setToolTipText("3-column layout");
510	630	sevenButton.addActionListener(this);
511	631	//
512	632
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	633	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ rootButton.setToolTipText("Edit selection in new tab");
514	635	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	636	+
	637	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ closeButton.setToolTipText("Close tab");
517	639	closeButton.addActionListener(this);
518	640	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	641	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	642
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	643	+ cGridBag commandsPanel = new cGridBag();
	644	+
	645	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ editButton.setToolTipText("Edit selection");
524	647	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	648
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	649	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ uneditButton.setToolTipText("Unedit selection");
530	651	uneditButton.addActionListener(this);
531	652
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);
	653	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	654	+ allParamsButton.setToolTipText("Edit all params");
544	655	allParamsButton.addActionListener(this);
545	656
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);
	657	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ clearPanelButton.setToolTipText("Clear edit panel");
	659	+ clearPanelButton.addActionListener(this);
	660	+
	661	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ unselectButton.setToolTipText("Unselect");
551	663	unselectButton.addActionListener(this);
552	664
	665	+ commandsPanel.preferredHeight = 1;
	666	+
	667	+ oe.treePanel.add(commandsPanel);
	668	+ oe.treePanel.Return();
	669	+
553	670	// oe.aConstraints.gridx += 1;
554	671	// oe.aConstraints.weighty = 0;
555	672	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +678,37 @@
561	678	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	679	// gcButton.addActionListener(this);
563	680
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;
	681	+ cGridBag jSPPanel = new cGridBag();
	682	+
	683	+ JScrollPane jSP;
575	684	//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);
	685	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	686	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	687	+
	688	+ oe.treePanel.add(jSPPanel);
	689	+ oe.treePanel.Return();
582	690
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);
	691	+ cGridBag copyOptionsPanel = new cGridBag();
	692	+
	693	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	694	+ colorCB.setToolTipText("Copy color when dropped");
587	695	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	696	+
	697	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	698	+ materialCB.setToolTipText("Copy material when dropped");
590	699	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	700	+
	701	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	702	+ textureCB.setToolTipText("Copy texture when dropped");
593	703	textureCB.addItemListener(this);
594	704
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	705	+ copyOptionsPanel.preferredHeight = 1;
	706	+ oe.treePanel.add(copyOptionsPanel);
	707	+ oe.treePanel.Return();
597	708
	709	+// mainPanel.setDividerLocation(0.5); //1.0);
	710	+// mainPanel.setResizeWeight(0.5);
	711	+
598	712	//jList.addListSelectionListener(this);
599	713	oe.jTree.addTreeSelectionListener(this);
600	714	//jTree.setRootVisible(false);
..	..	@@ -616,18 +730,91 @@
616	730	radio.layout = sevenButton;
617	731	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	732	}
	733	+
	734	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	735	+ {
	736	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	737	+ boxCB.setToolTipText("Display bounding boxes");
	738	+ boxCB.addItemListener(this);
	739	+
	740	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	741	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	742	+ zoomBoxCB.addItemListener(this);
	743	+
	744	+ if (true) // Globals.ADVANCED)
	745	+ {
	746	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	747	+ supportCB.setToolTipText("Enable rigging");
	748	+ supportCB.addItemListener(this);
	749	+
	750	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	751	+ // localCB.addItemListener(this);
	752	+
	753	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	754	+ crowdCB.setToolTipText("Used for crowds");
	755	+ crowdCB.addItemListener(this);
	756	+
	757	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	758	+ smoothCB.setToolTipText("Snapping delay");
	759	+ smoothCB.addItemListener(this);
	760	+
	761	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	762	+ slowCB.setToolTipText("Smooth interpolation");
	763	+ slowCB.addItemListener(this);
	764	+
	765	+// constraints.gridy += 1;
	766	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	767	+// speakerMocapCB.addItemListener(this);
	768	+
	769	+ if (false)
	770	+ {
	771	+ // handled in scripts
	772	+ //constraints.gridy += 1;
	773	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	774	+ speakerCameraCB.addItemListener(this);
	775	+
	776	+ //constraints.gridy += 1;
	777	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	778	+ speakerFocusCB.addItemListener(this);
	779	+
	780	+ //constraints.gridy += 1;
	781	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	782	+ smoothfocusCB.addItemListener(this);
	783	+ }
	784	+
	785	+//constraints.gridx += 1;
	786	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	787	+// debugCB.addItemListener(this);
	788	+
	789	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	790	+ oeilCB.addItemListener(this);
	791	+
	792	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	793	+ lookAtCB.setToolTipText("Look-at target");
	794	+ lookAtCB.addItemListener(this);
	795	+
	796	+ }
	797	+
	798	+ cGridBag fill = new cGridBag();
	799	+
	800	+ fill.preferredHeight = 200;
	801	+
	802	+ panel.add(fill);
	803	+
	804	+ }
619	805
620	806	void EditObject(Object3D obj)
621	807	{
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();
	808	+ cRadio radioButton = new cRadio(obj.name);
	809	+ radioButton.SetObject(obj);
	810	+ radioButton.layout = sevenButton;
	811	+ radioButton.SetCamera(cameraView.renderCamera, false);
	812	+ radioButton.addActionListener(this);
	813	+ radioPanel.add(radioButton);
	814	+ buttonGroup.add(radioButton);
	815	+ radioButton.doClick();
630	816	}
	817	+
631	818	void SetupViews(ObjEditor oe)
632	819	{
633	820	oe.SetupViews();
..	..	@@ -646,6 +833,7 @@
646	833	JCheckBox fastCB;
647	834	JCheckBox slowCB;
648	835	JCheckBox boxCB;
	836	+ JCheckBox zoomBoxCB;
649	837	JCheckBox trackCB;
650	838	JCheckBox smoothfocusCB;
651	839	// JCheckBox speakerMocapCB;
..	..	@@ -688,10 +876,10 @@
688	876	dropAttributes \|= Object3D.TEXTURE;
689	877	else
690	878	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	879	+ } else if(e.getSource() == liveCB)
693	880	{
694	881	cameraView.ToggleLive();
	882	+ refreshContents(false);
695	883	}
696	884	else if(e.getSource() == supportCB)
697	885	{
..	..	@@ -726,6 +914,10 @@
726	914	Recompile();
727	915	cameraView.repaint();
728	916	// refreshContents();
	917	+ }
	918	+ else if(e.getSource() == zoomBoxCB)
	919	+ {
	920	+ cameraView.ToggleZoomBoxMode();
729	921	}
730	922	else if(e.getSource() == smoothfocusCB)
731	923	{
..	..	@@ -840,7 +1032,9 @@
840	1032	// objEditor.DropFile((java.io.File[]) object, true);
841	1033	// return;
842	1034	// }
843		- if (string.charAt(0) == '/')
	1035	+
	1036	+ // File path for Mac and Windows
	1037	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1038	{
845	1039	// file(s)
846	1040	String[] names = string.split("\n");
..	..	@@ -867,7 +1061,7 @@
867	1061
868	1062	flashIt = false;
869	1063	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1064	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1065	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1066
873	1067	if (group.selection.size() == 1)
..	..	@@ -894,11 +1088,11 @@
894	1088	{
895	1089	loadClipboard(true);
896	1090	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1091	+ pasteInto(false, false);
898	1092	} else {
899	1093	loadClipboard(false);
900	1094	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1095	+ pasteInto(false, false); // true); // ???
902	1096	}
903	1097	}
904	1098	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1196,8 @@
1002	1196
1003	1197	void buildCreateMenu(Menu menu)
1004	1198	{
	1199	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1200	+ //heightFieldItem.addActionListener(this);
1005	1201	gridItem = menu.add(new MenuItem("Grid"));
1006	1202	gridItem.addActionListener(this);
1007	1203	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1210,37 @@
1014	1210	torusItem.addActionListener(this);
1015	1211	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1212	superItem.addActionListener(this);
	1213	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1214	+ kleinItem.addActionListener(this);
1017	1215	particleItem = menu.add(new MenuItem("Particle system"));
1018	1216	particleItem.addActionListener(this);
	1217	+ if (Globals.ADVANCED)
	1218	+ {
1019	1219	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1220	ragdollItem.addActionListener(this);
1021	1221	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1222	ragdoll2Item.addActionListener(this);
	1223	+ }
1023	1224	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1225	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1226	meshItem.addActionListener(this);
1026	1227	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1228	// meshGroupItem.addActionListener(this);
	1229	+ if (Globals.ADVANCED)
	1230	+ {
1028	1231	springItem = menu.add(new MenuItem("Spring"));
1029	1232	springItem.addActionListener(this);
1030	1233	flagItem = menu.add(new MenuItem("Flag"));
1031	1234	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	1235	blobItem = menu.add(new MenuItem("Blob"));
1037	1236	blobItem.addActionListener(this);
1038	1237	latheItem = menu.add(new MenuItem("Lathe"));
1039	1238	latheItem.addActionListener(this);
	1239	+ }
	1240	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1241	+ bezierItem.addActionListener(this);
	1242	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1243	+ overlayItem.addActionListener(this);
1040	1244	lightItem = menu.add(new MenuItem("Light"));
1041	1245	lightItem.addActionListener(this);
1042	1246	menu.add("-");
..	..	@@ -1046,46 +1250,44 @@
1046	1250	loopItem.addActionListener(this);
1047	1251	doubleItem = menu.add(new MenuItem("Fork"));
1048	1252	doubleItem.addActionListener(this);
	1253	+ if (Globals.ADVANCED)
	1254	+ {
1049	1255	tripleItem = menu.add(new MenuItem("Trident"));
1050	1256	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);
	1257	+ }
1060	1258	}
1061	1259
1062	1260	void buildToolsMenu(Menu menu)
1063	1261	{
1064	1262	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1263	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1264	+ animationItem.setState(Globals.ANIMATION);
1067	1265
1068	1266	menu.add("-");
1069	1267	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1268	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1269	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1270	+ textureFieldItem.addActionListener(this);
	1271	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1272	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1273	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1274	reduceMorphItem.addActionListener(this);
1077	1275	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1276	reduce34MorphItem.addActionListener(this);
1079		-
	1277	+ menu.add("-");
1080	1278	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1279	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1280
	1281	+ if (Globals.ADVANCED)
	1282	+ {
	1283	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1284	+ mirrorItem.addActionListener(this);
	1285	+ menu.add("-");
1084	1286	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1287	memoryItem.addActionListener(this);
1086	1288	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1289	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1290	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1291	dumpItem.addActionListener(this);
1090	1292	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1293	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1296,8 @@
1094	1296	resetParentItem.addActionListener(this);
1095	1297	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1298	repairParentItem.addActionListener(this);
	1299	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1300	+ repairShadowItem.addActionListener(this);
1097	1301	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1302	invariantsItem.addActionListener(this);
1099	1303	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1305,7 @@
1101	1305	menu.add("-");
1102	1306	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1307	editScriptItem.addActionListener(this);
	1308	+ }
1104	1309	}
1105	1310
1106	1311	void ScreenFit()
..	..	@@ -1429,9 +1634,9 @@
1429	1634
1430	1635	void Overwrite(int mask)
1431	1636	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1637	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1638	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1639	+ Object3D content = Grafreed.clipboard.get(0);
1435	1640
1436	1641	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1642	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1659,7 @@
1454	1659	//
1455	1660	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1661	{
	1662	+ Object source = event.getSource();
1457	1663	/*
1458	1664	if (event.getSource() == nameField)
1459	1665	{
..	..	@@ -1465,11 +1671,11 @@
1465	1671	}
1466	1672	else
1467	1673	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1674	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1675	{
1470	1676	ScreenFit();
1471	1677	} else
1472		- if (event.getSource() == switchItem)
	1678	+ if (source == switchItem)
1473	1679	{
1474	1680	cVector v1 = new cVector();
1475	1681	cVector v2 = new cVector();
..	..	@@ -1478,11 +1684,11 @@
1478	1684	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1685	objEditor.cameraView.repaint();
1480	1686	} else
1481		- if (event.getSource() == rectoidItem)
	1687	+ if (source == rectoidItem)
1482	1688	{
1483	1689	makeSomething(new Box());
1484	1690	} else
1485		- if (event.getSource() == particleItem)
	1691	+ if (source == particleItem)
1486	1692	{
1487	1693	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1694	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1709,9 @@
1503	1709	applyExample(particleGeom, "SMOKE");
1504	1710	makeSomething(particleGeom);
1505	1711	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1712	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1713	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1714	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1715
1510	1716	ragdoll.toParent = LA.newMatrix();
1511	1717	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1727,71 @@
1521	1727	makeSomething(ragdoll);
1522	1728	//makeSomething(new VehicleDemo());
1523	1729	} else
1524		- if (event.getSource() == gridItem)
	1730	+ /*
	1731	+ */
	1732	+ if (source == heightFieldItem)
	1733	+ {
	1734	+ Object3D obj = new Object3D();
	1735	+
	1736	+ obj.CreateMaterial();
	1737	+ obj.bRep = new BoundaryRep();
	1738	+
	1739	+ obj.bRep.CreateMesh(new iHeightField()
	1740	+ {
	1741	+ public double f(double x, double y)
	1742	+ {
	1743	+ // The Mandelbrot set is represented by coloring
	1744	+ // each point (x,y) according to the number of
	1745	+ // iterations it takes before the while loop in
	1746	+ // this method ends. For points that are actually
	1747	+ // in the Mandelbrot set, or very close to it, the
	1748	+ // count will reach the maximum value, 80. These
	1749	+ // points will be colored purple. All other colors
	1750	+ // represent points that are definitely NOT in the set.
	1751	+ x -= 600;
	1752	+ y -= 500;
	1753	+ x /= 200;
	1754	+ y /= 200;
	1755	+ int count = 0;
	1756	+ double zx = x;
	1757	+ double zy = y;
	1758	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1759	+ double new_zx = zxzx - zyzy + x;
	1760	+ zy = 2zxzy + y;
	1761	+ zx = new_zx;
	1762	+ count++;
	1763	+ }
	1764	+ return count; // Math.sqrt(count);
	1765	+ }
	1766	+ }, 1000,1000);
	1767	+
	1768	+ makeSomething(obj);
	1769	+ } else
	1770	+ if (source == gridItem)
1525	1771	{
1526	1772	makeSomething(new Grid());
1527	1773	} else
1528		- if (event.getSource() == ellipsoidItem)
	1774	+ if (source == ellipsoidItem)
1529	1775	{
1530	1776	makeSomething(new Sphere());
1531	1777	} else
1532		- if (event.getSource() == coneItem)
	1778	+ if (source == coneItem)
1533	1779	{
1534	1780	makeSomething(new Cone());
1535	1781	} else
1536		- if (event.getSource() == torusItem)
	1782	+ if (source == torusItem)
1537	1783	{
1538	1784	makeSomething(new Torus());
1539	1785	} else
1540		- if (event.getSource() == superItem)
	1786	+ if (source == superItem)
1541	1787	{
1542	1788	makeSomething(new Superellipsoid());
1543	1789	} else
1544		- if (event.getSource() == blobItem)
	1790	+ if (source == kleinItem)
	1791	+ {
	1792	+ makeSomething(new Klein());
	1793	+ } else
	1794	+ if (source == blobItem)
1545	1795	{
1546	1796	Blob blob = new Blob();
1547	1797	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1799,15 @@
1549	1799	//blob.retile();
1550	1800	makeSomething(blob);
1551	1801	} else
1552		- if (event.getSource() == latheItem)
	1802	+ if (source == latheItem)
1553	1803	{
1554	1804	makeSomething(new Lathe());
1555	1805	} else
1556		- if (event.getSource() == bezierItem)
	1806	+ if (source == bezierItem)
1557	1807	{
1558	1808	makeSomething(new BezierSurface());
1559	1809	} else
1560		- if (event.getSource() == checkerItem)
	1810	+ if (source == overlayItem)
1561	1811	{
1562	1812	/*
1563	1813	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1820,9 @@
1570	1820	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1821	LA.matInvert(obj.toParent, obj.fromParent);
1572	1822	*/
1573		- makeSomething(new CheckerIG());
	1823	+ makeSomething(new Checker());
1574	1824	} else
1575		- if (event.getSource() == meshItem)
	1825	+ if (source == meshItem)
1576	1826	{
1577	1827	Object3D itemtomake = new Object3D();
1578	1828	Object3D child;
..	..	@@ -1593,35 +1843,35 @@
1593	1843	makeSomething(child);
1594	1844	}
1595	1845	} else
1596		- if (event.getSource() == springItem)
	1846	+ if (source == springItem)
1597	1847	{
1598	1848	cSpring s = new cSpring();
1599	1849	s.setup();
1600	1850	makeSomething(s);
1601	1851	} else
1602		- if (event.getSource() == flagItem)
	1852	+ if (source == flagItem)
1603	1853	{
1604	1854	cSpring s = new cFlag();
1605	1855	s.setup();
1606	1856	makeSomething(s);
1607	1857	} else
1608		- if (event.getSource() == lightItem)
	1858	+ if (source == lightItem)
1609	1859	{
1610	1860	makeSomething(new Light());
1611	1861	} else
1612		- if (event.getSource() == csgItem)
	1862	+ if (source == csgItem)
1613	1863	{
1614	1864	group(new CSG());
1615	1865	} else
1616		- if (event.getSource() == templateItem)
	1866	+ if (source == templateItem)
1617	1867	{
1618	1868	group(new cTemplate());
1619	1869	} else
1620		- if (event.getSource() == attributeItem)
	1870	+ if (source == attributeItem)
1621	1871	{
1622	1872	makeSomething(new Attribute());
1623	1873	} else
1624		- if (event.getSource() == pointflowItem)
	1874	+ if (source == pointflowItem)
1625	1875	{
1626	1876	makeSomething(new PointFlow());
1627	1877	} else
..	..	@@ -1633,7 +1883,7 @@
1633	1883	} else
1634	1884	*/
1635	1885
1636		- if (event.getSource() == superLoopItem)
	1886	+ if (source == superLoopItem)
1637	1887	{
1638	1888	Composite g = new cGroup();
1639	1889	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1905,7 @@
1655	1905
1656	1906	group(g);
1657	1907	} else
1658		- if (event.getSource() == loopItem)
	1908	+ if (source == loopItem)
1659	1909	{
1660	1910	Composite csg = new GroupLeaf();
1661	1911	csg.count = 5;
..	..	@@ -1664,7 +1914,7 @@
1664	1914	csg.addChild(child);
1665	1915	child.addChild(csg);
1666	1916	} else
1667		- if (event.getSource() == doubleItem)
	1917	+ if (source == doubleItem)
1668	1918	{
1669	1919	Composite csg = new GroupLeaf();
1670	1920	csg.count = 5;
..	..	@@ -1676,7 +1926,7 @@
1676	1926	csg.addChild(child);
1677	1927	child.addChild(csg);
1678	1928	} else
1679		- if (event.getSource() == tripleItem)
	1929	+ if (source == tripleItem)
1680	1930	{
1681	1931	Composite csg = new GroupLeaf();
1682	1932	csg.count = 4;
..	..	@@ -1691,71 +1941,71 @@
1691	1941	csg.addChild(child);
1692	1942	child.addChild(csg);
1693	1943	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	1944	+ if (source == computeAOItem)
1696	1945	{
1697		- ImportGFD();
	1946	+ Globals.drawMode = CameraPane.OCCLUSION;
	1947	+ Globals.theRenderer.repaint();
1698	1948	} else
1699		- if (event.getSource() == importVRMLX3DItem)
1700		- {
1701		- ImportVRMLX3D();
1702		- } else
1703		- if (event.getSource() == import3DSItem)
1704		- {
1705		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706		- } else
1707		- if (event.getSource() == importOBJItem)
1708		- {
1709		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710		- } else
1711		- if (event.getSource() == computeAOItem)
1712		- {
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
1715		- } else
1716		- if (event.getSource() == recompileItem)
	1949	+ if (source == recompileItem)
1717	1950	{
1718	1951	Recompile();
1719	1952	refreshContents();
1720	1953	} else
1721		- if (event.getSource() == editScriptItem)
	1954	+ if (source == editScriptItem)
1722	1955	{
1723	1956	OpenDialog();
1724	1957	refreshContents();
1725	1958	} else
1726		- if (event.getSource() == invariantsItem)
	1959	+ if (source == invariantsItem)
1727	1960	{
1728	1961	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1962	+ Grafreed.grafreeD.universe.invariants();
1730	1963	} else
1731		- if (event.getSource() == memoryItem)
	1964	+ if (source == memoryItem)
1732	1965	{
1733	1966	//System.out.println("Invariants:");
1734	1967	PrintMemory();
1735	1968	} else
1736		- if (event.getSource() == pathItem)
	1969	+ if (source == pathItem)
1737	1970	{
1738	1971	PrintPath();
1739	1972	} else
1740		- if (event.getSource() == analyzeItem)
	1973	+ if (source == analyzeItem)
1741	1974	{
1742	1975	AnalyzeObject();
1743	1976	} else
1744		- if (event.getSource() == dumpItem)
	1977	+ if (source == dumpItem)
1745	1978	{
1746	1979	DumpObject();
1747	1980	} else
1748		- if (event.getSource() == screenfitButton)
	1981	+ if (source == undoButton)
	1982	+ {
	1983	+ Undo();
	1984	+ } else
	1985	+ if (source == redoButton)
	1986	+ {
	1987	+ Redo();
	1988	+ } else
	1989	+ if (source == saveButton)
	1990	+ {
	1991	+ Save();
	1992	+ } else
	1993	+ if (source == oneStepButton)
	1994	+ {
	1995	+ Globals.ONESTEP = true;
	1996	+ cameraView.repaint();
	1997	+ } else
	1998	+ if (source == screenfitButton)
1749	1999	{
1750	2000	//Reload(lastConverter, lastFilename, true);
1751	2001	ScreenFit();
1752	2002	} else
1753		- if (event.getSource() == screenfitpointButton)
	2003	+ if (source == screenfitpointButton)
1754	2004	{
1755	2005	//Reload(lastConverter, lastFilename, true);
1756	2006	ScreenFitPoint();
1757	2007	} else
1758		- if (event.getSource() == snapobjectButton)
	2008	+ if (source == snapobjectButton)
1759	2009	{
1760	2010	//Reload(lastConverter, lastFilename, true);
1761	2011	SnapObject();
..	..	@@ -1766,13 +2016,13 @@
1766	2016	// Recompile();
1767	2017	// refreshContents();
1768	2018	// } else
1769		- if (event.getSource() == gcButton)
	2019	+ if (source == gcButton)
1770	2020	{
1771	2021	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2022	System.gc();
1773	2023	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2024	} else
1775		- if (event.getSource() == editLeafItem)
	2025	+ if (source == editLeafItem)
1776	2026	{
1777	2027	Object3D obj;
1778	2028	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2036,78 @@
1786	2036	}
1787	2037	refreshContents(true);
1788	2038	} else
1789		- if (event.getSource() == openWindowItem)
	2039	+ if (source == openWindowItem)
1790	2040	{
1791	2041	EditSelection(true);
1792	2042	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2043	+ if (source == cutItem \|\| source == clearButton)
1794	2044	{
1795	2045	loadClipboard(true);
1796	2046	} else
1797		- if (event.getSource() == duplicateItem)
	2047	+ if (source == undoItem)
1798	2048	{
1799		- Object3D keep = GraphreeD.clipboard;
	2049	+ Undo();
	2050	+ } else
	2051	+ if (source == redoItem)
	2052	+ {
	2053	+ Redo();
	2054	+ } else
	2055	+ if (source == duplicateItem)
	2056	+ {
	2057	+ Object3D keep = Grafreed.clipboard;
1800	2058	loadClipboard(false);
1801	2059	paste(false);
1802		- GraphreeD.clipboard = keep;
	2060	+ Grafreed.clipboard = keep;
1803	2061	} else
1804		- if (event.getSource() == cloneItem)
	2062	+ if (source == cloneItem)
1805	2063	{
1806	2064	CloneSelection(false);
1807	2065	} else
1808		- if (event.getSource() == cloneSupportItem)
	2066	+ if (source == cloneSupportItem)
1809	2067	{
1810	2068	CloneSelection(true);
1811	2069	} else
1812		- if (event.getSource() == copyItem)
	2070	+ if (source == copyItem)
1813	2071	{
1814	2072	loadClipboard(false);
1815	2073	} else
1816		- if (event.getSource() == pasteItem)
	2074	+ if (source == pasteItem)
1817	2075	{
1818	2076	paste(false);
1819	2077	} else
1820		- if (event.getSource() == pasteLinkItem)
	2078	+ if (source == pasteIntoItem)
1821	2079	{
1822		- pasteInto(false);
	2080	+ pasteInto(true, false);
1823	2081	} else
1824		- if (event.getSource() == pasteCloneItem)
	2082	+ if (source == pasteLinkItem)
1825	2083	{
1826		- pasteInto(true);
	2084	+ pasteInto(false, false);
1827	2085	} else
1828		- if (event.getSource() == pasteExpandItem)
	2086	+ if (source == pasteCloneItem)
	2087	+ {
	2088	+ pasteInto(true, true);
	2089	+ } else
	2090	+ if (source == pasteExpandItem)
1829	2091	{
1830	2092	paste(true);
1831	2093	} else
1832		- if (event.getSource() == synchronizeItem)
	2094	+ if (source == synchronizeItem)
1833	2095	{
1834	2096	Overwrite(Object3D.TRANSFORM);
1835	2097	} else
1836		- if (event.getSource() == overwriteNameItem)
	2098	+ if (source == overwriteNameItem)
1837	2099	{
1838	2100	Overwrite(Object3D.NAME);
1839	2101	} else
1840		- if (event.getSource() == overwriteUVItem)
	2102	+ if (source == overwriteUVItem)
1841	2103	{
1842	2104	Overwrite(Object3D.UV);
1843	2105	} else
1844		- if (event.getSource() == overwriteMatItem)
	2106	+ if (source == overwriteMatItem)
1845	2107	{
	2108	+ /* july 2015
1846	2109	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2110	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2111	else
1849	2112	{
1850	2113	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2119,16 @@
1856	2119	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2120	}
1858	2121	}
	2122	+ */
	2123	+
	2124	+ Overwrite(dropAttributes);
1859	2125	}
1860		- if (event.getSource() == overwriteGeoItem)
	2126	+ if (source == overwriteGeoItem)
1861	2127	{
1862	2128	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2129	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2130	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2131	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2132	//
1867	2133	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2134	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2140,7 @@
1874	2140	// refreshContents();
1875	2141	// }
1876	2142	} else
1877		- if (event.getSource() == generateMeshItem)
	2143	+ if (source == generateMeshItem)
1878	2144	{
1879	2145	//if (group.selection.size() == 1)
1880	2146	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2151,7 @@
1885	2151	ResetModel();
1886	2152	refreshContents();
1887	2153	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2154	+ if (source == extractGeometriesItem)
1889	2155	{
1890	2156	boolean one = false;
1891	2157
..	..	@@ -1912,7 +2178,7 @@
1912	2178	ResetModel();
1913	2179	refreshContents();
1914	2180	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2181	+ if (source == cloneGeometriesItem)
1916	2182	{
1917	2183	boolean one = false;
1918	2184
..	..	@@ -1938,32 +2204,37 @@
1938	2204	ResetModel();
1939	2205	refreshContents();
1940	2206	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2207	+ if (source == shareGeometriesItem)
1942	2208	{
1943	2209	boolean one = false;
1944	2210
1945	2211	if (group.selection.size() == 1)
1946	2212	one = true;
1947	2213
	2214	+ Object3D merge = null;
	2215	+
1948	2216	Object3D content = new cGroup();
1949	2217
1950	2218	for (int i=0; i<group.selection.size(); i++)
1951	2219	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2220	+ merge = new Merge(group.selection.get(i));
1953	2221
1954	2222	if (one)
1955		- makeSomething(sel, false);
	2223	+ makeSomething(merge, false);
1956	2224	else
1957		- content.addChild(sel);
	2225	+ content.addChild(merge);
1958	2226	}
1959	2227
1960	2228	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2229	+ makeSomething(content, true);
	2230	+ else
	2231	+ {
	2232	+ ResetModel();
	2233	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2234	+ refreshContents();
	2235	+ }
1965	2236	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2237	+ if (source == mergeGeometriesItem)
1967	2238	{
1968	2239	boolean one = false;
1969	2240
..	..	@@ -1993,11 +2264,11 @@
1993	2264	ResetModel();
1994	2265	refreshContents();
1995	2266	} else
1996		- if (event.getSource() == linkverticesItem)
	2267	+ if (source == linkverticesItem)
1997	2268	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2269	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2270	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2271	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2272	//
2002	2273	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2274	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2277,48 @@
2006	2277	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2278	// refreshContents();
2008	2279	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2280	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2281	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2282	+ Object3D content = Grafreed.clipboard.get(0);
2012	2283
2013	2284	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2285	content = ((cGroup)content).get(0);
2015	2286
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2287	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2288	for (int i=0; i<group.selection.size(); i++)
2018	2289	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2290	+ boolean random = CameraPane.SWITCH;
	2291	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2292	group.selection.get(i).linkVerticesThis(content);
2022	2293	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2294	+ CameraPane.SWITCH = random;
2024	2295	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2296	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2297	refreshContents();
2027	2298	}
2028	2299	} else
2029		- if (event.getSource() == resetsupportItem)
	2300	+ if (source == resetsupportItem)
2030	2301	{
2031	2302	for (int i=0; i<group.selection.size(); i++)
2032	2303	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2304	+ boolean random = CameraPane.SWITCH;
	2305	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2306	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2307	+ CameraPane.SWITCH = random;
2037	2308	}
2038	2309
2039	2310	refreshContents();
2040	2311	} else
2041		- if (event.getSource() == resetreferencesItem)
	2312	+ if (source == relinkverticesItem)
	2313	+ {
	2314	+ boolean random = CameraPane.SWITCH;
	2315	+ CameraPane.SWITCH = false; // parse all random nodes
	2316	+ group.selection.RelinkToSupport();
	2317	+ CameraPane.SWITCH = random;
	2318	+
	2319	+ refreshContents();
	2320	+ } else
	2321	+ if (source == resetreferencesItem)
2042	2322	{
2043	2323	for (int i=0; i<group.selection.size(); i++)
2044	2324	{
..	..	@@ -2047,11 +2327,11 @@
2047	2327
2048	2328	refreshContents();
2049	2329	} else
2050		- if (event.getSource() == setMasterItem)
	2330	+ if (source == setMasterItem)
2051	2331	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2332	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2333	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2334	+ Object3D content = Grafreed.clipboard.get(0);
2055	2335
2056	2336	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2337	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2340,13 @@
2060	2340	refreshContents();
2061	2341	}
2062	2342	} else
2063		- if (event.getSource() == poseMeshItem)
	2343	+ if (source == poseMeshItem)
2064	2344	{
2065	2345	if (group.selection.size() == 1)
2066	2346	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2347	+ if (Grafreed.clipboard.size() == 1)
2068	2348	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2070	2350
2071	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2352	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2359,19 @@
2079	2359	}
2080	2360
2081	2361	} else
2082		- if (event.getSource() == revertMeshItem)
	2362	+ if (source == revertMeshItem)
2083	2363	{
2084	2364	RevertMeshes();
2085	2365	} else
2086		- if (event.getSource() == resetMeshItem)
	2366	+ if (source == resetAllItem)
2087	2367	{
2088	2368	ResetAll();
2089	2369	} else
2090		- if (event.getSource() == stepAllItem)
	2370	+ if (source == stepAllItem)
2091	2371	{
2092	2372	StepAll();
2093	2373	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2374	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2375	{
2096	2376	//int indices[] = jList.getSelectedIndices();
2097	2377	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2379,46 @@
2099	2379
2100	2380	ClearSelection(false);
2101	2381	} else
2102		- if (event.getSource() == clearAllItem)
	2382	+ if (source == clearAllItem)
2103	2383	{
2104	2384	ClearSelection(true);
2105	2385	} else
2106		- if (event.getSource() == grabItem)
	2386	+ if (source == grabItem)
2107	2387	{
2108	2388	group(new cGroup(), true);
2109	2389	} else
2110		- if (event.getSource() == frontItem)
	2390	+ if (source == hideItem)
	2391	+ {
	2392	+ group(new HiddenObject());
	2393	+ } else
	2394	+ if (source == frontItem)
2111	2395	{
2112	2396	front();
2113	2397	} else
2114		- if (event.getSource() == backItem)
	2398	+ if (source == backItem)
2115	2399	{
2116	2400	back();
2117	2401	} else
2118		- if (event.getSource() == cameraItem)
	2402	+ if (source == cameraItem)
2119	2403	{
2120	2404	makeSomething(new Camera());
2121	2405	} else
2122		- if (event.getSource() == compositeItem)
	2406	+ if (source == compositeItem)
2123	2407	{
2124	2408	group(new Composite());
2125	2409	} else
2126		- if (event.getSource() == randomItem)
	2410	+ if (source == randomItem)
2127	2411	{
2128	2412	RandomNode random = new RandomNode();
2129	2413	group(random);
2130	2414	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2415	+ random.name = random.get(0).name + "Switch";
2132	2416	} else
2133		- if (event.getSource() == physicsItem)
	2417	+ if (source == physicsItem)
2134	2418	{
2135	2419	group(new PhysicsNode());
2136	2420	} else
2137		- if (event.getSource() == frameselectorItem)
	2421	+ if (source == frameselectorItem)
2138	2422	{
2139	2423	for (int i=0; i<group.selection.size(); i++)
2140	2424	{
..	..	@@ -2146,7 +2430,7 @@
2146	2430	ResetModel();
2147	2431	refreshContents();
2148	2432	} else
2149		- if (event.getSource() == switchGeoItem)
	2433	+ if (source == switchGeoItem)
2150	2434	{
2151	2435	for (int i=0; i<group.selection.size(); i++)
2152	2436	{
..	..	@@ -2158,7 +2442,7 @@
2158	2442	ResetModel();
2159	2443	refreshContents();
2160	2444	} else
2161		- if (event.getSource() == switchTransfoItem)
	2445	+ if (source == switchTransfoItem)
2162	2446	{
2163	2447	for (int i=0; i<group.selection.size(); i++)
2164	2448	{
..	..	@@ -2170,7 +2454,7 @@
2170	2454	ResetModel();
2171	2455	refreshContents();
2172	2456	} else
2173		- if (event.getSource() == morphItem)
	2457	+ if (source == morphItem)
2174	2458	{
2175	2459	for (int i=0; i<group.selection.size(); i++)
2176	2460	{
..	..	@@ -2182,7 +2466,7 @@
2182	2466	ResetModel();
2183	2467	refreshContents();
2184	2468	} else
2185		- if (event.getSource() == scriptNodeItem)
	2469	+ if (source == scriptNodeItem)
2186	2470	{
2187	2471	boolean atleastone = false;
2188	2472
..	..	@@ -2221,191 +2505,239 @@
2221	2505	}
2222	2506	}
2223	2507	} else
2224		- if (event.getSource() == linkerItem)
	2508	+ if (source == linkerItem)
2225	2509	{
2226	2510	group(new cLinker());
2227	2511	} else
2228		- if (event.getSource() == textureItem)
	2512	+ if (source == textureItem)
2229	2513	{
2230	2514	group(new TextureNode());
2231	2515	} else
2232		- if (event.getSource() == shadowXItem)
	2516	+ if (source == billboardItem)
	2517	+ {
	2518	+ group(new BillboardNode());
	2519	+ } else
	2520	+ if (source == shadowXItem)
2233	2521	{
2234	2522	CastShadow(0);
2235	2523	} else
2236		- if (event.getSource() == shadowYItem)
	2524	+ if (source == shadowYItem)
2237	2525	{
2238	2526	CastShadow(1);
2239	2527	} else
2240		- if (event.getSource() == shadowZItem)
	2528	+ if (source == shadowZItem)
2241	2529	{
2242	2530	CastShadow(2);
2243	2531	} else
2244		- if (event.getSource() == ungroupItem)
	2532	+ if (source == ungroupItem)
2245	2533	{
2246		- ungroup();
	2534	+ //ungroup();
	2535	+ for (int i=0; i<group.selection.size(); i++)
	2536	+ {
	2537	+ Ungroup(group.selection.get(i));
	2538	+ }
	2539	+
	2540	+ ClearSelection(false);
	2541	+
	2542	+ refreshContents();
2247	2543	} else
2248		- if (event.getSource() == genUVItem)
	2544	+ if (source == genUVItem)
2249	2545	{
2250	2546	GenUV();
2251	2547	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2548	+ if (source == genNormalsCADItem)
2253	2549	{
2254	2550	GenNormals(true);
2255	2551	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2552	+ if (source == genNormalsMESHItem)
	2553	+ {
	2554	+ GenNormalsMESH();
	2555	+ } else
	2556	+ if (source == genNormalsORGANItem)
2257	2557	{
2258	2558	GenNormals(false);
2259	2559	} else
2260		- if (event.getSource() == stripifyItem)
	2560	+ if (source == genNormalsMINEItem)
	2561	+ {
	2562	+ GenNormalsMINE();
	2563	+ } else
	2564	+ if (source == stripifyItem)
2261	2565	{
2262	2566	Stripify();
2263	2567	} else
2264		- if (event.getSource() == unstripifyItem)
	2568	+ if (source == unstripifyItem)
2265	2569	{
2266	2570	Unstripify();
2267	2571	} else
2268		- if (event.getSource() == trimItem)
	2572	+ if (source == trimItem)
2269	2573	{
2270	2574	Trim();
2271	2575	} else
2272		- if (event.getSource() == untrimItem)
	2576	+ if (source == untrimItem)
2273	2577	{
2274	2578	Untrim();
2275	2579	} else
2276		- if (event.getSource() == clearColorsItem)
	2580	+ if (source == clearColorsItem)
2277	2581	{
2278	2582	ClearColors();
2279	2583	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2584	+ if (source == clearMaterialsItem)
2281	2585	{
2282	2586	ClearMaterials();
2283	2587	} else
2284		- if (event.getSource() == liveleavesItem)
	2588	+ if (source == liveleavesItem)
2285	2589	{
2286	2590	LiveLeaves(true);
2287	2591	} else
2288		- if (event.getSource() == unliveleavesItem)
	2592	+ if (source == unliveleavesItem)
2289	2593	{
2290	2594	LiveLeaves(false);
2291	2595	} else
2292		- if (event.getSource() == supportleavesItem)
	2596	+ if (source == supportleavesItem)
2293	2597	{
2294	2598	SupportLeaves(true);
2295	2599	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2600	+ if (source == unsupportleavesItem)
2297	2601	{
2298	2602	SupportLeaves(false);
2299	2603	} else
2300		- if (event.getSource() == hideleavesItem)
	2604	+ if (source == hideleavesItem)
2301	2605	{
2302	2606	HideLeaves(true);
2303	2607	} else
2304		- if (event.getSource() == showleavesItem)
	2608	+ if (source == showleavesItem)
2305	2609	{
2306	2610	HideLeaves(false);
2307	2611	} else
2308		- if (event.getSource() == markleavesItem)
	2612	+ if (source == markleavesItem)
2309	2613	{
2310	2614	MarkLeaves(true);
2311	2615	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2616	+ if (source == unmarkleavesItem)
2313	2617	{
2314	2618	MarkLeaves(false);
2315	2619	} else
2316		- if (event.getSource() == flipVItem)
	2620	+ if (source == rewindleavesItem)
	2621	+ {
	2622	+ RewindLeaves(true);
	2623	+ } else
	2624	+ if (source == unrewindleavesItem)
	2625	+ {
	2626	+ RewindLeaves(false);
	2627	+ } else
	2628	+ if (source == randomleavesItem)
	2629	+ {
	2630	+ RandomLeaves(true);
	2631	+ } else
	2632	+ if (source == unrandomleavesItem)
	2633	+ {
	2634	+ RandomLeaves(false);
	2635	+ } else
	2636	+ if (source == flipVItem)
2317	2637	{
2318	2638	FlipV(true);
2319	2639	} else
2320		- if (event.getSource() == unflipVItem)
	2640	+ if (source == unflipVItem)
2321	2641	{
2322	2642	FlipV(false);
2323	2643	} else
2324		- if (event.getSource() == lowTexturesItem)
	2644	+ if (source == lowTexturesItem)
2325	2645	{
2326	2646	SetTexRes(0);
2327	2647	} else
2328		- if (event.getSource() == normalTexturesItem)
	2648	+ if (source == normalTexturesItem)
2329	2649	{
2330	2650	SetTexRes(1);
2331	2651	} else
2332		- if (event.getSource() == highTexturesItem)
	2652	+ if (source == highTexturesItem)
2333	2653	{
2334	2654	SetTexRes(2);
2335	2655	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2656	+ if (source == veryhighTexturesItem)
2337	2657	{
2338	2658	SetTexRes(3);
2339	2659	} else
2340		- if (event.getSource() == maxTexturesItem)
	2660	+ if (source == maxTexturesItem)
2341	2661	{
2342	2662	SetTexRes(4);
2343	2663	} else
2344		- if (event.getSource() == panoTexturesItem)
	2664	+ if (source == panoTexturesItem)
2345	2665	{
2346	2666	SetTexRes(5);
2347	2667	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2668	+ if (source == reverseNormalsItem)
2349	2669	{
2350	2670	ReverseNormals();
2351	2671	} else
2352		- if (event.getSource() == parseverticesItem)
	2672	+ if (source == parseverticesItem)
2353	2673	{
2354	2674	ParseVertices();
2355	2675	} else
2356		- if (event.getSource() == alignItem)
	2676	+ if (source == textureFieldItem)
	2677	+ {
	2678	+ TextureVertices();
	2679	+ } else
	2680	+ if (source == alignItem)
2357	2681	{
2358	2682	Align();
2359	2683	} else
2360		- if (event.getSource() == mirrorItem)
	2684	+ if (source == mirrorItem)
2361	2685	{
2362	2686	MirrorPoses();
2363	2687	} else
2364		- if (event.getSource() == reduceMorphItem)
	2688	+ if (source == reduceMorphItem)
2365	2689	{
2366	2690	MeshReduction(false);
2367	2691	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2692	+ if (source == reduce34MorphItem)
2369	2693	{
2370	2694	MeshReduction(true);
2371	2695	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2696	+ if (source == reverseTrianglesItem)
2373	2697	{
2374	2698	ReverseTriangles();
2375	2699	} else
2376		- if (event.getSource() == reduceMeshItem)
	2700	+ if (source == reduceMeshItem)
2377	2701	{
2378	2702	ReduceMesh(false);
2379	2703	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2704	+ if (source == reduce34MeshItem)
2381	2705	{
2382	2706	ReduceMesh(true);
2383	2707	} else
2384		- if (event.getSource() == increaseMeshItem)
	2708	+ if (source == increaseMeshItem)
2385	2709	{
2386	2710	IncreaseMesh();
2387	2711	} else
2388		- if (event.getSource() == clipMeshItem)
	2712	+ if (source == clipMeshItem)
2389	2713	{
2390	2714	ClipMesh();
2391	2715	} else
2392		- if (event.getSource() == smoothMeshItem)
	2716	+ if (source == smoothMeshItem)
2393	2717	{
2394	2718	SmoothMesh();
2395	2719	} else
2396		- if (event.getSource() == transformgeometryItem)
	2720	+ if (source == transformGeometryItem)
2397	2721	{
2398	2722	TransformGeometry();
2399	2723	} else
2400		- if (event.getSource() == resetTransformItem)
	2724	+ if (source == transformChildrenItem)
	2725	+ {
	2726	+ TransformChildren();
	2727	+ } else
	2728	+ if (source == resetTransformItem)
2401	2729	{
2402	2730	ResetTransform();
2403	2731	} else
2404		- if (event.getSource() == resetCentroidItem)
	2732	+ if (source == resetCentroidItem)
2405	2733	{
2406		- ResetCentroid();
	2734	+ ResetCentroid(true);
2407	2735	} else
2408		- if (event.getSource() == resetParentItem)
	2736	+ if (source == resetCentroidXZItem)
	2737	+ {
	2738	+ ResetCentroid(false);
	2739	+ } else
	2740	+ if (source == resetParentItem)
2409	2741	{
2410	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2743	{
..	..	@@ -2415,7 +2747,7 @@
2415	2747
2416	2748	refreshContents();
2417	2749	} else
2418		- if (event.getSource() == repairParentItem)
	2750	+ if (source == repairParentItem)
2419	2751	{
2420	2752	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2753	{
..	..	@@ -2429,7 +2761,21 @@
2429	2761
2430	2762	refreshContents();
2431	2763	} else
2432		- if (event.getSource() == sortbysizeItem)
	2764	+ if (source == repairShadowItem)
	2765	+ {
	2766	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2767	+ {
	2768	+ Object3D obj = (Object3D)e.nextElement();
	2769	+ obj.RepairShadow();
	2770	+// for (int i=0; i<obj.size(); i++)
	2771	+// {
	2772	+// obj.get(i).parent = obj;
	2773	+// }
	2774	+ }
	2775	+
	2776	+ refreshContents();
	2777	+ } else
	2778	+ if (source == sortbysizeItem)
2433	2779	{
2434	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2781	{
..	..	@@ -2441,7 +2787,7 @@
2441	2787	ResetModel();
2442	2788	refreshContents();
2443	2789	} else
2444		- if (event.getSource() == sortbynameItem)
	2790	+ if (source == sortbynameItem)
2445	2791	{
2446	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2793	{
..	..	@@ -2453,7 +2799,7 @@
2453	2799	ResetModel();
2454	2800	refreshContents();
2455	2801	} else
2456		- if (event.getSource() == attachPigmentItem)
	2802	+ if (source == attachPigmentItem)
2457	2803	{
2458	2804	String texture = GetFile("Attach pigment");
2459	2805	Object3D obj;
..	..	@@ -2465,7 +2811,7 @@
2465	2811
2466	2812	refreshContents();
2467	2813	} else
2468		- if (event.getSource() == detachPigmentItem)
	2814	+ if (source == detachPigmentItem)
2469	2815	{
2470	2816	Object3D obj;
2471	2817	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2822,7 @@
2476	2822
2477	2823	refreshContents();
2478	2824	} else
2479		- if (event.getSource() == attachBumpItem)
	2825	+ if (source == attachBumpItem)
2480	2826	{
2481	2827	String texture = GetFile("Attach bump");
2482	2828	Object3D obj;
..	..	@@ -2488,7 +2834,7 @@
2488	2834
2489	2835	refreshContents();
2490	2836	} else
2491		- if (event.getSource() == detachBumpItem)
	2837	+ if (source == detachBumpItem)
2492	2838	{
2493	2839	Object3D obj;
2494	2840	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2845,7 @@
2499	2845
2500	2846	refreshContents();
2501	2847	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2848	+ if (source == pigmentBumpItem)
2503	2849	{
2504	2850	Object3D obj;
2505	2851	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2856,195 @@
2510	2856
2511	2857	refreshContents();
2512	2858	} else
2513		- if (event.getSource() == flashSelectionButton)
	2859	+ if (source == flashSelectionButton)
2514	2860	{
2515	2861	CameraPane.flash = true;
2516	2862	refreshContents();
2517	2863	} else
2518		- if (event.getSource() == oneButton)
	2864	+ if (source == oneButton)
2519	2865	{
2520	2866	} else
2521		- if (event.getSource() == twoButton)
	2867	+ if (source == twoButton)
2522	2868	{
2523	2869	radio.layout = twoButton;
2524	2870	// bug
2525	2871	//gridPanel.setDividerLocation(1.0);
2526	2872	//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();
	2873	+// bigThree.remove(scenePanel);
	2874	+// bigThree.remove(centralPanel);
	2875	+// bigThree.remove(XYZPanel);
	2876	+// aWindowConstraints.gridx = 0;
	2877	+// aWindowConstraints.gridy = 0;
	2878	+// aWindowConstraints.gridwidth = 1;
	2879	+// // aConstraints.gridheight = 3;
	2880	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2881	+// aWindowConstraints.weightx = 0;
	2882	+// aWindowConstraints.weighty = 1;
	2883	+// //bigThree.add(jtp, aWindowConstraints);
	2884	+// aWindowConstraints.weightx = 1;
	2885	+// aWindowConstraints.gridwidth = 3;
	2886	+// // aConstraints.gridheight = 3;
	2887	+// aWindowConstraints.gridx = 1;
	2888	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2889	+// bigThree.add(centralPanel, aWindowConstraints);
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.gridx = 4;
	2892	+// aWindowConstraints.gridwidth = 1;
	2893	+// // aConstraints.gridheight = 3;
	2894	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2895	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2896	+// scenePanel.setVisible(false);
	2897	+// centralPanel.setVisible(true);
	2898	+// XYZPanel.setVisible(false);
	2899	+ bigThree.ClearUI();
	2900	+ bigThree.add(centralPanel);
	2901	+ bigThree.FlushUI();
2551	2902	} else
2552		- if (event.getSource() == threeButton)
	2903	+ if (source == threeButton)
2553	2904	{
2554	2905	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();
	2906	+
	2907	+// bigThree.remove(scenePanel);
	2908	+// bigThree.remove(centralPanel);
	2909	+// bigThree.remove(XYZPanel);
	2910	+// aWindowConstraints.gridx = 0;
	2911	+// aWindowConstraints.gridy = 0;
	2912	+// aWindowConstraints.gridwidth = 1;
	2913	+// // aConstraints.gridheight = 3;
	2914	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2915	+// aWindowConstraints.weightx = 0;
	2916	+// aWindowConstraints.weighty = 1;
	2917	+// //bigThree.add(jtp, aWindowConstraints);
	2918	+// aWindowConstraints.weightx = 1;
	2919	+// aWindowConstraints.gridwidth = 3;
	2920	+// // aConstraints.gridheight = 3;
	2921	+// aWindowConstraints.gridx = 1;
	2922	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2923	+// bigThree.add(centralPanel, aWindowConstraints);
	2924	+// aWindowConstraints.weightx = 0;
	2925	+// aWindowConstraints.gridx = 4;
	2926	+// aWindowConstraints.gridwidth = 1;
	2927	+// // aConstraints.gridheight = 3;
	2928	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2929	+// bigThree.add(XYZPanel, aWindowConstraints);
	2930	+// bigThree.validate();
	2931	+// scenePanel.setVisible(false);
	2932	+// centralPanel.setVisible(true);
	2933	+// XYZPanel.setVisible(true);
	2934	+ bigThree.ClearUI();
	2935	+ bigThree.add(centralPanel);
	2936	+ bigThree.add(XYZPanel);
	2937	+ bigThree.FlushUI();
2579	2938	} else
2580		- if (event.getSource() == fourButton)
	2939	+ if (source == fourButton)
2581	2940	{
2582	2941	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();
	2942	+
	2943	+// bigThree.remove(scenePanel);
	2944	+// bigThree.remove(centralPanel);
	2945	+// bigThree.remove(XYZPanel);
	2946	+// aWindowConstraints.gridx = 0;
	2947	+// aWindowConstraints.gridy = 0;
	2948	+// aWindowConstraints.gridwidth = 1;
	2949	+// // aWindowConstraints.gridheight = 3;
	2950	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2951	+// aWindowConstraints.weightx = 1;
	2952	+// aWindowConstraints.weighty = 1;
	2953	+// bigThree.add(scenePanel, aWindowConstraints);
	2954	+// aWindowConstraints.weightx = 1;
	2955	+// aWindowConstraints.gridwidth = 3;
	2956	+// // aConstraints.gridheight = 3;
	2957	+// aWindowConstraints.gridx = 1;
	2958	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2959	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2960	+// aWindowConstraints.weightx = 0;
	2961	+// aWindowConstraints.gridx = 4;
	2962	+// aWindowConstraints.gridwidth = 1;
	2963	+// // aWindowConstraints.gridheight = 3;
	2964	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2965	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2966	+// bigThree.validate();
	2967	+// scenePanel.setVisible(true);
	2968	+// centralPanel.setVisible(false);
	2969	+// XYZPanel.setVisible(false);
	2970	+ bigThree.ClearUI();
	2971	+ bigThree.add(scenePanel);
	2972	+ bigThree.FlushUI();
2607	2973	} else
2608		- if (event.getSource() == sixButton)
	2974	+ if (source == sixButton)
2609	2975	{
2610	2976	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();
	2977	+
	2978	+// bigThree.remove(scenePanel);
	2979	+// bigThree.remove(centralPanel);
	2980	+// bigThree.remove(XYZPanel);
	2981	+// aWindowConstraints.gridx = 0;
	2982	+// aWindowConstraints.gridy = 0;
	2983	+// aWindowConstraints.gridwidth = 1;
	2984	+// // aConstraints.gridheight = 3;
	2985	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2986	+// aWindowConstraints.weightx = 0;
	2987	+// aWindowConstraints.weighty = 1;
	2988	+// bigThree.add(scenePanel, aWindowConstraints);
	2989	+// aWindowConstraints.weightx = 1;
	2990	+// aWindowConstraints.gridwidth = 3;
	2991	+// // aWindowConstraints.gridheight = 3;
	2992	+// aWindowConstraints.gridx = 1;
	2993	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2994	+// bigThree.add(centralPanel, aWindowConstraints);
	2995	+// aWindowConstraints.weightx = 0;
	2996	+// aWindowConstraints.gridx = 4;
	2997	+// aWindowConstraints.gridwidth = 1;
	2998	+// // aWindowConstraints.gridheight = 3;
	2999	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3000	+// //bigThree.add(XYZPanel, aConstraints);
	3001	+// bigThree.validate();
	3002	+// scenePanel.setVisible(true);
	3003	+// centralPanel.setVisible(true);
	3004	+// XYZPanel.setVisible(false);
	3005	+ bigThree.ClearUI();
	3006	+ bigThree.add(scenePanel);
	3007	+ bigThree.add(centralPanel);
	3008	+ bigThree.FlushUI();
2635	3009	} else
2636		- if (event.getSource() == sevenButton)
	3010	+ if (source == sevenButton)
2637	3011	{
2638	3012	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();
	3013	+
	3014	+// bigThree.remove(scenePanel);
	3015	+// bigThree.remove(centralPanel);
	3016	+// bigThree.remove(XYZPanel);
	3017	+// aWindowConstraints.gridx = 0;
	3018	+// aWindowConstraints.gridy = 0;
	3019	+// aWindowConstraints.gridwidth = 1;
	3020	+// // aWindowConstraints.gridheight = 3;
	3021	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3022	+// aWindowConstraints.weightx = 0;
	3023	+// aWindowConstraints.weighty = 1;
	3024	+// bigThree.add(scenePanel, aWindowConstraints);
	3025	+// aWindowConstraints.weightx = 1;
	3026	+// aWindowConstraints.gridwidth = 3;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.gridx = 1;
	3029	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3030	+// bigThree.add(centralPanel, aWindowConstraints);
	3031	+// aWindowConstraints.weightx = 0;
	3032	+// aWindowConstraints.gridx = 4;
	3033	+// aWindowConstraints.gridwidth = 1;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3036	+// bigThree.add(XYZPanel, aWindowConstraints);
	3037	+// bigThree.validate();
	3038	+// scenePanel.setVisible(true);
	3039	+// centralPanel.setVisible(true);
	3040	+// XYZPanel.setVisible(true);
	3041	+ bigThree.ClearUI();
	3042	+ bigThree.add(scenePanel);
	3043	+ bigThree.add(centralPanel);
	3044	+ bigThree.add(XYZPanel);
	3045	+ bigThree.FlushUI();
2663	3046	} else
2664		- if (event.getSource() == rootButton)
	3047	+ if (source == rootButton)
2665	3048	{
2666	3049	Object3D obj;
2667	3050	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +3056,7 @@
2673	3056
2674	3057	refreshContents(true);
2675	3058	} else
2676		- if (event.getSource() == closeButton)
	3059	+ if (source == closeButton)
2677	3060	{
2678	3061	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3062	cRadio ab;
..	..	@@ -2694,11 +3077,11 @@
2694	3077	}
2695	3078	refreshContents(true);
2696	3079	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3080	+ if (source == editItem \|\| source == editButton)
2698	3081	{
2699	3082	EditSelection(false);
2700	3083	} else
2701		- if (event.getSource() == uneditButton)
	3084	+ if (source == uneditButton)
2702	3085	{
2703	3086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3087	{
..	..	@@ -2708,14 +3091,14 @@
2708	3091	child.CloseUI();
2709	3092	listUI.remove(child);
2710	3093
2711		- child.editWindow = null; // ???????????
	3094	+ //child.editWindow = null; // ???????????
2712	3095	}
2713		- objEditor.ctrlPanel.revalidate();
	3096	+ objEditor.ctrlPanel.FlushUI();
2714	3097	//objEditor.jTree.clearSelection();
2715	3098	//objEditor.ResetSliders();
2716	3099	refreshContents(true);
2717	3100	} else
2718		- if (event.getSource() == clearPanelButton)
	3101	+ if (source == clearPanelButton)
2719	3102	{
2720	3103	assert(copy == group);
2721	3104	//copy.ClearUI();
..	..	@@ -2726,7 +3109,7 @@
2726	3109	listUI.clear();
2727	3110	refreshContents(true);
2728	3111	} else
2729		- if (event.getSource() == allParamsButton)
	3112	+ if (source == allParamsButton)
2730	3113	{
2731	3114	assert(copy == group);
2732	3115
..	..	@@ -2747,19 +3130,19 @@
2747	3130
2748	3131	refreshContents(true);
2749	3132	} else
2750		- if (event.getSource() == unselectButton)
	3133	+ if (source == unselectButton)
2751	3134	{
2752	3135	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3136	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3137	objEditor.ResetSliders();
2755	3138	refreshContents(true);
2756	3139	} else
2757		- if(event.getSource() instanceof cRadio)
	3140	+ if(source instanceof cRadio)
2758	3141	{
2759	3142	group.parent = keepparent;
2760	3143	group.attributes = 0;
2761	3144	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3145	+ /cRadio/ radio = (cRadio)source;
2763	3146	Object3D obj = radio.GetObject();
2764	3147	System.out.println("Edit " + obj);
2765	3148	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3162,7 @@
2779	3162	}
2780	3163
2781	3164	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3165	+ //Globals.theRenderer.object = group;
2783	3166	if(!useclient)
2784	3167	{
2785	3168	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3171,16 @@
2788	3171	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3172	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3173	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3174	+ //cameraView.lighttouched = true;
	3175	+ Globals.lighttouched = true;
2792	3176	topView.object = group;
2793	3177	frontView.object = group;
2794	3178	sideView.object = group;
2795	3179	}
	3180	+
	3181	+// fix "+" issue
2796	3182	group.editWindow = this;
	3183	+
2797	3184	/*
2798	3185	currentLayout = radio.layout;
2799	3186	if (currentLayout == null)
..	..	@@ -2806,7 +3193,20 @@
2806	3193	//group.attributes = -1;
2807	3194	ResetModel();
2808	3195	refreshContents(true);
2809		- }
	3196	+ } else if (event.getSource() == editCameraItem)
	3197	+ {
	3198	+ cameraView.ProtectCamera();
	3199	+ cameraView.repaint();
	3200	+ return;
	3201	+ } else if (event.getSource() == revertCameraItem)
	3202	+ {
	3203	+ cameraView.RevertCamera();
	3204	+ cameraView.repaint();
	3205	+ return;
	3206	+ // } else if (event.getSource() == textureButton)
	3207	+ // {
	3208	+ // return; // true;
	3209	+ }
2810	3210	else
2811	3211	{
2812	3212	//return super.action(event, arg);
..	..	@@ -2824,7 +3224,7 @@
2824	3224	if (useclient)
2825	3225	{
2826	3226	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3227	+ Globals.lighttouched = true;
2828	3228	//topView.object = client;
2829	3229	//frontView.object = client;
2830	3230	//sideView.object = client;
..	..	@@ -2832,7 +3232,7 @@
2832	3232	else
2833	3233	{
2834	3234	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3235	+ Globals.lighttouched = true;
2836	3236	//topView.object = group;
2837	3237	//frontView.object = group;
2838	3238	//sideView.object = group;
..	..	@@ -2867,6 +3267,28 @@
2867	3267	refreshContents();
2868	3268	}
2869	3269
	3270	+ void TransformChildren()
	3271	+ {
	3272	+ Object3D obj;
	3273	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3274	+ {
	3275	+ obj = (Object3D)e.nextElement();
	3276	+ obj.KeepTextureMatrices();
	3277	+ obj.TransformChildren();
	3278	+ obj.RestoreTextureMatrices();
	3279	+
	3280	+// if (obj.parent == null)
	3281	+// {
	3282	+// System.out.println("NULL PARENT!");
	3283	+// new Exception().printStackTrace();
	3284	+// }
	3285	+// else
	3286	+// TouchTransform(obj);
	3287	+// //obj.parent.Touch();
	3288	+ }
	3289	+
	3290	+ refreshContents();
	3291	+ }
2870	3292
2871	3293	void ResetTransform()
2872	3294	{
..	..	@@ -2979,7 +3401,7 @@
2979	3401	refreshContents();
2980	3402	}
2981	3403
2982		- void ResetCentroid()
	3404	+ void ResetCentroid(boolean full)
2983	3405	{
2984	3406	Object3D obj;
2985	3407	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3416,16 @@
2994	3416	LA.matIdentity(Object3D.mat);
2995	3417	obj.getBounds(minima, maxima, false);
2996	3418	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3419	+ if (full)
	3420	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3421	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3422	obj.TransformMesh(Object3D.mat);
	3423	+
3000	3424	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3425	+ if (full)
	3426	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3427	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3428	+
3003	3429	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3430	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3431	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3454,8 @@
3028	3454
3029	3455	int size = obj.MemorySize();
3030	3456
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3457	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3458	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3459	}
3033	3460	}
3034	3461	catch (Exception e)
..	..	@@ -3065,9 +3492,9 @@
3065	3492	obj = (Object3D)e.nextElement();
3066	3493
3067	3494	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3495	+ Grafreed.AnalyzeObject(obj);
3069	3496	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3497	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3498
3072	3499	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3500	}
..	..	@@ -3109,6 +3536,20 @@
3109	3536	void GenNormals(boolean crease)
3110	3537	{
3111	3538	group.GenNormalsS(crease);
	3539	+
	3540	+ refreshContents();
	3541	+ }
	3542	+
	3543	+ void GenNormalsMESH()
	3544	+ {
	3545	+ group.GenNormalsMeshS();
	3546	+
	3547	+ refreshContents();
	3548	+ }
	3549	+
	3550	+ void GenNormalsMINE()
	3551	+ {
	3552	+ group.selection.GenNormalsMINE();
3112	3553
3113	3554	refreshContents();
3114	3555	}
..	..	@@ -3157,104 +3598,259 @@
3157	3598
3158	3599	//Object3D buffer;
3159	3600	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		-
	3601	+// BoundaryRep temprep;
	3602	+// Object3D nodes;
	3603	+// Vector<Vertex> vertices;
	3604	+//
	3605	+// cGroup buffer;
	3606	+//
	3607	+// public void Vertex(Object3D node, Vertex v)
	3608	+// {
	3609	+//// vertices.add(v);
	3610	+//// nodes.addElement(node);
	3611	+////
	3612	+//// if (temprep.GetCache(v) != null)
	3613	+//// {
	3614	+//// temprep.Remove(v);
	3615	+//// } else
	3616	+//// {
	3617	+//// temprep.Remember(v);
	3618	+//// }
	3619	+//
	3620	+// //Object3D node = nodes.get(index);
	3621	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3622	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3623	+//
	3624	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3625	+//
	3626	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3627	+//
	3628	+// cGroup g = new cGroup();
	3629	+//
	3630	+// if (g.toParent == null)
	3631	+// {
	3632	+// g.toParent = LA.newMatrix();
	3633	+// g.fromParent = LA.newMatrix();
	3634	+// }
	3635	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3636	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3637	+//
	3638	+// g.add(GrafreeD.clipboard);
	3639	+//
	3640	+// buffer.add(g);
	3641	+// }
	3642	+//
	3643	+// public void Face(Object3D node, Face f)
	3644	+// {
	3645	+//
	3646	+// }
	3647	+//
	3648	+// void ParseVerticesOld() // ??
	3649	+// {
	3650	+// //if (group.selection.size() != 1)
	3651	+// // return;
	3652	+//
	3653	+// temprep = new BoundaryRep();
	3654	+// nodes = new Object3D();
	3655	+// vertices = new Vector<Vertex>();
	3656	+//
	3657	+// boolean epsequal = GrafreeD.epsequal;
	3658	+// GrafreeD.epsequal = true;
	3659	+//
	3660	+// for (int i=0; i<group.selection.size(); i++)
	3661	+// {
	3662	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3663	+//
	3664	+// group.selection.get(i).Parse(
	3665	+//this );
	3666	+//
	3667	+// int repsize = temprep.VertexCount();
	3668	+// int tablesize = temprep.vertextable.size();
	3669	+// int nodesize = nodes.size();
	3670	+//
	3671	+// assert(vertices.size() == nodes.size());
	3672	+//
	3673	+// temprep.vertextable.elements();
	3674	+//
	3675	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3676	+//
	3677	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3678	+// {
	3679	+// cGroup g = new cGroup();
	3680	+//
	3681	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3682	+//
	3683	+// Object3D node = nodes.get(index);
	3684	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3685	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3686	+//
	3687	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3688	+//
	3689	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3690	+//
	3691	+// if (g.toParent == null)
	3692	+// {
	3693	+// g.toParent = LA.newMatrix();
	3694	+// g.fromParent = LA.newMatrix();
	3695	+// }
	3696	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3697	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3698	+//
	3699	+// g.add(GrafreeD.clipboard);
	3700	+//
	3701	+// buffer.add(g);
	3702	+// }
	3703	+//
	3704	+// makeSomething(buffer, i==group.selection.size()-1);
	3705	+// }
	3706	+//
	3707	+// GrafreeD.epsequal = epsequal;
	3708	+//
	3709	+// //buffer = null;
	3710	+// temprep = null;
	3711	+// nodes = null;
	3712	+//
	3713	+// refreshContents();
	3714	+// }
	3715	+
3184	3716	void ParseVertices()
3185	3717	{
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;
	3718	+ boolean epsequal = Grafreed.epsequal;
	3719	+ Grafreed.epsequal = true;
3195	3720
3196	3721	for (int i=0; i<group.selection.size(); i++)
3197	3722	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3723	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3724
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3725	+ group.selection.get(i).Parse(
	3726	+
	3727	+ new iParse()
	3728	+ {
	3729	+ public void Vertex(Object3D node, Vertex v)
	3730	+ {
	3731	+ temp.set(v);
	3732	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3733
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();
	3734	+ cGroup g = new cGroup();
3211	3735
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3736	+ if (g.toParent == null)
	3737	+ {
	3738	+ g.toParent = LA.newMatrix();
	3739	+ g.fromParent = LA.newMatrix();
	3740	+ }
	3741	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3742	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3743
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);
	3744	+ g.add(Grafreed.clipboard);
3220	3745
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);
	3746	+ buffer.add(g);
	3747	+ }
3232	3748
3233		- g.add(GraphreeD.clipboard);
	3749	+ public void Face(Object3D node, Face f)
	3750	+ {
3234	3751
3235		- buffer.add(g);
3236		- }
	3752	+ }
	3753	+ }
	3754	+ );
3237	3755
3238	3756	makeSomething(buffer, i==group.selection.size()-1);
3239	3757	}
3240	3758
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3759	+ Grafreed.epsequal = epsequal;
3246	3760
3247	3761	refreshContents();
3248	3762	}
3249		-
	3763	+
	3764	+ void TextureVertices()
	3765	+ {
	3766	+ for (int i=0; i<group.selection.size(); i++)
	3767	+ {
	3768	+ group.selection.get(i).Parse(
	3769	+ new iParse()
	3770	+ {
	3771	+ public void Vertex(Object3D node, Vertex v)
	3772	+ {
	3773	+ cTexture tex = node.GetTextures();
	3774	+ String pigment = Object3D.GetPigment(tex);
	3775	+ //String bump = Object3D.GetBump(tex);
	3776	+
	3777	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3778	+
	3779	+ try
	3780	+ {
	3781	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3782	+ }
	3783	+ catch (Exception e)
	3784	+ {
	3785	+ System.err.println("FAIL: " + node);
	3786	+ }
	3787	+
	3788	+ double s = v.s;
	3789	+
	3790	+ if (s == 1)
	3791	+ s = 0;
	3792	+
	3793	+ double t = v.t;
	3794	+
	3795	+ if (t == 1)
	3796	+ t = 0;
	3797	+
	3798	+ int indexs = (int) (texturedata.getWidth() * s);
	3799	+ int indext = (int) (texturedata.getHeight() * t);
	3800	+
	3801	+ int index = indext * texturedata.getWidth() + indexs;
	3802	+
	3803	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3804	+
	3805	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3806	+
	3807	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3808	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3809	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3810	+ scale /= 3;
	3811	+
	3812	+ scale /= 0xFF;
	3813	+ // c'est quoi ca? scale /= 4;
	3814	+
	3815	+ //v.AO = scale;
	3816	+
	3817	+ v.x += v.norm.x * scale;
	3818	+ v.y += v.norm.y * scale;
	3819	+ v.z += v.norm.z * scale;
	3820	+ }
	3821	+
	3822	+ public void Face(Object3D node, Face f)
	3823	+ {
	3824	+ }
	3825	+ }
	3826	+ );
	3827	+ }
	3828	+
	3829	+ refreshContents();
	3830	+ }
	3831	+
3250	3832	void Align()
3251	3833	{
	3834	+ if (group.selection.size() == 0)
	3835	+ return;
	3836	+
	3837	+ cVector bbmin = new cVector();
	3838	+ cVector bbmax = new cVector();
	3839	+
	3840	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3841	+
	3842	+ double dx = bbmax.x - bbmin.x;
	3843	+ double dy = bbmax.y - bbmin.y;
	3844	+ double dz = bbmax.z - bbmin.z;
	3845	+
	3846	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3847	+
3252	3848	for (int i=0; i<group.selection.size(); i++)
3253	3849	{
3254	3850	Object3D obj = group.selection.get(i);
3255	3851
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3852	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3853	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3854	}
3259	3855
3260	3856	refreshContents();
..	..	@@ -3267,7 +3863,7 @@
3267	3863	// ref.SaveSupports();
3268	3864	// Object3D par = ref.parent;
3269	3865	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3866	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3867	// ref.parent = par;
3272	3868	// ref.RestoreSupports();
3273	3869
..	..	@@ -3275,11 +3871,11 @@
3275	3871
3276	3872	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3873
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3874	+ boolean random = CameraPane.SWITCH;
	3875	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3876	lowres.linkVerticesThis(null);
3281	3877	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3878	+ CameraPane.SWITCH = random;
3283	3879
3284	3880	System.err.flush();
3285	3881
..	..	@@ -3297,7 +3893,7 @@
3297	3893	// lowres.SaveSupports();
3298	3894	// par = lowres.parent;
3299	3895	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3896	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3897	Object3D newlow = CloneObject(lowres, false);
3302	3898	newlow.name = sn.switchobject.get(i).name;
3303	3899	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3915,7 @@
3319	3915	return;
3320	3916
3321	3917	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3918	+ Object3D ref = Grafreed.clipboard.get(0);
3323	3919
3324	3920	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3921
..	..	@@ -3488,7 +4084,7 @@
3488	4084	group.selection.RelinkToSupport(); // july 2014
3489	4085	System.out.println("DONE.");
3490	4086	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4087	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4088	}
3493	4089
3494	4090	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4109,20 @@
3513	4109
3514	4110	void ClipMesh()
3515	4111	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4112	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4113	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4114	+ Object3D content = Grafreed.clipboard.get(0);
3519	4115
3520	4116	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4117	content = ((cGroup)content).get(0);
3522	4118
3523	4119	// for (int i=0; i<group.selection.size(); i++)
3524	4120	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4121	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4122	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4123	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4124	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4125	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4126	System.out.println("DONE.");
3531	4127	refreshContents();
3532	4128	}
..	..	@@ -3571,6 +4167,18 @@
3571	4167	void MarkLeaves(boolean hide)
3572	4168	{
3573	4169	group.selection.MarkLeaves(hide);
	4170	+ refreshContents();
	4171	+ }
	4172	+
	4173	+ void RewindLeaves(boolean hide)
	4174	+ {
	4175	+ group.selection.RewindLeaves(hide);
	4176	+ refreshContents();
	4177	+ }
	4178	+
	4179	+ void RandomLeaves(boolean hide)
	4180	+ {
	4181	+ group.selection.RandomLeaves(hide);
3574	4182	refreshContents();
3575	4183	}
3576	4184
..	..	@@ -3659,7 +4267,7 @@
3659	4267	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4268
3661	4269	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4270	+ if(elem != group \|\| !newWindow)
3663	4271	{
3664	4272	// if (!(elem instanceof Composite))
3665	4273	// newWindow = false;
..	..	@@ -3749,7 +4357,6 @@
3749	4357	//case 702: // Event.LIST_DESELECT
3750	4358	group.deselectAll();
3751	4359	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4360	if (tps != null)
3754	4361	{
3755	4362	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,31 +4365,30 @@
3758	4365
3759	4366	//if (child.parent != null)
3760	4367	//child.parent.addSelectee(child);
	4368	+ objEditor.SetMaterial(child);
3761	4369	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4370	}
3766	4371	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4372	+// else
	4373	+// {
	4374	+// objEditor.SetMaterial(group); // .GetMaterial());
	4375	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4376	+// System.err.println("info : " + group.GetPath());
	4377	+// }
3773	4378
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4379	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4380	CameraPane.flash = true;
3778	4381
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4382	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4383	// a camera
3781	4384	{
3782		- 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;
	4385	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4386	+ {
	4387	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4388	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4389	+ }
	4390	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4391	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4392	}
3787	4393
3788	4394	refreshContents();
..	..	@@ -3793,6 +4399,26 @@
3793	4399
3794	4400	freezemodel = false;
3795	4401	}
	4402	+
	4403	+ void refreshContents(boolean cp)
	4404	+ {
	4405	+ if (!Globals.MOUSEDRAGGED)
	4406	+ {
	4407	+ objEditor.ClearInfo(); // .GetMaterial());
	4408	+
	4409	+ for (int i=0; i < group.selection.Size(); i++)
	4410	+ {
	4411	+ Object3D child = (Object3D) group.selection.get(i);
	4412	+
	4413	+ objEditor.AddInfo(child, this, true);
	4414	+ System.err.println("info : " + child.GetPath());
	4415	+ }
	4416	+
	4417	+ objEditor.SetText(); // jan 2014
	4418	+ }
	4419	+
	4420	+ super.refreshContents(cp);
	4421	+ }
3796	4422
3797	4423	void linkSomething(Object3D thing)
3798	4424	{
..	..	@@ -3864,16 +4490,18 @@
3864	4490	{
3865	4491	if (group.selection.isEmpty())
3866	4492	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4493	+
	4494	+ Grafreed.clipboardIsTempGroup = false;
3868	4495	Composite tGroup = null;
3869	4496	if (group.selection.size() > 0) // 1)
3870	4497	{
3871	4498	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4499	+ Grafreed.clipboardIsTempGroup = true;
3873	4500	}
3874	4501
3875	4502	if (cut)
3876	4503	{
	4504	+ Save();
3877	4505	//int indices[] = jList.getSelectedIndices();
3878	4506	//for (int i = indices.length - 1; i >= 0; i--)
3879	4507	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4537,16 @@
3909	4537	//System.out.println("cut " + child);
3910	4538	//System.out.println("parent = " + child.parent);
3911	4539	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4540	+ if (Grafreed.clipboardIsTempGroup)
3913	4541	tGroup.add/Child/(tmp);
3914	4542	else
3915		- GraphreeD.clipboard = tmp;
	4543	+ Grafreed.clipboard = tmp;
3916	4544	}
3917	4545	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4546	+ if (Grafreed.clipboardIsTempGroup)
3919	4547	tGroup.add/Child/(child);
3920	4548	else
3921		- GraphreeD.clipboard = child;
	4549	+ Grafreed.clipboard = child;
3922	4550	}
3923	4551
3924	4552	//ResetModel();
..	..	@@ -3950,21 +4578,23 @@
3950	4578	//System.out.println("cut " + elem);
3951	4579	//System.out.println("parent = " + elem.parent);
3952	4580	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4581	+ if (Grafreed.clipboardIsTempGroup)
3954	4582	tGroup.add/Child/(tmp);
3955	4583	else
3956		- GraphreeD.clipboard = tmp;
	4584	+ Grafreed.clipboard = tmp;
3957	4585	}
3958	4586	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4587	+ if (Grafreed.clipboardIsTempGroup)
3960	4588	tGroup.add/Child/(child);
3961	4589	else
3962		- GraphreeD.clipboard = child;
	4590	+ Grafreed.clipboard = child;
3963	4591	}
3964	4592
3965	4593	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4594	+
	4595	+ if (Grafreed.clipboardIsTempGroup)
	4596	+ Grafreed.clipboard = tGroup;
	4597	+
3968	4598	if (cut)
3969	4599	{
3970	4600	ResetModel();
..	..	@@ -3974,11 +4604,11 @@
3974	4604
3975	4605	void paste(boolean expand)
3976	4606	{
3977		- // if (GraphreeD.clipboard == null)
	4607	+ // if (GrafreeD.clipboard == null)
3978	4608	// return;
3979	4609	boolean first = true;
3980	4610
3981		- if (GraphreeD.clipboardIsTempGroup)
	4611	+ if (Grafreed.clipboardIsTempGroup)
3982	4612	{
3983	4613	Composite temp;
3984	4614
..	..	@@ -3989,7 +4619,7 @@
3989	4619	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4620	*/
3991	4621	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4622	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4623	{
3994	4624	Object3D child = (Object3D)e.nextElement();
3995	4625
..	..	@@ -4003,7 +4633,7 @@
4003	4633	else
4004	4634	elem = child.deepCopy(); // ?
4005	4635	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4636	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4637	// elem = elem.get(0);
4008	4638	makeSomething(elem, true); // ?? first);
4009	4639	//group.addChild(elem);
..	..	@@ -4023,23 +4653,23 @@
4023	4653	//Object3D cb = Applet3D.clipboard;
4024	4654	//temp.addChild(cb);
4025	4655	//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());
	4656	+ assert(Grafreed.clipboard.parent == null);
	4657	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4658	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4659	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4660	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4661	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4662	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4663	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4664	}
4035	4665
4036	4666	ResetModel();
4037	4667	refreshContents();
4038	4668	}
4039	4669
4040		- void pasteInto(boolean copyit)
	4670	+ void pasteInto(boolean copyit, boolean clone)
4041	4671	{
4042		-// if (GraphreeD.clipboard == null)
	4672	+// if (GrafreeD.clipboard == null)
4043	4673	// return;
4044	4674
4045	4675	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4696,22 @@
4066	4696	if (copyit)
4067	4697	{
4068	4698	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4699	+ if (clone)
	4700	+ {
	4701	+ CloneClipboard(false); // sept 2014
	4702	+ }
	4703	+ else
	4704	+ {
	4705	+ paste(false);
	4706	+ }
4070	4707	}
4071	4708	else
4072	4709	{
4073	4710	boolean first = true;
4074	4711
4075		- if (GraphreeD.clipboardIsTempGroup)
	4712	+ if (Grafreed.clipboardIsTempGroup)
4076	4713	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4714	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4715	Object3D copy;
4079	4716	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4717	{
..	..	@@ -4084,7 +4721,7 @@
4084	4721	}
4085	4722	} else
4086	4723	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4724	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4725	}
4089	4726	}
4090	4727	}
..	..	@@ -4276,6 +4913,26 @@
4276	4913	makeSomething(csg);
4277	4914	}
4278	4915
	4916	+ void Ungroup(Object3D g)
	4917	+ {
	4918	+ if (g instanceof HiddenObject)
	4919	+ {
	4920	+ HiddenObject h = (HiddenObject) g;
	4921	+
	4922	+ for (int i=0; i<h.ActualSize(); i++)
	4923	+ {
	4924	+ objEditor.makeSomething(h.get(i), false);
	4925	+ }
	4926	+ }
	4927	+ else
	4928	+ {
	4929	+ for (int i=0; i<g.Size(); i++)
	4930	+ {
	4931	+ objEditor.makeSomething(g.get(i), false);
	4932	+ }
	4933	+ }
	4934	+ }
	4935	+
4279	4936	void ungroup()
4280	4937	{
4281	4938	/*
..	..	@@ -4469,21 +5126,6 @@
4469	5126	}
4470	5127	*/
4471	5128
4472		- void ImportGFD()
4473		- {
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4475		- browser.show();
4476		- String filename = browser.getFile();
4477		- if (filename != null && filename.length() > 0)
4478		- {
4479		- String fullname = browser.getDirectory() + filename;
4480		-
4481		- //Object3D readobj =
4482		- objEditor.ReadGFD(fullname, objEditor);
4483		- //makeSomething(readobj);
4484		- }
4485		- }
4486		-
4487	5129	/*
4488	5130	public void Callback(Object obj)
4489	5131	{
..	..	@@ -4507,26 +5149,9 @@
4507	5149	}
4508	5150	*/
4509	5151
4510		- void ImportVRMLX3D()
4511		- {
4512		- if (GraphreeD.standAlone)
4513		- {
4514		- /**/
4515		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4516		- browser.show();
4517		- String filename = browser.getFile();
4518		- if (filename != null && filename.length() > 0)
4519		- {
4520		- String fullname = browser.getDirectory() + filename;
4521		- LoadVRMLX3D(fullname);
4522		- }
4523		- /**/
4524		- }
4525		- }
4526		-
4527	5152	String GetFile(String dialogName)
4528	5153	{
4529		- if (GraphreeD.standAlone)
	5154	+ if (Grafreed.standAlone)
4530	5155	{
4531	5156	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5157	browser.show();
..	..	@@ -4590,10 +5215,15 @@
4590	5215	cButton flashSelectionButton;
4591	5216	cButton editButton;
4592	5217	cButton uneditButton;
	5218	+ JCheckBox allParamsButton;
4593	5219	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5220	cButton unselectButton;
4596	5221
	5222	+ cButton saveButton;
	5223	+ cButton undoButton;
	5224	+ cButton redoButton;
	5225	+ cButton oneStepButton;
	5226	+
4597	5227	cButton screenfitButton;
4598	5228	cButton screenfitpointButton;
4599	5229	cButton snapobjectButton;
..	..	@@ -4624,6 +5254,8 @@
4624	5254	private MenuItem lookFromItem;
4625	5255	private MenuItem switchItem;
4626	5256	private MenuItem cutItem;
	5257	+ private MenuItem undoItem;
	5258	+ private MenuItem redoItem;
4627	5259	private MenuItem duplicateItem;
4628	5260	private MenuItem cloneItem;
4629	5261	private MenuItem cloneSupportItem;
..	..	@@ -4635,8 +5267,9 @@
4635	5267	private MenuItem resetsupportItem;
4636	5268	private MenuItem resetreferencesItem;
4637	5269	private MenuItem linkverticesItem;
	5270	+ private MenuItem relinkverticesItem;
4638	5271	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5272	+ private MenuItem resetAllItem;
4640	5273	private MenuItem stepAllItem;
4641	5274	private MenuItem revertMeshItem;
4642	5275	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5280,17 @@
4647	5280	private MenuItem mergeGeometriesItem;
4648	5281	private MenuItem copyItem;
4649	5282	private MenuItem pasteItem;
	5283	+ private MenuItem pasteIntoItem;
4650	5284	private MenuItem pasteLinkItem;
4651	5285	private MenuItem pasteCloneItem;
4652	5286	private MenuItem pasteExpandItem;
4653	5287	private MenuItem clearItem;
4654	5288	private MenuItem clearAllItem;
4655	5289	private MenuItem genUVItem;
	5290	+ private MenuItem genNormalsMESHItem;
4656	5291	private MenuItem genNormalsCADItem;
4657	5292	private MenuItem genNormalsORGANItem;
	5293	+ private MenuItem genNormalsMINEItem;
4658	5294	private MenuItem stripifyItem;
4659	5295	private MenuItem unstripifyItem;
4660	5296	private MenuItem trimItem;
..	..	@@ -4683,6 +5319,10 @@
4683	5319	private MenuItem showleavesItem;
4684	5320	private MenuItem markleavesItem;
4685	5321	private MenuItem unmarkleavesItem;
	5322	+ private MenuItem rewindleavesItem;
	5323	+ private MenuItem unrewindleavesItem;
	5324	+ private MenuItem randomleavesItem;
	5325	+ private MenuItem unrandomleavesItem;
4686	5326
4687	5327	private MenuItem flipVItem;
4688	5328	private MenuItem unflipVItem;
..	..	@@ -4694,8 +5334,11 @@
4694	5334	private MenuItem panoTexturesItem;
4695	5335
4696	5336	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5337	+ private MenuItem resetCentroidXZItem;
4698	5338	private MenuItem resetTransformItem;
	5339	+ private MenuItem transformGeometryItem;
	5340	+ private MenuItem transformChildrenItem;
	5341	+ private MenuItem hideItem;
4699	5342	private MenuItem grabItem;
4700	5343	private MenuItem backItem;
4701	5344	private MenuItem frontItem;
..	..	@@ -4716,6 +5359,7 @@
4716	5359
4717	5360	private MenuItem resetParentItem;
4718	5361	private MenuItem repairParentItem;
	5362	+ private MenuItem repairShadowItem;
4719	5363	private MenuItem sortbysizeItem;
4720	5364	private MenuItem sortbynameItem;
4721	5365
..	..	@@ -4728,16 +5372,19 @@
4728	5372	private MenuItem particleItem;
4729	5373	private MenuItem ragdollItem;
4730	5374	private MenuItem ragdoll2Item;
	5375	+ private MenuItem heightFieldItem;
	5376	+ private MenuItem textureFieldItem;
4731	5377	private MenuItem gridItem;
4732	5378	private MenuItem rectoidItem;
4733	5379	private MenuItem ellipsoidItem;
4734	5380	private MenuItem coneItem;
4735	5381	private MenuItem torusItem;
4736	5382	private MenuItem superItem;
	5383	+ private MenuItem kleinItem;
4737	5384	private MenuItem blobItem;
4738	5385	private MenuItem latheItem;
4739	5386	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5387	+ private MenuItem overlayItem;
4741	5388	private MenuItem meshItem;
4742	5389	// private MenuItem meshGroupItem;
4743	5390	private MenuItem springItem;
..	..	@@ -4746,6 +5393,7 @@
4746	5393	private MenuItem csgItem;
4747	5394	private MenuItem templateItem;
4748	5395	private MenuItem textureItem;
	5396	+ private MenuItem billboardItem;
4749	5397	private MenuItem shadowXItem;
4750	5398	private MenuItem shadowYItem;
4751	5399	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5406,6 @@
4758	5406	private MenuItem doubleItem;
4759	5407	private MenuItem tripleItem;
4760	5408
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5409	private MenuItem computeAOItem;
4767	5410	private MenuItem recompileItem;
4768	5411	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5415,8 @@
4772	5415	private MenuItem analyzeItem;
4773	5416	private MenuItem dumpItem;
4774	5417	//boolean freezemodel = false;
	5418	+
	5419	+ Menu cameraMenu;
	5420	+ MenuItem editCameraItem;
	5421	+ MenuItem revertCameraItem;
4775	5422	}