~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,129 @@
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	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,44 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//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);
	285	+ }
	286	+
	287	+ oe.menuBar.add(menu = new Menu("Setting"));
	288	+ if (Globals.ADVANCED)
	289	+ {
196	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	291	revertMeshItem.addActionListener(this);
198	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	293	resetreferencesItem.addActionListener(this);
200	294	menu.add("-");
	295	+ }
201	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	297	overwriteGeoItem.addActionListener(this);
203	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +304,99 @@
209	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	305	overwriteUVItem.addActionListener(this);
211	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
212	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	310	generateMeshItem.addActionListener(this);
214	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	312	poseMeshItem.addActionListener(this);
216	313	menu.add("-");
	314	+ }
217	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	316	resetsupportItem.addActionListener(this);
219	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	318	linkverticesItem.addActionListener(this);
	319	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	320	+ relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
221	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	325	setMasterItem.addActionListener(this);
	326	+ }
223	327
224		- oe.menuBar.add(menu = new Menu("Object"));
	328	+ oe.menuBar.add(menu = new Menu("Group"));
225	329	grabItem = menu.add(new MenuItem("Grab"));
226	330	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	331	backItem = menu.add(new MenuItem("Back"));
230	332	backItem.addActionListener(this);
	333	+ frontItem = menu.add(new MenuItem("Front"));
	334	+ frontItem.addActionListener(this);
231	335	compositeItem = menu.add(new MenuItem("Composite"));
232	336	compositeItem.addActionListener(this);
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	338	+ hideItem.addActionListener(this);
	339	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	340	+ ungroupItem.addActionListener(this);
233	341	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
235	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	345	switchGeoItem.addActionListener(this);
242	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	347	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
246	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	359	scriptNodeItem.addActionListener(this);
248	360	cameraItem = menu.add(new MenuItem("Camera"));
249	361	cameraItem.addActionListener(this);
250		- menu.add("-");
	362	+ }
	363	+
	364	+ oe.menuBar.add(menu = new Menu("Object"));
251	365	textureItem = menu.add(new MenuItem("Texture"));
252	366	textureItem.addActionListener(this);
	367	+ billboardItem = menu.add(new MenuItem("Billboard"));
	368	+ billboardItem.addActionListener(this);
253	369	csgItem = menu.add(new MenuItem("CSG"));
254	370	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	372	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	374	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
261	380	linkerItem = menu.add(new MenuItem("Linker"));
262	381	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	382	attributeItem = menu.add(new MenuItem("Attribute"));
266	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
267	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	387	pointflowItem.addActionListener(this);
	388	+ }
269	389	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	391	resetTransformItem.addActionListener(this);
274	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	393	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
278	400
279	401	oe.menuBar.add(menu = new Menu("Geometry"));
280	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +405,13 @@
283	405	genNormalsORGANItem.addActionListener(this);
284	406	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	407	genNormalsCADItem.addActionListener(this);
	408	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	409	+ genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
286	415	stripifyItem = menu.add(new MenuItem("Stripify"));
287	416	stripifyItem.addActionListener(this);
288	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +421,6 @@
292	421	untrimItem = menu.add(new MenuItem("Untrim"));
293	422	untrimItem.addActionListener(this);
294	423	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	424	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	425	clearColorsItem.addActionListener(this);
299	426	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +433,34 @@
306	433	reduce34MeshItem.addActionListener(this);
307	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	435	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
	444	+
	445	+ oe.menuBar.add(menu = new Menu("Attributes"));
	446	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	447	+ clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
313	452	menu.add("-");
314	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	454	liveleavesItem.addActionListener(this);
316	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
318	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	460	supportleavesItem.addActionListener(this);
320	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	462	unsupportleavesItem.addActionListener(this);
	463	+ }
322	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	465	hideleavesItem.addActionListener(this);
324	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +469,31 @@
327	469	markleavesItem.addActionListener(this);
328	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
330	480	menu.add("-");
331	481	flipVItem = menu.add(new MenuItem("Flip V"));
332	482	flipVItem.addActionListener(this);
333	483	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	484	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	485	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	486	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	487	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	488	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	489	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	490	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	491	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	492	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	493	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	494	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	495	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	496	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	497
357	498	oe.menuBar.add(menu = new Menu("Selection"));
358	499	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,14 +511,41 @@
370	511	sortbysizeItem.addActionListener(this);
371	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	513	sortbynameItem.addActionListener(this);
	514	+ menu.add("-");
	515	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	516	+ shareGeometriesItem.addActionListener(this);
	517	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	518	+ mergeGeometriesItem.addActionListener(this);
	519	+ if (Globals.ADVANCED)
	520	+ {
	521	+ // Pretty much the same as duplicate and clone.
	522	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	523	+ extractGeometriesItem.addActionListener(this);
	524	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	525	+ cloneGeometriesItem.addActionListener(this);
	526	+ }
	527	+
373	528	oe.menuBar.add(menu = new Menu("Insert"));
374	529	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	530	+
	531	+ oe.menuBar.add(menu = new Menu("Tools"));
376	532	buildToolsMenu(menu);
377	533	}
378	534
379	535	void SetupUI2(ObjEditor oe)
380	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
381	549	//new Exception().printStackTrace();
382	550
383	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -406,150 +574,120 @@
406	574	oe.radioPanel.add(dummyButton);
407	575	oe.buttonGroup.add(dummyButton);
408	576	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	578
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
414	605	liveCB.addItemListener(this);
415	606
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);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
434	613	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);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ trackCB.setToolTipText("Enable tracking");
476	617	trackCB.addItemListener(this);
477	618
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ screenfitButton.setToolTipText("Screen fit");
480	621	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	622	+
482	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	624	// 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	625
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);
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Show selection");
495	635	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	636
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	638	+
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	640	+ twoButton.setToolTipText("Show center view only");
502	641	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	643	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	644	+ fourButton.setToolTipText("Show left panel only");
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ sixButton.setToolTipText("2-column layout left");
506	647	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ threeButton.setToolTipText("2-column layout right");
508	650	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ sevenButton.setToolTipText("3-column layout");
510	653	sevenButton.addActionListener(this);
511	654	//
512	655
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
514	658	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ closeButton.setToolTipText("Close tab");
517	662	closeButton.addActionListener(this);
518	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	664	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	665
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
524	668	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	669
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
530	672	uneditButton.addActionListener(this);
531	673
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);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
544	676	allParamsButton.addActionListener(this);
545	677
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);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ clearPanelButton.setToolTipText("Clear edit panel");
	680	+ clearPanelButton.addActionListener(this);
	681	+
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	683	+ unselectButton.setToolTipText("Unselect");
551	684	unselectButton.addActionListener(this);
552	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
553	691	// oe.aConstraints.gridx += 1;
554	692	// oe.aConstraints.weighty = 0;
555	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +699,37 @@
561	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	700	// gcButton.addActionListener(this);
563	701
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;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
575	705	//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);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	707	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
582	711
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);
	712	+ cGridBag copyOptionsPanel = new cGridBag();
	713	+
	714	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	715	+ colorCB.setToolTipText("Copy color when dropped");
587	716	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	717	+
	718	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	719	+ materialCB.setToolTipText("Copy material when dropped");
590	720	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	721	+
	722	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	723	+ textureCB.setToolTipText("Copy texture when dropped");
593	724	textureCB.addItemListener(this);
594	725
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
597	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
598	733	//jList.addListSelectionListener(this);
599	734	oe.jTree.addTreeSelectionListener(this);
600	735	//jTree.setRootVisible(false);
..	..	@@ -616,20 +751,111 @@
616	751	radio.layout = sevenButton;
617	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	753	}
	754	+
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	756	+ {
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	758	+ boxCB.setToolTipText("Display bounding boxes");
	759	+ boxCB.addItemListener(this);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	762	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	763	+ zoomBoxCB.addItemListener(this);
	764	+
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
	767	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	768	+ supportCB.setToolTipText("Enable rigging");
	769	+ supportCB.addItemListener(this);
	770	+
	771	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	772	+ // localCB.addItemListener(this);
	773	+
	774	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	775	+ crowdCB.setToolTipText("Used for crowds");
	776	+ crowdCB.addItemListener(this);
	777	+
	778	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	779	+ smoothCB.setToolTipText("Snapping delay");
	780	+ smoothCB.addItemListener(this);
	781	+
	782	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	783	+ slowCB.setToolTipText("Smooth interpolation");
	784	+ slowCB.addItemListener(this);
	785	+
	786	+// constraints.gridy += 1;
	787	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	788	+// speakerMocapCB.addItemListener(this);
	789	+
	790	+ if (false)
	791	+ {
	792	+ // handled in scripts
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	795	+ speakerCameraCB.addItemListener(this);
	796	+
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	799	+ speakerFocusCB.addItemListener(this);
	800	+
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	803	+ smoothfocusCB.addItemListener(this);
	804	+ }
	805	+
	806	+//constraints.gridx += 1;
	807	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	808	+// debugCB.addItemListener(this);
	809	+
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
	812	+ oeilCB.addItemListener(this);
	813	+
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
	820	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	821	+ lookAtCB.setToolTipText("Look-at target");
	822	+ lookAtCB.addItemListener(this);
	823	+ }
	824	+
	825	+ }
	826	+
	827	+ cGridBag fill = new cGridBag();
	828	+
	829	+ fill.preferredHeight = 200;
	830	+
	831	+ panel.add(fill);
	832	+
	833	+ }
619	834
620	835	void EditObject(Object3D obj)
621	836	{
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();
	837	+ cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
	846	+ radioButton.SetObject(obj);
	847	+ radioButton.layout = sevenButton;
	848	+ radioButton.SetCamera(cameraView.renderCamera, false);
	849	+ radioButton.addActionListener(this);
	850	+ radioPanel.add(radioButton);
	851	+ buttonGroup.add(radioButton);
	852	+ radioButton.doClick();
630	853	}
	854	+
631	855	void SetupViews(ObjEditor oe)
632	856	{
	857	+ theFrame = this;
	858	+
633	859	oe.SetupViews();
634	860
635	861	System.out.println("SetupViews");
..	..	@@ -646,13 +872,16 @@
646	872	JCheckBox fastCB;
647	873	JCheckBox slowCB;
648	874	JCheckBox boxCB;
	875	+ JCheckBox zoomBoxCB;
649	876	JCheckBox trackCB;
650	877	JCheckBox smoothfocusCB;
651	878	// JCheckBox speakerMocapCB;
652	879	JCheckBox speakerCameraCB;
653	880	JCheckBox speakerFocusCB;
654	881	JCheckBox debugCB;
	882	+
655	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
656	885	JCheckBox lookAtCB;
657	886
658	887	// static int COLOR = 1;
..	..	@@ -688,10 +917,10 @@
688	917	dropAttributes \|= Object3D.TEXTURE;
689	918	else
690	919	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	920	+ } else if(e.getSource() == liveCB)
693	921	{
694	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
695	924	}
696	925	else if(e.getSource() == supportCB)
697	926	{
..	..	@@ -727,6 +956,10 @@
727	956	cameraView.repaint();
728	957	// refreshContents();
729	958	}
	959	+ else if(e.getSource() == zoomBoxCB)
	960	+ {
	961	+ cameraView.ToggleZoomBoxMode();
	962	+ }
