~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,44 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
193		- resetMeshItem.addActionListener(this);
194		- stepAllItem = menu.add(new MenuItem("Step All"));
195		- stepAllItem.addActionListener(this);
	286	+ }
	287	+
	288	+ oe.menuBar.add(menu = new Menu("Setting"));
	289	+ if (Globals.ADVANCED)
	290	+ {
196	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	292	revertMeshItem.addActionListener(this);
198	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	294	resetreferencesItem.addActionListener(this);
200	295	menu.add("-");
	296	+ }
201	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	298	overwriteGeoItem.addActionListener(this);
203	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +305,68 @@
209	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	306	overwriteUVItem.addActionListener(this);
211	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
212	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	311	generateMeshItem.addActionListener(this);
214	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	313	poseMeshItem.addActionListener(this);
216	314	menu.add("-");
	315	+ }
217	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	317	resetsupportItem.addActionListener(this);
219	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
221	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	326	setMasterItem.addActionListener(this);
	327	+ }
223	328
224		- oe.menuBar.add(menu = new Menu("Object"));
	329	+ oe.menuBar.add(menu = new Menu("Group"));
225	330	grabItem = menu.add(new MenuItem("Grab"));
226	331	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	332	backItem = menu.add(new MenuItem("Back"));
230	333	backItem.addActionListener(this);
	334	+ frontItem = menu.add(new MenuItem("Front"));
	335	+ frontItem.addActionListener(this);
231	336	compositeItem = menu.add(new MenuItem("Composite"));
232	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
233	342	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
235	344	randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
240	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	346	switchGeoItem.addActionListener(this);
242	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	348	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
246	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	360	scriptNodeItem.addActionListener(this);
248	361	cameraItem = menu.add(new MenuItem("Camera"));
249	362	cameraItem.addActionListener(this);
250		- menu.add("-");
	363	+ }
	364	+
	365	+ oe.menuBar.add(menu = new Menu("Object"));
251	366	textureItem = menu.add(new MenuItem("Texture"));
252	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
253	370	csgItem = menu.add(new MenuItem("CSG"));
254	371	csgItem.addActionListener(this);
255	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +375,29 @@
258	375	shadowYItem.addActionListener(this);
259	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
261	381	linkerItem = menu.add(new MenuItem("Linker"));
262	382	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	383	attributeItem = menu.add(new MenuItem("Attribute"));
266	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
267	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	388	pointflowItem.addActionListener(this);
	389	+ }
269	390	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	392	resetTransformItem.addActionListener(this);
274	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	394	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
278	401
279	402	oe.menuBar.add(menu = new Menu("Geometry"));
280	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +406,13 @@
283	406	genNormalsORGANItem.addActionListener(this);
284	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
286	416	stripifyItem = menu.add(new MenuItem("Stripify"));
287	417	stripifyItem.addActionListener(this);
288	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +422,6 @@
292	422	untrimItem = menu.add(new MenuItem("Untrim"));
293	423	untrimItem.addActionListener(this);
294	424	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	425	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	426	clearColorsItem.addActionListener(this);
299	427	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
	445	+
	446	+ oe.menuBar.add(menu = new Menu("Attributes"));
	447	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	448	+ clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
313	453	menu.add("-");
314	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	455	liveleavesItem.addActionListener(this);
316	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
318	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	461	supportleavesItem.addActionListener(this);
320	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	463	unsupportleavesItem.addActionListener(this);
	464	+ }
322	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	466	hideleavesItem.addActionListener(this);
324	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +470,31 @@
327	470	markleavesItem.addActionListener(this);
328	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
330	481	menu.add("-");
331	482	flipVItem = menu.add(new MenuItem("Flip V"));
332	483	flipVItem.addActionListener(this);
333	484	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	485	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	486	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	487	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	488	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	489	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	490	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	491	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	492	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	493	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	494	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	495	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	496	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	497	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	498
357	499	oe.menuBar.add(menu = new Menu("Selection"));
358	500	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,14 +512,41 @@
370	512	sortbysizeItem.addActionListener(this);
371	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	514	sortbynameItem.addActionListener(this);
	515	+ menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
	523	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	524	+ extractGeometriesItem.addActionListener(this);
	525	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	526	+ cloneGeometriesItem.addActionListener(this);
	527	+ }
	528	+
373	529	oe.menuBar.add(menu = new Menu("Insert"));
374	530	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	531	+
	532	+ oe.menuBar.add(menu = new Menu("Tools"));
376	533	buildToolsMenu(menu);
377	534	}
378	535
379	536	void SetupUI2(ObjEditor oe)
380	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
381	550	//new Exception().printStackTrace();
382	551
383	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -406,150 +575,122 @@
406	575	oe.radioPanel.add(dummyButton);
407	576	oe.buttonGroup.add(dummyButton);
408	577	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	578	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	579
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	605	+ liveCB.setToolTipText("Enable animation");
414	606	liveCB.addItemListener(this);
415	607
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);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
	612	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
434	614	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);
	615	+
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	617	+ trackCB.setToolTipText("Enable tracking");
476	618	trackCB.addItemListener(this);
477	619
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ screenfitButton.setToolTipText("Screen fit");
480	622	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	623	+
482	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	625	// 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	626
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);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ flashSelectionButton.setToolTipText("Show selection");
495	636	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	637
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	638	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	639	+
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ twoButton.setToolTipText("Show center view only");
502	642	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	644	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ fourButton.setToolTipText("Show left panel only");
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ sixButton.setToolTipText("2-column layout left");
506	648	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ threeButton.setToolTipText("2-column layout right");
508	651	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ sevenButton.setToolTipText("3-column layout");
510	654	sevenButton.addActionListener(this);
511	655	//
512	656
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ rootButton.setToolTipText("Edit selection in new tab");
514	659	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	660	+
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ closeButton.setToolTipText("Close tab");
517	663	closeButton.addActionListener(this);
518	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	665	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	666
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	667	+ cGridBag commandsPanel = new cGridBag();
	668	+
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editButton.setToolTipText("Edit selection");
524	671	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	672
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ uneditButton.setToolTipText("Unedit selection");
530	675	uneditButton.addActionListener(this);
531	676
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);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
544	679	allParamsButton.addActionListener(this);
545	680
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);
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ clearPanelButton.setToolTipText("Clear edit panel");
	683	+ clearPanelButton.addActionListener(this);
	684	+
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ unselectButton.setToolTipText("Unselect");
551	687	unselectButton.addActionListener(this);
552	688
	689	+ commandsPanel.preferredHeight = 1;
	690	+
	691	+ oe.treePanel.add(commandsPanel);
	692	+ oe.treePanel.Return();
	693	+
553	694	// oe.aConstraints.gridx += 1;
554	695	// oe.aConstraints.weighty = 0;
555	696	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +702,37 @@
561	702	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	703	// gcButton.addActionListener(this);
563	704
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;
	705	+ cGridBag jSPPanel = new cGridBag();
	706	+
	707	+ JScrollPane jSP;
575	708	//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);
	709	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	710	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	711	+
	712	+ oe.treePanel.add(jSPPanel);
	713	+ oe.treePanel.Return();
582	714
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);
	715	+ cGridBag copyOptionsPanel = new cGridBag();
	716	+
	717	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	718	+ colorCB.setToolTipText("Copy color when dropped");
587	719	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	720	+
	721	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	722	+ materialCB.setToolTipText("Copy material when dropped");
590	723	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	724	+
	725	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	726	+ textureCB.setToolTipText("Copy texture when dropped");
593	727	textureCB.addItemListener(this);
594	728
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	729	+ copyOptionsPanel.preferredHeight = 1;
	730	+ oe.treePanel.add(copyOptionsPanel);
	731	+ oe.treePanel.Return();
597	732
	733	+// mainPanel.setDividerLocation(0.5); //1.0);
	734	+// mainPanel.setResizeWeight(0.5);
	735	+
598	736	//jList.addListSelectionListener(this);
599	737	oe.jTree.addTreeSelectionListener(this);
600	738	//jTree.setRootVisible(false);
..	..	@@ -616,20 +754,95 @@
616	754	radio.layout = sevenButton;
617	755	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	756	}
	757	+
	758	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	759	+ {
	760	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	761	+ boxCB.setToolTipText("Display bounding boxes");
	762	+ boxCB.addItemListener(this);
	763	+
	764	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	765	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	766	+ zoomBoxCB.addItemListener(this);
	767	+
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
	770	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	771	+ supportCB.setToolTipText("Enable rigging");
	772	+ supportCB.addItemListener(this);
	773	+
	774	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	775	+ // localCB.addItemListener(this);
	776	+
	777	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	778	+ crowdCB.setToolTipText("Used for crowds");
	779	+ crowdCB.addItemListener(this);
	780	+
	781	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	782	+ smoothCB.setToolTipText("Snapping delay");
	783	+ smoothCB.addItemListener(this);
	784	+
	785	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	786	+ slowCB.setToolTipText("Smooth interpolation");
	787	+ slowCB.addItemListener(this);
	788	+
	789	+// constraints.gridy += 1;
	790	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	791	+// speakerMocapCB.addItemListener(this);
	792	+
	793	+ if (false)
	794	+ {
	795	+ // handled in scripts
	796	+ //constraints.gridy += 1;
	797	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	798	+ speakerCameraCB.addItemListener(this);
	799	+
	800	+ //constraints.gridy += 1;
	801	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	802	+ speakerFocusCB.addItemListener(this);
	803	+
	804	+ //constraints.gridy += 1;
	805	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	806	+ smoothfocusCB.addItemListener(this);
	807	+ }
	808	+
	809	+//constraints.gridx += 1;
	810	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	811	+// debugCB.addItemListener(this);
	812	+
	813	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	814	+ oeilCB.addItemListener(this);
	815	+
	816	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	817	+ lookAtCB.setToolTipText("Look-at target");
	818	+ lookAtCB.addItemListener(this);
	819	+
	820	+ }
	821	+
	822	+ cGridBag fill = new cGridBag();
	823	+
	824	+ fill.preferredHeight = 200;
	825	+
	826	+ panel.add(fill);
	827	+
	828	+ }
619	829
620	830	void EditObject(Object3D obj)
621	831	{
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();
	832	+ cRadio radioButton = new cRadio(obj.name);
	833	+ radioButton.SetObject(obj);
	834	+ radioButton.layout = sevenButton;
	835	+ radioButton.SetCamera(cameraView.renderCamera, false);
	836	+ radioButton.addActionListener(this);
	837	+ radioPanel.add(radioButton);
	838	+ buttonGroup.add(radioButton);
	839	+ radioButton.doClick();
630	840	}
	841	+
