~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,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,26 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	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);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
	237	+
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
	289	+ oe.menuBar.add(menu = new Menu("Setting"));
	290	+ if (Globals.ADVANCED)
	291	+ {
196	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	293	revertMeshItem.addActionListener(this);
198	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	295	resetreferencesItem.addActionListener(this);
200	296	menu.add("-");
	297	+ }
201	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	299	overwriteGeoItem.addActionListener(this);
203	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +306,103 @@
209	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	307	overwriteUVItem.addActionListener(this);
211	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
212	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	312	generateMeshItem.addActionListener(this);
214	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	314	poseMeshItem.addActionListener(this);
216	315	menu.add("-");
	316	+ }
217	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	318	resetsupportItem.addActionListener(this);
219	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	320	linkverticesItem.addActionListener(this);
	321	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	322	+ relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
221	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	327	setMasterItem.addActionListener(this);
	328	+ }
223	329
224		- oe.menuBar.add(menu = new Menu("Object"));
225		- grabItem = menu.add(new MenuItem("Grab"));
226		- grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
	330	+ oe.menuBar.add(menu = new Menu("Group"));
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
229	333	backItem = menu.add(new MenuItem("Back"));
230	334	backItem.addActionListener(this);
231		- compositeItem = menu.add(new MenuItem("Composite"));
232		- compositeItem.addActionListener(this);
233		- menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
235		- 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);
	335	+ frontItem = menu.add(new MenuItem("Front"));
	336	+ frontItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	343	+ hideItem.addActionListener(this);
	344	+ }
	345	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	346	+ ungroupItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
240	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	355	switchGeoItem.addActionListener(this);
242	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	357	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
246	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	367	scriptNodeItem.addActionListener(this);
248		- cameraItem = menu.add(new MenuItem("Camera"));
249		- cameraItem.addActionListener(this);
250		- menu.add("-");
251		- textureItem = menu.add(new MenuItem("Texture"));
252		- textureItem.addActionListener(this);
	368	+ }
	369	+
	370	+ oe.menuBar.add(menu = new Menu("Object"));
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
	373	+ billboardItem = menu.add(new MenuItem("Billboard"));
	374	+ billboardItem.addActionListener(this);
253	375	csgItem = menu.add(new MenuItem("CSG"));
254	376	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	378	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	380	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
261	386	linkerItem = menu.add(new MenuItem("Linker"));
262	387	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	388	attributeItem = menu.add(new MenuItem("Attribute"));
266	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
267	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	393	pointflowItem.addActionListener(this);
	394	+ }
269	395	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	397	resetTransformItem.addActionListener(this);
274	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	399	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
278	406
279	407	oe.menuBar.add(menu = new Menu("Geometry"));
280	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +411,13 @@
283	411	genNormalsORGANItem.addActionListener(this);
284	412	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	413	genNormalsCADItem.addActionListener(this);
	414	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	415	+ genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
	418	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	419	+ genNormalsMINEItem.addActionListener(this);
	420	+ }
286	421	stripifyItem = menu.add(new MenuItem("Stripify"));
287	422	stripifyItem.addActionListener(this);
288	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +427,6 @@
292	427	untrimItem = menu.add(new MenuItem("Untrim"));
293	428	untrimItem.addActionListener(this);
294	429	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	430	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	431	clearColorsItem.addActionListener(this);
299	432	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +439,34 @@
306	439	reduce34MeshItem.addActionListener(this);
307	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	441	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
	450	+
	451	+ oe.menuBar.add(menu = new Menu("Attributes"));
	452	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	453	+ clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
313	458	menu.add("-");
314	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	460	liveleavesItem.addActionListener(this);
316	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
318	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	466	supportleavesItem.addActionListener(this);
320	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	468	unsupportleavesItem.addActionListener(this);
	469	+ }
322	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	471	hideleavesItem.addActionListener(this);
324	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +475,31 @@
327	475	markleavesItem.addActionListener(this);
328	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
330	486	menu.add("-");
331	487	flipVItem = menu.add(new MenuItem("Flip V"));
332	488	flipVItem.addActionListener(this);
333	489	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	490	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	491	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	492	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	493	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	494	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	495	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	496	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	497	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	498	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	499	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	500	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	501	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	502	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	503
357	504	oe.menuBar.add(menu = new Menu("Selection"));
358	505	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,14 +517,41 @@
370	517	sortbysizeItem.addActionListener(this);
371	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	519	sortbynameItem.addActionListener(this);
	520	+ menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
	528	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	529	+ extractGeometriesItem.addActionListener(this);
	530	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	531	+ cloneGeometriesItem.addActionListener(this);
	532	+ }
	533	+
373	534	oe.menuBar.add(menu = new Menu("Insert"));
374	535	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	536	+
	537	+ oe.menuBar.add(menu = new Menu("Tools"));
376	538	buildToolsMenu(menu);
377	539	}
378	540
379	541	void SetupUI2(ObjEditor oe)
380	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
381	555	//new Exception().printStackTrace();
382	556
383	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -406,150 +580,213 @@
406	580	oe.radioPanel.add(dummyButton);
407	581	oe.buttonGroup.add(dummyButton);
408	582	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
412	586
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
414	621	liveCB.addItemListener(this);
415	622
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);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	628	+ fastCB.setToolTipText("Fast mode");
434	629	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);
476		- trackCB.addItemListener(this);
477		-
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ screenfitButton.setToolTipText("Screen fit");
480	635	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
482	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	642	// 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	643
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);
495		- flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
499	652
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ twoButton.setToolTipText("Show center view only");
502	655	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	659	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	660	+ fourButton.setToolTipText("Show left panel only");
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ sixButton.setToolTipText("2-column layout left");
506	663	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ threeButton.setToolTipText("2-column layout right");
508	666	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ sevenButton.setToolTipText("3-column layout");
510	669	sevenButton.addActionListener(this);
511	670	//
512	671
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ rootButton.setToolTipText("Edit selection in new tab");
514	674	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	675	+
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ closeButton.setToolTipText("Close tab");
517	678	closeButton.addActionListener(this);
518	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	680	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521		-
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
524		- editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	681
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Edit selection");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Unedit selection");
530	767	uneditButton.addActionListener(this);
531	768
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);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Edit all params");
544	771	allParamsButton.addActionListener(this);
545	772
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);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ clearPanelButton.setToolTipText("Clear edit panel");
	775	+ clearPanelButton.addActionListener(this);
	776	+
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	778	+ unselectButton.setToolTipText("Unselect");
551	779	unselectButton.addActionListener(this);
552	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
	789	+
553	790	// oe.aConstraints.gridx += 1;
554	791	// oe.aConstraints.weighty = 0;
555	792	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +798,22 @@
561	798	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	799	// gcButton.addActionListener(this);
563	800
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;
	801	+ cGridBag jSPPanel = new cGridBag();
	802	+
	803	+ JScrollPane jSP;
575	804	//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);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	806	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
582		-
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);
587		- colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
590		- materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
593		- textureCB.addItemListener(this);
594		-
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
597	807
	808	+ oe.treePanel.add(jSPPanel);
	809	+ oe.treePanel.Return();
	810	+
	811	+ oe.treePanel.add(copyOptionsPanel);
	812	+ oe.treePanel.Return();
	813	+
	814	+// mainPanel.setDividerLocation(0.5); //1.0);
	815	+// mainPanel.setResizeWeight(0.5);
	816	+
598	817	//jList.addListSelectionListener(this);
599	818	oe.jTree.addTreeSelectionListener(this);
600	819	//jTree.setRootVisible(false);
..	..	@@ -616,20 +835,153 @@
616	835	radio.layout = sevenButton;
617	836	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	837	}
	838	+
	839	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	840	+ {
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
	855	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	856	+ boxCB.setToolTipText("Display bounding boxes");
	857	+ boxCB.addItemListener(this);
	858	+
	859	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	860	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.addItemListener(this);
	862	+
	863	+ if (true) // Globals.ADVANCED)
	864	+ {
	865	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	866	+ supportCB.setToolTipText("Enable rigging");
	867	+ supportCB.addItemListener(this);
	868	+
	869	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	870	+ // localCB.addItemListener(this);
	871	+
	872	+ panel.Return();
	873	+
	874	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	875	+ crowdCB.setToolTipText("Used for crowds");
	876	+ crowdCB.addItemListener(this);
	877	+
	878	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	879	+ smoothCB.setToolTipText("Snapping delay");
	880	+ smoothCB.addItemListener(this);
	881	+
	882	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	883	+ slowCB.setToolTipText("Smooth interpolation");
	884	+ slowCB.addItemListener(this);
	885	+
	886	+// constraints.gridy += 1;
	887	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	888	+// speakerMocapCB.addItemListener(this);
	889	+
	890	+ panel.Return();
	891	+
	892	+ if (false)
	893	+ {
	894	+ // handled in scripts
	895	+ //constraints.gridy += 1;
	896	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	897	+ speakerCameraCB.addItemListener(this);
	898	+
	899	+ //constraints.gridy += 1;
	900	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	901	+ speakerFocusCB.addItemListener(this);
	902	+
	903	+ //constraints.gridy += 1;
	904	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	905	+ smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
	907	+ }
	908	+
	909	+//constraints.gridx += 1;
	910	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	911	+// debugCB.addItemListener(this);
	912	+
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
	917	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
	919	+ oeilCB.addItemListener(this);
	920	+
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
	941	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	942	+ lookAtCB.setToolTipText("Look-at target");
	943	+ lookAtCB.addItemListener(this);
	944	+ }
	945	+
	946	+ }
	947	+
	948	+ cGridBag fill = new cGridBag();
	949	+ fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
	954	+
	955	+ panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
	958	+
	959	+ }
619	960
620	961	void EditObject(Object3D obj)
621	962	{
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();
	963	+ cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
	972	+ radioButton.SetObject(obj);
	973	+ radioButton.layout = sevenButton;
	974	+ radioButton.SetCamera(cameraView.renderCamera, false);
	975	+ radioButton.addActionListener(this);
	976	+ radioPanel.add(radioButton);
	977	+ buttonGroup.add(radioButton);
	978	+ radioButton.doClick();
630	979	}
	980	+
631	981	void SetupViews(ObjEditor oe)
632	982	{
	983	+ theFrame = this;
	984	+
633	985	oe.SetupViews();
634	986
635	987	System.out.println("SetupViews");
..	..	@@ -638,22 +990,27 @@
638	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	991	}
640	992
641		- JCheckBox liveCB;
642		- JCheckBox supportCB;
643		- JCheckBox localCB;
644		- JCheckBox crowdCB;
645		- JCheckBox smoothCB;
646		- JCheckBox fastCB;
647		- JCheckBox slowCB;
648		- JCheckBox boxCB;
649		- JCheckBox trackCB;
650		- JCheckBox smoothfocusCB;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
651	1005	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
657	1014
658	1015	// static int COLOR = 1;
659	1016	// static int MATERIAL = 2;
..	..	@@ -661,9 +1018,9 @@
661	1018
662	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1020
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
667	1024
668	1025	public void itemStateChanged(ItemEvent e)
669	1026	{
..	..	@@ -688,10 +1045,10 @@
688	1045	dropAttributes \|= Object3D.TEXTURE;
689	1046	else
690	1047	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1048	+ } else if(e.getSource() == liveCB)
693	1049	{
694	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
695	1052	}
696	1053	else if(e.getSource() == supportCB)
697	1054	{
..	..	@@ -727,6 +1084,10 @@
727	1084	cameraView.repaint();
728	1085	// refreshContents();
729	1086	}
	1087	+ else if(e.getSource() == zoomBoxCB)
	1088	+ {
	1089	+ cameraView.ToggleZoomBoxMode();
	1090	+ }