730	963	else if(e.getSource() == smoothfocusCB)
731	964	{
732	965	cameraView.ToggleSmoothFocus();
..	..	@@ -751,6 +984,10 @@
751	984	else if(e.getSource() == oeilCB)
752	985	{
753	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
754	991	}
755	992	else if(e.getSource() == lookAtCB)
756	993	{
..	..	@@ -840,7 +1077,9 @@
840	1077	// objEditor.DropFile((java.io.File[]) object, true);
841	1078	// return;
842	1079	// }
843		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1083	{
845	1084	// file(s)
846	1085	String[] names = string.split("\n");
..	..	@@ -867,7 +1106,7 @@
867	1106
868	1107	flashIt = false;
869	1108	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1111
873	1112	if (group.selection.size() == 1)
..	..	@@ -894,11 +1133,11 @@
894	1133	{
895	1134	loadClipboard(true);
896	1135	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1136	+ pasteInto(false, false);
898	1137	} else {
899	1138	loadClipboard(false);
900	1139	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1140	+ pasteInto(false, false); // true); // ???
902	1141	}
903	1142	}
904	1143	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1241,8 @@
1002	1241
1003	1242	void buildCreateMenu(Menu menu)
1004	1243	{
	1244	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1245	+ //heightFieldItem.addActionListener(this);
1005	1246	gridItem = menu.add(new MenuItem("Grid"));
1006	1247	gridItem.addActionListener(this);
1007	1248	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1255,37 @@
1014	1255	torusItem.addActionListener(this);
1015	1256	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1257	superItem.addActionListener(this);
	1258	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1259	+ kleinItem.addActionListener(this);
1017	1260	particleItem = menu.add(new MenuItem("Particle system"));
1018	1261	particleItem.addActionListener(this);
	1262	+ if (Globals.ADVANCED)
	1263	+ {
1019	1264	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1265	ragdollItem.addActionListener(this);
1021	1266	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1267	ragdoll2Item.addActionListener(this);
	1268	+ }
1023	1269	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1270	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1271	meshItem.addActionListener(this);
1026	1272	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1273	// meshGroupItem.addActionListener(this);
	1274	+ if (Globals.ADVANCED)
	1275	+ {
1028	1276	springItem = menu.add(new MenuItem("Spring"));
1029	1277	springItem.addActionListener(this);
1030	1278	flagItem = menu.add(new MenuItem("Flag"));
1031	1279	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	1280	blobItem = menu.add(new MenuItem("Blob"));
1037	1281	blobItem.addActionListener(this);
1038	1282	latheItem = menu.add(new MenuItem("Lathe"));
1039	1283	latheItem.addActionListener(this);
	1284	+ }
	1285	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1286	+ bezierItem.addActionListener(this);
	1287	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1288	+ overlayItem.addActionListener(this);
1040	1289	lightItem = menu.add(new MenuItem("Light"));
1041	1290	lightItem.addActionListener(this);
1042	1291	menu.add("-");
..	..	@@ -1046,46 +1295,44 @@
1046	1295	loopItem.addActionListener(this);
1047	1296	doubleItem = menu.add(new MenuItem("Fork"));
1048	1297	doubleItem.addActionListener(this);
	1298	+ if (Globals.ADVANCED)
	1299	+ {
1049	1300	tripleItem = menu.add(new MenuItem("Trident"));
1050	1301	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);
	1302	+ }
1060	1303	}
1061	1304
1062	1305	void buildToolsMenu(Menu menu)
1063	1306	{
1064	1307	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1308	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1309	+ animationItem.setState(Globals.ANIMATION);
1067	1310
1068	1311	menu.add("-");
1069	1312	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1313	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1314	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1315	+ textureFieldItem.addActionListener(this);
	1316	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1317	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1318	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1319	reduceMorphItem.addActionListener(this);
1077	1320	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1321	reduce34MorphItem.addActionListener(this);
1079		-
	1322	+ menu.add("-");
1080	1323	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1324	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1325
	1326	+ if (Globals.ADVANCED)
	1327	+ {
	1328	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1329	+ mirrorItem.addActionListener(this);
	1330	+ menu.add("-");
1084	1331	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1332	memoryItem.addActionListener(this);
1086	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1334	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1336	dumpItem.addActionListener(this);
1090	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1338	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1341,8 @@
1094	1341	resetParentItem.addActionListener(this);
1095	1342	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1343	repairParentItem.addActionListener(this);
	1344	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1345	+ repairShadowItem.addActionListener(this);
1097	1346	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1347	invariantsItem.addActionListener(this);
1099	1348	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1350,7 @@
1101	1350	menu.add("-");
1102	1351	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1352	editScriptItem.addActionListener(this);
	1353	+ }
1104	1354	}
1105	1355
1106	1356	void ScreenFit()
..	..	@@ -1223,6 +1473,7 @@
1223	1473	shadow.material = new cMaterial(obj.material);
1224	1474	shadow.material.diffuse = 0.0001f;
1225	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1226	1477
1227	1478	makeSomething(shadow);
1228	1479	}
..	..	@@ -1429,9 +1680,9 @@
1429	1680
1430	1681	void Overwrite(int mask)
1431	1682	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1684	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1435	1686
1436	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1688	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1705,7 @@
1454	1705	//
1455	1706	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1707	{
	1708	+ Object source = event.getSource();
1457	1709	/*
1458	1710	if (event.getSource() == nameField)
1459	1711	{
..	..	@@ -1465,11 +1717,11 @@
1465	1717	}
1466	1718	else
1467	1719	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1720	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1721	{
1470	1722	ScreenFit();
1471	1723	} else
1472		- if (event.getSource() == switchItem)
	1724	+ if (source == switchItem)
1473	1725	{
1474	1726	cVector v1 = new cVector();
1475	1727	cVector v2 = new cVector();
..	..	@@ -1478,11 +1730,11 @@
1478	1730	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1731	objEditor.cameraView.repaint();
1480	1732	} else
1481		- if (event.getSource() == rectoidItem)
	1733	+ if (source == rectoidItem)
1482	1734	{
1483	1735	makeSomething(new Box());
1484	1736	} else
1485		- if (event.getSource() == particleItem)
	1737	+ if (source == particleItem)
1486	1738	{
1487	1739	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1740	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1755,9 @@
1503	1755	applyExample(particleGeom, "SMOKE");
1504	1756	makeSomething(particleGeom);
1505	1757	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1758	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1759	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1760	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1761
1510	1762	ragdoll.toParent = LA.newMatrix();
1511	1763	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1773,71 @@
1521	1773	makeSomething(ragdoll);
1522	1774	//makeSomething(new VehicleDemo());
1523	1775	} else
1524		- if (event.getSource() == gridItem)
	1776	+ /*
	1777	+ */
	1778	+ if (source == heightFieldItem)
	1779	+ {
	1780	+ Object3D obj = new Object3D();
	1781	+
	1782	+ obj.CreateMaterial();
	1783	+ obj.bRep = new BoundaryRep();
	1784	+
	1785	+ obj.bRep.CreateMesh(new iHeightField()
	1786	+ {
	1787	+ public double f(double x, double y)
	1788	+ {
	1789	+ // The Mandelbrot set is represented by coloring
	1790	+ // each point (x,y) according to the number of
	1791	+ // iterations it takes before the while loop in
	1792	+ // this method ends. For points that are actually
	1793	+ // in the Mandelbrot set, or very close to it, the
	1794	+ // count will reach the maximum value, 80. These
	1795	+ // points will be colored purple. All other colors
	1796	+ // represent points that are definitely NOT in the set.
	1797	+ x -= 600;
	1798	+ y -= 500;
	1799	+ x /= 200;
	1800	+ y /= 200;
	1801	+ int count = 0;
	1802	+ double zx = x;
	1803	+ double zy = y;
	1804	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1805	+ double new_zx = zxzx - zyzy + x;
	1806	+ zy = 2zxzy + y;
	1807	+ zx = new_zx;
	1808	+ count++;
	1809	+ }
	1810	+ return count; // Math.sqrt(count);
	1811	+ }
	1812	+ }, 1000,1000);
	1813	+
	1814	+ makeSomething(obj);
	1815	+ } else
	1816	+ if (source == gridItem)
1525	1817	{
1526	1818	makeSomething(new Grid());
1527	1819	} else
1528		- if (event.getSource() == ellipsoidItem)
	1820	+ if (source == ellipsoidItem)
1529	1821	{
1530	1822	makeSomething(new Sphere());
1531	1823	} else
1532		- if (event.getSource() == coneItem)
	1824	+ if (source == coneItem)
1533	1825	{
1534	1826	makeSomething(new Cone());
1535	1827	} else
1536		- if (event.getSource() == torusItem)
	1828	+ if (source == torusItem)
1537	1829	{
1538	1830	makeSomething(new Torus());
1539	1831	} else
1540		- if (event.getSource() == superItem)
	1832	+ if (source == superItem)
1541	1833	{
1542	1834	makeSomething(new Superellipsoid());
1543	1835	} else
1544		- if (event.getSource() == blobItem)
	1836	+ if (source == kleinItem)
	1837	+ {
	1838	+ makeSomething(new Klein());
	1839	+ } else
	1840	+ if (source == blobItem)
1545	1841	{
1546	1842	Blob blob = new Blob();
1547	1843	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1845,15 @@
1549	1845	//blob.retile();
1550	1846	makeSomething(blob);
1551	1847	} else
1552		- if (event.getSource() == latheItem)
	1848	+ if (source == latheItem)
1553	1849	{
1554	1850	makeSomething(new Lathe());
1555	1851	} else
1556		- if (event.getSource() == bezierItem)
	1852	+ if (source == bezierItem)
1557	1853	{
1558	1854	makeSomething(new BezierSurface());
1559	1855	} else
1560		- if (event.getSource() == checkerItem)
	1856	+ if (source == overlayItem)
1561	1857	{
1562	1858	/*
1563	1859	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1866,9 @@
1570	1866	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1867	LA.matInvert(obj.toParent, obj.fromParent);
1572	1868	*/
1573		- makeSomething(new CheckerIG());
	1869	+ makeSomething(new Checker());
1574	1870	} else
1575		- if (event.getSource() == meshItem)
	1871	+ if (source == meshItem)
1576	1872	{
1577	1873	Object3D itemtomake = new Object3D();
1578	1874	Object3D child;
..	..	@@ -1593,35 +1889,35 @@
1593	1889	makeSomething(child);
1594	1890	}
1595	1891	} else
1596		- if (event.getSource() == springItem)
	1892	+ if (source == springItem)