631	842	void SetupViews(ObjEditor oe)
632	843	{
	844	+ theFrame = this;
	845	+
633	846	oe.SetupViews();
634	847
635	848	System.out.println("SetupViews");
..	..	@@ -646,6 +859,7 @@
646	859	JCheckBox fastCB;
647	860	JCheckBox slowCB;
648	861	JCheckBox boxCB;
	862	+ JCheckBox zoomBoxCB;
649	863	JCheckBox trackCB;
650	864	JCheckBox smoothfocusCB;
651	865	// JCheckBox speakerMocapCB;
..	..	@@ -688,10 +902,10 @@
688	902	dropAttributes \|= Object3D.TEXTURE;
689	903	else
690	904	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	905	+ } else if(e.getSource() == liveCB)
693	906	{
694	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
695	909	}
696	910	else if(e.getSource() == supportCB)
697	911	{
..	..	@@ -726,6 +940,10 @@
726	940	Recompile();
727	941	cameraView.repaint();
728	942	// refreshContents();
	943	+ }
	944	+ else if(e.getSource() == zoomBoxCB)
	945	+ {
	946	+ cameraView.ToggleZoomBoxMode();
729	947	}
730	948	else if(e.getSource() == smoothfocusCB)
731	949	{
..	..	@@ -840,7 +1058,9 @@
840	1058	// objEditor.DropFile((java.io.File[]) object, true);
841	1059	// return;
842	1060	// }
843		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1064	{
845	1065	// file(s)
846	1066	String[] names = string.split("\n");
..	..	@@ -867,7 +1087,7 @@
867	1087
868	1088	flashIt = false;
869	1089	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1092
873	1093	if (group.selection.size() == 1)
..	..	@@ -894,11 +1114,11 @@
894	1114	{
895	1115	loadClipboard(true);
896	1116	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1117	+ pasteInto(false, false);
898	1118	} else {
899	1119	loadClipboard(false);
900	1120	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
902	1122	}
903	1123	}
904	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1222,8 @@
1002	1222
1003	1223	void buildCreateMenu(Menu menu)
1004	1224	{
	1225	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1226	+ //heightFieldItem.addActionListener(this);
1005	1227	gridItem = menu.add(new MenuItem("Grid"));
1006	1228	gridItem.addActionListener(this);
1007	1229	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1236,37 @@
1014	1236	torusItem.addActionListener(this);
1015	1237	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1238	superItem.addActionListener(this);
	1239	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1240	+ kleinItem.addActionListener(this);
1017	1241	particleItem = menu.add(new MenuItem("Particle system"));
1018	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1019	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1246	ragdollItem.addActionListener(this);
1021	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1023	1250	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1252	meshItem.addActionListener(this);
1026	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1028	1257	springItem = menu.add(new MenuItem("Spring"));
1029	1258	springItem.addActionListener(this);
1030	1259	flagItem = menu.add(new MenuItem("Flag"));
1031	1260	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	1261	blobItem = menu.add(new MenuItem("Blob"));
1037	1262	blobItem.addActionListener(this);
1038	1263	latheItem = menu.add(new MenuItem("Lathe"));
1039	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1040	1270	lightItem = menu.add(new MenuItem("Light"));
1041	1271	lightItem.addActionListener(this);
1042	1272	menu.add("-");
..	..	@@ -1046,46 +1276,44 @@
1046	1276	loopItem.addActionListener(this);
1047	1277	doubleItem = menu.add(new MenuItem("Fork"));
1048	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1049	1281	tripleItem = menu.add(new MenuItem("Trident"));
1050	1282	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);
	1283	+ }
1060	1284	}
1061	1285
1062	1286	void buildToolsMenu(Menu menu)
1063	1287	{
1064	1288	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1289	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1290	+ animationItem.setState(Globals.ANIMATION);
1067	1291
1068	1292	menu.add("-");
1069	1293	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1294	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1295	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1296	+ textureFieldItem.addActionListener(this);
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1298	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1300	reduceMorphItem.addActionListener(this);
1077	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1302	reduce34MorphItem.addActionListener(this);
1079		-
	1303	+ menu.add("-");
1080	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1305	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1084	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1313	memoryItem.addActionListener(this);
1086	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1315	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1317	dumpItem.addActionListener(this);
1090	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1319	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1322,8 @@
1094	1322	resetParentItem.addActionListener(this);
1095	1323	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1324	repairParentItem.addActionListener(this);
	1325	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1326	+ repairShadowItem.addActionListener(this);
1097	1327	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1328	invariantsItem.addActionListener(this);
1099	1329	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1331,7 @@
1101	1331	menu.add("-");
1102	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1333	editScriptItem.addActionListener(this);
	1334	+ }
1104	1335	}
1105	1336
1106	1337	void ScreenFit()
..	..	@@ -1429,9 +1660,9 @@
1429	1660
1430	1661	void Overwrite(int mask)
1431	1662	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1664	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1435	1666
1436	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1668	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1685,7 @@
1454	1685	//
1455	1686	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1687	{
	1688	+ Object source = event.getSource();
1457	1689	/*
1458	1690	if (event.getSource() == nameField)
1459	1691	{
..	..	@@ -1465,11 +1697,11 @@
1465	1697	}
1466	1698	else
1467	1699	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1700	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1701	{
1470	1702	ScreenFit();
1471	1703	} else
1472		- if (event.getSource() == switchItem)
	1704	+ if (source == switchItem)
1473	1705	{
1474	1706	cVector v1 = new cVector();
1475	1707	cVector v2 = new cVector();
..	..	@@ -1478,11 +1710,11 @@
1478	1710	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1711	objEditor.cameraView.repaint();
1480	1712	} else
1481		- if (event.getSource() == rectoidItem)
	1713	+ if (source == rectoidItem)
1482	1714	{
1483	1715	makeSomething(new Box());
1484	1716	} else
1485		- if (event.getSource() == particleItem)
	1717	+ if (source == particleItem)
1486	1718	{
1487	1719	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1720	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1735,9 @@
1503	1735	applyExample(particleGeom, "SMOKE");
1504	1736	makeSomething(particleGeom);
1505	1737	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1738	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1739	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1740	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1741
1510	1742	ragdoll.toParent = LA.newMatrix();
1511	1743	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1753,71 @@
1521	1753	makeSomething(ragdoll);
1522	1754	//makeSomething(new VehicleDemo());
1523	1755	} else
1524		- if (event.getSource() == gridItem)
	1756	+ /*
	1757	+ */
	1758	+ if (source == heightFieldItem)
	1759	+ {
	1760	+ Object3D obj = new Object3D();
	1761	+
	1762	+ obj.CreateMaterial();
	1763	+ obj.bRep = new BoundaryRep();
	1764	+
	1765	+ obj.bRep.CreateMesh(new iHeightField()
	1766	+ {
	1767	+ public double f(double x, double y)
	1768	+ {
	1769	+ // The Mandelbrot set is represented by coloring
	1770	+ // each point (x,y) according to the number of
	1771	+ // iterations it takes before the while loop in
	1772	+ // this method ends. For points that are actually
	1773	+ // in the Mandelbrot set, or very close to it, the
	1774	+ // count will reach the maximum value, 80. These
	1775	+ // points will be colored purple. All other colors
	1776	+ // represent points that are definitely NOT in the set.
	1777	+ x -= 600;
	1778	+ y -= 500;
	1779	+ x /= 200;
	1780	+ y /= 200;
	1781	+ int count = 0;
	1782	+ double zx = x;
	1783	+ double zy = y;
	1784	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1785	+ double new_zx = zxzx - zyzy + x;
	1786	+ zy = 2zxzy + y;
	1787	+ zx = new_zx;
	1788	+ count++;
	1789	+ }
	1790	+ return count; // Math.sqrt(count);
	1791	+ }
	1792	+ }, 1000,1000);
	1793	+
	1794	+ makeSomething(obj);
	1795	+ } else
	1796	+ if (source == gridItem)
1525	1797	{
1526	1798	makeSomething(new Grid());
1527	1799	} else
1528		- if (event.getSource() == ellipsoidItem)
	1800	+ if (source == ellipsoidItem)
1529	1801	{
1530	1802	makeSomething(new Sphere());
1531	1803	} else
1532		- if (event.getSource() == coneItem)
	1804	+ if (source == coneItem)
1533	1805	{
1534	1806	makeSomething(new Cone());
1535	1807	} else
1536		- if (event.getSource() == torusItem)
	1808	+ if (source == torusItem)
1537	1809	{
1538	1810	makeSomething(new Torus());
1539	1811	} else
1540		- if (event.getSource() == superItem)
	1812	+ if (source == superItem)
1541	1813	{
1542	1814	makeSomething(new Superellipsoid());
1543	1815	} else
1544		- if (event.getSource() == blobItem)
	1816	+ if (source == kleinItem)
	1817	+ {
	1818	+ makeSomething(new Klein());
	1819	+ } else
	1820	+ if (source == blobItem)
1545	1821	{
1546	1822	Blob blob = new Blob();
1547	1823	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1825,15 @@
1549	1825	//blob.retile();
1550	1826	makeSomething(blob);
1551	1827	} else
1552		- if (event.getSource() == latheItem)
	1828	+ if (source == latheItem)
1553	1829	{
1554	1830	makeSomething(new Lathe());
1555	1831	} else
1556		- if (event.getSource() == bezierItem)
	1832	+ if (source == bezierItem)
1557	1833	{
1558	1834	makeSomething(new BezierSurface());
1559	1835	} else
1560		- if (event.getSource() == checkerItem)
	1836	+ if (source == overlayItem)
1561	1837	{
1562	1838	/*
1563	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1846,9 @@
1570	1846	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1847	LA.matInvert(obj.toParent, obj.fromParent);
1572	1848	*/
1573		- makeSomething(new CheckerIG());
	1849	+ makeSomething(new Checker());
1574	1850	} else
1575		- if (event.getSource() == meshItem)
	1851	+ if (source == meshItem)
1576	1852	{
1577	1853	Object3D itemtomake = new Object3D();
1578	1854	Object3D child;
..	..	@@ -1593,35 +1869,35 @@
1593	1869	makeSomething(child);
1594	1870	}
1595	1871	} else
1596		- if (event.getSource() == springItem)
	1872	+ if (source == springItem)