730	1091	else if(e.getSource() == smoothfocusCB)
731	1092	{
732	1093	cameraView.ToggleSmoothFocus();
..	..	@@ -752,6 +1113,14 @@
752	1113	{
753	1114	cameraView.ToggleOeil();
754	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
755	1124	else if(e.getSource() == lookAtCB)
756	1125	{
757	1126	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1137,8 @@
768	1137
769	1138	/**/
770	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1143	// We can't move the root node or an empty selection
774	1144	return;
..	..	@@ -840,7 +1210,9 @@
840	1210	// objEditor.DropFile((java.io.File[]) object, true);
841	1211	// return;
842	1212	// }
843		- if (string.charAt(0) == '/')
	1213	+
	1214	+ // File path for Mac and Windows
	1215	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1216	{
845	1217	// file(s)
846	1218	String[] names = string.split("\n");
..	..	@@ -867,7 +1239,7 @@
867	1239
868	1240	flashIt = false;
869	1241	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1242	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1243	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1244
873	1245	if (group.selection.size() == 1)
..	..	@@ -883,23 +1255,33 @@
883	1255
884	1256	assert target == objEditor.jTree;
885	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
886	1259	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1261	} catch (Exception e) {
889	1262	System.out.println("destinationPath : " + destinationPath);
890	1263	return;
891	1264	}
892	1265
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
894	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
895	1277	loadClipboard(true);
896	1278	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1279	+ pasteInto(false, false);
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
903	1285	}
904	1286	public void dropActionChanged(DropTargetDragEvent dtde)
905	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1002,90 +1384,106 @@
1002	1384
1003	1385	void buildCreateMenu(Menu menu)
1004	1386	{
1005		- gridItem = menu.add(new MenuItem("Grid"));
1006		- gridItem.addActionListener(this);
1007		- rectoidItem = menu.add(new MenuItem("Box"));
1008		- rectoidItem.addActionListener(this);
1009		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1010		- ellipsoidItem.addActionListener(this);
1011		- coneItem = menu.add(new MenuItem("Cone"));
1012		- coneItem.addActionListener(this);
1013		- torusItem = menu.add(new MenuItem("Torus"));
1014		- torusItem.addActionListener(this);
1015		- superItem = menu.add(new MenuItem("Superellipsoid"));
1016		- superItem.addActionListener(this);
1017		- particleItem = menu.add(new MenuItem("Particle system"));
1018		- particleItem.addActionListener(this);
	1387	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1388	+ //heightFieldItem.addActionListener(this);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
	1407	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1408	+ kleinItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
	1413	+ if (Globals.ADVANCED)
	1414	+ {
1019	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1416	ragdollItem.addActionListener(this);
1021	1417	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1418	ragdoll2Item.addActionListener(this);
	1419	+ }
1023	1420	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1421	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1422	meshItem.addActionListener(this);
1026	1423	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1424	// meshGroupItem.addActionListener(this);
	1425	+ if (Globals.ADVANCED)
	1426	+ {
1028	1427	springItem = menu.add(new MenuItem("Spring"));
1029	1428	springItem.addActionListener(this);
1030	1429	flagItem = menu.add(new MenuItem("Flag"));
1031	1430	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	1431	blobItem = menu.add(new MenuItem("Blob"));
1037	1432	blobItem.addActionListener(this);
1038	1433	latheItem = menu.add(new MenuItem("Lathe"));
1039	1434	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- lightItem.addActionListener(this);
	1435	+ }
	1436	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1437	+ bezierItem.addActionListener(this);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1042	1442	menu.add("-");
1043	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	1444	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1047	1447	doubleItem = menu.add(new MenuItem("Fork"));
1048	1448	doubleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1049	1451	tripleItem = menu.add(new MenuItem("Trident"));
1050	1452	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);
	1453	+ }
1060	1454	}
1061	1455
1062	1456	void buildToolsMenu(Menu menu)
1063	1457	{
1064	1458	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1459	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1460	+ animationItem.setState(Globals.ANIMATION);
1067	1461
1068	1462	menu.add("-");
1069	1463	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1464	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1465	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1466	+ textureFieldItem.addActionListener(this);
	1467	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1468	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1469	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1470	reduceMorphItem.addActionListener(this);
1077	1471	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1472	reduce34MorphItem.addActionListener(this);
1079		-
	1473	+ menu.add("-");
1080	1474	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1475	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1476
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1480	+ mirrorItem.addActionListener(this);
	1481	+ menu.add("-");
1084	1482	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1483	memoryItem.addActionListener(this);
1086	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1485	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1487	dumpItem.addActionListener(this);
1090	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1489	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1492,8 @@
1094	1492	resetParentItem.addActionListener(this);
1095	1493	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1494	repairParentItem.addActionListener(this);
	1495	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1496	+ repairShadowItem.addActionListener(this);
1097	1497	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1498	invariantsItem.addActionListener(this);
1099	1499	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1501,7 @@
1101	1501	menu.add("-");
1102	1502	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1503	editScriptItem.addActionListener(this);
	1504	+ }
1104	1505	}
1105	1506
1106	1507	void ScreenFit()
..	..	@@ -1223,6 +1624,7 @@
1223	1624	shadow.material = new cMaterial(obj.material);
1224	1625	shadow.material.diffuse = 0.0001f;
1225	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1226	1628
1227	1629	makeSomething(shadow);
1228	1630	}
..	..	@@ -1429,9 +1831,9 @@
1429	1831
1430	1832	void Overwrite(int mask)
1431	1833	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1834	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1835	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1836	+ Object3D content = Grafreed.clipboard.get(0);
1435	1837
1436	1838	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1839	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1856,7 @@
1454	1856	//
1455	1857	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1858	{
	1859	+ Object source = event.getSource();
1457	1860	/*
1458	1861	if (event.getSource() == nameField)
1459	1862	{
..	..	@@ -1465,11 +1868,11 @@
1465	1868	}
1466	1869	else
1467	1870	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1871	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1872	{
1470	1873	ScreenFit();
1471	1874	} else
1472		- if (event.getSource() == switchItem)
	1875	+ if (source == switchViewItem)
1473	1876	{
1474	1877	cVector v1 = new cVector();
1475	1878	cVector v2 = new cVector();
..	..	@@ -1478,11 +1881,11 @@
1478	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1882	objEditor.cameraView.repaint();
1480	1883	} else
1481		- if (event.getSource() == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1482	1885	{
1483	1886	makeSomething(new Box());
1484	1887	} else
1485		- if (event.getSource() == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1486	1889	{
1487	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1906,9 @@
1503	1906	applyExample(particleGeom, "SMOKE");
1504	1907	makeSomething(particleGeom);
1505	1908	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1909	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1910	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1911	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1912
1510	1913	ragdoll.toParent = LA.newMatrix();
1511	1914	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1924,71 @@
1521	1924	makeSomething(ragdoll);
1522	1925	//makeSomething(new VehicleDemo());
1523	1926	} else
1524		- if (event.getSource() == gridItem)
	1927	+ /*
	1928	+ */
	1929	+ if (source == heightFieldItem)
	1930	+ {
	1931	+ Object3D obj = new Object3D();
	1932	+
	1933	+ obj.CreateMaterial();
	1934	+ obj.bRep = new BoundaryRep();
	1935	+
	1936	+ obj.bRep.CreateMesh(new iHeightField()
	1937	+ {
	1938	+ public double f(double x, double y)
	1939	+ {
	1940	+ // The Mandelbrot set is represented by coloring
	1941	+ // each point (x,y) according to the number of
	1942	+ // iterations it takes before the while loop in
	1943	+ // this method ends. For points that are actually
	1944	+ // in the Mandelbrot set, or very close to it, the
	1945	+ // count will reach the maximum value, 80. These
	1946	+ // points will be colored purple. All other colors
	1947	+ // represent points that are definitely NOT in the set.
	1948	+ x -= 600;
	1949	+ y -= 500;
	1950	+ x /= 200;
	1951	+ y /= 200;
	1952	+ int count = 0;
	1953	+ double zx = x;
	1954	+ double zy = y;
	1955	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1956	+ double new_zx = zxzx - zyzy + x;
	1957	+ zy = 2zxzy + y;
	1958	+ zx = new_zx;
	1959	+ count++;
	1960	+ }
	1961	+ return count; // Math.sqrt(count);
	1962	+ }
	1963	+ }, 1000,1000);
	1964	+
	1965	+ makeSomething(obj);
	1966	+ } else
	1967	+ if (source == gridItem \|\| source == gridButton)