1597	1893	{
1598	1894	cSpring s = new cSpring();
1599	1895	s.setup();
1600	1896	makeSomething(s);
1601	1897	} else
1602		- if (event.getSource() == flagItem)
	1898	+ if (source == flagItem)
1603	1899	{
1604	1900	cSpring s = new cFlag();
1605	1901	s.setup();
1606	1902	makeSomething(s);
1607	1903	} else
1608		- if (event.getSource() == lightItem)
	1904	+ if (source == lightItem)
1609	1905	{
1610	1906	makeSomething(new Light());
1611	1907	} else
1612		- if (event.getSource() == csgItem)
	1908	+ if (source == csgItem)
1613	1909	{
1614	1910	group(new CSG());
1615	1911	} else
1616		- if (event.getSource() == templateItem)
	1912	+ if (source == templateItem)
1617	1913	{
1618	1914	group(new cTemplate());
1619	1915	} else
1620		- if (event.getSource() == attributeItem)
	1916	+ if (source == attributeItem)
1621	1917	{
1622	1918	makeSomething(new Attribute());
1623	1919	} else
1624		- if (event.getSource() == pointflowItem)
	1920	+ if (source == pointflowItem)
1625	1921	{
1626	1922	makeSomething(new PointFlow());
1627	1923	} else
..	..	@@ -1633,7 +1929,7 @@
1633	1929	} else
1634	1930	*/
1635	1931
1636		- if (event.getSource() == superLoopItem)
	1932	+ if (source == superLoopItem)
1637	1933	{
1638	1934	Composite g = new cGroup();
1639	1935	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1951,7 @@
1655	1951
1656	1952	group(g);
1657	1953	} else
1658		- if (event.getSource() == loopItem)
	1954	+ if (source == loopItem)
1659	1955	{
1660	1956	Composite csg = new GroupLeaf();
1661	1957	csg.count = 5;
..	..	@@ -1664,7 +1960,7 @@
1664	1960	csg.addChild(child);
1665	1961	child.addChild(csg);
1666	1962	} else
1667		- if (event.getSource() == doubleItem)
	1963	+ if (source == doubleItem)
1668	1964	{
1669	1965	Composite csg = new GroupLeaf();
1670	1966	csg.count = 5;
..	..	@@ -1676,7 +1972,7 @@
1676	1972	csg.addChild(child);
1677	1973	child.addChild(csg);
1678	1974	} else
1679		- if (event.getSource() == tripleItem)
	1975	+ if (source == tripleItem)
1680	1976	{
1681	1977	Composite csg = new GroupLeaf();
1682	1978	csg.count = 4;
..	..	@@ -1691,71 +1987,83 @@
1691	1987	csg.addChild(child);
1692	1988	child.addChild(csg);
1693	1989	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	1990	+ if (source == computeAOItem)
1696	1991	{
1697		- ImportGFD();
	1992	+ Globals.drawMode = CameraPane.OCCLUSION;
	1993	+ Globals.theRenderer.repaint();
1698	1994	} 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)
	1995	+ if (source == recompileItem)
1717	1996	{
1718	1997	Recompile();
1719	1998	refreshContents();
1720	1999	} else
1721		- if (event.getSource() == editScriptItem)
	2000	+ if (source == editScriptItem)
1722	2001	{
1723	2002	OpenDialog();
1724	2003	refreshContents();
1725	2004	} else
1726		- if (event.getSource() == invariantsItem)
	2005	+ if (source == invariantsItem)
1727	2006	{
1728	2007	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1730	2009	} else
1731		- if (event.getSource() == memoryItem)
	2010	+ if (source == memoryItem)
1732	2011	{
1733	2012	//System.out.println("Invariants:");
1734	2013	PrintMemory();
1735	2014	} else
1736		- if (event.getSource() == pathItem)
	2015	+ if (source == pathItem)
1737	2016	{
1738	2017	PrintPath();
1739	2018	} else
1740		- if (event.getSource() == analyzeItem)
	2019	+ if (source == analyzeItem)
1741	2020	{
1742	2021	AnalyzeObject();
1743	2022	} else
1744		- if (event.getSource() == dumpItem)
	2023	+ if (source == dumpItem)
1745	2024	{
1746	2025	DumpObject();
1747	2026	} else
1748		- if (event.getSource() == screenfitButton)
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
	2050	+ } else
	2051	+ if (source == oneStepButton)
	2052	+ {
	2053	+ Globals.ONESTEP = true;
	2054	+ cameraView.repaint();
	2055	+ } else
	2056	+ if (source == screenfitButton)
1749	2057	{
1750	2058	//Reload(lastConverter, lastFilename, true);
1751	2059	ScreenFit();
1752	2060	} else
1753		- if (event.getSource() == screenfitpointButton)
	2061	+ if (source == screenfitpointButton)
1754	2062	{
1755	2063	//Reload(lastConverter, lastFilename, true);
1756	2064	ScreenFitPoint();
1757	2065	} else
1758		- if (event.getSource() == snapobjectButton)
	2066	+ if (source == snapobjectButton)
1759	2067	{
1760	2068	//Reload(lastConverter, lastFilename, true);
1761	2069	SnapObject();
..	..	@@ -1766,13 +2074,13 @@
1766	2074	// Recompile();
1767	2075	// refreshContents();
1768	2076	// } else
1769		- if (event.getSource() == gcButton)
	2077	+ if (source == gcButton)
1770	2078	{
1771	2079	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2080	System.gc();
1773	2081	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2082	} else
1775		- if (event.getSource() == editLeafItem)
	2083	+ if (source == editLeafItem)
1776	2084	{
1777	2085	Object3D obj;
1778	2086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2094,78 @@
1786	2094	}
1787	2095	refreshContents(true);
1788	2096	} else
1789		- if (event.getSource() == openWindowItem)
	2097	+ if (source == openWindowItem)
1790	2098	{
1791	2099	EditSelection(true);
1792	2100	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2101	+ if (source == cutItem \|\| source == clearButton)
1794	2102	{
1795	2103	loadClipboard(true);
1796	2104	} else
1797		- if (event.getSource() == duplicateItem)
	2105	+ if (source == undoItem)
1798	2106	{
1799		- Object3D keep = GraphreeD.clipboard;
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
	2113	+ if (source == duplicateItem)
	2114	+ {
	2115	+ Object3D keep = Grafreed.clipboard;
1800	2116	loadClipboard(false);
1801	2117	paste(false);
1802		- GraphreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1803	2119	} else
1804		- if (event.getSource() == cloneItem)
	2120	+ if (source == cloneItem)
1805	2121	{
1806	2122	CloneSelection(false);
1807	2123	} else
1808		- if (event.getSource() == cloneSupportItem)
	2124	+ if (source == cloneSupportItem)
1809	2125	{
1810	2126	CloneSelection(true);
1811	2127	} else
1812		- if (event.getSource() == copyItem)
	2128	+ if (source == copyItem)
1813	2129	{
1814	2130	loadClipboard(false);
1815	2131	} else
1816		- if (event.getSource() == pasteItem)
	2132	+ if (source == pasteItem)
1817	2133	{
1818	2134	paste(false);
1819	2135	} else
1820		- if (event.getSource() == pasteLinkItem)
	2136	+ if (source == pasteIntoItem)
1821	2137	{
1822		- pasteInto(false);
	2138	+ pasteInto(true, false);
1823	2139	} else
1824		- if (event.getSource() == pasteCloneItem)
	2140	+ if (source == pasteLinkItem)
1825	2141	{
1826		- pasteInto(true);
	2142	+ pasteInto(false, false);
1827	2143	} else
1828		- if (event.getSource() == pasteExpandItem)
	2144	+ if (source == pasteCloneItem)
	2145	+ {
	2146	+ pasteInto(true, true);
	2147	+ } else
	2148	+ if (source == pasteExpandItem)
1829	2149	{
1830	2150	paste(true);
1831	2151	} else
1832		- if (event.getSource() == synchronizeItem)
	2152	+ if (source == synchronizeItem)
1833	2153	{
1834	2154	Overwrite(Object3D.TRANSFORM);
1835	2155	} else
1836		- if (event.getSource() == overwriteNameItem)
	2156	+ if (source == overwriteNameItem)
1837	2157	{
1838	2158	Overwrite(Object3D.NAME);
1839	2159	} else
1840		- if (event.getSource() == overwriteUVItem)
	2160	+ if (source == overwriteUVItem)
1841	2161	{
1842	2162	Overwrite(Object3D.UV);
1843	2163	} else
1844		- if (event.getSource() == overwriteMatItem)
	2164	+ if (source == overwriteMatItem)
1845	2165	{
	2166	+ /* july 2015
1846	2167	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2168	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2169	else
1849	2170	{
1850	2171	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2177,16 @@
1856	2177	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2178	}
1858	2179	}
	2180	+ */
	2181	+
	2182	+ Overwrite(dropAttributes);
1859	2183	}
1860		- if (event.getSource() == overwriteGeoItem)
	2184	+ if (source == overwriteGeoItem)
1861	2185	{
1862	2186	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2187	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2188	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2189	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2190	//
1867	2191	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2192	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2198,7 @@
1874	2198	// refreshContents();
1875	2199	// }
1876	2200	} else
1877		- if (event.getSource() == generateMeshItem)
	2201	+ if (source == generateMeshItem)
1878	2202	{
1879	2203	//if (group.selection.size() == 1)
1880	2204	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2209,7 @@
1885	2209	ResetModel();
1886	2210	refreshContents();
1887	2211	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2212	+ if (source == extractGeometriesItem)
1889	2213	{
1890	2214	boolean one = false;
1891	2215
..	..	@@ -1912,7 +2236,7 @@
1912	2236	ResetModel();
1913	2237	refreshContents();
1914	2238	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2239	+ if (source == cloneGeometriesItem)
1916	2240	{
1917	2241	boolean one = false;
1918	2242
..	..	@@ -1938,32 +2262,37 @@
1938	2262	ResetModel();
1939	2263	refreshContents();
1940	2264	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2265	+ if (source == shareGeometriesItem)
1942	2266	{
1943	2267	boolean one = false;
1944	2268
1945	2269	if (group.selection.size() == 1)
1946	2270	one = true;
1947	2271
	2272	+ Object3D merge = null;
	2273	+
1948	2274	Object3D content = new cGroup();
1949	2275
1950	2276	for (int i=0; i<group.selection.size(); i++)
1951	2277	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2278	+ merge = new Merge(group.selection.get(i));
1953	2279
1954	2280	if (one)
1955		- makeSomething(sel, false);
	2281	+ makeSomething(merge, false);
1956	2282	else
1957		- content.addChild(sel);
	2283	+ content.addChild(merge);
1958	2284	}
1959	2285
1960	2286	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2287	+ makeSomething(content, true);
	2288	+ else
	2289	+ {
	2290	+ ResetModel();
	2291	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2292	+ refreshContents();
	2293	+ }
1965	2294	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2295	+ if (source == mergeGeometriesItem)
1967	2296	{
1968	2297	boolean one = false;
1969	2298
..	..	@@ -1993,11 +2322,11 @@
1993	2322	ResetModel();
1994	2323	refreshContents();
1995	2324	} else
1996		- if (event.getSource() == linkverticesItem)
	2325	+ if (source == linkverticesItem)
1997	2326	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2327	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2328	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2329	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2330	//
2002	2331	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2332	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2335,48 @@
2006	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2336	// refreshContents();
2008	2337	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2339	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2012	2341
2013	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2343	content = ((cGroup)content).get(0);
2015	2344
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2345	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2346	for (int i=0; i<group.selection.size(); i++)
2018	2347	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2348	+ boolean random = CameraPane.SWITCH;
	2349	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2350	group.selection.get(i).linkVerticesThis(content);
2022	2351	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2352	+ CameraPane.SWITCH = random;
2024	2353	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2354	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2355	refreshContents();
2027	2356	}
2028	2357	} else
2029		- if (event.getSource() == resetsupportItem)
	2358	+ if (source == resetsupportItem)
2030	2359	{
2031	2360	for (int i=0; i<group.selection.size(); i++)
2032	2361	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2362	+ boolean random = CameraPane.SWITCH;
	2363	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2364	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2365	+ CameraPane.SWITCH = random;
2037	2366	}
2038	2367
2039	2368	refreshContents();
2040	2369	} else
2041		- if (event.getSource() == resetreferencesItem)
	2370	+ if (source == relinkverticesItem)
	2371	+ {
	2372	+ boolean random = CameraPane.SWITCH;
	2373	+ CameraPane.SWITCH = false; // parse all random nodes
	2374	+ group.selection.RelinkToSupport();
	2375	+ CameraPane.SWITCH = random;
	2376	+
	2377	+ refreshContents();
	2378	+ } else
	2379	+ if (source == resetreferencesItem)
2042	2380	{
2043	2381	for (int i=0; i<group.selection.size(); i++)
2044	2382	{
..	..	@@ -2047,11 +2385,11 @@
2047	2385
2048	2386	refreshContents();
2049	2387	} else
2050		- if (event.getSource() == setMasterItem)
	2388	+ if (source == setMasterItem)
2051	2389	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2391	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2055	2393
2056	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2395	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2398,13 @@
2060	2398	refreshContents();
2061	2399	}
2062	2400	} else
2063		- if (event.getSource() == poseMeshItem)
	2401	+ if (source == poseMeshItem)
2064	2402	{
2065	2403	if (group.selection.size() == 1)
2066	2404	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2068	2406	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2070	2408
2071	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2410	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2417,19 @@
2079	2417	}
2080	2418
2081	2419	} else
2082		- if (event.getSource() == revertMeshItem)
	2420	+ if (source == revertMeshItem)