1597	1873	{
1598	1874	cSpring s = new cSpring();
1599	1875	s.setup();
1600	1876	makeSomething(s);
1601	1877	} else
1602		- if (event.getSource() == flagItem)
	1878	+ if (source == flagItem)
1603	1879	{
1604	1880	cSpring s = new cFlag();
1605	1881	s.setup();
1606	1882	makeSomething(s);
1607	1883	} else
1608		- if (event.getSource() == lightItem)
	1884	+ if (source == lightItem)
1609	1885	{
1610	1886	makeSomething(new Light());
1611	1887	} else
1612		- if (event.getSource() == csgItem)
	1888	+ if (source == csgItem)
1613	1889	{
1614	1890	group(new CSG());
1615	1891	} else
1616		- if (event.getSource() == templateItem)
	1892	+ if (source == templateItem)
1617	1893	{
1618	1894	group(new cTemplate());
1619	1895	} else
1620		- if (event.getSource() == attributeItem)
	1896	+ if (source == attributeItem)
1621	1897	{
1622	1898	makeSomething(new Attribute());
1623	1899	} else
1624		- if (event.getSource() == pointflowItem)
	1900	+ if (source == pointflowItem)
1625	1901	{
1626	1902	makeSomething(new PointFlow());
1627	1903	} else
..	..	@@ -1633,7 +1909,7 @@
1633	1909	} else
1634	1910	*/
1635	1911
1636		- if (event.getSource() == superLoopItem)
	1912	+ if (source == superLoopItem)
1637	1913	{
1638	1914	Composite g = new cGroup();
1639	1915	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1931,7 @@
1655	1931
1656	1932	group(g);
1657	1933	} else
1658		- if (event.getSource() == loopItem)
	1934	+ if (source == loopItem)
1659	1935	{
1660	1936	Composite csg = new GroupLeaf();
1661	1937	csg.count = 5;
..	..	@@ -1664,7 +1940,7 @@
1664	1940	csg.addChild(child);
1665	1941	child.addChild(csg);
1666	1942	} else
1667		- if (event.getSource() == doubleItem)
	1943	+ if (source == doubleItem)
1668	1944	{
1669	1945	Composite csg = new GroupLeaf();
1670	1946	csg.count = 5;
..	..	@@ -1676,7 +1952,7 @@
1676	1952	csg.addChild(child);
1677	1953	child.addChild(csg);
1678	1954	} else
1679		- if (event.getSource() == tripleItem)
	1955	+ if (source == tripleItem)
1680	1956	{
1681	1957	Composite csg = new GroupLeaf();
1682	1958	csg.count = 4;
..	..	@@ -1691,71 +1967,83 @@
1691	1967	csg.addChild(child);
1692	1968	child.addChild(csg);
1693	1969	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	1970	+ if (source == computeAOItem)
1696	1971	{
1697		- ImportGFD();
	1972	+ Globals.drawMode = CameraPane.OCCLUSION;
	1973	+ Globals.theRenderer.repaint();
1698	1974	} 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)
	1975	+ if (source == recompileItem)
1717	1976	{
1718	1977	Recompile();
1719	1978	refreshContents();
1720	1979	} else
1721		- if (event.getSource() == editScriptItem)
	1980	+ if (source == editScriptItem)
1722	1981	{
1723	1982	OpenDialog();
1724	1983	refreshContents();
1725	1984	} else
1726		- if (event.getSource() == invariantsItem)
	1985	+ if (source == invariantsItem)
1727	1986	{
1728	1987	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1730	1989	} else
1731		- if (event.getSource() == memoryItem)
	1990	+ if (source == memoryItem)
1732	1991	{
1733	1992	//System.out.println("Invariants:");
1734	1993	PrintMemory();
1735	1994	} else
1736		- if (event.getSource() == pathItem)
	1995	+ if (source == pathItem)
1737	1996	{
1738	1997	PrintPath();
1739	1998	} else
1740		- if (event.getSource() == analyzeItem)
	1999	+ if (source == analyzeItem)
1741	2000	{
1742	2001	AnalyzeObject();
1743	2002	} else
1744		- if (event.getSource() == dumpItem)
	2003	+ if (source == dumpItem)
1745	2004	{
1746	2005	DumpObject();
1747	2006	} else
1748		- if (event.getSource() == screenfitButton)
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
	2035	+ } else
	2036	+ if (source == screenfitButton)
1749	2037	{
1750	2038	//Reload(lastConverter, lastFilename, true);
1751	2039	ScreenFit();
1752	2040	} else
1753		- if (event.getSource() == screenfitpointButton)
	2041	+ if (source == screenfitpointButton)
1754	2042	{
1755	2043	//Reload(lastConverter, lastFilename, true);
1756	2044	ScreenFitPoint();
1757	2045	} else
1758		- if (event.getSource() == snapobjectButton)
	2046	+ if (source == snapobjectButton)
1759	2047	{
1760	2048	//Reload(lastConverter, lastFilename, true);
1761	2049	SnapObject();
..	..	@@ -1766,13 +2054,13 @@
1766	2054	// Recompile();
1767	2055	// refreshContents();
1768	2056	// } else
1769		- if (event.getSource() == gcButton)
	2057	+ if (source == gcButton)
1770	2058	{
1771	2059	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2060	System.gc();
1773	2061	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2062	} else
1775		- if (event.getSource() == editLeafItem)
	2063	+ if (source == editLeafItem)
1776	2064	{
1777	2065	Object3D obj;
1778	2066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2074,78 @@
1786	2074	}
1787	2075	refreshContents(true);
1788	2076	} else
1789		- if (event.getSource() == openWindowItem)
	2077	+ if (source == openWindowItem)
1790	2078	{
1791	2079	EditSelection(true);
1792	2080	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2081	+ if (source == cutItem \|\| source == clearButton)
1794	2082	{
1795	2083	loadClipboard(true);
1796	2084	} else
1797		- if (event.getSource() == duplicateItem)
	2085	+ if (source == undoItem)
1798	2086	{
1799		- Object3D keep = GraphreeD.clipboard;
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
	2093	+ if (source == duplicateItem)
	2094	+ {
	2095	+ Object3D keep = Grafreed.clipboard;
1800	2096	loadClipboard(false);
1801	2097	paste(false);
1802		- GraphreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1803	2099	} else
1804		- if (event.getSource() == cloneItem)
	2100	+ if (source == cloneItem)
1805	2101	{
1806	2102	CloneSelection(false);
1807	2103	} else
1808		- if (event.getSource() == cloneSupportItem)
	2104	+ if (source == cloneSupportItem)
1809	2105	{
1810	2106	CloneSelection(true);
1811	2107	} else
1812		- if (event.getSource() == copyItem)
	2108	+ if (source == copyItem)
1813	2109	{
1814	2110	loadClipboard(false);
1815	2111	} else
1816		- if (event.getSource() == pasteItem)
	2112	+ if (source == pasteItem)
1817	2113	{
1818	2114	paste(false);
1819	2115	} else
1820		- if (event.getSource() == pasteLinkItem)
	2116	+ if (source == pasteIntoItem)
1821	2117	{
1822		- pasteInto(false);
	2118	+ pasteInto(true, false);
1823	2119	} else
1824		- if (event.getSource() == pasteCloneItem)
	2120	+ if (source == pasteLinkItem)
1825	2121	{
1826		- pasteInto(true);
	2122	+ pasteInto(false, false);
1827	2123	} else
1828		- if (event.getSource() == pasteExpandItem)
	2124	+ if (source == pasteCloneItem)
	2125	+ {
	2126	+ pasteInto(true, true);
	2127	+ } else
	2128	+ if (source == pasteExpandItem)
1829	2129	{
1830	2130	paste(true);
1831	2131	} else
1832		- if (event.getSource() == synchronizeItem)
	2132	+ if (source == synchronizeItem)
1833	2133	{
1834	2134	Overwrite(Object3D.TRANSFORM);
1835	2135	} else
1836		- if (event.getSource() == overwriteNameItem)
	2136	+ if (source == overwriteNameItem)
1837	2137	{
1838	2138	Overwrite(Object3D.NAME);
1839	2139	} else
1840		- if (event.getSource() == overwriteUVItem)
	2140	+ if (source == overwriteUVItem)
1841	2141	{
1842	2142	Overwrite(Object3D.UV);
1843	2143	} else
1844		- if (event.getSource() == overwriteMatItem)
	2144	+ if (source == overwriteMatItem)
1845	2145	{
	2146	+ /* july 2015
1846	2147	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2148	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2149	else
1849	2150	{
1850	2151	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2157,16 @@
1856	2157	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2158	}
1858	2159	}
	2160	+ */
	2161	+
	2162	+ Overwrite(dropAttributes);
1859	2163	}
1860		- if (event.getSource() == overwriteGeoItem)
	2164	+ if (source == overwriteGeoItem)
1861	2165	{
1862	2166	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2167	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2168	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2169	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2170	//
1867	2171	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2172	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2178,7 @@
1874	2178	// refreshContents();
1875	2179	// }
1876	2180	} else
1877		- if (event.getSource() == generateMeshItem)
	2181	+ if (source == generateMeshItem)
1878	2182	{
1879	2183	//if (group.selection.size() == 1)
1880	2184	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2189,7 @@
1885	2189	ResetModel();
1886	2190	refreshContents();
1887	2191	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2192	+ if (source == extractGeometriesItem)
1889	2193	{
1890	2194	boolean one = false;
1891	2195
..	..	@@ -1912,7 +2216,7 @@
1912	2216	ResetModel();
1913	2217	refreshContents();
1914	2218	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2219	+ if (source == cloneGeometriesItem)
1916	2220	{
1917	2221	boolean one = false;
1918	2222
..	..	@@ -1938,32 +2242,37 @@
1938	2242	ResetModel();
1939	2243	refreshContents();
1940	2244	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2245	+ if (source == shareGeometriesItem)
1942	2246	{
1943	2247	boolean one = false;
1944	2248
1945	2249	if (group.selection.size() == 1)
1946	2250	one = true;
1947	2251
	2252	+ Object3D merge = null;
	2253	+
1948	2254	Object3D content = new cGroup();
1949	2255
1950	2256	for (int i=0; i<group.selection.size(); i++)
1951	2257	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2258	+ merge = new Merge(group.selection.get(i));
1953	2259
1954	2260	if (one)
1955		- makeSomething(sel, false);
	2261	+ makeSomething(merge, false);
1956	2262	else
1957		- content.addChild(sel);
	2263	+ content.addChild(merge);
1958	2264	}
1959	2265
1960	2266	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2267	+ makeSomething(content, true);
	2268	+ else
	2269	+ {
	2270	+ ResetModel();
	2271	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2272	+ refreshContents();
	2273	+ }
1965	2274	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2275	+ if (source == mergeGeometriesItem)
1967	2276	{
1968	2277	boolean one = false;
1969	2278
..	..	@@ -1993,11 +2302,11 @@
1993	2302	ResetModel();
1994	2303	refreshContents();
1995	2304	} else
1996		- if (event.getSource() == linkverticesItem)
	2305	+ if (source == linkverticesItem)
1997	2306	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2307	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2308	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2309	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2310	//
2002	2311	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2312	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2315,48 @@
2006	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2316	// refreshContents();
2008	2317	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2319	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2012	2321
2013	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2323	content = ((cGroup)content).get(0);
2015	2324
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2325	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2326	for (int i=0; i<group.selection.size(); i++)
2018	2327	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2330	group.selection.get(i).linkVerticesThis(content);
2022	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2024	2333	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2334	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2335	refreshContents();
2027	2336	}
2028	2337	} else
2029		- if (event.getSource() == resetsupportItem)
	2338	+ if (source == resetsupportItem)
2030	2339	{
2031	2340	for (int i=0; i<group.selection.size(); i++)
2032	2341	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2344	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2037	2346	}
2038	2347
2039	2348	refreshContents();
2040	2349	} else
2041		- if (event.getSource() == resetreferencesItem)
	2350	+ if (source == relinkverticesItem)
	2351	+ {
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
	2354	+ group.selection.RelinkToSupport();
	2355	+ CameraPane.SWITCH = random;
	2356	+
	2357	+ refreshContents();
	2358	+ } else
	2359	+ if (source == resetreferencesItem)
2042	2360	{
2043	2361	for (int i=0; i<group.selection.size(); i++)
2044	2362	{
..	..	@@ -2047,11 +2365,11 @@
2047	2365
2048	2366	refreshContents();
2049	2367	} else
2050		- if (event.getSource() == setMasterItem)
	2368	+ if (source == setMasterItem)
2051	2369	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2371	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2055	2373
2056	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2375	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2378,13 @@
2060	2378	refreshContents();
2061	2379	}
2062	2380	} else
2063		- if (event.getSource() == poseMeshItem)
	2381	+ if (source == poseMeshItem)
2064	2382	{
2065	2383	if (group.selection.size() == 1)
2066	2384	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2068	2386	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2070	2388
2071	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2390	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2397,19 @@
2079	2397	}
2080	2398
2081	2399	} else
2082		- if (event.getSource() == revertMeshItem)
	2400	+ if (source == revertMeshItem)