1525	1968	{
1526	1969	makeSomething(new Grid());
1527	1970	} else
1528		- if (event.getSource() == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	1972	{
1530	1973	makeSomething(new Sphere());
1531	1974	} else
1532		- if (event.getSource() == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1533	1976	{
1534	1977	makeSomething(new Cone());
1535	1978	} else
1536		- if (event.getSource() == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1537	1980	{
1538	1981	makeSomething(new Torus());
1539	1982	} else
1540		- if (event.getSource() == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1541	1984	{
1542	1985	makeSomething(new Superellipsoid());
1543	1986	} else
1544		- if (event.getSource() == blobItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
	1988	+ {
	1989	+ makeSomething(new Klein());
	1990	+ } else
	1991	+ if (source == blobItem)
1545	1992	{
1546	1993	Blob blob = new Blob();
1547	1994	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1996,15 @@
1549	1996	//blob.retile();
1550	1997	makeSomething(blob);
1551	1998	} else
1552		- if (event.getSource() == latheItem)
	1999	+ if (source == latheItem)
1553	2000	{
1554	2001	makeSomething(new Lathe());
1555	2002	} else
1556		- if (event.getSource() == bezierItem)
	2003	+ if (source == bezierItem)
1557	2004	{
1558	2005	makeSomething(new BezierSurface());
1559	2006	} else
1560		- if (event.getSource() == checkerItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1561	2008	{
1562	2009	/*
1563	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2017,9 @@
1570	2017	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2018	LA.matInvert(obj.toParent, obj.fromParent);
1572	2019	*/
1573		- makeSomething(new CheckerIG());
	2020	+ makeSomething(new Checker());
1574	2021	} else
1575		- if (event.getSource() == meshItem)
	2022	+ if (source == meshItem)
1576	2023	{
1577	2024	Object3D itemtomake = new Object3D();
1578	2025	Object3D child;
..	..	@@ -1593,35 +2040,35 @@
1593	2040	makeSomething(child);
1594	2041	}
1595	2042	} else
1596		- if (event.getSource() == springItem)
	2043	+ if (source == springItem)
1597	2044	{
1598	2045	cSpring s = new cSpring();
1599	2046	s.setup();
1600	2047	makeSomething(s);
1601	2048	} else
1602		- if (event.getSource() == flagItem)
	2049	+ if (source == flagItem)
1603	2050	{
1604	2051	cSpring s = new cFlag();
1605	2052	s.setup();
1606	2053	makeSomething(s);
1607	2054	} else
1608		- if (event.getSource() == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1609	2056	{
1610	2057	makeSomething(new Light());
1611	2058	} else
1612		- if (event.getSource() == csgItem)
	2059	+ if (source == csgItem)
1613	2060	{
1614	2061	group(new CSG());
1615	2062	} else
1616		- if (event.getSource() == templateItem)
	2063	+ if (source == templateItem)
1617	2064	{
1618	2065	group(new cTemplate());
1619	2066	} else
1620		- if (event.getSource() == attributeItem)
	2067	+ if (source == attributeItem)
1621	2068	{
1622	2069	makeSomething(new Attribute());
1623	2070	} else
1624		- if (event.getSource() == pointflowItem)
	2071	+ if (source == pointflowItem)
1625	2072	{
1626	2073	makeSomething(new PointFlow());
1627	2074	} else
..	..	@@ -1633,7 +2080,7 @@
1633	2080	} else
1634	2081	*/
1635	2082
1636		- if (event.getSource() == superLoopItem)
	2083	+ if (source == superLoopItem)
1637	2084	{
1638	2085	Composite g = new cGroup();
1639	2086	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +2102,7 @@
1655	2102
1656	2103	group(g);
1657	2104	} else
1658		- if (event.getSource() == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1659	2106	{
1660	2107	Composite csg = new GroupLeaf();
1661	2108	csg.count = 5;
..	..	@@ -1664,7 +2111,7 @@
1664	2111	csg.addChild(child);
1665	2112	child.addChild(csg);
1666	2113	} else
1667		- if (event.getSource() == doubleItem)
	2114	+ if (source == doubleItem)
1668	2115	{
1669	2116	Composite csg = new GroupLeaf();
1670	2117	csg.count = 5;
..	..	@@ -1676,7 +2123,7 @@
1676	2123	csg.addChild(child);
1677	2124	child.addChild(csg);
1678	2125	} else
1679		- if (event.getSource() == tripleItem)
	2126	+ if (source == tripleItem)
1680	2127	{
1681	2128	Composite csg = new GroupLeaf();
1682	2129	csg.count = 4;
..	..	@@ -1691,71 +2138,83 @@
1691	2138	csg.addChild(child);
1692	2139	child.addChild(csg);
1693	2140	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2141	+ if (source == computeAOItem)
1696	2142	{
1697		- ImportGFD();
	2143	+ Globals.drawMode = CameraPane.OCCLUSION;
	2144	+ Globals.theRenderer.repaint();
1698	2145	} 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)
	2146	+ if (source == recompileItem)
1717	2147	{
1718	2148	Recompile();
1719	2149	refreshContents();
1720	2150	} else
1721		- if (event.getSource() == editScriptItem)
	2151	+ if (source == editScriptItem)
1722	2152	{
1723	2153	OpenDialog();
1724	2154	refreshContents();
1725	2155	} else
1726		- if (event.getSource() == invariantsItem)
	2156	+ if (source == invariantsItem)
1727	2157	{
1728	2158	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2159	+ Grafreed.grafreeD.universe.invariants();
1730	2160	} else
1731		- if (event.getSource() == memoryItem)
	2161	+ if (source == memoryItem)
1732	2162	{
1733	2163	//System.out.println("Invariants:");
1734	2164	PrintMemory();
1735	2165	} else
1736		- if (event.getSource() == pathItem)
	2166	+ if (source == pathItem)
1737	2167	{
1738	2168	PrintPath();
1739	2169	} else
1740		- if (event.getSource() == analyzeItem)
	2170	+ if (source == analyzeItem)
1741	2171	{
1742	2172	AnalyzeObject();
1743	2173	} else
1744		- if (event.getSource() == dumpItem)
	2174	+ if (source == dumpItem)
1745	2175	{
1746	2176	DumpObject();
1747	2177	} else
1748		- if (event.getSource() == screenfitButton)
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
	2201	+ } else
	2202	+ if (source == oneStepButton)
	2203	+ {
	2204	+ Globals.ONESTEP = true;
	2205	+ cameraView.repaint();
	2206	+ } else
	2207	+ if (source == screenfitButton)
1749	2208	{
1750	2209	//Reload(lastConverter, lastFilename, true);
1751	2210	ScreenFit();
1752	2211	} else
1753		- if (event.getSource() == screenfitpointButton)
	2212	+ if (source == screenfitpointButton)
1754	2213	{
1755	2214	//Reload(lastConverter, lastFilename, true);
1756	2215	ScreenFitPoint();
1757	2216	} else
1758		- if (event.getSource() == snapobjectButton)
	2217	+ if (source == snapobjectButton)
1759	2218	{
1760	2219	//Reload(lastConverter, lastFilename, true);
1761	2220	SnapObject();
..	..	@@ -1766,13 +2225,13 @@
1766	2225	// Recompile();
1767	2226	// refreshContents();
1768	2227	// } else
1769		- if (event.getSource() == gcButton)
	2228	+ if (source == gcButton)
1770	2229	{
1771	2230	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2231	System.gc();
1773	2232	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2233	} else
1775		- if (event.getSource() == editLeafItem)
	2234	+ if (source == editLeafItem)
1776	2235	{
1777	2236	Object3D obj;
1778	2237	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2245,78 @@
1786	2245	}
1787	2246	refreshContents(true);
1788	2247	} else
1789		- if (event.getSource() == openWindowItem)
	2248	+ if (source == openWindowItem)
1790	2249	{
1791	2250	EditSelection(true);
1792	2251	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2252	+ if (source == cutItem \|\| source == clearButton)
1794	2253	{
1795	2254	loadClipboard(true);
1796	2255	} else
1797		- if (event.getSource() == duplicateItem)
	2256	+ if (source == undoItem)
1798	2257	{
1799		- Object3D keep = GraphreeD.clipboard;
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
	2263	+ } else
	2264	+ if (source == duplicateItem)
	2265	+ {
	2266	+ Object3D keep = Grafreed.clipboard;
1800	2267	loadClipboard(false);
1801	2268	paste(false);
1802		- GraphreeD.clipboard = keep;
	2269	+ Grafreed.clipboard = keep;
1803	2270	} else
1804		- if (event.getSource() == cloneItem)
	2271	+ if (source == cloneItem)
1805	2272	{
1806	2273	CloneSelection(false);
1807	2274	} else
1808		- if (event.getSource() == cloneSupportItem)
	2275	+ if (source == cloneSupportItem)
1809	2276	{
1810	2277	CloneSelection(true);
1811	2278	} else
1812		- if (event.getSource() == copyItem)
	2279	+ if (source == copyItem)
1813	2280	{
1814	2281	loadClipboard(false);
1815	2282	} else
1816		- if (event.getSource() == pasteItem)
	2283	+ if (source == pasteItem)
1817	2284	{
1818	2285	paste(false);
1819	2286	} else
1820		- if (event.getSource() == pasteLinkItem)
	2287	+ if (source == pasteIntoItem)
1821	2288	{
1822		- pasteInto(false);
	2289	+ pasteInto(true, false);
1823	2290	} else
1824		- if (event.getSource() == pasteCloneItem)
	2291	+ if (source == pasteLinkItem)
1825	2292	{
1826		- pasteInto(true);
	2293	+ pasteInto(false, false);
1827	2294	} else
1828		- if (event.getSource() == pasteExpandItem)
	2295	+ if (source == pasteCloneItem)
	2296	+ {
	2297	+ pasteInto(true, true);
	2298	+ } else
	2299	+ if (source == pasteExpandItem)
1829	2300	{
1830	2301	paste(true);
1831	2302	} else
1832		- if (event.getSource() == synchronizeItem)
	2303	+ if (source == synchronizeItem)
1833	2304	{
1834	2305	Overwrite(Object3D.TRANSFORM);
1835	2306	} else
1836		- if (event.getSource() == overwriteNameItem)
	2307	+ if (source == overwriteNameItem)
1837	2308	{
1838	2309	Overwrite(Object3D.NAME);
1839	2310	} else
1840		- if (event.getSource() == overwriteUVItem)
	2311	+ if (source == overwriteUVItem)
1841	2312	{
1842	2313	Overwrite(Object3D.UV);
1843	2314	} else
1844		- if (event.getSource() == overwriteMatItem)
	2315	+ if (source == overwriteMatItem)
1845	2316	{
	2317	+ /* july 2015
1846	2318	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2319	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2320	else
1849	2321	{
1850	2322	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2328,16 @@
1856	2328	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2329	}
1858	2330	}
	2331	+ */
	2332	+
	2333	+ Overwrite(dropAttributes);
1859	2334	}
1860		- if (event.getSource() == overwriteGeoItem)
	2335	+ if (source == overwriteGeoItem)
1861	2336	{
1862	2337	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2338	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2339	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2340	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2341	//
1867	2342	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2343	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2349,7 @@
1874	2349	// refreshContents();
1875	2350	// }
1876	2351	} else
1877		- if (event.getSource() == generateMeshItem)
	2352	+ if (source == generateMeshItem)
1878	2353	{
1879	2354	//if (group.selection.size() == 1)
1880	2355	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2360,7 @@
1885	2360	ResetModel();
1886	2361	refreshContents();
1887	2362	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2363	+ if (source == extractGeometriesItem)
1889	2364	{
1890	2365	boolean one = false;
1891	2366
..	..	@@ -1912,7 +2387,7 @@
1912	2387	ResetModel();
1913	2388	refreshContents();
1914	2389	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2390	+ if (source == cloneGeometriesItem)
1916	2391	{
1917	2392	boolean one = false;
1918	2393
..	..	@@ -1938,32 +2413,37 @@
1938	2413	ResetModel();
1939	2414	refreshContents();
1940	2415	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2416	+ if (source == shareGeometriesItem)
1942	2417	{
1943	2418	boolean one = false;
1944	2419
1945	2420	if (group.selection.size() == 1)
1946	2421	one = true;
1947	2422
	2423	+ Object3D merge = null;
	2424	+
1948	2425	Object3D content = new cGroup();
1949	2426
1950	2427	for (int i=0; i<group.selection.size(); i++)
1951	2428	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2429	+ merge = new Merge(group.selection.get(i));
1953	2430
1954	2431	if (one)
1955		- makeSomething(sel, false);
	2432	+ makeSomething(merge, false);
1956	2433	else
1957		- content.addChild(sel);
	2434	+ content.addChild(merge);
1958	2435	}
1959	2436
1960	2437	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2438	+ makeSomething(content, true);
	2439	+ else
	2440	+ {
	2441	+ ResetModel();
	2442	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2443	+ refreshContents();
	2444	+ }
1965	2445	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2446	+ if (source == mergeGeometriesItem)
1967	2447	{
1968	2448	boolean one = false;
1969	2449
..	..	@@ -1993,11 +2473,11 @@
1993	2473	ResetModel();
1994	2474	refreshContents();
1995	2475	} else
1996		- if (event.getSource() == linkverticesItem)
	2476	+ if (source == linkverticesItem)
1997	2477	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2478	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2479	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2480	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2481	//
2002	2482	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2483	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2486,48 @@
2006	2486	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2487	// refreshContents();
2008	2488	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2489	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2490	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2491	+ Object3D content = Grafreed.clipboard.get(0);
2012	2492
2013	2493	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2494	content = ((cGroup)content).get(0);
2015	2495
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2496	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2497	for (int i=0; i<group.selection.size(); i++)
2018	2498	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2501	group.selection.get(i).linkVerticesThis(content);
2022	2502	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2503	+ CameraPane.SWITCH = random;
2024	2504	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2505	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2506	refreshContents();
2027	2507	}
2028	2508	} else
2029		- if (event.getSource() == resetsupportItem)
	2509	+ if (source == resetsupportItem)
2030	2510	{
2031	2511	for (int i=0; i<group.selection.size(); i++)
2032	2512	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2513	+ boolean random = CameraPane.SWITCH;
	2514	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2515	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2516	+ CameraPane.SWITCH = random;
2037	2517	}
2038	2518
2039	2519	refreshContents();
2040	2520	} else
2041		- if (event.getSource() == resetreferencesItem)
	2521	+ if (source == relinkverticesItem)
	2522	+ {
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
	2525	+ group.selection.RelinkToSupport();
	2526	+ CameraPane.SWITCH = random;
	2527	+
	2528	+ refreshContents();
	2529	+ } else
	2530	+ if (source == resetreferencesItem)
2042	2531	{
2043	2532	for (int i=0; i<group.selection.size(); i++)
2044	2533	{
..	..	@@ -2047,11 +2536,11 @@
2047	2536
2048	2537	refreshContents();
2049	2538	} else
2050		- if (event.getSource() == setMasterItem)
	2539	+ if (source == setMasterItem)
2051	2540	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2541	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2542	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2543	+ Object3D content = Grafreed.clipboard.get(0);
2055	2544
2056	2545	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2546	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2549,13 @@
2060	2549	refreshContents();
2061	2550	}
2062	2551	} else
2063		- if (event.getSource() == poseMeshItem)
	2552	+ if (source == poseMeshItem)
2064	2553	{
2065	2554	if (group.selection.size() == 1)
2066	2555	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2556	+ if (Grafreed.clipboard.size() == 1)
2068	2557	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2070	2559
2071	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2561	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2568,19 @@
2079	2568	}
2080	2569
2081	2570	} else
2082		- if (event.getSource() == revertMeshItem)
	2571	+ if (source == revertMeshItem)
2083	2572	{
2084	2573	RevertMeshes();
2085	2574	} else
2086		- if (event.getSource() == resetMeshItem)
	2575	+ if (source == resetAllItem)
2087	2576	{
2088	2577	ResetAll();
2089	2578	} else
2090		- if (event.getSource() == stepAllItem)
	2579	+ if (source == stepAllItem)
2091	2580	{
2092	2581	StepAll();
2093	2582	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2583	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2584	{
2096	2585	//int indices[] = jList.getSelectedIndices();
2097	2586	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2588,46 @@
2099	2588
2100	2589	ClearSelection(false);
2101	2590	} else
2102		- if (event.getSource() == clearAllItem)
	2591	+ if (source == clearAllItem)
2103	2592	{
2104	2593	ClearSelection(true);
2105	2594	} else
2106		- if (event.getSource() == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2107	2596	{
2108		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2109	2598	} else
2110		- if (event.getSource() == frontItem)
	2599	+ if (source == hideItem)
	2600	+ {
	2601	+ group(new HiddenObject());
	2602	+ } else
	2603	+ if (source == frontItem)
2111	2604	{
2112	2605	front();
2113	2606	} else
2114		- if (event.getSource() == backItem)
	2607	+ if (source == backItem)
2115	2608	{
2116	2609	back();
2117	2610	} else
2118		- if (event.getSource() == cameraItem)
	2611	+ if (source == cameraItem)
2119	2612	{
2120	2613	makeSomething(new Camera());
2121	2614	} else
2122		- if (event.getSource() == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2123	2616	{
2124	2617	group(new Composite());
2125	2618	} else
2126		- if (event.getSource() == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2127	2620	{
2128	2621	RandomNode random = new RandomNode();
2129	2622	group(random);
2130	2623	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2624	+ random.name = random.get(0).name + "Switch";
2132	2625	} else
2133		- if (event.getSource() == physicsItem)
	2626	+ if (source == physicsItem)
2134	2627	{
2135	2628	group(new PhysicsNode());
2136	2629	} else
2137		- if (event.getSource() == frameselectorItem)
	2630	+ if (source == frameselectorItem)
2138	2631	{
2139	2632	for (int i=0; i<group.selection.size(); i++)
2140	2633	{
..	..	@@ -2146,7 +2639,7 @@
2146	2639	ResetModel();
2147	2640	refreshContents();
2148	2641	} else
2149		- if (event.getSource() == switchGeoItem)
	2642	+ if (source == switchGeoItem)
2150	2643	{
2151	2644	for (int i=0; i<group.selection.size(); i++)
2152	2645	{
..	..	@@ -2158,7 +2651,7 @@
2158	2651	ResetModel();
2159	2652	refreshContents();
2160	2653	} else
2161		- if (event.getSource() == switchTransfoItem)
	2654	+ if (source == switchTransfoItem)
2162	2655	{
2163	2656	for (int i=0; i<group.selection.size(); i++)
2164	2657	{
..	..	@@ -2170,7 +2663,7 @@
2170	2663	ResetModel();
2171	2664	refreshContents();
2172	2665	} else
2173		- if (event.getSource() == morphItem)
	2666	+ if (source == morphItem)
2174	2667	{
2175	2668	for (int i=0; i<group.selection.size(); i++)
2176	2669	{
..	..	@@ -2182,7 +2675,7 @@
2182	2675	ResetModel();
2183	2676	refreshContents();
2184	2677	} else
2185		- if (event.getSource() == scriptNodeItem)
	2678	+ if (source == scriptNodeItem)
2186	2679	{
2187	2680	boolean atleastone = false;
2188	2681
..	..	@@ -2221,191 +2714,239 @@
2221	2714	}
2222	2715	}
2223	2716	} else
2224		- if (event.getSource() == linkerItem)
	2717	+ if (source == linkerItem)
2225	2718	{
2226	2719	group(new cLinker());
2227	2720	} else
2228		- if (event.getSource() == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2229	2722	{
2230	2723	group(new TextureNode());
2231	2724	} else
2232		- if (event.getSource() == shadowXItem)
	2725	+ if (source == billboardItem)
	2726	+ {
	2727	+ group(new BillboardNode());
	2728	+ } else
	2729	+ if (source == shadowXItem)
2233	2730	{
2234	2731	CastShadow(0);
2235	2732	} else
2236		- if (event.getSource() == shadowYItem)
	2733	+ if (source == shadowYItem)
2237	2734	{
2238	2735	CastShadow(1);
2239	2736	} else
2240		- if (event.getSource() == shadowZItem)
	2737	+ if (source == shadowZItem)
2241	2738	{
2242	2739	CastShadow(2);
2243	2740	} else
2244		- if (event.getSource() == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	2742	{
2246		- ungroup();
	2743	+ //ungroup();
	2744	+ for (int i=0; i<group.selection.size(); i++)
	2745	+ {
	2746	+ Ungroup(group.selection.get(i));
	2747	+ }
	2748	+
	2749	+ ClearSelection(false);
	2750	+
	2751	+ refreshContents();
2247	2752	} else
2248		- if (event.getSource() == genUVItem)
	2753	+ if (source == genUVItem)
2249	2754	{
2250	2755	GenUV();
2251	2756	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2757	+ if (source == genNormalsCADItem)
2253	2758	{
2254	2759	GenNormals(true);
2255	2760	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2761	+ if (source == genNormalsMESHItem)
	2762	+ {
	2763	+ GenNormalsMESH();
	2764	+ } else
	2765	+ if (source == genNormalsORGANItem)
2257	2766	{
2258	2767	GenNormals(false);
2259	2768	} else
2260		- if (event.getSource() == stripifyItem)
	2769	+ if (source == genNormalsMINEItem)
	2770	+ {
	2771	+ GenNormalsMINE();
	2772	+ } else
	2773	+ if (source == stripifyItem)
2261	2774	{
2262	2775	Stripify();
2263	2776	} else
2264		- if (event.getSource() == unstripifyItem)
	2777	+ if (source == unstripifyItem)
2265	2778	{
2266	2779	Unstripify();
2267	2780	} else
2268		- if (event.getSource() == trimItem)
	2781	+ if (source == trimItem)
2269	2782	{
2270	2783	Trim();
2271	2784	} else
2272		- if (event.getSource() == untrimItem)
	2785	+ if (source == untrimItem)
2273	2786	{
2274	2787	Untrim();
2275	2788	} else
2276		- if (event.getSource() == clearColorsItem)
	2789	+ if (source == clearColorsItem)
2277	2790	{
2278	2791	ClearColors();
2279	2792	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2793	+ if (source == clearMaterialsItem)
2281	2794	{
2282	2795	ClearMaterials();
2283	2796	} else
2284		- if (event.getSource() == liveleavesItem)
	2797	+ if (source == liveleavesItem)
2285	2798	{
2286	2799	LiveLeaves(true);
2287	2800	} else
2288		- if (event.getSource() == unliveleavesItem)
	2801	+ if (source == unliveleavesItem)
2289	2802	{
2290	2803	LiveLeaves(false);
2291	2804	} else
2292		- if (event.getSource() == supportleavesItem)
	2805	+ if (source == supportleavesItem)
2293	2806	{
2294	2807	SupportLeaves(true);
2295	2808	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2809	+ if (source == unsupportleavesItem)
2297	2810	{
2298	2811	SupportLeaves(false);
2299	2812	} else
2300		- if (event.getSource() == hideleavesItem)
	2813	+ if (source == hideleavesItem)
2301	2814	{
2302	2815	HideLeaves(true);
2303	2816	} else
2304		- if (event.getSource() == showleavesItem)
	2817	+ if (source == showleavesItem)
2305	2818	{
2306	2819	HideLeaves(false);
2307	2820	} else
2308		- if (event.getSource() == markleavesItem)
	2821	+ if (source == markleavesItem)
2309	2822	{
2310	2823	MarkLeaves(true);
2311	2824	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2825	+ if (source == unmarkleavesItem)
2313	2826	{
2314	2827	MarkLeaves(false);
2315	2828	} else
2316		- if (event.getSource() == flipVItem)
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
	2844	+ } else
	2845	+ if (source == flipVItem)
2317	2846	{
2318	2847	FlipV(true);
2319	2848	} else
2320		- if (event.getSource() == unflipVItem)
	2849	+ if (source == unflipVItem)
2321	2850	{
2322	2851	FlipV(false);
2323	2852	} else
2324		- if (event.getSource() == lowTexturesItem)
	2853	+ if (source == lowTexturesItem)
2325	2854	{
2326	2855	SetTexRes(0);
2327	2856	} else
2328		- if (event.getSource() == normalTexturesItem)
	2857	+ if (source == normalTexturesItem)
2329	2858	{
2330	2859	SetTexRes(1);
2331	2860	} else
2332		- if (event.getSource() == highTexturesItem)
	2861	+ if (source == highTexturesItem)
2333	2862	{
2334	2863	SetTexRes(2);
2335	2864	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2865	+ if (source == veryhighTexturesItem)
2337	2866	{
2338	2867	SetTexRes(3);
2339	2868	} else
2340		- if (event.getSource() == maxTexturesItem)
	2869	+ if (source == maxTexturesItem)
2341	2870	{
2342	2871	SetTexRes(4);
2343	2872	} else
2344		- if (event.getSource() == panoTexturesItem)
	2873	+ if (source == panoTexturesItem)
2345	2874	{
2346	2875	SetTexRes(5);
2347	2876	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2877	+ if (source == reverseNormalsItem)
2349	2878	{
2350	2879	ReverseNormals();
2351	2880	} else
2352		- if (event.getSource() == parseverticesItem)
	2881	+ if (source == parseverticesItem)
2353	2882	{
2354	2883	ParseVertices();
2355	2884	} else
2356		- if (event.getSource() == alignItem)
	2885	+ if (source == textureFieldItem)
	2886	+ {
	2887	+ TextureVertices();
	2888	+ } else
	2889	+ if (source == alignItem)
2357	2890	{
2358	2891	Align();
2359	2892	} else
2360		- if (event.getSource() == mirrorItem)
	2893	+ if (source == mirrorItem)
2361	2894	{
2362	2895	MirrorPoses();
2363	2896	} else
2364		- if (event.getSource() == reduceMorphItem)
	2897	+ if (source == reduceMorphItem)
2365	2898	{
2366	2899	MeshReduction(false);
2367	2900	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2901	+ if (source == reduce34MorphItem)
2369	2902	{
2370	2903	MeshReduction(true);
2371	2904	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2905	+ if (source == reverseTrianglesItem)
2373	2906	{
2374	2907	ReverseTriangles();
2375	2908	} else
2376		- if (event.getSource() == reduceMeshItem)
	2909	+ if (source == reduceMeshItem)
2377	2910	{
2378	2911	ReduceMesh(false);
2379	2912	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2913	+ if (source == reduce34MeshItem)
2381	2914	{
2382	2915	ReduceMesh(true);
2383	2916	} else
2384		- if (event.getSource() == increaseMeshItem)
	2917	+ if (source == increaseMeshItem)
2385	2918	{
2386	2919	IncreaseMesh();
2387	2920	} else
2388		- if (event.getSource() == clipMeshItem)
	2921	+ if (source == clipMeshItem)
2389	2922	{
2390	2923	ClipMesh();
2391	2924	} else
2392		- if (event.getSource() == smoothMeshItem)
	2925	+ if (source == smoothMeshItem)
2393	2926	{
2394	2927	SmoothMesh();
2395	2928	} else
2396		- if (event.getSource() == transformgeometryItem)
	2929	+ if (source == transformGeometryItem)
2397	2930	{
2398	2931	TransformGeometry();
2399	2932	} else
2400		- if (event.getSource() == resetTransformItem)
	2933	+ if (source == transformChildrenItem)
	2934	+ {
	2935	+ TransformChildren();
	2936	+ } else
	2937	+ if (source == resetTransformItem)
2401	2938	{
2402	2939	ResetTransform();
2403	2940	} else
2404		- if (event.getSource() == resetCentroidItem)
	2941	+ if (source == resetCentroidItem)
2405	2942	{
2406		- ResetCentroid();
	2943	+ ResetCentroid(true);
2407	2944	} else
2408		- if (event.getSource() == resetParentItem)
	2945	+ if (source == resetCentroidXZItem)
	2946	+ {
	2947	+ ResetCentroid(false);
	2948	+ } else
	2949	+ if (source == resetParentItem)
2409	2950	{
2410	2951	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2952	{
..	..	@@ -2415,7 +2956,7 @@
2415	2956
2416	2957	refreshContents();
2417	2958	} else
2418		- if (event.getSource() == repairParentItem)
	2959	+ if (source == repairParentItem)
2419	2960	{
2420	2961	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2962	{
..	..	@@ -2429,7 +2970,21 @@
2429	2970
2430	2971	refreshContents();
2431	2972	} else
2432		- if (event.getSource() == sortbysizeItem)
	2973	+ if (source == repairShadowItem)
	2974	+ {
	2975	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2976	+ {
	2977	+ Object3D obj = (Object3D)e.nextElement();
	2978	+ obj.RepairShadow();
	2979	+// for (int i=0; i<obj.size(); i++)
	2980	+// {
	2981	+// obj.get(i).parent = obj;
	2982	+// }
	2983	+ }
	2984	+
	2985	+ refreshContents();
	2986	+ } else
	2987	+ if (source == sortbysizeItem)
2433	2988	{
2434	2989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2990	{
..	..	@@ -2441,7 +2996,7 @@
2441	2996	ResetModel();
2442	2997	refreshContents();
2443	2998	} else
2444		- if (event.getSource() == sortbynameItem)
	2999	+ if (source == sortbynameItem)
2445	3000	{
2446	3001	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3002	{
..	..	@@ -2453,7 +3008,7 @@
2453	3008	ResetModel();
2454	3009	refreshContents();
2455	3010	} else
2456		- if (event.getSource() == attachPigmentItem)
	3011	+ if (source == attachPigmentItem)
2457	3012	{
2458	3013	String texture = GetFile("Attach pigment");
2459	3014	Object3D obj;
..	..	@@ -2465,7 +3020,7 @@
2465	3020
2466	3021	refreshContents();
2467	3022	} else
2468		- if (event.getSource() == detachPigmentItem)
	3023	+ if (source == detachPigmentItem)
2469	3024	{
2470	3025	Object3D obj;
2471	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3031,7 @@
2476	3031
2477	3032	refreshContents();
2478	3033	} else
2479		- if (event.getSource() == attachBumpItem)
	3034	+ if (source == attachBumpItem)
2480	3035	{
2481	3036	String texture = GetFile("Attach bump");
2482	3037	Object3D obj;
..	..	@@ -2488,7 +3043,7 @@
2488	3043
2489	3044	refreshContents();
2490	3045	} else
2491		- if (event.getSource() == detachBumpItem)
	3046	+ if (source == detachBumpItem)
2492	3047	{
2493	3048	Object3D obj;
2494	3049	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +3054,7 @@
2499	3054
2500	3055	refreshContents();
2501	3056	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3057	+ if (source == pigmentBumpItem)
2503	3058	{
2504	3059	Object3D obj;
2505	3060	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +3065,237 @@
2510	3065
2511	3066	refreshContents();
2512	3067	} else
2513		- if (event.getSource() == flashSelectionButton)
	3068	+ if (source == flashSelectionButton)
2514	3069	{
2515	3070	CameraPane.flash = true;
2516	3071	refreshContents();
2517	3072	} else
2518		- if (event.getSource() == oneButton)
	3073	+ if (source == oneButton)
2519	3074	{
2520	3075	} else
2521		- if (event.getSource() == twoButton)
	3076	+ if (source == twoButton)
2522	3077	{
2523	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2524	3083	// bug
2525	3084	//gridPanel.setDividerLocation(1.0);
2526	3085	//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();
	3086	+// bigThree.remove(scenePanel);
	3087	+// bigThree.remove(centralPanel);
	3088	+// bigThree.remove(XYZPanel);
	3089	+// aWindowConstraints.gridx = 0;
	3090	+// aWindowConstraints.gridy = 0;
	3091	+// aWindowConstraints.gridwidth = 1;
	3092	+// // aConstraints.gridheight = 3;
	3093	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3094	+// aWindowConstraints.weightx = 0;
	3095	+// aWindowConstraints.weighty = 1;
	3096	+// //bigThree.add(jtp, aWindowConstraints);
	3097	+// aWindowConstraints.weightx = 1;
	3098	+// aWindowConstraints.gridwidth = 3;
	3099	+// // aConstraints.gridheight = 3;
	3100	+// aWindowConstraints.gridx = 1;
	3101	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3102	+// bigThree.add(centralPanel, aWindowConstraints);
	3103	+// aWindowConstraints.weightx = 0;
	3104	+// aWindowConstraints.gridx = 4;
	3105	+// aWindowConstraints.gridwidth = 1;
	3106	+// // aConstraints.gridheight = 3;
	3107	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3108	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3109	+// scenePanel.setVisible(false);
	3110	+// centralPanel.setVisible(true);
	3111	+// XYZPanel.setVisible(false);
	3112	+ bigThree.ClearUI();
	3113	+ bigThree.add(centralPanel);
	3114	+ bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2551	3133	} else
2552		- if (event.getSource() == threeButton)
	3134	+ if (source == threeButton)
2553	3135	{
2554	3136	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();
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
	3140	+
	3141	+// bigThree.remove(scenePanel);
	3142	+// bigThree.remove(centralPanel);
	3143	+// bigThree.remove(XYZPanel);
	3144	+// aWindowConstraints.gridx = 0;
	3145	+// aWindowConstraints.gridy = 0;
	3146	+// aWindowConstraints.gridwidth = 1;
	3147	+// // aConstraints.gridheight = 3;
	3148	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3149	+// aWindowConstraints.weightx = 0;
	3150	+// aWindowConstraints.weighty = 1;
	3151	+// //bigThree.add(jtp, aWindowConstraints);
	3152	+// aWindowConstraints.weightx = 1;
	3153	+// aWindowConstraints.gridwidth = 3;
	3154	+// // aConstraints.gridheight = 3;
	3155	+// aWindowConstraints.gridx = 1;
	3156	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3157	+// bigThree.add(centralPanel, aWindowConstraints);
	3158	+// aWindowConstraints.weightx = 0;
	3159	+// aWindowConstraints.gridx = 4;
	3160	+// aWindowConstraints.gridwidth = 1;
	3161	+// // aConstraints.gridheight = 3;
	3162	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3163	+// bigThree.add(XYZPanel, aWindowConstraints);
	3164	+// bigThree.validate();
	3165	+// scenePanel.setVisible(false);
	3166	+// centralPanel.setVisible(true);
	3167	+// XYZPanel.setVisible(true);
	3168	+ bigThree.ClearUI();
	3169	+ bigThree.add(centralPanel);
	3170	+ bigThree.add(XYZPanel);
	3171	+ bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2579	3174	} else
2580		- if (event.getSource() == fourButton)
	3175	+ if (source == fourButton)
2581	3176	{
2582	3177	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();
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
	3181	+
	3182	+// bigThree.remove(scenePanel);
	3183	+// bigThree.remove(centralPanel);
	3184	+// bigThree.remove(XYZPanel);
	3185	+// aWindowConstraints.gridx = 0;
	3186	+// aWindowConstraints.gridy = 0;
	3187	+// aWindowConstraints.gridwidth = 1;
	3188	+// // aWindowConstraints.gridheight = 3;
	3189	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3190	+// aWindowConstraints.weightx = 1;
	3191	+// aWindowConstraints.weighty = 1;
	3192	+// bigThree.add(scenePanel, aWindowConstraints);
	3193	+// aWindowConstraints.weightx = 1;
	3194	+// aWindowConstraints.gridwidth = 3;
	3195	+// // aConstraints.gridheight = 3;
	3196	+// aWindowConstraints.gridx = 1;
	3197	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3198	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3199	+// aWindowConstraints.weightx = 0;
	3200	+// aWindowConstraints.gridx = 4;
	3201	+// aWindowConstraints.gridwidth = 1;
	3202	+// // aWindowConstraints.gridheight = 3;
	3203	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3204	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3205	+// bigThree.validate();
	3206	+// scenePanel.setVisible(true);
	3207	+// centralPanel.setVisible(false);
	3208	+// XYZPanel.setVisible(false);
	3209	+ bigThree.ClearUI();
	3210	+ bigThree.add(scenePanel);
	3211	+ bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2607	3214	} else
2608		- if (event.getSource() == sixButton)
	3215	+ if (source == sixButton)
2609	3216	{
2610	3217	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();
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
	3221	+
	3222	+// bigThree.remove(scenePanel);
	3223	+// bigThree.remove(centralPanel);
	3224	+// bigThree.remove(XYZPanel);
	3225	+// aWindowConstraints.gridx = 0;
	3226	+// aWindowConstraints.gridy = 0;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3230	+// aWindowConstraints.weightx = 0;
	3231	+// aWindowConstraints.weighty = 1;
	3232	+// bigThree.add(scenePanel, aWindowConstraints);
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.gridwidth = 3;
	3235	+// // aWindowConstraints.gridheight = 3;
	3236	+// aWindowConstraints.gridx = 1;
	3237	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3238	+// bigThree.add(centralPanel, aWindowConstraints);
	3239	+// aWindowConstraints.weightx = 0;
	3240	+// aWindowConstraints.gridx = 4;
	3241	+// aWindowConstraints.gridwidth = 1;
	3242	+// // aWindowConstraints.gridheight = 3;
	3243	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3244	+// //bigThree.add(XYZPanel, aConstraints);
	3245	+// bigThree.validate();
	3246	+// scenePanel.setVisible(true);
	3247	+// centralPanel.setVisible(true);
	3248	+// XYZPanel.setVisible(false);
	3249	+ bigThree.ClearUI();
	3250	+ bigThree.add(scenePanel);
	3251	+ bigThree.add(centralPanel);
	3252	+ bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2635	3255	} else
2636		- if (event.getSource() == sevenButton)
	3256	+ if (source == sevenButton)
2637	3257	{
2638	3258	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();
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
	3262	+
	3263	+// bigThree.remove(scenePanel);
	3264	+// bigThree.remove(centralPanel);
	3265	+// bigThree.remove(XYZPanel);
	3266	+// aWindowConstraints.gridx = 0;
	3267	+// aWindowConstraints.gridy = 0;
	3268	+// aWindowConstraints.gridwidth = 1;
	3269	+// // aWindowConstraints.gridheight = 3;
	3270	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3271	+// aWindowConstraints.weightx = 0;
	3272	+// aWindowConstraints.weighty = 1;
	3273	+// bigThree.add(scenePanel, aWindowConstraints);
	3274	+// aWindowConstraints.weightx = 1;
	3275	+// aWindowConstraints.gridwidth = 3;
	3276	+// // aWindowConstraints.gridheight = 3;
	3277	+// aWindowConstraints.gridx = 1;
	3278	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3279	+// bigThree.add(centralPanel, aWindowConstraints);
	3280	+// aWindowConstraints.weightx = 0;
	3281	+// aWindowConstraints.gridx = 4;
	3282	+// aWindowConstraints.gridwidth = 1;
	3283	+// // aConstraints.gridheight = 3;
	3284	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3285	+// bigThree.add(XYZPanel, aWindowConstraints);
	3286	+// bigThree.validate();
	3287	+// scenePanel.setVisible(true);
	3288	+// centralPanel.setVisible(true);
	3289	+// XYZPanel.setVisible(true);
	3290	+ bigThree.ClearUI();
	3291	+ bigThree.add(scenePanel);
	3292	+ bigThree.add(centralPanel);
	3293	+ bigThree.add(XYZPanel);
	3294	+ bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2663	3297	} else
2664		- if (event.getSource() == rootButton)
	3298	+ if (source == rootButton)
2665	3299	{
2666	3300	Object3D obj;
2667	3301	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,66 +3305,84 @@
2671	3305	EditObject(obj);
2672	3306	}
2673	3307
	3308	+ cameraView.requestFocusInWindow();
2674	3309	refreshContents(true);
2675	3310	} else
2676		- if (event.getSource() == closeButton)
	3311	+ if (source == closeButton)
2677	3312	{
2678	3313	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3314	cRadio ab;
2680	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3316	{
2682	3317	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
2685	3326	buttonGroup.remove(ab);
2686	3327	radioPanel.remove(ab);
2687	3328
2688		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
2689	3331	// ab.GetObject().objectUI = null; // ?????????
2690	3332
2691	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	3334	break;
2693	3335	}
2694	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
2695	3339	refreshContents(true);
2696	3340	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3341	+ if (source == editItem \|\| source == editButton)
2698	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
2699	3349	EditSelection(false);
2700	3350	} else
2701		- if (event.getSource() == uneditButton)
	3351	+ if (source == uneditButton)
2702	3352	{
2703	3353	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3354	{
2705	3355	Object3D child = (Object3D)e.nextElement();
2706	3356	if(child.editWindow != null)
2707	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
2708	3359	child.CloseUI();
2709	3360	listUI.remove(child);
2710	3361
2711		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
2712	3363	}
2713		- objEditor.ctrlPanel.revalidate();
	3364	+ objEditor.ctrlPanel.FlushUI();
2714	3365	//objEditor.jTree.clearSelection();
2715	3366	//objEditor.ResetSliders();
2716	3367	refreshContents(true);
2717	3368	} else
2718		- if (event.getSource() == clearPanelButton)
	3369	+ if (source == clearPanelButton)
2719	3370	{
2720	3371	assert(copy == group);
2721	3372	//copy.ClearUI();
2722	3373	for (Object3D obj : listUI)
2723	3374	{
	3375	+ obj.pinned = true;
2724	3376	obj.CloseUI();
2725	3377	}
2726	3378	listUI.clear();
2727	3379	refreshContents(true);
2728	3380	} else
2729		- if (event.getSource() == allParamsButton)
	3381	+ if (source == allParamsButton)
2730	3382	{
2731	3383	assert(copy == group);
2732	3384
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	3386
2735	3387	for (Object3D obj : listUI)
2736	3388	{
..	..	@@ -2747,19 +3399,19 @@
2747	3399
2748	3400	refreshContents(true);
2749	3401	} else
2750		- if (event.getSource() == unselectButton)
	3402	+ if (source == unselectButton)
2751	3403	{
2752	3404	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3405	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3406	objEditor.ResetSliders();
2755	3407	refreshContents(true);
2756	3408	} else
2757		- if(event.getSource() instanceof cRadio)
	3409	+ if(source instanceof cRadio)
2758	3410	{
2759	3411	group.parent = keepparent;
2760	3412	group.attributes = 0;
2761	3413	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3414	+ /cRadio/ radio = (cRadio)source;
2763	3415	Object3D obj = radio.GetObject();
2764	3416	System.out.println("Edit " + obj);
2765	3417	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3431,7 @@
2779	3431	}
2780	3432
2781	3433	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3434	+ //Globals.theRenderer.object = group;
2783	3435	if(!useclient)
2784	3436	{
2785	3437	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3440,17 @@
2788	3440	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3441	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3442	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3443	+ //cameraView.lighttouched = true;
	3444	+ Globals.lighttouched = true;
2792	3445	topView.object = group;
2793	3446	frontView.object = group;
2794	3447	sideView.object = group;
2795	3448	}
2796		- group.editWindow = this;
	3449	+
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
	3453	+
2797	3454	/*
2798	3455	currentLayout = radio.layout;
2799	3456	if (currentLayout == null)
..	..	@@ -2805,8 +3462,23 @@
2805	3462	//group.parent = null; // ROOT
2806	3463	//group.attributes = -1;
2807	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
2808	3467	refreshContents(true);
2809		- }
	3468	+ } else if (event.getSource() == editCameraItem)
	3469	+ {
	3470	+ cameraView.ProtectCamera();
	3471	+ cameraView.repaint();
	3472	+ return;
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3474	+ {
	3475	+ cameraView.RevertCamera();
	3476	+ cameraView.repaint();
	3477	+ return;
	3478	+ // } else if (event.getSource() == textureButton)
	3479	+ // {
	3480	+ // return; // true;
	3481	+ }
2810	3482	else
2811	3483	{
2812	3484	//return super.action(event, arg);
..	..	@@ -2815,7 +3487,6 @@
2815	3487	}
2816	3488
2817	3489	boolean useclient = false;
2818		- cRadio radio;
2819	3490
2820	3491	void ToggleRoot()
2821	3492	{
..	..	@@ -2824,7 +3495,7 @@
2824	3495	if (useclient)
2825	3496	{
2826	3497	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3498	+ Globals.lighttouched = true;
2828	3499	//topView.object = client;
2829	3500	//frontView.object = client;
2830	3501	//sideView.object = client;
..	..	@@ -2832,7 +3503,7 @@
2832	3503	else
2833	3504	{
2834	3505	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3506	+ Globals.lighttouched = true;
2836	3507	//topView.object = group;
2837	3508	//frontView.object = group;
2838	3509	//sideView.object = group;
..	..	@@ -2867,6 +3538,28 @@
2867	3538	refreshContents();
2868	3539	}
2869	3540
	3541	+ void TransformChildren()
	3542	+ {
	3543	+ Object3D obj;
	3544	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3545	+ {
	3546	+ obj = (Object3D)e.nextElement();
	3547	+ obj.KeepTextureMatrices();
	3548	+ obj.TransformChildren();
	3549	+ obj.RestoreTextureMatrices();
	3550	+
	3551	+// if (obj.parent == null)
	3552	+// {
	3553	+// System.out.println("NULL PARENT!");
	3554	+// new Exception().printStackTrace();
	3555	+// }
	3556	+// else
	3557	+// TouchTransform(obj);
	3558	+// //obj.parent.Touch();
	3559	+ }
	3560	+
	3561	+ refreshContents();
	3562	+ }
2870	3563
2871	3564	void ResetTransform()
2872	3565	{
..	..	@@ -2979,7 +3672,7 @@
2979	3672	refreshContents();
2980	3673	}
2981	3674
2982		- void ResetCentroid()
	3675	+ void ResetCentroid(boolean full)
2983	3676	{
2984	3677	Object3D obj;
2985	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3687,16 @@
2994	3687	LA.matIdentity(Object3D.mat);
2995	3688	obj.getBounds(minima, maxima, false);
2996	3689	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3690	+ if (full)
	3691	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3692	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3693	obj.TransformMesh(Object3D.mat);
	3694	+
3000	3695	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3696	+ if (full)
	3697	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3698	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3699	+
3003	3700	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3701	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3702	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3725,8 @@
3028	3725
3029	3726	int size = obj.MemorySize();
3030	3727
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3730	}
3033	3731	}
3034	3732	catch (Exception e)
..	..	@@ -3065,9 +3763,9 @@
3065	3763	obj = (Object3D)e.nextElement();
3066	3764
3067	3765	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3766	+ Grafreed.AnalyzeObject(obj);
3069	3767	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3768	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3769
3072	3770	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3771	}
..	..	@@ -3109,6 +3807,20 @@
3109	3807	void GenNormals(boolean crease)
3110	3808	{
3111	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
	3817	+
	3818	+ refreshContents();
	3819	+ }
	3820	+
	3821	+ void GenNormalsMINE()
	3822	+ {
	3823	+ group.selection.GenNormalsMINE();
3112	3824
3113	3825	refreshContents();
3114	3826	}
..	..	@@ -3157,104 +3869,259 @@
3157	3869
3158	3870	//Object3D buffer;
3159	3871	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		-
	3872	+// BoundaryRep temprep;
	3873	+// Object3D nodes;
	3874	+// Vector<Vertex> vertices;
	3875	+//
	3876	+// cGroup buffer;
	3877	+//
	3878	+// public void Vertex(Object3D node, Vertex v)
	3879	+// {
	3880	+//// vertices.add(v);
	3881	+//// nodes.addElement(node);
	3882	+////
	3883	+//// if (temprep.GetCache(v) != null)
	3884	+//// {
	3885	+//// temprep.Remove(v);
	3886	+//// } else
	3887	+//// {
	3888	+//// temprep.Remember(v);
	3889	+//// }
	3890	+//
	3891	+// //Object3D node = nodes.get(index);
	3892	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3893	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3894	+//
	3895	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3896	+//
	3897	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3898	+//
	3899	+// cGroup g = new cGroup();
	3900	+//
	3901	+// if (g.toParent == null)
	3902	+// {
	3903	+// g.toParent = LA.newMatrix();
	3904	+// g.fromParent = LA.newMatrix();
	3905	+// }
	3906	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3907	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3908	+//
	3909	+// g.add(GrafreeD.clipboard);
	3910	+//
	3911	+// buffer.add(g);
	3912	+// }
	3913	+//
	3914	+// public void Face(Object3D node, Face f)
	3915	+// {
	3916	+//
	3917	+// }
	3918	+//
	3919	+// void ParseVerticesOld() // ??
	3920	+// {
	3921	+// //if (group.selection.size() != 1)
	3922	+// // return;
	3923	+//
	3924	+// temprep = new BoundaryRep();
	3925	+// nodes = new Object3D();
	3926	+// vertices = new Vector<Vertex>();
	3927	+//
	3928	+// boolean epsequal = GrafreeD.epsequal;
	3929	+// GrafreeD.epsequal = true;
	3930	+//
	3931	+// for (int i=0; i<group.selection.size(); i++)
	3932	+// {
	3933	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3934	+//
	3935	+// group.selection.get(i).Parse(
	3936	+//this );
	3937	+//
	3938	+// int repsize = temprep.VertexCount();
	3939	+// int tablesize = temprep.vertextable.size();
	3940	+// int nodesize = nodes.size();
	3941	+//
	3942	+// assert(vertices.size() == nodes.size());
	3943	+//
	3944	+// temprep.vertextable.elements();
	3945	+//
	3946	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3947	+//
	3948	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3949	+// {
	3950	+// cGroup g = new cGroup();
	3951	+//
	3952	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3953	+//
	3954	+// Object3D node = nodes.get(index);
	3955	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3956	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3957	+//
	3958	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3959	+//
	3960	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3961	+//
	3962	+// if (g.toParent == null)
	3963	+// {
	3964	+// g.toParent = LA.newMatrix();
	3965	+// g.fromParent = LA.newMatrix();
	3966	+// }
	3967	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3968	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3969	+//
	3970	+// g.add(GrafreeD.clipboard);
	3971	+//
	3972	+// buffer.add(g);
	3973	+// }
	3974	+//
	3975	+// makeSomething(buffer, i==group.selection.size()-1);
	3976	+// }
	3977	+//
	3978	+// GrafreeD.epsequal = epsequal;
	3979	+//
	3980	+// //buffer = null;
	3981	+// temprep = null;
	3982	+// nodes = null;
	3983	+//
	3984	+// refreshContents();
	3985	+// }
	3986	+
3184	3987	void ParseVertices()
3185	3988	{
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;
	3989	+ boolean epsequal = Grafreed.epsequal;
	3990	+ Grafreed.epsequal = true;
3195	3991
3196	3992	for (int i=0; i<group.selection.size(); i++)
3197	3993	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3994	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3995
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3996	+ group.selection.get(i).Parse(
	3997	+
	3998	+ new iParse()
	3999	+ {
	4000	+ public void Vertex(Object3D node, Vertex v)
	4001	+ {
	4002	+ temp.set(v);
	4003	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4004
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();
	4005	+ cGroup g = new cGroup();
3211	4006
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4007	+ if (g.toParent == null)
	4008	+ {
	4009	+ g.toParent = LA.newMatrix();
	4010	+ g.fromParent = LA.newMatrix();
	4011	+ }
	4012	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4013	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4014
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);
	4015	+ g.add(Grafreed.clipboard);
3220	4016
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);
	4017	+ buffer.add(g);
	4018	+ }
3232	4019
3233		- g.add(GraphreeD.clipboard);
	4020	+ public void Face(Object3D node, Face f)
	4021	+ {
3234	4022
3235		- buffer.add(g);
3236		- }
	4023	+ }
	4024	+ }
	4025	+ );
3237	4026
3238	4027	makeSomething(buffer, i==group.selection.size()-1);
3239	4028	}
3240	4029
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4030	+ Grafreed.epsequal = epsequal;
3246	4031
3247	4032	refreshContents();
3248	4033	}
3249		-
	4034	+
	4035	+ void TextureVertices()
	4036	+ {
	4037	+ for (int i=0; i<group.selection.size(); i++)
	4038	+ {
	4039	+ group.selection.get(i).Parse(
	4040	+ new iParse()
	4041	+ {
	4042	+ public void Vertex(Object3D node, Vertex v)
	4043	+ {
	4044	+ cTexture tex = node.GetTextures();
	4045	+ String pigment = Object3D.GetPigment(tex);
	4046	+ //String bump = Object3D.GetBump(tex);
	4047	+
	4048	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4049	+
	4050	+ try
	4051	+ {
	4052	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4053	+ }
	4054	+ catch (Exception e)
	4055	+ {
	4056	+ System.err.println("FAIL: " + node);
	4057	+ }
	4058	+
	4059	+ double s = v.s;
	4060	+
	4061	+ if (s == 1)
	4062	+ s = 0;
	4063	+
	4064	+ double t = v.t;
	4065	+
	4066	+ if (t == 1)
	4067	+ t = 0;
	4068	+
	4069	+ int indexs = (int) (texturedata.getWidth() * s);
	4070	+ int indext = (int) (texturedata.getHeight() * t);
	4071	+
	4072	+ int index = indext * texturedata.getWidth() + indexs;
	4073	+
	4074	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4075	+
	4076	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4077	+
	4078	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4079	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4080	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4081	+ scale /= 3;
	4082	+
	4083	+ scale /= 0xFF;
	4084	+ // c'est quoi ca? scale /= 4;
	4085	+
	4086	+ //v.AO = scale;
	4087	+
	4088	+ v.x += v.norm.x * scale;
	4089	+ v.y += v.norm.y * scale;
	4090	+ v.z += v.norm.z * scale;
	4091	+ }
	4092	+
	4093	+ public void Face(Object3D node, Face f)
	4094	+ {
	4095	+ }
	4096	+ }
	4097	+ );
	4098	+ }
	4099	+
	4100	+ refreshContents();
	4101	+ }
	4102	+
3250	4103	void Align()
3251	4104	{
	4105	+ if (group.selection.size() == 0)
	4106	+ return;
	4107	+
	4108	+ cVector bbmin = new cVector();
	4109	+ cVector bbmax = new cVector();
	4110	+
	4111	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4112	+
	4113	+ double dx = bbmax.x - bbmin.x;
	4114	+ double dy = bbmax.y - bbmin.y;
	4115	+ double dz = bbmax.z - bbmin.z;
	4116	+
	4117	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4118	+
3252	4119	for (int i=0; i<group.selection.size(); i++)
3253	4120	{
3254	4121	Object3D obj = group.selection.get(i);
3255	4122
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4123	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4124	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4125	}
3259	4126
3260	4127	refreshContents();
..	..	@@ -3267,7 +4134,7 @@
3267	4134	// ref.SaveSupports();
3268	4135	// Object3D par = ref.parent;
3269	4136	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4137	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4138	// ref.parent = par;
3272	4139	// ref.RestoreSupports();
3273	4140
..	..	@@ -3275,11 +4142,11 @@
3275	4142
3276	4143	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4144
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4145	+ boolean random = CameraPane.SWITCH;
	4146	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4147	lowres.linkVerticesThis(null);
3281	4148	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4149	+ CameraPane.SWITCH = random;
3283	4150
3284	4151	System.err.flush();
3285	4152
..	..	@@ -3297,7 +4164,7 @@
3297	4164	// lowres.SaveSupports();
3298	4165	// par = lowres.parent;
3299	4166	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4167	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4168	Object3D newlow = CloneObject(lowres, false);
3302	4169	newlow.name = sn.switchobject.get(i).name;
3303	4170	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4186,7 @@
3319	4186	return;
3320	4187
3321	4188	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4189	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4190
3324	4191	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4192
..	..	@@ -3488,7 +4355,7 @@
3488	4355	group.selection.RelinkToSupport(); // july 2014
3489	4356	System.out.println("DONE.");
3490	4357	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4358	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4359	}
3493	4360
3494	4361	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4380,20 @@
3513	4380
3514	4381	void ClipMesh()
3515	4382	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4383	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4384	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4385	+ Object3D content = Grafreed.clipboard.get(0);
3519	4386
3520	4387	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4388	content = ((cGroup)content).get(0);
3522	4389
3523	4390	// for (int i=0; i<group.selection.size(); i++)
3524	4391	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4392	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4393	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4394	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4395	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4396	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4397	System.out.println("DONE.");
3531	4398	refreshContents();
3532	4399	}
..	..	@@ -3571,6 +4438,18 @@
3571	4438	void MarkLeaves(boolean hide)
3572	4439	{
3573	4440	group.selection.MarkLeaves(hide);
	4441	+ refreshContents();
	4442	+ }
	4443	+
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
3574	4453	refreshContents();
3575	4454	}
3576	4455
..	..	@@ -3645,10 +4524,6 @@
3645	4524	// }
3646	4525	// }
3647	4526
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	4527	void EditSelection(boolean newWindow)
3653	4528	{
3654	4529	// aConstraints.gridy = 0;
..	..	@@ -3656,10 +4531,10 @@
3656	4531	{
3657	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4535
3661	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4537	+ if(elem != group \|\| !newWindow)
3663	4538	{
3664	4539	// if (!(elem instanceof Composite))
3665	4540	// newWindow = false;
..	..	@@ -3742,6 +4617,17 @@
3742	4617
3743	4618	freezemodel = true;
3744	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
3745	4631	/**/
3746	4632	//switch (event.id)
3747	4633	{
..	..	@@ -3749,7 +4635,6 @@
3749	4635	//case 702: // Event.LIST_DESELECT
3750	4636	group.deselectAll();
3751	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4638	if (tps != null)
3754	4639	{
3755	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +4643,39 @@
3758	4643
3759	4644	//if (child.parent != null)
3760	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
3761	4647	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4648	}
3766	4649	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4650	+// else
	4651	+// {
	4652	+// objEditor.SetMaterial(group); // .GetMaterial());
	4653	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4654	+// System.err.println("info : " + group.GetPath());
	4655	+// }
3773	4656
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4658	CameraPane.flash = true;
3778	4659
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4661	// a camera
3781	4662	{
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;
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
	4668	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4669	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4670	}
3787	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
3788	4679	refreshContents();
3789	4680	//return true;
3790	4681	}
..	..	@@ -3793,6 +4684,33 @@
3793	4684
3794	4685	freezemodel = false;
3795	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
3796	4714
3797	4715	void linkSomething(Object3D thing)
3798	4716	{
..	..	@@ -3864,16 +4782,19 @@
3864	4782	{
3865	4783	if (group.selection.isEmpty())
3866	4784	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4785	+
	4786	+ Grafreed.clipboardIsTempGroup = false;
3868	4787	Composite tGroup = null;
3869	4788	if (group.selection.size() > 0) // 1)
3870	4789	{
3871	4790	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4791	+ Grafreed.clipboardIsTempGroup = true;
3873	4792	}
3874	4793
3875	4794	if (cut)
3876	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
3877	4798	//int indices[] = jList.getSelectedIndices();
3878	4799	//for (int i = indices.length - 1; i >= 0; i--)
3879	4800	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4830,16 @@
3909	4830	//System.out.println("cut " + child);
3910	4831	//System.out.println("parent = " + child.parent);
3911	4832	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4833	+ if (Grafreed.clipboardIsTempGroup)
3913	4834	tGroup.add/Child/(tmp);
3914	4835	else
3915		- GraphreeD.clipboard = tmp;
	4836	+ Grafreed.clipboard = tmp;
3916	4837	}
3917	4838	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4839	+ if (Grafreed.clipboardIsTempGroup)
3919	4840	tGroup.add/Child/(child);
3920	4841	else
3921		- GraphreeD.clipboard = child;
	4842	+ Grafreed.clipboard = child;
3922	4843	}
3923	4844
3924	4845	//ResetModel();
..	..	@@ -3950,21 +4871,23 @@
3950	4871	//System.out.println("cut " + elem);
3951	4872	//System.out.println("parent = " + elem.parent);
3952	4873	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4874	+ if (Grafreed.clipboardIsTempGroup)
3954	4875	tGroup.add/Child/(tmp);
3955	4876	else
3956		- GraphreeD.clipboard = tmp;
	4877	+ Grafreed.clipboard = tmp;
3957	4878	}
3958	4879	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4880	+ if (Grafreed.clipboardIsTempGroup)
3960	4881	tGroup.add/Child/(child);
3961	4882	else
3962		- GraphreeD.clipboard = child;
	4883	+ Grafreed.clipboard = child;
3963	4884	}
3964	4885
3965	4886	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4887	+
	4888	+ if (Grafreed.clipboardIsTempGroup)
	4889	+ Grafreed.clipboard = tGroup;
	4890	+
3968	4891	if (cut)
3969	4892	{
3970	4893	ResetModel();
..	..	@@ -3974,11 +4897,11 @@
3974	4897
3975	4898	void paste(boolean expand)
3976	4899	{
3977		- // if (GraphreeD.clipboard == null)
	4900	+ // if (GrafreeD.clipboard == null)
3978	4901	// return;
3979	4902	boolean first = true;
3980	4903
3981		- if (GraphreeD.clipboardIsTempGroup)
	4904	+ if (Grafreed.clipboardIsTempGroup)
3982	4905	{
3983	4906	Composite temp;
3984	4907
..	..	@@ -3989,7 +4912,7 @@
3989	4912	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4913	*/
3991	4914	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4915	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4916	{
3994	4917	Object3D child = (Object3D)e.nextElement();
3995	4918
..	..	@@ -4003,7 +4926,7 @@
4003	4926	else
4004	4927	elem = child.deepCopy(); // ?
4005	4928	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4929	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4930	// elem = elem.get(0);
4008	4931	makeSomething(elem, true); // ?? first);
4009	4932	//group.addChild(elem);
..	..	@@ -4023,23 +4946,23 @@
4023	4946	//Object3D cb = Applet3D.clipboard;
4024	4947	//temp.addChild(cb);
4025	4948	//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());
	4949	+ assert(Grafreed.clipboard.parent == null);
	4950	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4951	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4952	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4953	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4954	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4955	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4956	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4957	}
4035	4958
4036	4959	ResetModel();
4037	4960	refreshContents();
4038	4961	}
4039	4962
4040		- void pasteInto(boolean copyit)
	4963	+ void pasteInto(boolean copyit, boolean clone)
4041	4964	{
4042		-// if (GraphreeD.clipboard == null)
	4965	+// if (GrafreeD.clipboard == null)
4043	4966	// return;
4044	4967
4045	4968	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4989,22 @@
4066	4989	if (copyit)
4067	4990	{
4068	4991	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4992	+ if (clone)
	4993	+ {
	4994	+ CloneClipboard(false); // sept 2014
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ paste(false);
	4999	+ }
4070	5000	}
4071	5001	else
4072	5002	{
4073	5003	boolean first = true;
4074	5004
4075		- if (GraphreeD.clipboardIsTempGroup)
	5005	+ if (Grafreed.clipboardIsTempGroup)
4076	5006	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5007	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5008	Object3D copy;
4079	5009	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5010	{
..	..	@@ -4084,7 +5014,7 @@
4084	5014	}
4085	5015	} else
4086	5016	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5017	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5018	}
4089	5019	}
4090	5020	}
..	..	@@ -4276,6 +5206,26 @@
4276	5206	makeSomething(csg);
4277	5207	}
4278	5208
	5209	+ void Ungroup(Object3D g)
	5210	+ {
	5211	+ if (g instanceof HiddenObject)
	5212	+ {
	5213	+ HiddenObject h = (HiddenObject) g;
	5214	+
	5215	+ for (int i=0; i<h.ActualSize(); i++)
	5216	+ {
	5217	+ objEditor.makeSomething(h.get(i), false);
	5218	+ }
	5219	+ }
	5220	+ else
	5221	+ {
	5222	+ for (int i=0; i<g.Size(); i++)
	5223	+ {
	5224	+ objEditor.makeSomething(g.get(i), false);
	5225	+ }
	5226	+ }
	5227	+ }
	5228	+
4279	5229	void ungroup()
4280	5230	{
4281	5231	/*
..	..	@@ -4469,21 +5419,6 @@
4469	5419	}
4470	5420	*/
4471	5421
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	5422	/*
4488	5423	public void Callback(Object obj)
4489	5424	{
..	..	@@ -4507,26 +5442,9 @@
4507	5442	}
4508	5443	*/
4509	5444
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	5445	String GetFile(String dialogName)
4528	5446	{
4529		- if (GraphreeD.standAlone)
	5447	+ if (Grafreed.standAlone)
4530	5448	{
4531	5449	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5450	browser.show();
..	..	@@ -4590,10 +5508,36 @@
4590	5508	cButton flashSelectionButton;
4591	5509	cButton editButton;
4592	5510	cButton uneditButton;
	5511	+ JCheckBox allParamsButton;
4593	5512	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5513	cButton unselectButton;
4596	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
	5521	+ cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
	5540	+
4597	5541	cButton screenfitButton;
4598	5542	cButton screenfitpointButton;
4599	5543	cButton snapobjectButton;
..	..	@@ -4605,14 +5549,6 @@
4605	5549
4606	5550	cButton setsupportButton;
4607	5551
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		-
4616	5552	//
4617	5553	//Composite
4618	5554	Object3D // to do !!
..	..	@@ -4622,9 +5558,11 @@
4622	5558	//JTree jTree;
4623	5559	private MenuItem lookAtItem;
4624	5560	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
4626	5562	private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
4628	5566	private MenuItem cloneItem;
4629	5567	private MenuItem cloneSupportItem;
4630	5568	private MenuItem overwriteGeoItem;
..	..	@@ -4635,8 +5573,9 @@
4635	5573	private MenuItem resetsupportItem;
4636	5574	private MenuItem resetreferencesItem;
4637	5575	private MenuItem linkverticesItem;
	5576	+ private MenuItem relinkverticesItem;
4638	5577	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5578	+ private MenuItem resetAllItem;
4640	5579	private MenuItem stepAllItem;
4641	5580	private MenuItem revertMeshItem;
4642	5581	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5586,17 @@
4647	5586	private MenuItem mergeGeometriesItem;
4648	5587	private MenuItem copyItem;
4649	5588	private MenuItem pasteItem;
	5589	+ private MenuItem pasteIntoItem;
4650	5590	private MenuItem pasteLinkItem;
4651	5591	private MenuItem pasteCloneItem;
4652	5592	private MenuItem pasteExpandItem;
4653	5593	private MenuItem clearItem;
4654	5594	private MenuItem clearAllItem;
4655	5595	private MenuItem genUVItem;
	5596	+ private MenuItem genNormalsMESHItem;
4656	5597	private MenuItem genNormalsCADItem;
4657	5598	private MenuItem genNormalsORGANItem;
	5599	+ private MenuItem genNormalsMINEItem;
4658	5600	private MenuItem stripifyItem;
4659	5601	private MenuItem unstripifyItem;
4660	5602	private MenuItem trimItem;
..	..	@@ -4683,6 +5625,10 @@
4683	5625	private MenuItem showleavesItem;
4684	5626	private MenuItem markleavesItem;
4685	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
4686	5632
4687	5633	private MenuItem flipVItem;
4688	5634	private MenuItem unflipVItem;
..	..	@@ -4694,14 +5640,17 @@
4694	5640	private MenuItem panoTexturesItem;
4695	5641
4696	5642	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5643	+ private MenuItem resetCentroidXZItem;
4698	5644	private MenuItem resetTransformItem;
	5645	+ private MenuItem transformGeometryItem;
	5646	+ private MenuItem transformChildrenItem;
	5647	+ private MenuItem hideItem;
4699	5648	private MenuItem grabItem;
4700	5649	private MenuItem backItem;
4701	5650	private MenuItem frontItem;
4702	5651	private MenuItem cameraItem;
4703	5652	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
4705	5654	private MenuItem physicsItem;
4706	5655	private MenuItem frameselectorItem;
4707	5656	private MenuItem scriptNodeItem;
..	..	@@ -4716,6 +5665,7 @@
4716	5665
4717	5666	private MenuItem resetParentItem;
4718	5667	private MenuItem repairParentItem;
	5668	+ private MenuItem repairShadowItem;
4719	5669	private MenuItem sortbysizeItem;
4720	5670	private MenuItem sortbynameItem;
4721	5671
..	..	@@ -4728,16 +5678,19 @@
4728	5678	private MenuItem particleItem;
4729	5679	private MenuItem ragdollItem;
4730	5680	private MenuItem ragdoll2Item;
	5681	+ private MenuItem heightFieldItem;
	5682	+ private MenuItem textureFieldItem;
4731	5683	private MenuItem gridItem;
4732	5684	private MenuItem rectoidItem;
4733	5685	private MenuItem ellipsoidItem;
4734	5686	private MenuItem coneItem;
4735	5687	private MenuItem torusItem;
4736	5688	private MenuItem superItem;
	5689	+ private MenuItem kleinItem;
4737	5690	private MenuItem blobItem;
4738	5691	private MenuItem latheItem;
4739	5692	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5693	+ private MenuItem overlayItem;
4741	5694	private MenuItem meshItem;
4742	5695	// private MenuItem meshGroupItem;
4743	5696	private MenuItem springItem;
..	..	@@ -4746,6 +5699,7 @@
4746	5699	private MenuItem csgItem;
4747	5700	private MenuItem templateItem;
4748	5701	private MenuItem textureItem;
	5702	+ private MenuItem billboardItem;
4749	5703	private MenuItem shadowXItem;
4750	5704	private MenuItem shadowYItem;
4751	5705	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5712,6 @@
4758	5712	private MenuItem doubleItem;
4759	5713	private MenuItem tripleItem;
4760	5714
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5715	private MenuItem computeAOItem;
4767	5716	private MenuItem recompileItem;
4768	5717	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5721,8 @@
4772	5721	private MenuItem analyzeItem;
4773	5722	private MenuItem dumpItem;
4774	5723	//boolean freezemodel = false;
	5724	+
	5725	+ Menu cameraMenu;
	5726	+ MenuItem editCameraItem;
	5727	+ MenuItem restoreCameraItem;
4775	5728	}