2083	2421	{
2084	2422	RevertMeshes();
2085	2423	} else
2086		- if (event.getSource() == resetMeshItem)
	2424	+ if (source == resetAllItem)
2087	2425	{
2088	2426	ResetAll();
2089	2427	} else
2090		- if (event.getSource() == stepAllItem)
	2428	+ if (source == stepAllItem)
2091	2429	{
2092	2430	StepAll();
2093	2431	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2432	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2433	{
2096	2434	//int indices[] = jList.getSelectedIndices();
2097	2435	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2437,46 @@
2099	2437
2100	2438	ClearSelection(false);
2101	2439	} else
2102		- if (event.getSource() == clearAllItem)
	2440	+ if (source == clearAllItem)
2103	2441	{
2104	2442	ClearSelection(true);
2105	2443	} else
2106		- if (event.getSource() == grabItem)
	2444	+ if (source == grabItem)
2107	2445	{
2108	2446	group(new cGroup(), true);
2109	2447	} else
2110		- if (event.getSource() == frontItem)
	2448	+ if (source == hideItem)
	2449	+ {
	2450	+ group(new HiddenObject());
	2451	+ } else
	2452	+ if (source == frontItem)
2111	2453	{
2112	2454	front();
2113	2455	} else
2114		- if (event.getSource() == backItem)
	2456	+ if (source == backItem)
2115	2457	{
2116	2458	back();
2117	2459	} else
2118		- if (event.getSource() == cameraItem)
	2460	+ if (source == cameraItem)
2119	2461	{
2120	2462	makeSomething(new Camera());
2121	2463	} else
2122		- if (event.getSource() == compositeItem)
	2464	+ if (source == compositeItem)
2123	2465	{
2124	2466	group(new Composite());
2125	2467	} else
2126		- if (event.getSource() == randomItem)
	2468	+ if (source == randomItem)
2127	2469	{
2128	2470	RandomNode random = new RandomNode();
2129	2471	group(random);
2130	2472	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2473	+ random.name = random.get(0).name + "Switch";
2132	2474	} else
2133		- if (event.getSource() == physicsItem)
	2475	+ if (source == physicsItem)
2134	2476	{
2135	2477	group(new PhysicsNode());
2136	2478	} else
2137		- if (event.getSource() == frameselectorItem)
	2479	+ if (source == frameselectorItem)
2138	2480	{
2139	2481	for (int i=0; i<group.selection.size(); i++)
2140	2482	{
..	..	@@ -2146,7 +2488,7 @@
2146	2488	ResetModel();
2147	2489	refreshContents();
2148	2490	} else
2149		- if (event.getSource() == switchGeoItem)
	2491	+ if (source == switchGeoItem)
2150	2492	{
2151	2493	for (int i=0; i<group.selection.size(); i++)
2152	2494	{
..	..	@@ -2158,7 +2500,7 @@
2158	2500	ResetModel();
2159	2501	refreshContents();
2160	2502	} else
2161		- if (event.getSource() == switchTransfoItem)
	2503	+ if (source == switchTransfoItem)
2162	2504	{
2163	2505	for (int i=0; i<group.selection.size(); i++)
2164	2506	{
..	..	@@ -2170,7 +2512,7 @@
2170	2512	ResetModel();
2171	2513	refreshContents();
2172	2514	} else
2173		- if (event.getSource() == morphItem)
	2515	+ if (source == morphItem)
2174	2516	{
2175	2517	for (int i=0; i<group.selection.size(); i++)
2176	2518	{
..	..	@@ -2182,7 +2524,7 @@
2182	2524	ResetModel();
2183	2525	refreshContents();
2184	2526	} else
2185		- if (event.getSource() == scriptNodeItem)
	2527	+ if (source == scriptNodeItem)
2186	2528	{
2187	2529	boolean atleastone = false;
2188	2530
..	..	@@ -2221,191 +2563,239 @@
2221	2563	}
2222	2564	}
2223	2565	} else
2224		- if (event.getSource() == linkerItem)
	2566	+ if (source == linkerItem)
2225	2567	{
2226	2568	group(new cLinker());
2227	2569	} else
2228		- if (event.getSource() == textureItem)
	2570	+ if (source == textureItem)
2229	2571	{
2230	2572	group(new TextureNode());
2231	2573	} else
2232		- if (event.getSource() == shadowXItem)
	2574	+ if (source == billboardItem)
	2575	+ {
	2576	+ group(new BillboardNode());
	2577	+ } else
	2578	+ if (source == shadowXItem)
2233	2579	{
2234	2580	CastShadow(0);
2235	2581	} else
2236		- if (event.getSource() == shadowYItem)
	2582	+ if (source == shadowYItem)
2237	2583	{
2238	2584	CastShadow(1);
2239	2585	} else
2240		- if (event.getSource() == shadowZItem)
	2586	+ if (source == shadowZItem)
2241	2587	{
2242	2588	CastShadow(2);
2243	2589	} else
2244		- if (event.getSource() == ungroupItem)
	2590	+ if (source == ungroupItem)
2245	2591	{
2246		- ungroup();
	2592	+ //ungroup();
	2593	+ for (int i=0; i<group.selection.size(); i++)
	2594	+ {
	2595	+ Ungroup(group.selection.get(i));
	2596	+ }
	2597	+
	2598	+ ClearSelection(false);
	2599	+
	2600	+ refreshContents();
2247	2601	} else
2248		- if (event.getSource() == genUVItem)
	2602	+ if (source == genUVItem)
2249	2603	{
2250	2604	GenUV();
2251	2605	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2606	+ if (source == genNormalsCADItem)
2253	2607	{
2254	2608	GenNormals(true);
2255	2609	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2610	+ if (source == genNormalsMESHItem)
	2611	+ {
	2612	+ GenNormalsMESH();
	2613	+ } else
	2614	+ if (source == genNormalsORGANItem)
2257	2615	{
2258	2616	GenNormals(false);
2259	2617	} else
2260		- if (event.getSource() == stripifyItem)
	2618	+ if (source == genNormalsMINEItem)
	2619	+ {
	2620	+ GenNormalsMINE();
	2621	+ } else
	2622	+ if (source == stripifyItem)
2261	2623	{
2262	2624	Stripify();
2263	2625	} else
2264		- if (event.getSource() == unstripifyItem)
	2626	+ if (source == unstripifyItem)
2265	2627	{
2266	2628	Unstripify();
2267	2629	} else
2268		- if (event.getSource() == trimItem)
	2630	+ if (source == trimItem)
2269	2631	{
2270	2632	Trim();
2271	2633	} else
2272		- if (event.getSource() == untrimItem)
	2634	+ if (source == untrimItem)
2273	2635	{
2274	2636	Untrim();
2275	2637	} else
2276		- if (event.getSource() == clearColorsItem)
	2638	+ if (source == clearColorsItem)
2277	2639	{
2278	2640	ClearColors();
2279	2641	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2642	+ if (source == clearMaterialsItem)
2281	2643	{
2282	2644	ClearMaterials();
2283	2645	} else
2284		- if (event.getSource() == liveleavesItem)
	2646	+ if (source == liveleavesItem)
2285	2647	{
2286	2648	LiveLeaves(true);
2287	2649	} else
2288		- if (event.getSource() == unliveleavesItem)
	2650	+ if (source == unliveleavesItem)
2289	2651	{
2290	2652	LiveLeaves(false);
2291	2653	} else
2292		- if (event.getSource() == supportleavesItem)
	2654	+ if (source == supportleavesItem)
2293	2655	{
2294	2656	SupportLeaves(true);
2295	2657	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2658	+ if (source == unsupportleavesItem)
2297	2659	{
2298	2660	SupportLeaves(false);
2299	2661	} else
2300		- if (event.getSource() == hideleavesItem)
	2662	+ if (source == hideleavesItem)
2301	2663	{
2302	2664	HideLeaves(true);
2303	2665	} else
2304		- if (event.getSource() == showleavesItem)
	2666	+ if (source == showleavesItem)
2305	2667	{
2306	2668	HideLeaves(false);
2307	2669	} else
2308		- if (event.getSource() == markleavesItem)
	2670	+ if (source == markleavesItem)
2309	2671	{
2310	2672	MarkLeaves(true);
2311	2673	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2674	+ if (source == unmarkleavesItem)
2313	2675	{
2314	2676	MarkLeaves(false);
2315	2677	} else
2316		- if (event.getSource() == flipVItem)
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
	2693	+ } else
	2694	+ if (source == flipVItem)
2317	2695	{
2318	2696	FlipV(true);
2319	2697	} else
2320		- if (event.getSource() == unflipVItem)
	2698	+ if (source == unflipVItem)
2321	2699	{
2322	2700	FlipV(false);
2323	2701	} else
2324		- if (event.getSource() == lowTexturesItem)
	2702	+ if (source == lowTexturesItem)
2325	2703	{
2326	2704	SetTexRes(0);
2327	2705	} else
2328		- if (event.getSource() == normalTexturesItem)
	2706	+ if (source == normalTexturesItem)
2329	2707	{
2330	2708	SetTexRes(1);
2331	2709	} else
2332		- if (event.getSource() == highTexturesItem)
	2710	+ if (source == highTexturesItem)
2333	2711	{
2334	2712	SetTexRes(2);
2335	2713	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2714	+ if (source == veryhighTexturesItem)
2337	2715	{
2338	2716	SetTexRes(3);
2339	2717	} else
2340		- if (event.getSource() == maxTexturesItem)
	2718	+ if (source == maxTexturesItem)
2341	2719	{
2342	2720	SetTexRes(4);
2343	2721	} else
2344		- if (event.getSource() == panoTexturesItem)
	2722	+ if (source == panoTexturesItem)
2345	2723	{
2346	2724	SetTexRes(5);
2347	2725	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2726	+ if (source == reverseNormalsItem)
2349	2727	{
2350	2728	ReverseNormals();
2351	2729	} else
2352		- if (event.getSource() == parseverticesItem)
	2730	+ if (source == parseverticesItem)
2353	2731	{
2354	2732	ParseVertices();
2355	2733	} else
2356		- if (event.getSource() == alignItem)
	2734	+ if (source == textureFieldItem)
	2735	+ {
	2736	+ TextureVertices();
	2737	+ } else
	2738	+ if (source == alignItem)
2357	2739	{
2358	2740	Align();
2359	2741	} else
2360		- if (event.getSource() == mirrorItem)
	2742	+ if (source == mirrorItem)
2361	2743	{
2362	2744	MirrorPoses();
2363	2745	} else
2364		- if (event.getSource() == reduceMorphItem)
	2746	+ if (source == reduceMorphItem)
2365	2747	{
2366	2748	MeshReduction(false);
2367	2749	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2750	+ if (source == reduce34MorphItem)
2369	2751	{
2370	2752	MeshReduction(true);
2371	2753	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2754	+ if (source == reverseTrianglesItem)
2373	2755	{
2374	2756	ReverseTriangles();
2375	2757	} else
2376		- if (event.getSource() == reduceMeshItem)
	2758	+ if (source == reduceMeshItem)
2377	2759	{
2378	2760	ReduceMesh(false);
2379	2761	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2762	+ if (source == reduce34MeshItem)
2381	2763	{
2382	2764	ReduceMesh(true);
2383	2765	} else
2384		- if (event.getSource() == increaseMeshItem)
	2766	+ if (source == increaseMeshItem)
2385	2767	{
2386	2768	IncreaseMesh();
2387	2769	} else
2388		- if (event.getSource() == clipMeshItem)
	2770	+ if (source == clipMeshItem)
2389	2771	{
2390	2772	ClipMesh();
2391	2773	} else
2392		- if (event.getSource() == smoothMeshItem)
	2774	+ if (source == smoothMeshItem)
2393	2775	{
2394	2776	SmoothMesh();
2395	2777	} else
2396		- if (event.getSource() == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2397	2779	{
2398	2780	TransformGeometry();
2399	2781	} else
2400		- if (event.getSource() == resetTransformItem)
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
	2785	+ } else
	2786	+ if (source == resetTransformItem)
2401	2787	{
2402	2788	ResetTransform();
2403	2789	} else
2404		- if (event.getSource() == resetCentroidItem)
	2790	+ if (source == resetCentroidItem)
2405	2791	{
2406		- ResetCentroid();
	2792	+ ResetCentroid(true);
2407	2793	} else
2408		- if (event.getSource() == resetParentItem)
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
	2797	+ } else
	2798	+ if (source == resetParentItem)
2409	2799	{
2410	2800	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2801	{
..	..	@@ -2415,7 +2805,7 @@
2415	2805
2416	2806	refreshContents();
2417	2807	} else
2418		- if (event.getSource() == repairParentItem)
	2808	+ if (source == repairParentItem)
2419	2809	{
2420	2810	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2811	{
..	..	@@ -2429,7 +2819,21 @@
2429	2819
2430	2820	refreshContents();
2431	2821	} else
2432		- if (event.getSource() == sortbysizeItem)
	2822	+ if (source == repairShadowItem)
	2823	+ {
	2824	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2825	+ {
	2826	+ Object3D obj = (Object3D)e.nextElement();
	2827	+ obj.RepairShadow();
	2828	+// for (int i=0; i<obj.size(); i++)
	2829	+// {
	2830	+// obj.get(i).parent = obj;
	2831	+// }
	2832	+ }
	2833	+
	2834	+ refreshContents();
	2835	+ } else
	2836	+ if (source == sortbysizeItem)
2433	2837	{
2434	2838	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2839	{
..	..	@@ -2441,7 +2845,7 @@
2441	2845	ResetModel();
2442	2846	refreshContents();
2443	2847	} else
2444		- if (event.getSource() == sortbynameItem)
	2848	+ if (source == sortbynameItem)
2445	2849	{
2446	2850	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2851	{
..	..	@@ -2453,7 +2857,7 @@
2453	2857	ResetModel();
2454	2858	refreshContents();
2455	2859	} else
2456		- if (event.getSource() == attachPigmentItem)
	2860	+ if (source == attachPigmentItem)
2457	2861	{
2458	2862	String texture = GetFile("Attach pigment");
2459	2863	Object3D obj;
..	..	@@ -2465,7 +2869,7 @@
2465	2869
2466	2870	refreshContents();
2467	2871	} else
2468		- if (event.getSource() == detachPigmentItem)
	2872	+ if (source == detachPigmentItem)
2469	2873	{
2470	2874	Object3D obj;
2471	2875	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2880,7 @@
2476	2880
2477	2881	refreshContents();
2478	2882	} else
2479		- if (event.getSource() == attachBumpItem)
	2883	+ if (source == attachBumpItem)
2480	2884	{
2481	2885	String texture = GetFile("Attach bump");
2482	2886	Object3D obj;
..	..	@@ -2488,7 +2892,7 @@
2488	2892
2489	2893	refreshContents();
2490	2894	} else
2491		- if (event.getSource() == detachBumpItem)
	2895	+ if (source == detachBumpItem)
2492	2896	{
2493	2897	Object3D obj;
2494	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2903,7 @@
2499	2903
2500	2904	refreshContents();
2501	2905	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2906	+ if (source == pigmentBumpItem)
2503	2907	{
2504	2908	Object3D obj;
2505	2909	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2914,221 @@
2510	2914
2511	2915	refreshContents();
2512	2916	} else
2513		- if (event.getSource() == flashSelectionButton)
	2917	+ if (source == flashSelectionButton)
2514	2918	{
2515	2919	CameraPane.flash = true;
2516	2920	refreshContents();
2517	2921	} else
2518		- if (event.getSource() == oneButton)
	2922	+ if (source == oneButton)
2519	2923	{
2520	2924	} else
2521		- if (event.getSource() == twoButton)
	2925	+ if (source == twoButton)
2522	2926	{
2523	2927	radio.layout = twoButton;
2524	2928	// bug
2525	2929	//gridPanel.setDividerLocation(1.0);
2526	2930	//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();
	2931	+// bigThree.remove(scenePanel);
	2932	+// bigThree.remove(centralPanel);
	2933	+// bigThree.remove(XYZPanel);
	2934	+// aWindowConstraints.gridx = 0;
	2935	+// aWindowConstraints.gridy = 0;
	2936	+// aWindowConstraints.gridwidth = 1;
	2937	+// // aConstraints.gridheight = 3;
	2938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2939	+// aWindowConstraints.weightx = 0;
	2940	+// aWindowConstraints.weighty = 1;
	2941	+// //bigThree.add(jtp, aWindowConstraints);
	2942	+// aWindowConstraints.weightx = 1;
	2943	+// aWindowConstraints.gridwidth = 3;
	2944	+// // aConstraints.gridheight = 3;
	2945	+// aWindowConstraints.gridx = 1;
	2946	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2947	+// bigThree.add(centralPanel, aWindowConstraints);
	2948	+// aWindowConstraints.weightx = 0;
	2949	+// aWindowConstraints.gridx = 4;
	2950	+// aWindowConstraints.gridwidth = 1;
	2951	+// // aConstraints.gridheight = 3;
	2952	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2953	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2954	+// scenePanel.setVisible(false);
	2955	+// centralPanel.setVisible(true);
	2956	+// XYZPanel.setVisible(false);
	2957	+ bigThree.ClearUI();
	2958	+ bigThree.add(centralPanel);
	2959	+ bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2551	2978	} else
2552		- if (event.getSource() == threeButton)
	2979	+ if (source == threeButton)
2553	2980	{
2554	2981	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();
	2982	+
	2983	+// bigThree.remove(scenePanel);
	2984	+// bigThree.remove(centralPanel);
	2985	+// bigThree.remove(XYZPanel);
	2986	+// aWindowConstraints.gridx = 0;
	2987	+// aWindowConstraints.gridy = 0;
	2988	+// aWindowConstraints.gridwidth = 1;
	2989	+// // aConstraints.gridheight = 3;
	2990	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2991	+// aWindowConstraints.weightx = 0;
	2992	+// aWindowConstraints.weighty = 1;
	2993	+// //bigThree.add(jtp, aWindowConstraints);
	2994	+// aWindowConstraints.weightx = 1;
	2995	+// aWindowConstraints.gridwidth = 3;
	2996	+// // aConstraints.gridheight = 3;
	2997	+// aWindowConstraints.gridx = 1;
	2998	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2999	+// bigThree.add(centralPanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 0;
	3001	+// aWindowConstraints.gridx = 4;
	3002	+// aWindowConstraints.gridwidth = 1;
	3003	+// // aConstraints.gridheight = 3;
	3004	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3005	+// bigThree.add(XYZPanel, aWindowConstraints);
	3006	+// bigThree.validate();
	3007	+// scenePanel.setVisible(false);
	3008	+// centralPanel.setVisible(true);
	3009	+// XYZPanel.setVisible(true);
	3010	+ bigThree.ClearUI();
	3011	+ bigThree.add(centralPanel);
	3012	+ bigThree.add(XYZPanel);
	3013	+ bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2579	3016	} else
2580		- if (event.getSource() == fourButton)
	3017	+ if (source == fourButton)
2581	3018	{
2582	3019	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();
	3020	+
	3021	+// bigThree.remove(scenePanel);
	3022	+// bigThree.remove(centralPanel);
	3023	+// bigThree.remove(XYZPanel);
	3024	+// aWindowConstraints.gridx = 0;
	3025	+// aWindowConstraints.gridy = 0;
	3026	+// aWindowConstraints.gridwidth = 1;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3029	+// aWindowConstraints.weightx = 1;
	3030	+// aWindowConstraints.weighty = 1;
	3031	+// bigThree.add(scenePanel, aWindowConstraints);
	3032	+// aWindowConstraints.weightx = 1;
	3033	+// aWindowConstraints.gridwidth = 3;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.gridx = 1;
	3036	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3037	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3038	+// aWindowConstraints.weightx = 0;
	3039	+// aWindowConstraints.gridx = 4;
	3040	+// aWindowConstraints.gridwidth = 1;
	3041	+// // aWindowConstraints.gridheight = 3;
	3042	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3043	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3044	+// bigThree.validate();
	3045	+// scenePanel.setVisible(true);
	3046	+// centralPanel.setVisible(false);
	3047	+// XYZPanel.setVisible(false);
	3048	+ bigThree.ClearUI();
	3049	+ bigThree.add(scenePanel);
	3050	+ bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2607	3053	} else
2608		- if (event.getSource() == sixButton)
	3054	+ if (source == sixButton)
2609	3055	{
2610	3056	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();
	3057	+
	3058	+// bigThree.remove(scenePanel);
	3059	+// bigThree.remove(centralPanel);
	3060	+// bigThree.remove(XYZPanel);
	3061	+// aWindowConstraints.gridx = 0;
	3062	+// aWindowConstraints.gridy = 0;
	3063	+// aWindowConstraints.gridwidth = 1;
	3064	+// // aConstraints.gridheight = 3;
	3065	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3066	+// aWindowConstraints.weightx = 0;
	3067	+// aWindowConstraints.weighty = 1;
	3068	+// bigThree.add(scenePanel, aWindowConstraints);
	3069	+// aWindowConstraints.weightx = 1;
	3070	+// aWindowConstraints.gridwidth = 3;
	3071	+// // aWindowConstraints.gridheight = 3;
	3072	+// aWindowConstraints.gridx = 1;
	3073	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3074	+// bigThree.add(centralPanel, aWindowConstraints);
	3075	+// aWindowConstraints.weightx = 0;
	3076	+// aWindowConstraints.gridx = 4;
	3077	+// aWindowConstraints.gridwidth = 1;
	3078	+// // aWindowConstraints.gridheight = 3;
	3079	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3080	+// //bigThree.add(XYZPanel, aConstraints);
	3081	+// bigThree.validate();
	3082	+// scenePanel.setVisible(true);
	3083	+// centralPanel.setVisible(true);
	3084	+// XYZPanel.setVisible(false);
	3085	+ bigThree.ClearUI();
	3086	+ bigThree.add(scenePanel);
	3087	+ bigThree.add(centralPanel);
	3088	+ bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2635	3091	} else
2636		- if (event.getSource() == sevenButton)
	3092	+ if (source == sevenButton)
2637	3093	{
2638	3094	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();
	3095	+
	3096	+// bigThree.remove(scenePanel);
	3097	+// bigThree.remove(centralPanel);
	3098	+// bigThree.remove(XYZPanel);
	3099	+// aWindowConstraints.gridx = 0;
	3100	+// aWindowConstraints.gridy = 0;
	3101	+// aWindowConstraints.gridwidth = 1;
	3102	+// // aWindowConstraints.gridheight = 3;
	3103	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3104	+// aWindowConstraints.weightx = 0;
	3105	+// aWindowConstraints.weighty = 1;
	3106	+// bigThree.add(scenePanel, aWindowConstraints);
	3107	+// aWindowConstraints.weightx = 1;
	3108	+// aWindowConstraints.gridwidth = 3;
	3109	+// // aWindowConstraints.gridheight = 3;
	3110	+// aWindowConstraints.gridx = 1;
	3111	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3112	+// bigThree.add(centralPanel, aWindowConstraints);
	3113	+// aWindowConstraints.weightx = 0;
	3114	+// aWindowConstraints.gridx = 4;
	3115	+// aWindowConstraints.gridwidth = 1;
	3116	+// // aConstraints.gridheight = 3;
	3117	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3118	+// bigThree.add(XYZPanel, aWindowConstraints);
	3119	+// bigThree.validate();
	3120	+// scenePanel.setVisible(true);
	3121	+// centralPanel.setVisible(true);
	3122	+// XYZPanel.setVisible(true);
	3123	+ bigThree.ClearUI();
	3124	+ bigThree.add(scenePanel);
	3125	+ bigThree.add(centralPanel);
	3126	+ bigThree.add(XYZPanel);
	3127	+ bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2663	3130	} else
2664		- if (event.getSource() == rootButton)
	3131	+ if (source == rootButton)
2665	3132	{
2666	3133	Object3D obj;
2667	3134	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,17 +3138,24 @@
2671	3138	EditObject(obj);
2672	3139	}
2673	3140
	3141	+ cameraView.requestFocusInWindow();
2674	3142	refreshContents(true);
2675	3143	} else
2676		- if (event.getSource() == closeButton)
	3144	+ if (source == closeButton)
2677	3145	{
2678	3146	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3147	cRadio ab;
2680	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3149	{
2682	3150	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2685	3159	buttonGroup.remove(ab);
2686	3160	radioPanel.remove(ab);
2687	3161
..	..	@@ -2692,13 +3166,15 @@
2692	3166	break;
2693	3167	}
2694	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2695	3171	refreshContents(true);
2696	3172	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3173	+ if (source == editItem \|\| source == editButton)
2698	3174	{
2699	3175	EditSelection(false);
2700	3176	} else
2701		- if (event.getSource() == uneditButton)
	3177	+ if (source == uneditButton)
2702	3178	{
2703	3179	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3180	{
..	..	@@ -2708,14 +3184,14 @@
2708	3184	child.CloseUI();
2709	3185	listUI.remove(child);
2710	3186
2711		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2712	3188	}
2713		- objEditor.ctrlPanel.revalidate();
	3189	+ objEditor.ctrlPanel.FlushUI();
2714	3190	//objEditor.jTree.clearSelection();
2715	3191	//objEditor.ResetSliders();
2716	3192	refreshContents(true);
2717	3193	} else
2718		- if (event.getSource() == clearPanelButton)
	3194	+ if (source == clearPanelButton)
2719	3195	{
2720	3196	assert(copy == group);
2721	3197	//copy.ClearUI();
..	..	@@ -2726,7 +3202,7 @@
2726	3202	listUI.clear();
2727	3203	refreshContents(true);
2728	3204	} else
2729		- if (event.getSource() == allParamsButton)
	3205	+ if (source == allParamsButton)
2730	3206	{
2731	3207	assert(copy == group);
2732	3208
..	..	@@ -2747,19 +3223,19 @@
2747	3223
2748	3224	refreshContents(true);
2749	3225	} else
2750		- if (event.getSource() == unselectButton)
	3226	+ if (source == unselectButton)
2751	3227	{
2752	3228	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3229	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3230	objEditor.ResetSliders();
2755	3231	refreshContents(true);
2756	3232	} else
2757		- if(event.getSource() instanceof cRadio)
	3233	+ if(source instanceof cRadio)
2758	3234	{
2759	3235	group.parent = keepparent;
2760	3236	group.attributes = 0;
2761	3237	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3238	+ /cRadio/ radio = (cRadio)source;
2763	3239	Object3D obj = radio.GetObject();
2764	3240	System.out.println("Edit " + obj);
2765	3241	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3255,7 @@
2779	3255	}
2780	3256
2781	3257	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3258	+ //Globals.theRenderer.object = group;
2783	3259	if(!useclient)
2784	3260	{
2785	3261	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3264,16 @@
2788	3264	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3265	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3266	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3267	+ //cameraView.lighttouched = true;
	3268	+ Globals.lighttouched = true;
2792	3269	topView.object = group;
2793	3270	frontView.object = group;
2794	3271	sideView.object = group;
2795	3272	}
2796		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
2797	3277	/*
2798	3278	currentLayout = radio.layout;
2799	3279	if (currentLayout == null)
..	..	@@ -2805,8 +3285,23 @@
2805	3285	//group.parent = null; // ROOT
2806	3286	//group.attributes = -1;
2807	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
2808	3290	refreshContents(true);
2809		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
2810	3305	else
2811	3306	{
2812	3307	//return super.action(event, arg);
..	..	@@ -2815,7 +3310,6 @@
2815	3310	}
2816	3311
2817	3312	boolean useclient = false;
2818		- cRadio radio;
2819	3313
2820	3314	void ToggleRoot()
2821	3315	{
..	..	@@ -2824,7 +3318,7 @@
2824	3318	if (useclient)
2825	3319	{
2826	3320	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3321	+ Globals.lighttouched = true;
2828	3322	//topView.object = client;
2829	3323	//frontView.object = client;
2830	3324	//sideView.object = client;
..	..	@@ -2832,7 +3326,7 @@
2832	3326	else
2833	3327	{
2834	3328	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3329	+ Globals.lighttouched = true;
2836	3330	//topView.object = group;
2837	3331	//frontView.object = group;
2838	3332	//sideView.object = group;
..	..	@@ -2867,6 +3361,28 @@
2867	3361	refreshContents();
2868	3362	}
2869	3363
	3364	+ void TransformChildren()
	3365	+ {
	3366	+ Object3D obj;
	3367	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3368	+ {
	3369	+ obj = (Object3D)e.nextElement();
	3370	+ obj.KeepTextureMatrices();
	3371	+ obj.TransformChildren();
	3372	+ obj.RestoreTextureMatrices();
	3373	+
	3374	+// if (obj.parent == null)
	3375	+// {
	3376	+// System.out.println("NULL PARENT!");
	3377	+// new Exception().printStackTrace();
	3378	+// }
	3379	+// else
	3380	+// TouchTransform(obj);
	3381	+// //obj.parent.Touch();
	3382	+ }
	3383	+
	3384	+ refreshContents();
	3385	+ }
2870	3386
2871	3387	void ResetTransform()
2872	3388	{
..	..	@@ -2979,7 +3495,7 @@
2979	3495	refreshContents();
2980	3496	}
2981	3497
2982		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
2983	3499	{
2984	3500	Object3D obj;
2985	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3510,16 @@
2994	3510	LA.matIdentity(Object3D.mat);
2995	3511	obj.getBounds(minima, maxima, false);
2996	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3000	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3003	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3548,8 @@
3028	3548
3029	3549	int size = obj.MemorySize();
3030	3550
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3553	}
3033	3554	}
3034	3555	catch (Exception e)
..	..	@@ -3065,9 +3586,9 @@
3065	3586	obj = (Object3D)e.nextElement();
3066	3587
3067	3588	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3069	3590	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3592
3072	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3594	}
..	..	@@ -3109,6 +3630,20 @@
3109	3630	void GenNormals(boolean crease)
3110	3631	{
3111	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
	3640	+
	3641	+ refreshContents();
	3642	+ }
	3643	+
	3644	+ void GenNormalsMINE()
	3645	+ {
	3646	+ group.selection.GenNormalsMINE();
3112	3647
3113	3648	refreshContents();
3114	3649	}
..	..	@@ -3157,104 +3692,259 @@
3157	3692
3158	3693	//Object3D buffer;
3159	3694	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		-
	3695	+// BoundaryRep temprep;
	3696	+// Object3D nodes;
	3697	+// Vector<Vertex> vertices;
	3698	+//
	3699	+// cGroup buffer;
	3700	+//
	3701	+// public void Vertex(Object3D node, Vertex v)
	3702	+// {
	3703	+//// vertices.add(v);
	3704	+//// nodes.addElement(node);
	3705	+////
	3706	+//// if (temprep.GetCache(v) != null)
	3707	+//// {
	3708	+//// temprep.Remove(v);
	3709	+//// } else
	3710	+//// {
	3711	+//// temprep.Remember(v);
	3712	+//// }
	3713	+//
	3714	+// //Object3D node = nodes.get(index);
	3715	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3716	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3717	+//
	3718	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3719	+//
	3720	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3721	+//
	3722	+// cGroup g = new cGroup();
	3723	+//
	3724	+// if (g.toParent == null)
	3725	+// {
	3726	+// g.toParent = LA.newMatrix();
	3727	+// g.fromParent = LA.newMatrix();
	3728	+// }
	3729	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3730	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3731	+//
	3732	+// g.add(GrafreeD.clipboard);
	3733	+//
	3734	+// buffer.add(g);
	3735	+// }
	3736	+//
	3737	+// public void Face(Object3D node, Face f)
	3738	+// {
	3739	+//
	3740	+// }
	3741	+//
	3742	+// void ParseVerticesOld() // ??
	3743	+// {
	3744	+// //if (group.selection.size() != 1)
	3745	+// // return;
	3746	+//
	3747	+// temprep = new BoundaryRep();
	3748	+// nodes = new Object3D();
	3749	+// vertices = new Vector<Vertex>();
	3750	+//
	3751	+// boolean epsequal = GrafreeD.epsequal;
	3752	+// GrafreeD.epsequal = true;
	3753	+//
	3754	+// for (int i=0; i<group.selection.size(); i++)
	3755	+// {
	3756	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3757	+//
	3758	+// group.selection.get(i).Parse(
	3759	+//this );
	3760	+//
	3761	+// int repsize = temprep.VertexCount();
	3762	+// int tablesize = temprep.vertextable.size();
	3763	+// int nodesize = nodes.size();
	3764	+//
	3765	+// assert(vertices.size() == nodes.size());
	3766	+//
	3767	+// temprep.vertextable.elements();
	3768	+//
	3769	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3770	+//
	3771	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3772	+// {
	3773	+// cGroup g = new cGroup();
	3774	+//
	3775	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3776	+//
	3777	+// Object3D node = nodes.get(index);
	3778	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3779	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3780	+//
	3781	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3782	+//
	3783	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3784	+//
	3785	+// if (g.toParent == null)
	3786	+// {
	3787	+// g.toParent = LA.newMatrix();
	3788	+// g.fromParent = LA.newMatrix();
	3789	+// }
	3790	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3791	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3792	+//
	3793	+// g.add(GrafreeD.clipboard);
	3794	+//
	3795	+// buffer.add(g);
	3796	+// }
	3797	+//
	3798	+// makeSomething(buffer, i==group.selection.size()-1);
	3799	+// }
	3800	+//
	3801	+// GrafreeD.epsequal = epsequal;
	3802	+//
	3803	+// //buffer = null;
	3804	+// temprep = null;
	3805	+// nodes = null;
	3806	+//
	3807	+// refreshContents();
	3808	+// }
	3809	+
3184	3810	void ParseVertices()
3185	3811	{
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;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3195	3814
3196	3815	for (int i=0; i<group.selection.size(); i++)
3197	3816	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3817	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3818
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3819	+ group.selection.get(i).Parse(
	3820	+
	3821	+ new iParse()
	3822	+ {
	3823	+ public void Vertex(Object3D node, Vertex v)
	3824	+ {
	3825	+ temp.set(v);
	3826	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3827
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();
	3828	+ cGroup g = new cGroup();
3211	3829
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3830	+ if (g.toParent == null)
	3831	+ {
	3832	+ g.toParent = LA.newMatrix();
	3833	+ g.fromParent = LA.newMatrix();
	3834	+ }
	3835	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3836	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3837
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);
	3838	+ g.add(Grafreed.clipboard);
3220	3839
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);
	3840	+ buffer.add(g);
	3841	+ }
3232	3842
3233		- g.add(GraphreeD.clipboard);
	3843	+ public void Face(Object3D node, Face f)
	3844	+ {
3234	3845
3235		- buffer.add(g);
3236		- }
	3846	+ }
	3847	+ }
	3848	+ );
3237	3849
3238	3850	makeSomething(buffer, i==group.selection.size()-1);
3239	3851	}
3240	3852
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3853	+ Grafreed.epsequal = epsequal;
3246	3854
3247	3855	refreshContents();
3248	3856	}
3249		-
	3857	+
	3858	+ void TextureVertices()
	3859	+ {
	3860	+ for (int i=0; i<group.selection.size(); i++)
	3861	+ {
	3862	+ group.selection.get(i).Parse(
	3863	+ new iParse()
	3864	+ {
	3865	+ public void Vertex(Object3D node, Vertex v)
	3866	+ {
	3867	+ cTexture tex = node.GetTextures();
	3868	+ String pigment = Object3D.GetPigment(tex);
	3869	+ //String bump = Object3D.GetBump(tex);
	3870	+
	3871	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3872	+
	3873	+ try
	3874	+ {
	3875	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3876	+ }
	3877	+ catch (Exception e)
	3878	+ {
	3879	+ System.err.println("FAIL: " + node);
	3880	+ }
	3881	+
	3882	+ double s = v.s;
	3883	+
	3884	+ if (s == 1)
	3885	+ s = 0;
	3886	+
	3887	+ double t = v.t;
	3888	+
	3889	+ if (t == 1)
	3890	+ t = 0;
	3891	+
	3892	+ int indexs = (int) (texturedata.getWidth() * s);
	3893	+ int indext = (int) (texturedata.getHeight() * t);
	3894	+
	3895	+ int index = indext * texturedata.getWidth() + indexs;
	3896	+
	3897	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3898	+
	3899	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3900	+
	3901	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3902	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3903	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3904	+ scale /= 3;
	3905	+
	3906	+ scale /= 0xFF;
	3907	+ // c'est quoi ca? scale /= 4;
	3908	+
	3909	+ //v.AO = scale;
	3910	+
	3911	+ v.x += v.norm.x * scale;
	3912	+ v.y += v.norm.y * scale;
	3913	+ v.z += v.norm.z * scale;
	3914	+ }
	3915	+
	3916	+ public void Face(Object3D node, Face f)
	3917	+ {
	3918	+ }
	3919	+ }
	3920	+ );
	3921	+ }
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
3250	3926	void Align()
3251	3927	{
	3928	+ if (group.selection.size() == 0)
	3929	+ return;
	3930	+
	3931	+ cVector bbmin = new cVector();
	3932	+ cVector bbmax = new cVector();
	3933	+
	3934	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3935	+
	3936	+ double dx = bbmax.x - bbmin.x;
	3937	+ double dy = bbmax.y - bbmin.y;
	3938	+ double dz = bbmax.z - bbmin.z;
	3939	+
	3940	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3941	+
3252	3942	for (int i=0; i<group.selection.size(); i++)
3253	3943	{
3254	3944	Object3D obj = group.selection.get(i);
3255	3945
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3946	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3947	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3948	}
3259	3949
3260	3950	refreshContents();
..	..	@@ -3267,7 +3957,7 @@
3267	3957	// ref.SaveSupports();
3268	3958	// Object3D par = ref.parent;
3269	3959	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3960	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3961	// ref.parent = par;
3272	3962	// ref.RestoreSupports();
3273	3963
..	..	@@ -3275,11 +3965,11 @@
3275	3965
3276	3966	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3967
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3968	+ boolean random = CameraPane.SWITCH;
	3969	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3970	lowres.linkVerticesThis(null);
3281	3971	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3972	+ CameraPane.SWITCH = random;
3283	3973
3284	3974	System.err.flush();
3285	3975
..	..	@@ -3297,7 +3987,7 @@
3297	3987	// lowres.SaveSupports();
3298	3988	// par = lowres.parent;
3299	3989	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3990	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3991	Object3D newlow = CloneObject(lowres, false);
3302	3992	newlow.name = sn.switchobject.get(i).name;
3303	3993	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4009,7 @@
3319	4009	return;
3320	4010
3321	4011	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4013
3324	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4015
..	..	@@ -3488,7 +4178,7 @@
3488	4178	group.selection.RelinkToSupport(); // july 2014
3489	4179	System.out.println("DONE.");
3490	4180	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4181	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4182	}
3493	4183
3494	4184	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4203,20 @@
3513	4203
3514	4204	void ClipMesh()
3515	4205	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4207	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3519	4209
3520	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4211	content = ((cGroup)content).get(0);
3522	4212
3523	4213	// for (int i=0; i<group.selection.size(); i++)
3524	4214	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4215	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4216	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4218	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4219	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4220	System.out.println("DONE.");
3531	4221	refreshContents();
3532	4222	}
..	..	@@ -3571,6 +4261,18 @@
3571	4261	void MarkLeaves(boolean hide)
3572	4262	{
3573	4263	group.selection.MarkLeaves(hide);
	4264	+ refreshContents();
	4265	+ }
	4266	+
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
3574	4276	refreshContents();
3575	4277	}
3576	4278
..	..	@@ -3659,7 +4361,7 @@
3659	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4362
3661	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
3663	4365	{
3664	4366	// if (!(elem instanceof Composite))
3665	4367	// newWindow = false;
..	..	@@ -3749,7 +4451,6 @@
3749	4451	//case 702: // Event.LIST_DESELECT
3750	4452	group.deselectAll();
3751	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4454	if (tps != null)
3754	4455	{
3755	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,31 +4459,30 @@
3758	4459
3759	4460	//if (child.parent != null)
3760	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
3761	4463	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4464	}
3766	4465	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4466	+// else
	4467	+// {
	4468	+// objEditor.SetMaterial(group); // .GetMaterial());
	4469	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4470	+// System.err.println("info : " + group.GetPath());
	4471	+// }
3773	4472
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4474	CameraPane.flash = true;
3778	4475
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4477	// a camera
3781	4478	{
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;
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
	4484	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4485	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4486	}
3787	4487
3788	4488	refreshContents();
..	..	@@ -3793,6 +4493,26 @@
3793	4493
3794	4494	freezemodel = false;
3795	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
3796	4516
3797	4517	void linkSomething(Object3D thing)
3798	4518	{
..	..	@@ -3864,16 +4584,18 @@
3864	4584	{
3865	4585	if (group.selection.isEmpty())
3866	4586	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
3868	4589	Composite tGroup = null;
3869	4590	if (group.selection.size() > 0) // 1)
3870	4591	{
3871	4592	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
3873	4594	}
3874	4595
3875	4596	if (cut)
3876	4597	{
	4598	+ Save();
3877	4599	//int indices[] = jList.getSelectedIndices();
3878	4600	//for (int i = indices.length - 1; i >= 0; i--)
3879	4601	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4631,16 @@
3909	4631	//System.out.println("cut " + child);
3910	4632	//System.out.println("parent = " + child.parent);
3911	4633	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
3913	4635	tGroup.add/Child/(tmp);
3914	4636	else
3915		- GraphreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
3916	4638	}
3917	4639	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
3919	4641	tGroup.add/Child/(child);
3920	4642	else
3921		- GraphreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
3922	4644	}
3923	4645
3924	4646	//ResetModel();
..	..	@@ -3950,21 +4672,23 @@
3950	4672	//System.out.println("cut " + elem);
3951	4673	//System.out.println("parent = " + elem.parent);
3952	4674	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
3954	4676	tGroup.add/Child/(tmp);
3955	4677	else
3956		- GraphreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
3957	4679	}
3958	4680	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
3960	4682	tGroup.add/Child/(child);
3961	4683	else
3962		- GraphreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
3963	4685	}
3964	4686
3965	4687	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
3968	4692	if (cut)
3969	4693	{
3970	4694	ResetModel();
..	..	@@ -3974,11 +4698,11 @@
3974	4698
3975	4699	void paste(boolean expand)
3976	4700	{
3977		- // if (GraphreeD.clipboard == null)
	4701	+ // if (GrafreeD.clipboard == null)
3978	4702	// return;
3979	4703	boolean first = true;
3980	4704
3981		- if (GraphreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
3982	4706	{
3983	4707	Composite temp;
3984	4708
..	..	@@ -3989,7 +4713,7 @@
3989	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4714	*/
3991	4715	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4716	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4717	{
3994	4718	Object3D child = (Object3D)e.nextElement();
3995	4719
..	..	@@ -4003,7 +4727,7 @@
4003	4727	else
4004	4728	elem = child.deepCopy(); // ?
4005	4729	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4730	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4731	// elem = elem.get(0);
4008	4732	makeSomething(elem, true); // ?? first);
4009	4733	//group.addChild(elem);
..	..	@@ -4023,23 +4747,23 @@
4023	4747	//Object3D cb = Applet3D.clipboard;
4024	4748	//temp.addChild(cb);
4025	4749	//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());
	4750	+ assert(Grafreed.clipboard.parent == null);
	4751	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4752	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4753	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4754	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4755	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4758	}
4035	4759
4036	4760	ResetModel();
4037	4761	refreshContents();
4038	4762	}
4039	4763
4040		- void pasteInto(boolean copyit)
	4764	+ void pasteInto(boolean copyit, boolean clone)
4041	4765	{
4042		-// if (GraphreeD.clipboard == null)
	4766	+// if (GrafreeD.clipboard == null)
4043	4767	// return;
4044	4768
4045	4769	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4790,22 @@
4066	4790	if (copyit)
4067	4791	{
4068	4792	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4793	+ if (clone)
	4794	+ {
	4795	+ CloneClipboard(false); // sept 2014
	4796	+ }
	4797	+ else
	4798	+ {
	4799	+ paste(false);
	4800	+ }
4070	4801	}
4071	4802	else
4072	4803	{
4073	4804	boolean first = true;
4074	4805
4075		- if (GraphreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4076	4807	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4809	Object3D copy;
4079	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4811	{
..	..	@@ -4084,7 +4815,7 @@
4084	4815	}
4085	4816	} else
4086	4817	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4819	}
4089	4820	}
4090	4821	}
..	..	@@ -4276,6 +5007,26 @@
4276	5007	makeSomething(csg);
4277	5008	}
4278	5009
	5010	+ void Ungroup(Object3D g)
	5011	+ {
	5012	+ if (g instanceof HiddenObject)
	5013	+ {
	5014	+ HiddenObject h = (HiddenObject) g;
	5015	+
	5016	+ for (int i=0; i<h.ActualSize(); i++)
	5017	+ {
	5018	+ objEditor.makeSomething(h.get(i), false);
	5019	+ }
	5020	+ }
	5021	+ else
	5022	+ {
	5023	+ for (int i=0; i<g.Size(); i++)
	5024	+ {
	5025	+ objEditor.makeSomething(g.get(i), false);
	5026	+ }
	5027	+ }
	5028	+ }
	5029	+
4279	5030	void ungroup()
4280	5031	{
4281	5032	/*
..	..	@@ -4469,21 +5220,6 @@
4469	5220	}
4470	5221	*/
4471	5222
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	5223	/*
4488	5224	public void Callback(Object obj)
4489	5225	{
..	..	@@ -4507,26 +5243,9 @@
4507	5243	}
4508	5244	*/
4509	5245
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	5246	String GetFile(String dialogName)
4528	5247	{
4529		- if (GraphreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4530	5249	{
4531	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5251	browser.show();
..	..	@@ -4590,10 +5309,18 @@
4590	5309	cButton flashSelectionButton;
4591	5310	cButton editButton;
4592	5311	cButton uneditButton;
	5312	+ JCheckBox allParamsButton;
4593	5313	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5314	cButton unselectButton;
4596	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
	5322	+ cButton oneStepButton;
	5323	+
4597	5324	cButton screenfitButton;
4598	5325	cButton screenfitpointButton;
4599	5326	cButton snapobjectButton;
..	..	@@ -4604,14 +5331,6 @@
4604	5331	cButton closeButton;
4605	5332
4606	5333	cButton setsupportButton;
4607		-
4608		- cButton twoButton;
4609		- cButton sixButton;
4610		- cButton threeButton;
4611		- cButton sevenButton;
4612		- cButton fourButton; // full panel
4613		- cButton oneButton; // full XYZ
4614		- //cButton currentLayout;
4615	5334
4616	5335	//
4617	5336	//Composite
..	..	@@ -4624,6 +5343,8 @@
4624	5343	private MenuItem lookFromItem;
4625	5344	private MenuItem switchItem;
4626	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
4627	5348	private MenuItem duplicateItem;
4628	5349	private MenuItem cloneItem;
4629	5350	private MenuItem cloneSupportItem;
..	..	@@ -4635,8 +5356,9 @@
4635	5356	private MenuItem resetsupportItem;
4636	5357	private MenuItem resetreferencesItem;
4637	5358	private MenuItem linkverticesItem;
	5359	+ private MenuItem relinkverticesItem;
4638	5360	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
4640	5362	private MenuItem stepAllItem;
4641	5363	private MenuItem revertMeshItem;
4642	5364	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5369,17 @@
4647	5369	private MenuItem mergeGeometriesItem;
4648	5370	private MenuItem copyItem;
4649	5371	private MenuItem pasteItem;
	5372	+ private MenuItem pasteIntoItem;
4650	5373	private MenuItem pasteLinkItem;
4651	5374	private MenuItem pasteCloneItem;
4652	5375	private MenuItem pasteExpandItem;
4653	5376	private MenuItem clearItem;
4654	5377	private MenuItem clearAllItem;
4655	5378	private MenuItem genUVItem;
	5379	+ private MenuItem genNormalsMESHItem;
4656	5380	private MenuItem genNormalsCADItem;
4657	5381	private MenuItem genNormalsORGANItem;
	5382	+ private MenuItem genNormalsMINEItem;
4658	5383	private MenuItem stripifyItem;
4659	5384	private MenuItem unstripifyItem;
4660	5385	private MenuItem trimItem;
..	..	@@ -4683,6 +5408,10 @@
4683	5408	private MenuItem showleavesItem;
4684	5409	private MenuItem markleavesItem;
4685	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
4686	5415
4687	5416	private MenuItem flipVItem;
4688	5417	private MenuItem unflipVItem;
..	..	@@ -4694,8 +5423,11 @@
4694	5423	private MenuItem panoTexturesItem;
4695	5424
4696	5425	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
4698	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
	5430	+ private MenuItem hideItem;
4699	5431	private MenuItem grabItem;
4700	5432	private MenuItem backItem;
4701	5433	private MenuItem frontItem;
..	..	@@ -4716,6 +5448,7 @@
4716	5448
4717	5449	private MenuItem resetParentItem;
4718	5450	private MenuItem repairParentItem;
	5451	+ private MenuItem repairShadowItem;
4719	5452	private MenuItem sortbysizeItem;
4720	5453	private MenuItem sortbynameItem;
4721	5454
..	..	@@ -4728,16 +5461,19 @@
4728	5461	private MenuItem particleItem;
4729	5462	private MenuItem ragdollItem;
4730	5463	private MenuItem ragdoll2Item;
	5464	+ private MenuItem heightFieldItem;
	5465	+ private MenuItem textureFieldItem;
4731	5466	private MenuItem gridItem;
4732	5467	private MenuItem rectoidItem;
4733	5468	private MenuItem ellipsoidItem;
4734	5469	private MenuItem coneItem;
4735	5470	private MenuItem torusItem;
4736	5471	private MenuItem superItem;
	5472	+ private MenuItem kleinItem;
4737	5473	private MenuItem blobItem;
4738	5474	private MenuItem latheItem;
4739	5475	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5476	+ private MenuItem overlayItem;
4741	5477	private MenuItem meshItem;
4742	5478	// private MenuItem meshGroupItem;
4743	5479	private MenuItem springItem;
..	..	@@ -4746,6 +5482,7 @@
4746	5482	private MenuItem csgItem;
4747	5483	private MenuItem templateItem;
4748	5484	private MenuItem textureItem;
	5485	+ private MenuItem billboardItem;
4749	5486	private MenuItem shadowXItem;
4750	5487	private MenuItem shadowYItem;
4751	5488	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5495,6 @@
4758	5495	private MenuItem doubleItem;
4759	5496	private MenuItem tripleItem;
4760	5497
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5498	private MenuItem computeAOItem;
4767	5499	private MenuItem recompileItem;
4768	5500	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5504,8 @@
4772	5504	private MenuItem analyzeItem;
4773	5505	private MenuItem dumpItem;
4774	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
4775	5511	}