2083	2401	{
2084	2402	RevertMeshes();
2085	2403	} else
2086		- if (event.getSource() == resetMeshItem)
	2404	+ if (source == resetAllItem)
2087	2405	{
2088	2406	ResetAll();
2089	2407	} else
2090		- if (event.getSource() == stepAllItem)
	2408	+ if (source == stepAllItem)
2091	2409	{
2092	2410	StepAll();
2093	2411	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2412	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2413	{
2096	2414	//int indices[] = jList.getSelectedIndices();
2097	2415	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2417,46 @@
2099	2417
2100	2418	ClearSelection(false);
2101	2419	} else
2102		- if (event.getSource() == clearAllItem)
	2420	+ if (source == clearAllItem)
2103	2421	{
2104	2422	ClearSelection(true);
2105	2423	} else
2106		- if (event.getSource() == grabItem)
	2424	+ if (source == grabItem)
2107	2425	{
2108	2426	group(new cGroup(), true);
2109	2427	} else
2110		- if (event.getSource() == frontItem)
	2428	+ if (source == hideItem)
	2429	+ {
	2430	+ group(new HiddenObject());
	2431	+ } else
	2432	+ if (source == frontItem)
2111	2433	{
2112	2434	front();
2113	2435	} else
2114		- if (event.getSource() == backItem)
	2436	+ if (source == backItem)
2115	2437	{
2116	2438	back();
2117	2439	} else
2118		- if (event.getSource() == cameraItem)
	2440	+ if (source == cameraItem)
2119	2441	{
2120	2442	makeSomething(new Camera());
2121	2443	} else
2122		- if (event.getSource() == compositeItem)
	2444	+ if (source == compositeItem)
2123	2445	{
2124	2446	group(new Composite());
2125	2447	} else
2126		- if (event.getSource() == randomItem)
	2448	+ if (source == randomItem)
2127	2449	{
2128	2450	RandomNode random = new RandomNode();
2129	2451	group(random);
2130	2452	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2132	2454	} else
2133		- if (event.getSource() == physicsItem)
	2455	+ if (source == physicsItem)
2134	2456	{
2135	2457	group(new PhysicsNode());
2136	2458	} else
2137		- if (event.getSource() == frameselectorItem)
	2459	+ if (source == frameselectorItem)
2138	2460	{
2139	2461	for (int i=0; i<group.selection.size(); i++)
2140	2462	{
..	..	@@ -2146,7 +2468,7 @@
2146	2468	ResetModel();
2147	2469	refreshContents();
2148	2470	} else
2149		- if (event.getSource() == switchGeoItem)
	2471	+ if (source == switchGeoItem)
2150	2472	{
2151	2473	for (int i=0; i<group.selection.size(); i++)
2152	2474	{
..	..	@@ -2158,7 +2480,7 @@
2158	2480	ResetModel();
2159	2481	refreshContents();
2160	2482	} else
2161		- if (event.getSource() == switchTransfoItem)
	2483	+ if (source == switchTransfoItem)
2162	2484	{
2163	2485	for (int i=0; i<group.selection.size(); i++)
2164	2486	{
..	..	@@ -2170,7 +2492,7 @@
2170	2492	ResetModel();
2171	2493	refreshContents();
2172	2494	} else
2173		- if (event.getSource() == morphItem)
	2495	+ if (source == morphItem)
2174	2496	{
2175	2497	for (int i=0; i<group.selection.size(); i++)
2176	2498	{
..	..	@@ -2182,7 +2504,7 @@
2182	2504	ResetModel();
2183	2505	refreshContents();
2184	2506	} else
2185		- if (event.getSource() == scriptNodeItem)
	2507	+ if (source == scriptNodeItem)
2186	2508	{
2187	2509	boolean atleastone = false;
2188	2510
..	..	@@ -2221,191 +2543,239 @@
2221	2543	}
2222	2544	}
2223	2545	} else
2224		- if (event.getSource() == linkerItem)
	2546	+ if (source == linkerItem)
2225	2547	{
2226	2548	group(new cLinker());
2227	2549	} else
2228		- if (event.getSource() == textureItem)
	2550	+ if (source == textureItem)
2229	2551	{
2230	2552	group(new TextureNode());
2231	2553	} else
2232		- if (event.getSource() == shadowXItem)
	2554	+ if (source == billboardItem)
	2555	+ {
	2556	+ group(new BillboardNode());
	2557	+ } else
	2558	+ if (source == shadowXItem)
2233	2559	{
2234	2560	CastShadow(0);
2235	2561	} else
2236		- if (event.getSource() == shadowYItem)
	2562	+ if (source == shadowYItem)
2237	2563	{
2238	2564	CastShadow(1);
2239	2565	} else
2240		- if (event.getSource() == shadowZItem)
	2566	+ if (source == shadowZItem)
2241	2567	{
2242	2568	CastShadow(2);
2243	2569	} else
2244		- if (event.getSource() == ungroupItem)
	2570	+ if (source == ungroupItem)
2245	2571	{
2246		- ungroup();
	2572	+ //ungroup();
	2573	+ for (int i=0; i<group.selection.size(); i++)
	2574	+ {
	2575	+ Ungroup(group.selection.get(i));
	2576	+ }
	2577	+
	2578	+ ClearSelection(false);
	2579	+
	2580	+ refreshContents();
2247	2581	} else
2248		- if (event.getSource() == genUVItem)
	2582	+ if (source == genUVItem)
2249	2583	{
2250	2584	GenUV();
2251	2585	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2586	+ if (source == genNormalsCADItem)
2253	2587	{
2254	2588	GenNormals(true);
2255	2589	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2590	+ if (source == genNormalsMESHItem)
	2591	+ {
	2592	+ GenNormalsMESH();
	2593	+ } else
	2594	+ if (source == genNormalsORGANItem)
2257	2595	{
2258	2596	GenNormals(false);
2259	2597	} else
2260		- if (event.getSource() == stripifyItem)
	2598	+ if (source == genNormalsMINEItem)
	2599	+ {
	2600	+ GenNormalsMINE();
	2601	+ } else
	2602	+ if (source == stripifyItem)
2261	2603	{
2262	2604	Stripify();
2263	2605	} else
2264		- if (event.getSource() == unstripifyItem)
	2606	+ if (source == unstripifyItem)
2265	2607	{
2266	2608	Unstripify();
2267	2609	} else
2268		- if (event.getSource() == trimItem)
	2610	+ if (source == trimItem)
2269	2611	{
2270	2612	Trim();
2271	2613	} else
2272		- if (event.getSource() == untrimItem)
	2614	+ if (source == untrimItem)
2273	2615	{
2274	2616	Untrim();
2275	2617	} else
2276		- if (event.getSource() == clearColorsItem)
	2618	+ if (source == clearColorsItem)
2277	2619	{
2278	2620	ClearColors();
2279	2621	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2622	+ if (source == clearMaterialsItem)
2281	2623	{
2282	2624	ClearMaterials();
2283	2625	} else
2284		- if (event.getSource() == liveleavesItem)
	2626	+ if (source == liveleavesItem)
2285	2627	{
2286	2628	LiveLeaves(true);
2287	2629	} else
2288		- if (event.getSource() == unliveleavesItem)
	2630	+ if (source == unliveleavesItem)
2289	2631	{
2290	2632	LiveLeaves(false);
2291	2633	} else
2292		- if (event.getSource() == supportleavesItem)
	2634	+ if (source == supportleavesItem)
2293	2635	{
2294	2636	SupportLeaves(true);
2295	2637	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2638	+ if (source == unsupportleavesItem)
2297	2639	{
2298	2640	SupportLeaves(false);
2299	2641	} else
2300		- if (event.getSource() == hideleavesItem)
	2642	+ if (source == hideleavesItem)
2301	2643	{
2302	2644	HideLeaves(true);
2303	2645	} else
2304		- if (event.getSource() == showleavesItem)
	2646	+ if (source == showleavesItem)
2305	2647	{
2306	2648	HideLeaves(false);
2307	2649	} else
2308		- if (event.getSource() == markleavesItem)
	2650	+ if (source == markleavesItem)
2309	2651	{
2310	2652	MarkLeaves(true);
2311	2653	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2654	+ if (source == unmarkleavesItem)
2313	2655	{
2314	2656	MarkLeaves(false);
2315	2657	} else
2316		- if (event.getSource() == flipVItem)
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
	2673	+ } else
	2674	+ if (source == flipVItem)
2317	2675	{
2318	2676	FlipV(true);
2319	2677	} else
2320		- if (event.getSource() == unflipVItem)
	2678	+ if (source == unflipVItem)
2321	2679	{
2322	2680	FlipV(false);
2323	2681	} else
2324		- if (event.getSource() == lowTexturesItem)
	2682	+ if (source == lowTexturesItem)
2325	2683	{
2326	2684	SetTexRes(0);
2327	2685	} else
2328		- if (event.getSource() == normalTexturesItem)
	2686	+ if (source == normalTexturesItem)
2329	2687	{
2330	2688	SetTexRes(1);
2331	2689	} else
2332		- if (event.getSource() == highTexturesItem)
	2690	+ if (source == highTexturesItem)
2333	2691	{
2334	2692	SetTexRes(2);
2335	2693	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2694	+ if (source == veryhighTexturesItem)
2337	2695	{
2338	2696	SetTexRes(3);
2339	2697	} else
2340		- if (event.getSource() == maxTexturesItem)
	2698	+ if (source == maxTexturesItem)
2341	2699	{
2342	2700	SetTexRes(4);
2343	2701	} else
2344		- if (event.getSource() == panoTexturesItem)
	2702	+ if (source == panoTexturesItem)
2345	2703	{
2346	2704	SetTexRes(5);
2347	2705	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2706	+ if (source == reverseNormalsItem)
2349	2707	{
2350	2708	ReverseNormals();
2351	2709	} else
2352		- if (event.getSource() == parseverticesItem)
	2710	+ if (source == parseverticesItem)
2353	2711	{
2354	2712	ParseVertices();
2355	2713	} else
2356		- if (event.getSource() == alignItem)
	2714	+ if (source == textureFieldItem)
	2715	+ {
	2716	+ TextureVertices();
	2717	+ } else
	2718	+ if (source == alignItem)
2357	2719	{
2358	2720	Align();
2359	2721	} else
2360		- if (event.getSource() == mirrorItem)
	2722	+ if (source == mirrorItem)
2361	2723	{
2362	2724	MirrorPoses();
2363	2725	} else
2364		- if (event.getSource() == reduceMorphItem)
	2726	+ if (source == reduceMorphItem)
2365	2727	{
2366	2728	MeshReduction(false);
2367	2729	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2730	+ if (source == reduce34MorphItem)
2369	2731	{
2370	2732	MeshReduction(true);
2371	2733	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2734	+ if (source == reverseTrianglesItem)
2373	2735	{
2374	2736	ReverseTriangles();
2375	2737	} else
2376		- if (event.getSource() == reduceMeshItem)
	2738	+ if (source == reduceMeshItem)
2377	2739	{
2378	2740	ReduceMesh(false);
2379	2741	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2742	+ if (source == reduce34MeshItem)
2381	2743	{
2382	2744	ReduceMesh(true);
2383	2745	} else
2384		- if (event.getSource() == increaseMeshItem)
	2746	+ if (source == increaseMeshItem)
2385	2747	{
2386	2748	IncreaseMesh();
2387	2749	} else
2388		- if (event.getSource() == clipMeshItem)
	2750	+ if (source == clipMeshItem)
2389	2751	{
2390	2752	ClipMesh();
2391	2753	} else
2392		- if (event.getSource() == smoothMeshItem)
	2754	+ if (source == smoothMeshItem)
2393	2755	{
2394	2756	SmoothMesh();
2395	2757	} else
2396		- if (event.getSource() == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2397	2759	{
2398	2760	TransformGeometry();
2399	2761	} else
2400		- if (event.getSource() == resetTransformItem)
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
	2765	+ } else
	2766	+ if (source == resetTransformItem)
2401	2767	{
2402	2768	ResetTransform();
2403	2769	} else
2404		- if (event.getSource() == resetCentroidItem)
	2770	+ if (source == resetCentroidItem)
2405	2771	{
2406		- ResetCentroid();
	2772	+ ResetCentroid(true);
2407	2773	} else
2408		- if (event.getSource() == resetParentItem)
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
	2777	+ } else
	2778	+ if (source == resetParentItem)
2409	2779	{
2410	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2781	{
..	..	@@ -2415,7 +2785,7 @@
2415	2785
2416	2786	refreshContents();
2417	2787	} else
2418		- if (event.getSource() == repairParentItem)
	2788	+ if (source == repairParentItem)
2419	2789	{
2420	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2791	{
..	..	@@ -2429,7 +2799,21 @@
2429	2799
2430	2800	refreshContents();
2431	2801	} else
2432		- if (event.getSource() == sortbysizeItem)
	2802	+ if (source == repairShadowItem)
	2803	+ {
	2804	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2805	+ {
	2806	+ Object3D obj = (Object3D)e.nextElement();
	2807	+ obj.RepairShadow();
	2808	+// for (int i=0; i<obj.size(); i++)
	2809	+// {
	2810	+// obj.get(i).parent = obj;
	2811	+// }
	2812	+ }
	2813	+
	2814	+ refreshContents();
	2815	+ } else
	2816	+ if (source == sortbysizeItem)
2433	2817	{
2434	2818	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2819	{
..	..	@@ -2441,7 +2825,7 @@
2441	2825	ResetModel();
2442	2826	refreshContents();
2443	2827	} else
2444		- if (event.getSource() == sortbynameItem)
	2828	+ if (source == sortbynameItem)
2445	2829	{
2446	2830	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2831	{
..	..	@@ -2453,7 +2837,7 @@
2453	2837	ResetModel();
2454	2838	refreshContents();
2455	2839	} else
2456		- if (event.getSource() == attachPigmentItem)
	2840	+ if (source == attachPigmentItem)
2457	2841	{
2458	2842	String texture = GetFile("Attach pigment");
2459	2843	Object3D obj;
..	..	@@ -2465,7 +2849,7 @@
2465	2849
2466	2850	refreshContents();
2467	2851	} else
2468		- if (event.getSource() == detachPigmentItem)
	2852	+ if (source == detachPigmentItem)
2469	2853	{
2470	2854	Object3D obj;
2471	2855	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2860,7 @@
2476	2860
2477	2861	refreshContents();
2478	2862	} else
2479		- if (event.getSource() == attachBumpItem)
	2863	+ if (source == attachBumpItem)
2480	2864	{
2481	2865	String texture = GetFile("Attach bump");
2482	2866	Object3D obj;
..	..	@@ -2488,7 +2872,7 @@
2488	2872
2489	2873	refreshContents();
2490	2874	} else
2491		- if (event.getSource() == detachBumpItem)
	2875	+ if (source == detachBumpItem)
2492	2876	{
2493	2877	Object3D obj;
2494	2878	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2883,7 @@
2499	2883
2500	2884	refreshContents();
2501	2885	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2886	+ if (source == pigmentBumpItem)
2503	2887	{
2504	2888	Object3D obj;
2505	2889	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2894,221 @@
2510	2894
2511	2895	refreshContents();
2512	2896	} else
2513		- if (event.getSource() == flashSelectionButton)
	2897	+ if (source == flashSelectionButton)
2514	2898	{
2515	2899	CameraPane.flash = true;
2516	2900	refreshContents();
2517	2901	} else
2518		- if (event.getSource() == oneButton)
	2902	+ if (source == oneButton)
2519	2903	{
2520	2904	} else
2521		- if (event.getSource() == twoButton)
	2905	+ if (source == twoButton)
2522	2906	{
2523	2907	radio.layout = twoButton;
2524	2908	// bug
2525	2909	//gridPanel.setDividerLocation(1.0);
2526	2910	//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();
	2911	+// bigThree.remove(scenePanel);
	2912	+// bigThree.remove(centralPanel);
	2913	+// bigThree.remove(XYZPanel);
	2914	+// aWindowConstraints.gridx = 0;
	2915	+// aWindowConstraints.gridy = 0;
	2916	+// aWindowConstraints.gridwidth = 1;
	2917	+// // aConstraints.gridheight = 3;
	2918	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2919	+// aWindowConstraints.weightx = 0;
	2920	+// aWindowConstraints.weighty = 1;
	2921	+// //bigThree.add(jtp, aWindowConstraints);
	2922	+// aWindowConstraints.weightx = 1;
	2923	+// aWindowConstraints.gridwidth = 3;
	2924	+// // aConstraints.gridheight = 3;
	2925	+// aWindowConstraints.gridx = 1;
	2926	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2927	+// bigThree.add(centralPanel, aWindowConstraints);
	2928	+// aWindowConstraints.weightx = 0;
	2929	+// aWindowConstraints.gridx = 4;
	2930	+// aWindowConstraints.gridwidth = 1;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2933	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2934	+// scenePanel.setVisible(false);
	2935	+// centralPanel.setVisible(true);
	2936	+// XYZPanel.setVisible(false);
	2937	+ bigThree.ClearUI();
	2938	+ bigThree.add(centralPanel);
	2939	+ bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2551	2958	} else
2552		- if (event.getSource() == threeButton)
	2959	+ if (source == threeButton)
2553	2960	{
2554	2961	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();
	2962	+
	2963	+// bigThree.remove(scenePanel);
	2964	+// bigThree.remove(centralPanel);
	2965	+// bigThree.remove(XYZPanel);
	2966	+// aWindowConstraints.gridx = 0;
	2967	+// aWindowConstraints.gridy = 0;
	2968	+// aWindowConstraints.gridwidth = 1;
	2969	+// // aConstraints.gridheight = 3;
	2970	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2971	+// aWindowConstraints.weightx = 0;
	2972	+// aWindowConstraints.weighty = 1;
	2973	+// //bigThree.add(jtp, aWindowConstraints);
	2974	+// aWindowConstraints.weightx = 1;
	2975	+// aWindowConstraints.gridwidth = 3;
	2976	+// // aConstraints.gridheight = 3;
	2977	+// aWindowConstraints.gridx = 1;
	2978	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2979	+// bigThree.add(centralPanel, aWindowConstraints);
	2980	+// aWindowConstraints.weightx = 0;
	2981	+// aWindowConstraints.gridx = 4;
	2982	+// aWindowConstraints.gridwidth = 1;
	2983	+// // aConstraints.gridheight = 3;
	2984	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2985	+// bigThree.add(XYZPanel, aWindowConstraints);
	2986	+// bigThree.validate();
	2987	+// scenePanel.setVisible(false);
	2988	+// centralPanel.setVisible(true);
	2989	+// XYZPanel.setVisible(true);
	2990	+ bigThree.ClearUI();
	2991	+ bigThree.add(centralPanel);
	2992	+ bigThree.add(XYZPanel);
	2993	+ bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2579	2996	} else
2580		- if (event.getSource() == fourButton)
	2997	+ if (source == fourButton)
2581	2998	{
2582	2999	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();
	3000	+
	3001	+// bigThree.remove(scenePanel);
	3002	+// bigThree.remove(centralPanel);
	3003	+// bigThree.remove(XYZPanel);
	3004	+// aWindowConstraints.gridx = 0;
	3005	+// aWindowConstraints.gridy = 0;
	3006	+// aWindowConstraints.gridwidth = 1;
	3007	+// // aWindowConstraints.gridheight = 3;
	3008	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3009	+// aWindowConstraints.weightx = 1;
	3010	+// aWindowConstraints.weighty = 1;
	3011	+// bigThree.add(scenePanel, aWindowConstraints);
	3012	+// aWindowConstraints.weightx = 1;
	3013	+// aWindowConstraints.gridwidth = 3;
	3014	+// // aConstraints.gridheight = 3;
	3015	+// aWindowConstraints.gridx = 1;
	3016	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3017	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3018	+// aWindowConstraints.weightx = 0;
	3019	+// aWindowConstraints.gridx = 4;
	3020	+// aWindowConstraints.gridwidth = 1;
	3021	+// // aWindowConstraints.gridheight = 3;
	3022	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3023	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3024	+// bigThree.validate();
	3025	+// scenePanel.setVisible(true);
	3026	+// centralPanel.setVisible(false);
	3027	+// XYZPanel.setVisible(false);
	3028	+ bigThree.ClearUI();
	3029	+ bigThree.add(scenePanel);
	3030	+ bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2607	3033	} else
2608		- if (event.getSource() == sixButton)
	3034	+ if (source == sixButton)
2609	3035	{
2610	3036	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();
	3037	+
	3038	+// bigThree.remove(scenePanel);
	3039	+// bigThree.remove(centralPanel);
	3040	+// bigThree.remove(XYZPanel);
	3041	+// aWindowConstraints.gridx = 0;
	3042	+// aWindowConstraints.gridy = 0;
	3043	+// aWindowConstraints.gridwidth = 1;
	3044	+// // aConstraints.gridheight = 3;
	3045	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3046	+// aWindowConstraints.weightx = 0;
	3047	+// aWindowConstraints.weighty = 1;
	3048	+// bigThree.add(scenePanel, aWindowConstraints);
	3049	+// aWindowConstraints.weightx = 1;
	3050	+// aWindowConstraints.gridwidth = 3;
	3051	+// // aWindowConstraints.gridheight = 3;
	3052	+// aWindowConstraints.gridx = 1;
	3053	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3054	+// bigThree.add(centralPanel, aWindowConstraints);
	3055	+// aWindowConstraints.weightx = 0;
	3056	+// aWindowConstraints.gridx = 4;
	3057	+// aWindowConstraints.gridwidth = 1;
	3058	+// // aWindowConstraints.gridheight = 3;
	3059	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3060	+// //bigThree.add(XYZPanel, aConstraints);
	3061	+// bigThree.validate();
	3062	+// scenePanel.setVisible(true);
	3063	+// centralPanel.setVisible(true);
	3064	+// XYZPanel.setVisible(false);
	3065	+ bigThree.ClearUI();
	3066	+ bigThree.add(scenePanel);
	3067	+ bigThree.add(centralPanel);
	3068	+ bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2635	3071	} else
2636		- if (event.getSource() == sevenButton)
	3072	+ if (source == sevenButton)
2637	3073	{
2638	3074	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();
	3075	+
	3076	+// bigThree.remove(scenePanel);
	3077	+// bigThree.remove(centralPanel);
	3078	+// bigThree.remove(XYZPanel);
	3079	+// aWindowConstraints.gridx = 0;
	3080	+// aWindowConstraints.gridy = 0;
	3081	+// aWindowConstraints.gridwidth = 1;
	3082	+// // aWindowConstraints.gridheight = 3;
	3083	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3084	+// aWindowConstraints.weightx = 0;
	3085	+// aWindowConstraints.weighty = 1;
	3086	+// bigThree.add(scenePanel, aWindowConstraints);
	3087	+// aWindowConstraints.weightx = 1;
	3088	+// aWindowConstraints.gridwidth = 3;
	3089	+// // aWindowConstraints.gridheight = 3;
	3090	+// aWindowConstraints.gridx = 1;
	3091	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3092	+// bigThree.add(centralPanel, aWindowConstraints);
	3093	+// aWindowConstraints.weightx = 0;
	3094	+// aWindowConstraints.gridx = 4;
	3095	+// aWindowConstraints.gridwidth = 1;
	3096	+// // aConstraints.gridheight = 3;
	3097	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3098	+// bigThree.add(XYZPanel, aWindowConstraints);
	3099	+// bigThree.validate();
	3100	+// scenePanel.setVisible(true);
	3101	+// centralPanel.setVisible(true);
	3102	+// XYZPanel.setVisible(true);
	3103	+ bigThree.ClearUI();
	3104	+ bigThree.add(scenePanel);
	3105	+ bigThree.add(centralPanel);
	3106	+ bigThree.add(XYZPanel);
	3107	+ bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2663	3110	} else
2664		- if (event.getSource() == rootButton)
	3111	+ if (source == rootButton)
2665	3112	{
2666	3113	Object3D obj;
2667	3114	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,9 +3118,10 @@
2671	3118	EditObject(obj);
2672	3119	}
2673	3120
	3121	+ cameraView.requestFocusInWindow();
2674	3122	refreshContents(true);
2675	3123	} else
2676		- if (event.getSource() == closeButton)
	3124	+ if (source == closeButton)
2677	3125	{
2678	3126	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3127	cRadio ab;
..	..	@@ -2692,13 +3140,15 @@
2692	3140	break;
2693	3141	}
2694	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2695	3145	refreshContents(true);
2696	3146	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3147	+ if (source == editItem \|\| source == editButton)
2698	3148	{
2699	3149	EditSelection(false);
2700	3150	} else
2701		- if (event.getSource() == uneditButton)
	3151	+ if (source == uneditButton)
2702	3152	{
2703	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3154	{
..	..	@@ -2708,14 +3158,14 @@
2708	3158	child.CloseUI();
2709	3159	listUI.remove(child);
2710	3160
2711		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2712	3162	}
2713		- objEditor.ctrlPanel.revalidate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2714	3164	//objEditor.jTree.clearSelection();
2715	3165	//objEditor.ResetSliders();
2716	3166	refreshContents(true);
2717	3167	} else
2718		- if (event.getSource() == clearPanelButton)
	3168	+ if (source == clearPanelButton)
2719	3169	{
2720	3170	assert(copy == group);
2721	3171	//copy.ClearUI();
..	..	@@ -2726,7 +3176,7 @@
2726	3176	listUI.clear();
2727	3177	refreshContents(true);
2728	3178	} else
2729		- if (event.getSource() == allParamsButton)
	3179	+ if (source == allParamsButton)
2730	3180	{
2731	3181	assert(copy == group);
2732	3182
..	..	@@ -2747,19 +3197,19 @@
2747	3197
2748	3198	refreshContents(true);
2749	3199	} else
2750		- if (event.getSource() == unselectButton)
	3200	+ if (source == unselectButton)
2751	3201	{
2752	3202	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3203	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3204	objEditor.ResetSliders();
2755	3205	refreshContents(true);
2756	3206	} else
2757		- if(event.getSource() instanceof cRadio)
	3207	+ if(source instanceof cRadio)
2758	3208	{
2759	3209	group.parent = keepparent;
2760	3210	group.attributes = 0;
2761	3211	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3212	+ /cRadio/ radio = (cRadio)source;
2763	3213	Object3D obj = radio.GetObject();
2764	3214	System.out.println("Edit " + obj);
2765	3215	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3229,7 @@
2779	3229	}
2780	3230
2781	3231	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3232	+ //Globals.theRenderer.object = group;
2783	3233	if(!useclient)
2784	3234	{
2785	3235	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3238,16 @@
2788	3238	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3239	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3240	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3241	+ //cameraView.lighttouched = true;
	3242	+ Globals.lighttouched = true;
2792	3243	topView.object = group;
2793	3244	frontView.object = group;
2794	3245	sideView.object = group;
2795	3246	}
2796		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
2797	3251	/*
2798	3252	currentLayout = radio.layout;
2799	3253	if (currentLayout == null)
..	..	@@ -2805,8 +3259,23 @@
2805	3259	//group.parent = null; // ROOT
2806	3260	//group.attributes = -1;
2807	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
2808	3264	refreshContents(true);
2809		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
2810	3279	else
2811	3280	{
2812	3281	//return super.action(event, arg);
..	..	@@ -2815,7 +3284,6 @@
2815	3284	}
2816	3285
2817	3286	boolean useclient = false;
2818		- cRadio radio;
2819	3287
2820	3288	void ToggleRoot()
2821	3289	{
..	..	@@ -2824,7 +3292,7 @@
2824	3292	if (useclient)
2825	3293	{
2826	3294	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3295	+ Globals.lighttouched = true;
2828	3296	//topView.object = client;
2829	3297	//frontView.object = client;
2830	3298	//sideView.object = client;
..	..	@@ -2832,7 +3300,7 @@
2832	3300	else
2833	3301	{
2834	3302	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3303	+ Globals.lighttouched = true;
2836	3304	//topView.object = group;
2837	3305	//frontView.object = group;
2838	3306	//sideView.object = group;
..	..	@@ -2867,6 +3335,28 @@
2867	3335	refreshContents();
2868	3336	}
2869	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
2870	3360
2871	3361	void ResetTransform()
2872	3362	{
..	..	@@ -2979,7 +3469,7 @@
2979	3469	refreshContents();
2980	3470	}
2981	3471
2982		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
2983	3473	{
2984	3474	Object3D obj;
2985	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3484,16 @@
2994	3484	LA.matIdentity(Object3D.mat);
2995	3485	obj.getBounds(minima, maxima, false);
2996	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3000	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3003	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3522,8 @@
3028	3522
3029	3523	int size = obj.MemorySize();
3030	3524
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3527	}
3033	3528	}
3034	3529	catch (Exception e)
..	..	@@ -3065,9 +3560,9 @@
3065	3560	obj = (Object3D)e.nextElement();
3066	3561
3067	3562	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3069	3564	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3566
3072	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3568	}
..	..	@@ -3109,6 +3604,20 @@
3109	3604	void GenNormals(boolean crease)
3110	3605	{
3111	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
	3614	+
	3615	+ refreshContents();
	3616	+ }
	3617	+
	3618	+ void GenNormalsMINE()
	3619	+ {
	3620	+ group.selection.GenNormalsMINE();
3112	3621
3113	3622	refreshContents();
3114	3623	}
..	..	@@ -3157,104 +3666,259 @@
3157	3666
3158	3667	//Object3D buffer;
3159	3668	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		-
	3669	+// BoundaryRep temprep;
	3670	+// Object3D nodes;
	3671	+// Vector<Vertex> vertices;
	3672	+//
	3673	+// cGroup buffer;
	3674	+//
	3675	+// public void Vertex(Object3D node, Vertex v)
	3676	+// {
	3677	+//// vertices.add(v);
	3678	+//// nodes.addElement(node);
	3679	+////
	3680	+//// if (temprep.GetCache(v) != null)
	3681	+//// {
	3682	+//// temprep.Remove(v);
	3683	+//// } else
	3684	+//// {
	3685	+//// temprep.Remember(v);
	3686	+//// }
	3687	+//
	3688	+// //Object3D node = nodes.get(index);
	3689	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3690	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3691	+//
	3692	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3693	+//
	3694	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3695	+//
	3696	+// cGroup g = new cGroup();
	3697	+//
	3698	+// if (g.toParent == null)
	3699	+// {
	3700	+// g.toParent = LA.newMatrix();
	3701	+// g.fromParent = LA.newMatrix();
	3702	+// }
	3703	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3704	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3705	+//
	3706	+// g.add(GrafreeD.clipboard);
	3707	+//
	3708	+// buffer.add(g);
	3709	+// }
	3710	+//
	3711	+// public void Face(Object3D node, Face f)
	3712	+// {
	3713	+//
	3714	+// }
	3715	+//
	3716	+// void ParseVerticesOld() // ??
	3717	+// {
	3718	+// //if (group.selection.size() != 1)
	3719	+// // return;
	3720	+//
	3721	+// temprep = new BoundaryRep();
	3722	+// nodes = new Object3D();
	3723	+// vertices = new Vector<Vertex>();
	3724	+//
	3725	+// boolean epsequal = GrafreeD.epsequal;
	3726	+// GrafreeD.epsequal = true;
	3727	+//
	3728	+// for (int i=0; i<group.selection.size(); i++)
	3729	+// {
	3730	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3731	+//
	3732	+// group.selection.get(i).Parse(
	3733	+//this );
	3734	+//
	3735	+// int repsize = temprep.VertexCount();
	3736	+// int tablesize = temprep.vertextable.size();
	3737	+// int nodesize = nodes.size();
	3738	+//
	3739	+// assert(vertices.size() == nodes.size());
	3740	+//
	3741	+// temprep.vertextable.elements();
	3742	+//
	3743	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3744	+//
	3745	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3746	+// {
	3747	+// cGroup g = new cGroup();
	3748	+//
	3749	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3750	+//
	3751	+// Object3D node = nodes.get(index);
	3752	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3753	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3754	+//
	3755	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3756	+//
	3757	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3758	+//
	3759	+// if (g.toParent == null)
	3760	+// {
	3761	+// g.toParent = LA.newMatrix();
	3762	+// g.fromParent = LA.newMatrix();
	3763	+// }
	3764	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3765	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3766	+//
	3767	+// g.add(GrafreeD.clipboard);
	3768	+//
	3769	+// buffer.add(g);
	3770	+// }
	3771	+//
	3772	+// makeSomething(buffer, i==group.selection.size()-1);
	3773	+// }
	3774	+//
	3775	+// GrafreeD.epsequal = epsequal;
	3776	+//
	3777	+// //buffer = null;
	3778	+// temprep = null;
	3779	+// nodes = null;
	3780	+//
	3781	+// refreshContents();
	3782	+// }
	3783	+
3184	3784	void ParseVertices()
3185	3785	{
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;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3195	3788
3196	3789	for (int i=0; i<group.selection.size(); i++)
3197	3790	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3791	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3792
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3793	+ group.selection.get(i).Parse(
	3794	+
	3795	+ new iParse()
	3796	+ {
	3797	+ public void Vertex(Object3D node, Vertex v)
	3798	+ {
	3799	+ temp.set(v);
	3800	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3801
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();
	3802	+ cGroup g = new cGroup();
3211	3803
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3804	+ if (g.toParent == null)
	3805	+ {
	3806	+ g.toParent = LA.newMatrix();
	3807	+ g.fromParent = LA.newMatrix();
	3808	+ }
	3809	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3810	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3811
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);
	3812	+ g.add(Grafreed.clipboard);
3220	3813
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);
	3814	+ buffer.add(g);
	3815	+ }
3232	3816
3233		- g.add(GraphreeD.clipboard);
	3817	+ public void Face(Object3D node, Face f)
	3818	+ {
3234	3819
3235		- buffer.add(g);
3236		- }
	3820	+ }
	3821	+ }
	3822	+ );
3237	3823
3238	3824	makeSomething(buffer, i==group.selection.size()-1);
3239	3825	}
3240	3826
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3827	+ Grafreed.epsequal = epsequal;
3246	3828
3247	3829	refreshContents();
3248	3830	}
3249		-
	3831	+
	3832	+ void TextureVertices()
	3833	+ {
	3834	+ for (int i=0; i<group.selection.size(); i++)
	3835	+ {
	3836	+ group.selection.get(i).Parse(
	3837	+ new iParse()
	3838	+ {
	3839	+ public void Vertex(Object3D node, Vertex v)
	3840	+ {
	3841	+ cTexture tex = node.GetTextures();
	3842	+ String pigment = Object3D.GetPigment(tex);
	3843	+ //String bump = Object3D.GetBump(tex);
	3844	+
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
	3855	+
	3856	+ double s = v.s;
	3857	+
	3858	+ if (s == 1)
	3859	+ s = 0;
	3860	+
	3861	+ double t = v.t;
	3862	+
	3863	+ if (t == 1)
	3864	+ t = 0;
	3865	+
	3866	+ int indexs = (int) (texturedata.getWidth() * s);
	3867	+ int indext = (int) (texturedata.getHeight() * t);
	3868	+
	3869	+ int index = indext * texturedata.getWidth() + indexs;
	3870	+
	3871	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3872	+
	3873	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3874	+
	3875	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3876	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3877	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3878	+ scale /= 3;
	3879	+
	3880	+ scale /= 0xFF;
	3881	+ // c'est quoi ca? scale /= 4;
	3882	+
	3883	+ //v.AO = scale;
	3884	+
	3885	+ v.x += v.norm.x * scale;
	3886	+ v.y += v.norm.y * scale;
	3887	+ v.z += v.norm.z * scale;
	3888	+ }
	3889	+
	3890	+ public void Face(Object3D node, Face f)
	3891	+ {
	3892	+ }
	3893	+ }
	3894	+ );
	3895	+ }
	3896	+
	3897	+ refreshContents();
	3898	+ }
	3899	+
3250	3900	void Align()
3251	3901	{
	3902	+ if (group.selection.size() == 0)
	3903	+ return;
	3904	+
	3905	+ cVector bbmin = new cVector();
	3906	+ cVector bbmax = new cVector();
	3907	+
	3908	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3909	+
	3910	+ double dx = bbmax.x - bbmin.x;
	3911	+ double dy = bbmax.y - bbmin.y;
	3912	+ double dz = bbmax.z - bbmin.z;
	3913	+
	3914	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3915	+
3252	3916	for (int i=0; i<group.selection.size(); i++)
3253	3917	{
3254	3918	Object3D obj = group.selection.get(i);
3255	3919
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3920	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3921	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3922	}
3259	3923
3260	3924	refreshContents();
..	..	@@ -3267,7 +3931,7 @@
3267	3931	// ref.SaveSupports();
3268	3932	// Object3D par = ref.parent;
3269	3933	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3934	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3935	// ref.parent = par;
3272	3936	// ref.RestoreSupports();
3273	3937
..	..	@@ -3275,11 +3939,11 @@
3275	3939
3276	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3941
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3944	lowres.linkVerticesThis(null);
3281	3945	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3283	3947
3284	3948	System.err.flush();
3285	3949
..	..	@@ -3297,7 +3961,7 @@
3297	3961	// lowres.SaveSupports();
3298	3962	// par = lowres.parent;
3299	3963	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3964	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3965	Object3D newlow = CloneObject(lowres, false);
3302	3966	newlow.name = sn.switchobject.get(i).name;
3303	3967	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3983,7 @@
3319	3983	return;
3320	3984
3321	3985	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3323	3987
3324	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3989
..	..	@@ -3488,7 +4152,7 @@
3488	4152	group.selection.RelinkToSupport(); // july 2014
3489	4153	System.out.println("DONE.");
3490	4154	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4155	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4156	}
3493	4157
3494	4158	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4177,20 @@
3513	4177
3514	4178	void ClipMesh()
3515	4179	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4181	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3519	4183
3520	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4185	content = ((cGroup)content).get(0);
3522	4186
3523	4187	// for (int i=0; i<group.selection.size(); i++)
3524	4188	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4189	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4190	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4192	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4193	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4194	System.out.println("DONE.");
3531	4195	refreshContents();
3532	4196	}
..	..	@@ -3571,6 +4235,18 @@
3571	4235	void MarkLeaves(boolean hide)
3572	4236	{
3573	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3574	4250	refreshContents();
3575	4251	}
3576	4252
..	..	@@ -3659,7 +4335,7 @@
3659	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4336
3661	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
3663	4339	{
3664	4340	// if (!(elem instanceof Composite))
3665	4341	// newWindow = false;
..	..	@@ -3749,7 +4425,6 @@
3749	4425	//case 702: // Event.LIST_DESELECT
3750	4426	group.deselectAll();
3751	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4428	if (tps != null)
3754	4429	{
3755	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,31 +4433,30 @@
3758	4433
3759	4434	//if (child.parent != null)
3760	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
3761	4437	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4438	}
3766	4439	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4440	+// else
	4441	+// {
	4442	+// objEditor.SetMaterial(group); // .GetMaterial());
	4443	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4444	+// System.err.println("info : " + group.GetPath());
	4445	+// }
3773	4446
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4448	CameraPane.flash = true;
3778	4449
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4451	// a camera
3781	4452	{
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;
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
	4458	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4459	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4460	}
3787	4461
3788	4462	refreshContents();
..	..	@@ -3793,6 +4467,26 @@
3793	4467
3794	4468	freezemodel = false;
3795	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
3796	4490
3797	4491	void linkSomething(Object3D thing)
3798	4492	{
..	..	@@ -3864,16 +4558,18 @@
3864	4558	{
3865	4559	if (group.selection.isEmpty())
3866	4560	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
3868	4563	Composite tGroup = null;
3869	4564	if (group.selection.size() > 0) // 1)
3870	4565	{
3871	4566	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
3873	4568	}
3874	4569
3875	4570	if (cut)
3876	4571	{
	4572	+ Save();
3877	4573	//int indices[] = jList.getSelectedIndices();
3878	4574	//for (int i = indices.length - 1; i >= 0; i--)
3879	4575	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4605,16 @@
3909	4605	//System.out.println("cut " + child);
3910	4606	//System.out.println("parent = " + child.parent);
3911	4607	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
3913	4609	tGroup.add/Child/(tmp);
3914	4610	else
3915		- GraphreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
3916	4612	}
3917	4613	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
3919	4615	tGroup.add/Child/(child);
3920	4616	else
3921		- GraphreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
3922	4618	}
3923	4619
3924	4620	//ResetModel();
..	..	@@ -3950,21 +4646,23 @@
3950	4646	//System.out.println("cut " + elem);
3951	4647	//System.out.println("parent = " + elem.parent);
3952	4648	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
3954	4650	tGroup.add/Child/(tmp);
3955	4651	else
3956		- GraphreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
3957	4653	}
3958	4654	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
3960	4656	tGroup.add/Child/(child);
3961	4657	else
3962		- GraphreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
3963	4659	}
3964	4660
3965	4661	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
3968	4666	if (cut)
3969	4667	{
3970	4668	ResetModel();
..	..	@@ -3974,11 +4672,11 @@
3974	4672
3975	4673	void paste(boolean expand)
3976	4674	{
3977		- // if (GraphreeD.clipboard == null)
	4675	+ // if (GrafreeD.clipboard == null)
3978	4676	// return;
3979	4677	boolean first = true;
3980	4678
3981		- if (GraphreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
3982	4680	{
3983	4681	Composite temp;
3984	4682
..	..	@@ -3989,7 +4687,7 @@
3989	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4688	*/
3991	4689	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4691	{
3994	4692	Object3D child = (Object3D)e.nextElement();
3995	4693
..	..	@@ -4003,7 +4701,7 @@
4003	4701	else
4004	4702	elem = child.deepCopy(); // ?
4005	4703	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4704	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4705	// elem = elem.get(0);
4008	4706	makeSomething(elem, true); // ?? first);
4009	4707	//group.addChild(elem);
..	..	@@ -4023,23 +4721,23 @@
4023	4721	//Object3D cb = Applet3D.clipboard;
4024	4722	//temp.addChild(cb);
4025	4723	//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());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4729	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4732	}
4035	4733
4036	4734	ResetModel();
4037	4735	refreshContents();
4038	4736	}
4039	4737
4040		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4041	4739	{
4042		-// if (GraphreeD.clipboard == null)
	4740	+// if (GrafreeD.clipboard == null)
4043	4741	// return;
4044	4742
4045	4743	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4764,22 @@
4066	4764	if (copyit)
4067	4765	{
4068	4766	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4070	4775	}
4071	4776	else
4072	4777	{
4073	4778	boolean first = true;
4074	4779
4075		- if (GraphreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4076	4781	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4783	Object3D copy;
4079	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4785	{
..	..	@@ -4084,7 +4789,7 @@
4084	4789	}
4085	4790	} else
4086	4791	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4793	}
4089	4794	}
4090	4795	}
..	..	@@ -4276,6 +4981,26 @@
4276	4981	makeSomething(csg);
4277	4982	}
4278	4983
	4984	+ void Ungroup(Object3D g)
	4985	+ {
	4986	+ if (g instanceof HiddenObject)
	4987	+ {
	4988	+ HiddenObject h = (HiddenObject) g;
	4989	+
	4990	+ for (int i=0; i<h.ActualSize(); i++)
	4991	+ {
	4992	+ objEditor.makeSomething(h.get(i), false);
	4993	+ }
	4994	+ }
	4995	+ else
	4996	+ {
	4997	+ for (int i=0; i<g.Size(); i++)
	4998	+ {
	4999	+ objEditor.makeSomething(g.get(i), false);
	5000	+ }
	5001	+ }
	5002	+ }
	5003	+
4279	5004	void ungroup()
4280	5005	{
4281	5006	/*
..	..	@@ -4469,21 +5194,6 @@
4469	5194	}
4470	5195	*/
4471	5196
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	5197	/*
4488	5198	public void Callback(Object obj)
4489	5199	{
..	..	@@ -4507,26 +5217,9 @@
4507	5217	}
4508	5218	*/
4509	5219
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	5220	String GetFile(String dialogName)
4528	5221	{
4529		- if (GraphreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4530	5223	{
4531	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5225	browser.show();
..	..	@@ -4590,10 +5283,18 @@
4590	5283	cButton flashSelectionButton;
4591	5284	cButton editButton;
4592	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4593	5287	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5288	cButton unselectButton;
4596	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4597	5298	cButton screenfitButton;
4598	5299	cButton screenfitpointButton;
4599	5300	cButton snapobjectButton;
..	..	@@ -4604,14 +5305,6 @@
4604	5305	cButton closeButton;
4605	5306
4606	5307	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	5308
4616	5309	//
4617	5310	//Composite
..	..	@@ -4624,6 +5317,8 @@
4624	5317	private MenuItem lookFromItem;
4625	5318	private MenuItem switchItem;
4626	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
4627	5322	private MenuItem duplicateItem;
4628	5323	private MenuItem cloneItem;
4629	5324	private MenuItem cloneSupportItem;
..	..	@@ -4635,8 +5330,9 @@
4635	5330	private MenuItem resetsupportItem;
4636	5331	private MenuItem resetreferencesItem;
4637	5332	private MenuItem linkverticesItem;
	5333	+ private MenuItem relinkverticesItem;
4638	5334	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
4640	5336	private MenuItem stepAllItem;
4641	5337	private MenuItem revertMeshItem;
4642	5338	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5343,17 @@
4647	5343	private MenuItem mergeGeometriesItem;
4648	5344	private MenuItem copyItem;
4649	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
4650	5347	private MenuItem pasteLinkItem;
4651	5348	private MenuItem pasteCloneItem;
4652	5349	private MenuItem pasteExpandItem;
4653	5350	private MenuItem clearItem;
4654	5351	private MenuItem clearAllItem;
4655	5352	private MenuItem genUVItem;
	5353	+ private MenuItem genNormalsMESHItem;
4656	5354	private MenuItem genNormalsCADItem;
4657	5355	private MenuItem genNormalsORGANItem;
	5356	+ private MenuItem genNormalsMINEItem;
4658	5357	private MenuItem stripifyItem;
4659	5358	private MenuItem unstripifyItem;
4660	5359	private MenuItem trimItem;
..	..	@@ -4683,6 +5382,10 @@
4683	5382	private MenuItem showleavesItem;
4684	5383	private MenuItem markleavesItem;
4685	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
4686	5389
4687	5390	private MenuItem flipVItem;
4688	5391	private MenuItem unflipVItem;
..	..	@@ -4694,8 +5397,11 @@
4694	5397	private MenuItem panoTexturesItem;
4695	5398
4696	5399	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
4698	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
	5404	+ private MenuItem hideItem;
4699	5405	private MenuItem grabItem;
4700	5406	private MenuItem backItem;
4701	5407	private MenuItem frontItem;
..	..	@@ -4716,6 +5422,7 @@
4716	5422
4717	5423	private MenuItem resetParentItem;
4718	5424	private MenuItem repairParentItem;
	5425	+ private MenuItem repairShadowItem;
4719	5426	private MenuItem sortbysizeItem;
4720	5427	private MenuItem sortbynameItem;
4721	5428
..	..	@@ -4728,16 +5435,19 @@
4728	5435	private MenuItem particleItem;
4729	5436	private MenuItem ragdollItem;
4730	5437	private MenuItem ragdoll2Item;
	5438	+ private MenuItem heightFieldItem;
	5439	+ private MenuItem textureFieldItem;
4731	5440	private MenuItem gridItem;
4732	5441	private MenuItem rectoidItem;
4733	5442	private MenuItem ellipsoidItem;
4734	5443	private MenuItem coneItem;
4735	5444	private MenuItem torusItem;
4736	5445	private MenuItem superItem;
	5446	+ private MenuItem kleinItem;
4737	5447	private MenuItem blobItem;
4738	5448	private MenuItem latheItem;
4739	5449	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
4741	5451	private MenuItem meshItem;
4742	5452	// private MenuItem meshGroupItem;
4743	5453	private MenuItem springItem;
..	..	@@ -4746,6 +5456,7 @@
4746	5456	private MenuItem csgItem;
4747	5457	private MenuItem templateItem;
4748	5458	private MenuItem textureItem;
	5459	+ private MenuItem billboardItem;
4749	5460	private MenuItem shadowXItem;
4750	5461	private MenuItem shadowYItem;
4751	5462	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5469,6 @@
4758	5469	private MenuItem doubleItem;
4759	5470	private MenuItem tripleItem;
4760	5471
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5472	private MenuItem computeAOItem;
4767	5473	private MenuItem recompileItem;
4768	5474	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5478,8 @@
4772	5478	private MenuItem analyzeItem;
4773	5479	private MenuItem dumpItem;
4774	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
4775	5485	}