~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("Show 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,214 @@
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 = 1;
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 item switcher");
	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 = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
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("Show all controle");
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	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
	790	+
553	791	// oe.aConstraints.gridx += 1;
554	792	// oe.aConstraints.weighty = 0;
555	793	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +799,22 @@
561	799	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	800	// gcButton.addActionListener(this);
563	801
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;
	802	+ cGridBag jSPPanel = new cGridBag();
	803	+
	804	+ JScrollPane jSP;
575	805	//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);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	807	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	808
	809	+ oe.treePanel.add(jSPPanel);
	810	+ oe.treePanel.Return();
	811	+
	812	+ oe.treePanel.add(copyOptionsPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+// mainPanel.setDividerLocation(0.5); //1.0);
	816	+// mainPanel.setResizeWeight(0.5);
	817	+
598	818	//jList.addListSelectionListener(this);
599	819	oe.jTree.addTreeSelectionListener(this);
600	820	//jTree.setRootVisible(false);
..	..	@@ -616,20 +836,157 @@
616	836	radio.layout = sevenButton;
617	837	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	838	}
	839	+
	840	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	841	+ {
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
	856	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	857	+ boxCB.setToolTipText("Display bounding boxes");
	858	+ boxCB.addItemListener(this);
	859	+
	860	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
	862	+ zoomBoxCB.addItemListener(this);
	863	+
	864	+ if (true) // Globals.ADVANCED)
	865	+ {
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
	873	+
	874	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	875	+ // localCB.addItemListener(this);
	876	+
	877	+ panel.Return();
	878	+
	879	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	880	+ crowdCB.setToolTipText("Used for crowds");
	881	+ crowdCB.addItemListener(this);
	882	+
	883	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	884	+ smoothCB.setToolTipText("Snapping delay");
	885	+ smoothCB.addItemListener(this);
	886	+
	887	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	888	+ slowCB.setToolTipText("Smooth interpolation");
	889	+ slowCB.addItemListener(this);
	890	+
	891	+// constraints.gridy += 1;
	892	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	893	+// speakerMocapCB.addItemListener(this);
	894	+
	895	+ panel.Return();
	896	+
	897	+ if (false)
	898	+ {
	899	+ // handled in scripts
	900	+ //constraints.gridy += 1;
	901	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	902	+ speakerCameraCB.addItemListener(this);
	903	+
	904	+ //constraints.gridy += 1;
	905	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	906	+ speakerFocusCB.addItemListener(this);
	907	+
	908	+ //constraints.gridy += 1;
	909	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	910	+ smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
	912	+ }
	913	+
	914	+//constraints.gridx += 1;
	915	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	916	+// debugCB.addItemListener(this);
	917	+
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
	922	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
	924	+ oeilCB.addItemListener(this);
	925	+
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
	946	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	947	+ lookAtCB.setToolTipText("Look-at target");
	948	+ lookAtCB.addItemListener(this);
	949	+ }
	950	+
	951	+ }
	952	+
	953	+ cGridBag fill = new cGridBag();
	954	+ fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
	959	+
	960	+ panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
	963	+
	964	+ }
619	965
620	966	void EditObject(Object3D obj)
621	967	{
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();
	968	+ cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
	977	+ radioButton.SetObject(obj);
	978	+ radioButton.layout = sevenButton;
	979	+ radioButton.SetCamera(cameraView.renderCamera, false);
	980	+ radioButton.addActionListener(this);
	981	+ radioPanel.add(radioButton);
	982	+ buttonGroup.add(radioButton);
	983	+ radioButton.doClick();
630	984	}
	985	+
631	986	void SetupViews(ObjEditor oe)
632	987	{
	988	+ theFrame = this;
	989	+
633	990	oe.SetupViews();
634	991
635	992	System.out.println("SetupViews");
..	..	@@ -638,22 +995,28 @@
638	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	996	}
640	997
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;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
651	1011	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
657	1020
658	1021	// static int COLOR = 1;
659	1022	// static int MATERIAL = 2;
..	..	@@ -661,9 +1024,9 @@
661	1024
662	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1026
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
667	1030
668	1031	public void itemStateChanged(ItemEvent e)
669	1032	{
..	..	@@ -688,10 +1051,10 @@
688	1051	dropAttributes \|= Object3D.TEXTURE;
689	1052	else
690	1053	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1054	+ } else if(e.getSource() == liveCB)
693	1055	{
694	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
695	1058	}
696	1059	else if(e.getSource() == supportCB)
697	1060	{
..	..	@@ -727,6 +1090,10 @@
727	1090	cameraView.repaint();
728	1091	// refreshContents();
729	1092	}
	1093	+ else if(e.getSource() == zoomBoxCB)
	1094	+ {
	1095	+ cameraView.ToggleZoomBoxMode();
	1096	+ }
730	1097	else if(e.getSource() == smoothfocusCB)
731	1098	{
732	1099	cameraView.ToggleSmoothFocus();
..	..	@@ -752,6 +1119,18 @@
752	1119	{
753	1120	cameraView.ToggleOeil();
754	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
755	1134	else if(e.getSource() == lookAtCB)
756	1135	{
757	1136	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1147,8 @@
768	1147
769	1148	/**/
770	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1153	// We can't move the root node or an empty selection
774	1154	return;
..	..	@@ -840,7 +1220,9 @@
840	1220	// objEditor.DropFile((java.io.File[]) object, true);
841	1221	// return;
842	1222	// }
843		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1226	{
845	1227	// file(s)
846	1228	String[] names = string.split("\n");
..	..	@@ -867,7 +1249,7 @@
867	1249
868	1250	flashIt = false;
869	1251	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1254
873	1255	if (group.selection.size() == 1)
..	..	@@ -883,23 +1265,33 @@
883	1265
884	1266	assert target == objEditor.jTree;
885	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
886	1269	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1271	} catch (Exception e) {
889	1272	System.out.println("destinationPath : " + destinationPath);
890	1273	return;
891	1274	}
892	1275
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
894	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
895	1287	loadClipboard(true);
896	1288	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1289	+ pasteInto(false, false);
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
903	1295	}
904	1296	public void dropActionChanged(DropTargetDragEvent dtde)
905	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1002,90 +1394,106 @@
1002	1394
1003	1395	void buildCreateMenu(Menu menu)
1004	1396	{
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);
	1397	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1398	+ //heightFieldItem.addActionListener(this);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
	1417	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1418	+ kleinItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
	1423	+ if (Globals.ADVANCED)
	1424	+ {
1019	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1426	ragdollItem.addActionListener(this);
1021	1427	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1428	ragdoll2Item.addActionListener(this);
	1429	+ }
1023	1430	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1431	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1432	meshItem.addActionListener(this);
1026	1433	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1434	// meshGroupItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1028	1437	springItem = menu.add(new MenuItem("Spring"));
1029	1438	springItem.addActionListener(this);
1030	1439	flagItem = menu.add(new MenuItem("Flag"));
1031	1440	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	1441	blobItem = menu.add(new MenuItem("Blob"));
1037	1442	blobItem.addActionListener(this);
1038	1443	latheItem = menu.add(new MenuItem("Lathe"));
1039	1444	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- lightItem.addActionListener(this);
	1445	+ }
	1446	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1447	+ bezierItem.addActionListener(this);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1042	1452	menu.add("-");
1043	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	1454	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1047	1457	doubleItem = menu.add(new MenuItem("Fork"));
1048	1458	doubleItem.addActionListener(this);
	1459	+ if (Globals.ADVANCED)
	1460	+ {
1049	1461	tripleItem = menu.add(new MenuItem("Trident"));
1050	1462	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);
	1463	+ }
1060	1464	}
1061	1465
1062	1466	void buildToolsMenu(Menu menu)
1063	1467	{
1064	1468	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1469	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1470	+ animationItem.setState(Globals.ANIMATION);
1067	1471
1068	1472	menu.add("-");
1069	1473	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1474	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1475	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1476	+ textureFieldItem.addActionListener(this);
	1477	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1478	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1479	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1480	reduceMorphItem.addActionListener(this);
1077	1481	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1482	reduce34MorphItem.addActionListener(this);
1079		-
	1483	+ menu.add("-");
1080	1484	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1485	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1486
	1487	+ if (Globals.ADVANCED)
	1488	+ {
	1489	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1490	+ mirrorItem.addActionListener(this);
	1491	+ menu.add("-");
1084	1492	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1493	memoryItem.addActionListener(this);
1086	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1495	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1497	dumpItem.addActionListener(this);
1090	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1499	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1502,8 @@
1094	1502	resetParentItem.addActionListener(this);
1095	1503	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1504	repairParentItem.addActionListener(this);
	1505	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1506	+ repairShadowItem.addActionListener(this);
1097	1507	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1508	invariantsItem.addActionListener(this);
1099	1509	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1511,7 @@
1101	1511	menu.add("-");
1102	1512	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1513	editScriptItem.addActionListener(this);
	1514	+ }
1104	1515	}
1105	1516
1106	1517	void ScreenFit()
..	..	@@ -1223,9 +1634,24 @@
1223	1634	shadow.material = new cMaterial(obj.material);
1224	1635	shadow.material.diffuse = 0.0001f;
1225	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1226	1638
1227	1639	makeSomething(shadow);
1228	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1229	1655
1230	1656	/**
1231	1657	* applyExample
..	..	@@ -1429,9 +1855,9 @@
1429	1855
1430	1856	void Overwrite(int mask)
1431	1857	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1859	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1435	1861
1436	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1863	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1880,7 @@
1454	1880	//
1455	1881	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1882	{
	1883	+ Object source = event.getSource();
1457	1884	/*
1458	1885	if (event.getSource() == nameField)
1459	1886	{
..	..	@@ -1465,11 +1892,11 @@
1465	1892	}
1466	1893	else
1467	1894	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1895	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1896	{
1470	1897	ScreenFit();
1471	1898	} else
1472		- if (event.getSource() == switchItem)
	1899	+ if (source == switchViewItem)
1473	1900	{
1474	1901	cVector v1 = new cVector();
1475	1902	cVector v2 = new cVector();
..	..	@@ -1478,11 +1905,11 @@
1478	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1906	objEditor.cameraView.repaint();
1480	1907	} else
1481		- if (event.getSource() == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1482	1909	{
1483	1910	makeSomething(new Box());
1484	1911	} else
1485		- if (event.getSource() == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1486	1913	{
1487	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1930,9 @@
1503	1930	applyExample(particleGeom, "SMOKE");
1504	1931	makeSomething(particleGeom);
1505	1932	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1933	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1934	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1935	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1936
1510	1937	ragdoll.toParent = LA.newMatrix();
1511	1938	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1948,71 @@
1521	1948	makeSomething(ragdoll);
1522	1949	//makeSomething(new VehicleDemo());
1523	1950	} else
1524		- if (event.getSource() == gridItem)
	1951	+ /*
	1952	+ */
	1953	+ if (source == heightFieldItem)
	1954	+ {
	1955	+ Object3D obj = new Object3D();
	1956	+
	1957	+ obj.CreateMaterial();
	1958	+ obj.bRep = new BoundaryRep();
	1959	+
	1960	+ obj.bRep.CreateMesh(new iHeightField()
	1961	+ {
	1962	+ public double f(double x, double y)
	1963	+ {
	1964	+ // The Mandelbrot set is represented by coloring
	1965	+ // each point (x,y) according to the number of
	1966	+ // iterations it takes before the while loop in
	1967	+ // this method ends. For points that are actually
	1968	+ // in the Mandelbrot set, or very close to it, the
	1969	+ // count will reach the maximum value, 80. These
	1970	+ // points will be colored purple. All other colors
	1971	+ // represent points that are definitely NOT in the set.
	1972	+ x -= 600;
	1973	+ y -= 500;
	1974	+ x /= 200;
	1975	+ y /= 200;
	1976	+ int count = 0;
	1977	+ double zx = x;
	1978	+ double zy = y;
	1979	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1980	+ double new_zx = zxzx - zyzy + x;
	1981	+ zy = 2zxzy + y;
	1982	+ zx = new_zx;
	1983	+ count++;
	1984	+ }
	1985	+ return count; // Math.sqrt(count);
	1986	+ }
	1987	+ }, 1000,1000);
	1988	+
	1989	+ makeSomething(obj);
	1990	+ } else
	1991	+ if (source == gridItem \|\| source == gridButton)
1525	1992	{
1526	1993	makeSomething(new Grid());
1527	1994	} else
1528		- if (event.getSource() == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	1996	{
1530	1997	makeSomething(new Sphere());
1531	1998	} else
1532		- if (event.getSource() == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1533	2000	{
1534	2001	makeSomething(new Cone());
1535	2002	} else
1536		- if (event.getSource() == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1537	2004	{
1538	2005	makeSomething(new Torus());
1539	2006	} else
1540		- if (event.getSource() == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1541	2008	{
1542	2009	makeSomething(new Superellipsoid());
1543	2010	} else
1544		- if (event.getSource() == blobItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
	2012	+ {
	2013	+ makeSomething(new Klein());
	2014	+ } else
	2015	+ if (source == blobItem)
1545	2016	{
1546	2017	Blob blob = new Blob();
1547	2018	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +2020,15 @@
1549	2020	//blob.retile();
1550	2021	makeSomething(blob);
1551	2022	} else
1552		- if (event.getSource() == latheItem)
	2023	+ if (source == latheItem)
1553	2024	{
1554	2025	makeSomething(new Lathe());
1555	2026	} else
1556		- if (event.getSource() == bezierItem)
	2027	+ if (source == bezierItem)
1557	2028	{
1558	2029	makeSomething(new BezierSurface());
1559	2030	} else
1560		- if (event.getSource() == checkerItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1561	2032	{
1562	2033	/*
1563	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2041,9 @@
1570	2041	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2042	LA.matInvert(obj.toParent, obj.fromParent);
1572	2043	*/
1573		- makeSomething(new CheckerIG());
	2044	+ makeSomething(new Checker());
1574	2045	} else
1575		- if (event.getSource() == meshItem)
	2046	+ if (source == meshItem)
1576	2047	{
1577	2048	Object3D itemtomake = new Object3D();
1578	2049	Object3D child;
..	..	@@ -1593,35 +2064,35 @@
1593	2064	makeSomething(child);
1594	2065	}
1595	2066	} else
1596		- if (event.getSource() == springItem)
	2067	+ if (source == springItem)
1597	2068	{
1598	2069	cSpring s = new cSpring();
1599	2070	s.setup();
1600	2071	makeSomething(s);
1601	2072	} else
1602		- if (event.getSource() == flagItem)
	2073	+ if (source == flagItem)
1603	2074	{
1604	2075	cSpring s = new cFlag();
1605	2076	s.setup();
1606	2077	makeSomething(s);
1607	2078	} else
1608		- if (event.getSource() == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1609	2080	{
1610	2081	makeSomething(new Light());
1611	2082	} else
1612		- if (event.getSource() == csgItem)
	2083	+ if (source == csgItem)
1613	2084	{
1614	2085	group(new CSG());
1615	2086	} else
1616		- if (event.getSource() == templateItem)
	2087	+ if (source == templateItem)
1617	2088	{
1618	2089	group(new cTemplate());
1619	2090	} else
1620		- if (event.getSource() == attributeItem)
	2091	+ if (source == attributeItem)
1621	2092	{
1622	2093	makeSomething(new Attribute());
1623	2094	} else
1624		- if (event.getSource() == pointflowItem)
	2095	+ if (source == pointflowItem)
1625	2096	{
1626	2097	makeSomething(new PointFlow());
1627	2098	} else
..	..	@@ -1633,7 +2104,7 @@
1633	2104	} else
1634	2105	*/
1635	2106
1636		- if (event.getSource() == superLoopItem)
	2107	+ if (source == superLoopItem)
1637	2108	{
1638	2109	Composite g = new cGroup();
1639	2110	for (int i=0; i<15; i++)
..	..	@@ -1655,30 +2126,30 @@
1655	2126
1656	2127	group(g);
1657	2128	} else
1658		- if (event.getSource() == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1659	2130	{
1660	2131	Composite csg = new GroupLeaf();
1661	2132	csg.count = 5;
1662	2133	group(csg);
1663		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1664	2135	csg.addChild(child);
1665	2136	child.addChild(csg);
1666	2137	} else
1667		- if (event.getSource() == doubleItem)
	2138	+ if (source == doubleItem)
1668	2139	{
1669		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1670	2141	csg.count = 5;
1671	2142	group(csg);
1672		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1673	2144	csg.addChild(child);
1674	2145	child.addChild(csg);
1675		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1676	2147	csg.addChild(child);
1677	2148	child.addChild(csg);
1678	2149	} else
1679		- if (event.getSource() == tripleItem)
	2150	+ if (source == tripleItem)
1680	2151	{
1681		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1682	2153	csg.count = 4;
1683	2154	group(csg);
1684	2155	Composite child = new cGroup();
..	..	@@ -1691,71 +2162,83 @@
1691	2162	csg.addChild(child);
1692	2163	child.addChild(csg);
1693	2164	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2165	+ if (source == computeAOItem)
1696	2166	{
1697		- ImportGFD();
	2167	+ Globals.drawMode = CameraPane.OCCLUSION;
	2168	+ Globals.theRenderer.repaint();
1698	2169	} 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)
	2170	+ if (source == recompileItem)
1717	2171	{
1718	2172	Recompile();
1719	2173	refreshContents();
1720	2174	} else
1721		- if (event.getSource() == editScriptItem)
	2175	+ if (source == editScriptItem)
1722	2176	{
1723	2177	OpenDialog();
1724	2178	refreshContents();
1725	2179	} else
1726		- if (event.getSource() == invariantsItem)
	2180	+ if (source == invariantsItem)
1727	2181	{
1728	2182	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1730	2184	} else
1731		- if (event.getSource() == memoryItem)
	2185	+ if (source == memoryItem)
1732	2186	{
1733	2187	//System.out.println("Invariants:");
1734	2188	PrintMemory();
1735	2189	} else
1736		- if (event.getSource() == pathItem)
	2190	+ if (source == pathItem)
1737	2191	{
1738	2192	PrintPath();
1739	2193	} else
1740		- if (event.getSource() == analyzeItem)
	2194	+ if (source == analyzeItem)
1741	2195	{
1742	2196	AnalyzeObject();
1743	2197	} else
1744		- if (event.getSource() == dumpItem)
	2198	+ if (source == dumpItem)
1745	2199	{
1746	2200	DumpObject();
1747	2201	} else
1748		- if (event.getSource() == screenfitButton)
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
	2213	+ } else
	2214	+ if (source == undoButton)
	2215	+ {
	2216	+ Undo();
	2217	+ } else
	2218	+ if (source == redoButton)
	2219	+ {
	2220	+ Redo();
	2221	+ } else
	2222	+ if (source == saveButton)
	2223	+ {
	2224	+ Save();
	2225	+ } else
	2226	+ if (source == oneStepButton)
	2227	+ {
	2228	+ Globals.ONESTEP = true;
	2229	+ cameraView.repaint();
	2230	+ } else
	2231	+ if (source == screenfitButton)
1749	2232	{
1750	2233	//Reload(lastConverter, lastFilename, true);
1751	2234	ScreenFit();
1752	2235	} else
1753		- if (event.getSource() == screenfitpointButton)
	2236	+ if (source == screenfitpointButton)
1754	2237	{
1755	2238	//Reload(lastConverter, lastFilename, true);
1756	2239	ScreenFitPoint();
1757	2240	} else
1758		- if (event.getSource() == snapobjectButton)
	2241	+ if (source == snapobjectButton)
1759	2242	{
1760	2243	//Reload(lastConverter, lastFilename, true);
1761	2244	SnapObject();
..	..	@@ -1766,13 +2249,13 @@
1766	2249	// Recompile();
1767	2250	// refreshContents();
1768	2251	// } else
1769		- if (event.getSource() == gcButton)
	2252	+ if (source == gcButton)
1770	2253	{
1771	2254	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2255	System.gc();
1773	2256	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2257	} else
1775		- if (event.getSource() == editLeafItem)
	2258	+ if (source == editLeafItem)
1776	2259	{
1777	2260	Object3D obj;
1778	2261	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2269,78 @@
1786	2269	}
1787	2270	refreshContents(true);
1788	2271	} else
1789		- if (event.getSource() == openWindowItem)
	2272	+ if (source == openWindowItem)
1790	2273	{
1791	2274	EditSelection(true);
1792	2275	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2276	+ if (source == cutItem \|\| source == clearButton)
1794	2277	{
1795	2278	loadClipboard(true);
1796	2279	} else
1797		- if (event.getSource() == duplicateItem)
	2280	+ if (source == undoItem)
1798	2281	{
1799		- Object3D keep = GraphreeD.clipboard;
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == duplicateItem)
	2289	+ {
	2290	+ Object3D keep = Grafreed.clipboard;
1800	2291	loadClipboard(false);
1801	2292	paste(false);
1802		- GraphreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1803	2294	} else
1804		- if (event.getSource() == cloneItem)
	2295	+ if (source == cloneItem)
1805	2296	{
1806	2297	CloneSelection(false);
1807	2298	} else
1808		- if (event.getSource() == cloneSupportItem)
	2299	+ if (source == cloneSupportItem)
1809	2300	{
1810	2301	CloneSelection(true);
1811	2302	} else
1812		- if (event.getSource() == copyItem)
	2303	+ if (source == copyItem)
1813	2304	{
1814	2305	loadClipboard(false);
1815	2306	} else
1816		- if (event.getSource() == pasteItem)
	2307	+ if (source == pasteItem)
1817	2308	{
1818	2309	paste(false);
1819	2310	} else
1820		- if (event.getSource() == pasteLinkItem)
	2311	+ if (source == pasteIntoItem)
1821	2312	{
1822		- pasteInto(false);
	2313	+ pasteInto(true, false);
1823	2314	} else
1824		- if (event.getSource() == pasteCloneItem)
	2315	+ if (source == pasteLinkItem)
1825	2316	{
1826		- pasteInto(true);
	2317	+ pasteInto(false, false);
1827	2318	} else
1828		- if (event.getSource() == pasteExpandItem)
	2319	+ if (source == pasteCloneItem)
	2320	+ {
	2321	+ pasteInto(true, true);
	2322	+ } else
	2323	+ if (source == pasteExpandItem)
1829	2324	{
1830	2325	paste(true);
1831	2326	} else
1832		- if (event.getSource() == synchronizeItem)
	2327	+ if (source == synchronizeItem)
1833	2328	{
1834	2329	Overwrite(Object3D.TRANSFORM);
1835	2330	} else
1836		- if (event.getSource() == overwriteNameItem)
	2331	+ if (source == overwriteNameItem)
1837	2332	{
1838	2333	Overwrite(Object3D.NAME);
1839	2334	} else
1840		- if (event.getSource() == overwriteUVItem)
	2335	+ if (source == overwriteUVItem)
1841	2336	{
1842	2337	Overwrite(Object3D.UV);
1843	2338	} else
1844		- if (event.getSource() == overwriteMatItem)
	2339	+ if (source == overwriteMatItem)
1845	2340	{
	2341	+ /* july 2015
1846	2342	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2343	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2344	else
1849	2345	{
1850	2346	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2352,16 @@
1856	2352	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2353	}
1858	2354	}
	2355	+ */
	2356	+
	2357	+ Overwrite(dropAttributes);
1859	2358	}
1860		- if (event.getSource() == overwriteGeoItem)
	2359	+ if (source == overwriteGeoItem)
1861	2360	{
1862	2361	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2362	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2363	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2364	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2365	//
1867	2366	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2367	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2373,7 @@
1874	2373	// refreshContents();
1875	2374	// }
1876	2375	} else
1877		- if (event.getSource() == generateMeshItem)
	2376	+ if (source == generateMeshItem)
1878	2377	{
1879	2378	//if (group.selection.size() == 1)
1880	2379	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2384,7 @@
1885	2384	ResetModel();
1886	2385	refreshContents();
1887	2386	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2387	+ if (source == extractGeometriesItem)
1889	2388	{
1890	2389	boolean one = false;
1891	2390
..	..	@@ -1912,7 +2411,7 @@
1912	2411	ResetModel();
1913	2412	refreshContents();
1914	2413	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2414	+ if (source == cloneGeometriesItem)
1916	2415	{
1917	2416	boolean one = false;
1918	2417
..	..	@@ -1938,32 +2437,37 @@
1938	2437	ResetModel();
1939	2438	refreshContents();
1940	2439	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2440	+ if (source == shareGeometriesItem)
1942	2441	{
1943	2442	boolean one = false;
1944	2443
1945	2444	if (group.selection.size() == 1)
1946	2445	one = true;
1947	2446
	2447	+ Object3D merge = null;
	2448	+
1948	2449	Object3D content = new cGroup();
1949	2450
1950	2451	for (int i=0; i<group.selection.size(); i++)
1951	2452	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2453	+ merge = new Merge(group.selection.get(i));
1953	2454
1954	2455	if (one)
1955		- makeSomething(sel, false);
	2456	+ makeSomething(merge, false);
1956	2457	else
1957		- content.addChild(sel);
	2458	+ content.addChild(merge);
1958	2459	}
1959	2460
1960	2461	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2462	+ makeSomething(content, true);
	2463	+ else
	2464	+ {
	2465	+ ResetModel();
	2466	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2467	+ refreshContents();
	2468	+ }
1965	2469	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2470	+ if (source == mergeGeometriesItem)
1967	2471	{
1968	2472	boolean one = false;
1969	2473
..	..	@@ -1993,11 +2497,11 @@
1993	2497	ResetModel();
1994	2498	refreshContents();
1995	2499	} else
1996		- if (event.getSource() == linkverticesItem)
	2500	+ if (source == linkverticesItem)
1997	2501	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2502	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2503	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2504	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2505	//
2002	2506	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2507	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2510,48 @@
2006	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2511	// refreshContents();
2008	2512	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2514	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2012	2516
2013	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2518	content = ((cGroup)content).get(0);
2015	2519
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2520	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2521	for (int i=0; i<group.selection.size(); i++)
2018	2522	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2525	group.selection.get(i).linkVerticesThis(content);
2022	2526	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2527	+ CameraPane.SWITCH = random;
2024	2528	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2529	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2530	refreshContents();
2027	2531	}
2028	2532	} else
2029		- if (event.getSource() == resetsupportItem)
	2533	+ if (source == resetsupportItem)
2030	2534	{
2031	2535	for (int i=0; i<group.selection.size(); i++)
2032	2536	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2537	+ boolean random = CameraPane.SWITCH;
	2538	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2539	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2540	+ CameraPane.SWITCH = random;
2037	2541	}
2038	2542
2039	2543	refreshContents();
2040	2544	} else
2041		- if (event.getSource() == resetreferencesItem)
	2545	+ if (source == relinkverticesItem)
	2546	+ {
	2547	+ boolean random = CameraPane.SWITCH;
	2548	+ CameraPane.SWITCH = false; // parse all random nodes
	2549	+ group.selection.RelinkToSupport();
	2550	+ CameraPane.SWITCH = random;
	2551	+
	2552	+ refreshContents();
	2553	+ } else
	2554	+ if (source == resetreferencesItem)
2042	2555	{
2043	2556	for (int i=0; i<group.selection.size(); i++)
2044	2557	{
..	..	@@ -2047,11 +2560,11 @@
2047	2560
2048	2561	refreshContents();
2049	2562	} else
2050		- if (event.getSource() == setMasterItem)
	2563	+ if (source == setMasterItem)
2051	2564	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2566	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2055	2568
2056	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2570	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2573,13 @@
2060	2573	refreshContents();
2061	2574	}
2062	2575	} else
2063		- if (event.getSource() == poseMeshItem)
	2576	+ if (source == poseMeshItem)
2064	2577	{
2065	2578	if (group.selection.size() == 1)
2066	2579	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2068	2581	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2070	2583
2071	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2585	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2592,19 @@
2079	2592	}
2080	2593
2081	2594	} else
2082		- if (event.getSource() == revertMeshItem)
	2595	+ if (source == revertMeshItem)
2083	2596	{
2084	2597	RevertMeshes();
2085	2598	} else
2086		- if (event.getSource() == resetMeshItem)
	2599	+ if (source == resetAllItem)
2087	2600	{
2088	2601	ResetAll();
2089	2602	} else
2090		- if (event.getSource() == stepAllItem)
	2603	+ if (source == stepAllItem)
2091	2604	{
2092	2605	StepAll();
2093	2606	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2607	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2608	{
2096	2609	//int indices[] = jList.getSelectedIndices();
2097	2610	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2612,46 @@
2099	2612
2100	2613	ClearSelection(false);
2101	2614	} else
2102		- if (event.getSource() == clearAllItem)
	2615	+ if (source == clearAllItem)
2103	2616	{
2104	2617	ClearSelection(true);
2105	2618	} else
2106		- if (event.getSource() == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2107	2620	{
2108		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2109	2622	} else
2110		- if (event.getSource() == frontItem)
	2623	+ if (source == hideItem)
	2624	+ {
	2625	+ group(new HiddenObject());
	2626	+ } else
	2627	+ if (source == frontItem)
2111	2628	{
2112	2629	front();
2113	2630	} else
2114		- if (event.getSource() == backItem)
	2631	+ if (source == backItem)
2115	2632	{
2116	2633	back();
2117	2634	} else
2118		- if (event.getSource() == cameraItem)
	2635	+ if (source == cameraItem)
2119	2636	{
2120	2637	makeSomething(new Camera());
2121	2638	} else
2122		- if (event.getSource() == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2123	2640	{
2124	2641	group(new Composite());
2125	2642	} else
2126		- if (event.getSource() == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2127	2644	{
2128	2645	RandomNode random = new RandomNode();
2129	2646	group(random);
2130	2647	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2648	+ random.name = random.get(0).name + "Switch";
2132	2649	} else
2133		- if (event.getSource() == physicsItem)
	2650	+ if (source == physicsItem)
2134	2651	{
2135	2652	group(new PhysicsNode());
2136	2653	} else
2137		- if (event.getSource() == frameselectorItem)
	2654	+ if (source == frameselectorItem)
2138	2655	{
2139	2656	for (int i=0; i<group.selection.size(); i++)
2140	2657	{
..	..	@@ -2146,7 +2663,7 @@
2146	2663	ResetModel();
2147	2664	refreshContents();
2148	2665	} else
2149		- if (event.getSource() == switchGeoItem)
	2666	+ if (source == switchGeoItem)
2150	2667	{
2151	2668	for (int i=0; i<group.selection.size(); i++)
2152	2669	{
..	..	@@ -2158,7 +2675,7 @@
2158	2675	ResetModel();
2159	2676	refreshContents();
2160	2677	} else
2161		- if (event.getSource() == switchTransfoItem)
	2678	+ if (source == switchTransfoItem)
2162	2679	{
2163	2680	for (int i=0; i<group.selection.size(); i++)
2164	2681	{
..	..	@@ -2170,7 +2687,7 @@
2170	2687	ResetModel();
2171	2688	refreshContents();
2172	2689	} else
2173		- if (event.getSource() == morphItem)
	2690	+ if (source == morphItem)
2174	2691	{
2175	2692	for (int i=0; i<group.selection.size(); i++)
2176	2693	{
..	..	@@ -2182,7 +2699,7 @@
2182	2699	ResetModel();
2183	2700	refreshContents();
2184	2701	} else
2185		- if (event.getSource() == scriptNodeItem)
	2702	+ if (source == scriptNodeItem)
2186	2703	{
2187	2704	boolean atleastone = false;
2188	2705
..	..	@@ -2221,191 +2738,252 @@
2221	2738	}
2222	2739	}
2223	2740	} else
2224		- if (event.getSource() == linkerItem)
	2741	+ if (source == linkerItem)
2225	2742	{
2226	2743	group(new cLinker());
2227	2744	} else
2228		- if (event.getSource() == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2229	2746	{
2230	2747	group(new TextureNode());
2231	2748	} else
2232		- if (event.getSource() == shadowXItem)
	2749	+ if (source == billboardItem)
	2750	+ {
	2751	+ group(new BillboardNode());
	2752	+ } else
	2753	+ if (source == shadowXItem)
2233	2754	{
2234	2755	CastShadow(0);
2235	2756	} else
2236		- if (event.getSource() == shadowYItem)
	2757	+ if (source == shadowYItem)
2237	2758	{
2238	2759	CastShadow(1);
2239	2760	} else
2240		- if (event.getSource() == shadowZItem)
	2761	+ if (source == shadowZItem)
2241	2762	{
2242	2763	CastShadow(2);
2243	2764	} else
2244		- if (event.getSource() == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	2766	{
2246		- ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
	2769	+ for (int i=0; i<group.selection.size(); i++)
	2770	+ {
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
	2776	+ }
	2777	+
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2247	2789	} else
2248		- if (event.getSource() == genUVItem)
	2790	+ if (source == genUVItem)
2249	2791	{
2250	2792	GenUV();
2251	2793	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2794	+ if (source == genNormalsCADItem)
2253	2795	{
2254	2796	GenNormals(true);
2255	2797	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2798	+ if (source == genNormalsMESHItem)
	2799	+ {
	2800	+ GenNormalsMESH();
	2801	+ } else
	2802	+ if (source == genNormalsORGANItem)
2257	2803	{
2258	2804	GenNormals(false);
2259	2805	} else
2260		- if (event.getSource() == stripifyItem)
	2806	+ if (source == genNormalsMINEItem)
	2807	+ {
	2808	+ GenNormalsMINE();
	2809	+ } else
	2810	+ if (source == stripifyItem)
2261	2811	{
2262	2812	Stripify();
2263	2813	} else
2264		- if (event.getSource() == unstripifyItem)
	2814	+ if (source == unstripifyItem)
2265	2815	{
2266	2816	Unstripify();
2267	2817	} else
2268		- if (event.getSource() == trimItem)
	2818	+ if (source == trimItem)
2269	2819	{
2270	2820	Trim();
2271	2821	} else
2272		- if (event.getSource() == untrimItem)
	2822	+ if (source == untrimItem)
2273	2823	{
2274	2824	Untrim();
2275	2825	} else
2276		- if (event.getSource() == clearColorsItem)
	2826	+ if (source == clearColorsItem)
2277	2827	{
2278	2828	ClearColors();
2279	2829	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2830	+ if (source == clearMaterialsItem)
2281	2831	{
2282	2832	ClearMaterials();
2283	2833	} else
2284		- if (event.getSource() == liveleavesItem)
	2834	+ if (source == liveleavesItem)
2285	2835	{
2286	2836	LiveLeaves(true);
2287	2837	} else
2288		- if (event.getSource() == unliveleavesItem)
	2838	+ if (source == unliveleavesItem)
2289	2839	{
2290	2840	LiveLeaves(false);
2291	2841	} else
2292		- if (event.getSource() == supportleavesItem)
	2842	+ if (source == supportleavesItem)
2293	2843	{
2294	2844	SupportLeaves(true);
2295	2845	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2846	+ if (source == unsupportleavesItem)
2297	2847	{
2298	2848	SupportLeaves(false);
2299	2849	} else
2300		- if (event.getSource() == hideleavesItem)
	2850	+ if (source == hideleavesItem)
2301	2851	{
2302	2852	HideLeaves(true);
2303	2853	} else
2304		- if (event.getSource() == showleavesItem)
	2854	+ if (source == showleavesItem)
2305	2855	{
2306	2856	HideLeaves(false);
2307	2857	} else
2308		- if (event.getSource() == markleavesItem)
	2858	+ if (source == markleavesItem)
2309	2859	{
2310	2860	MarkLeaves(true);
2311	2861	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2862	+ if (source == unmarkleavesItem)
2313	2863	{
2314	2864	MarkLeaves(false);
2315	2865	} else
2316		- if (event.getSource() == flipVItem)
	2866	+ if (source == rewindleavesItem)
	2867	+ {
	2868	+ RewindLeaves(true);
	2869	+ } else
	2870	+ if (source == unrewindleavesItem)
	2871	+ {
	2872	+ RewindLeaves(false);
	2873	+ } else
	2874	+ if (source == randomleavesItem)
	2875	+ {
	2876	+ RandomLeaves(true);
	2877	+ } else
	2878	+ if (source == unrandomleavesItem)
	2879	+ {
	2880	+ RandomLeaves(false);
	2881	+ } else
	2882	+ if (source == flipVItem)
2317	2883	{
2318	2884	FlipV(true);
2319	2885	} else
2320		- if (event.getSource() == unflipVItem)
	2886	+ if (source == unflipVItem)
2321	2887	{
2322	2888	FlipV(false);
2323	2889	} else
2324		- if (event.getSource() == lowTexturesItem)
	2890	+ if (source == lowTexturesItem)
2325	2891	{
2326	2892	SetTexRes(0);
2327	2893	} else
2328		- if (event.getSource() == normalTexturesItem)
	2894	+ if (source == normalTexturesItem)
2329	2895	{
2330	2896	SetTexRes(1);
2331	2897	} else
2332		- if (event.getSource() == highTexturesItem)
	2898	+ if (source == highTexturesItem)
2333	2899	{
2334	2900	SetTexRes(2);
2335	2901	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2902	+ if (source == veryhighTexturesItem)
2337	2903	{
2338	2904	SetTexRes(3);
2339	2905	} else
2340		- if (event.getSource() == maxTexturesItem)
	2906	+ if (source == maxTexturesItem)
2341	2907	{
2342	2908	SetTexRes(4);
2343	2909	} else
2344		- if (event.getSource() == panoTexturesItem)
	2910	+ if (source == panoTexturesItem)
2345	2911	{
2346	2912	SetTexRes(5);
2347	2913	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2914	+ if (source == reverseNormalsItem)
2349	2915	{
2350	2916	ReverseNormals();
2351	2917	} else
2352		- if (event.getSource() == parseverticesItem)
	2918	+ if (source == parseverticesItem)
2353	2919	{
2354	2920	ParseVertices();
2355	2921	} else
2356		- if (event.getSource() == alignItem)
	2922	+ if (source == textureFieldItem)
	2923	+ {
	2924	+ TextureVertices();
	2925	+ } else
	2926	+ if (source == alignItem)
2357	2927	{
2358	2928	Align();
2359	2929	} else
2360		- if (event.getSource() == mirrorItem)
	2930	+ if (source == mirrorItem)
2361	2931	{
2362	2932	MirrorPoses();
2363	2933	} else
2364		- if (event.getSource() == reduceMorphItem)
	2934	+ if (source == reduceMorphItem)
2365	2935	{
2366	2936	MeshReduction(false);
2367	2937	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2938	+ if (source == reduce34MorphItem)
2369	2939	{
2370	2940	MeshReduction(true);
2371	2941	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2942	+ if (source == reverseTrianglesItem)
2373	2943	{
2374	2944	ReverseTriangles();
2375	2945	} else
2376		- if (event.getSource() == reduceMeshItem)
	2946	+ if (source == reduceMeshItem)
2377	2947	{
2378	2948	ReduceMesh(false);
2379	2949	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2950	+ if (source == reduce34MeshItem)
2381	2951	{
2382	2952	ReduceMesh(true);
2383	2953	} else
2384		- if (event.getSource() == increaseMeshItem)
	2954	+ if (source == increaseMeshItem)
2385	2955	{
2386	2956	IncreaseMesh();
2387	2957	} else
2388		- if (event.getSource() == clipMeshItem)
	2958	+ if (source == clipMeshItem)
2389	2959	{
2390	2960	ClipMesh();
2391	2961	} else
2392		- if (event.getSource() == smoothMeshItem)
	2962	+ if (source == smoothMeshItem)
2393	2963	{
2394	2964	SmoothMesh();
2395	2965	} else
2396		- if (event.getSource() == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2397	2967	{
2398	2968	TransformGeometry();
2399	2969	} else
2400		- if (event.getSource() == resetTransformItem)
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
	2973	+ } else
	2974	+ if (source == resetTransformItem)
2401	2975	{
2402	2976	ResetTransform();
2403	2977	} else
2404		- if (event.getSource() == resetCentroidItem)
	2978	+ if (source == resetCentroidItem)
2405	2979	{
2406		- ResetCentroid();
	2980	+ ResetCentroid(true);
2407	2981	} else
2408		- if (event.getSource() == resetParentItem)
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
	2985	+ } else
	2986	+ if (source == resetParentItem)
2409	2987	{
2410	2988	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2989	{
..	..	@@ -2415,7 +2993,7 @@
2415	2993
2416	2994	refreshContents();
2417	2995	} else
2418		- if (event.getSource() == repairParentItem)
	2996	+ if (source == repairParentItem)
2419	2997	{
2420	2998	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2999	{
..	..	@@ -2429,7 +3007,21 @@
2429	3007
2430	3008	refreshContents();
2431	3009	} else
2432		- if (event.getSource() == sortbysizeItem)
	3010	+ if (source == repairShadowItem)
	3011	+ {
	3012	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3013	+ {
	3014	+ Object3D obj = (Object3D)e.nextElement();
	3015	+ obj.RepairShadow();
	3016	+// for (int i=0; i<obj.size(); i++)
	3017	+// {
	3018	+// obj.get(i).parent = obj;
	3019	+// }
	3020	+ }
	3021	+
	3022	+ refreshContents();
	3023	+ } else
	3024	+ if (source == sortbysizeItem)
2433	3025	{
2434	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	3027	{
..	..	@@ -2441,7 +3033,7 @@
2441	3033	ResetModel();
2442	3034	refreshContents();
2443	3035	} else
2444		- if (event.getSource() == sortbynameItem)
	3036	+ if (source == sortbynameItem)
2445	3037	{
2446	3038	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3039	{
..	..	@@ -2453,7 +3045,7 @@
2453	3045	ResetModel();
2454	3046	refreshContents();
2455	3047	} else
2456		- if (event.getSource() == attachPigmentItem)
	3048	+ if (source == attachPigmentItem)
2457	3049	{
2458	3050	String texture = GetFile("Attach pigment");
2459	3051	Object3D obj;
..	..	@@ -2465,7 +3057,7 @@
2465	3057
2466	3058	refreshContents();
2467	3059	} else
2468		- if (event.getSource() == detachPigmentItem)
	3060	+ if (source == detachPigmentItem)
2469	3061	{
2470	3062	Object3D obj;
2471	3063	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3068,7 @@
2476	3068
2477	3069	refreshContents();
2478	3070	} else
2479		- if (event.getSource() == attachBumpItem)
	3071	+ if (source == attachBumpItem)
2480	3072	{
2481	3073	String texture = GetFile("Attach bump");
2482	3074	Object3D obj;
..	..	@@ -2488,7 +3080,7 @@
2488	3080
2489	3081	refreshContents();
2490	3082	} else
2491		- if (event.getSource() == detachBumpItem)
	3083	+ if (source == detachBumpItem)
2492	3084	{
2493	3085	Object3D obj;
2494	3086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +3091,7 @@
2499	3091
2500	3092	refreshContents();
2501	3093	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3094	+ if (source == pigmentBumpItem)
2503	3095	{
2504	3096	Object3D obj;
2505	3097	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +3102,237 @@
2510	3102
2511	3103	refreshContents();
2512	3104	} else
2513		- if (event.getSource() == flashSelectionButton)
	3105	+ if (source == flashSelectionButton)
2514	3106	{
2515	3107	CameraPane.flash = true;
2516	3108	refreshContents();
2517	3109	} else
2518		- if (event.getSource() == oneButton)
	3110	+ if (source == oneButton)
2519	3111	{
2520	3112	} else
2521		- if (event.getSource() == twoButton)
	3113	+ if (source == twoButton)
2522	3114	{
2523	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2524	3120	// bug
2525	3121	//gridPanel.setDividerLocation(1.0);
2526	3122	//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();
	3123	+// bigThree.remove(scenePanel);
	3124	+// bigThree.remove(centralPanel);
	3125	+// bigThree.remove(XYZPanel);
	3126	+// aWindowConstraints.gridx = 0;
	3127	+// aWindowConstraints.gridy = 0;
	3128	+// aWindowConstraints.gridwidth = 1;
	3129	+// // aConstraints.gridheight = 3;
	3130	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3131	+// aWindowConstraints.weightx = 0;
	3132	+// aWindowConstraints.weighty = 1;
	3133	+// //bigThree.add(jtp, aWindowConstraints);
	3134	+// aWindowConstraints.weightx = 1;
	3135	+// aWindowConstraints.gridwidth = 3;
	3136	+// // aConstraints.gridheight = 3;
	3137	+// aWindowConstraints.gridx = 1;
	3138	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3139	+// bigThree.add(centralPanel, aWindowConstraints);
	3140	+// aWindowConstraints.weightx = 0;
	3141	+// aWindowConstraints.gridx = 4;
	3142	+// aWindowConstraints.gridwidth = 1;
	3143	+// // aConstraints.gridheight = 3;
	3144	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3145	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3146	+// scenePanel.setVisible(false);
	3147	+// centralPanel.setVisible(true);
	3148	+// XYZPanel.setVisible(false);
	3149	+ bigThree.ClearUI();
	3150	+ bigThree.add(centralPanel);
	3151	+ bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2551	3170	} else
2552		- if (event.getSource() == threeButton)
	3171	+ if (source == threeButton)
2553	3172	{
2554	3173	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();
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
	3177	+
	3178	+// bigThree.remove(scenePanel);
	3179	+// bigThree.remove(centralPanel);
	3180	+// bigThree.remove(XYZPanel);
	3181	+// aWindowConstraints.gridx = 0;
	3182	+// aWindowConstraints.gridy = 0;
	3183	+// aWindowConstraints.gridwidth = 1;
	3184	+// // aConstraints.gridheight = 3;
	3185	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3186	+// aWindowConstraints.weightx = 0;
	3187	+// aWindowConstraints.weighty = 1;
	3188	+// //bigThree.add(jtp, aWindowConstraints);
	3189	+// aWindowConstraints.weightx = 1;
	3190	+// aWindowConstraints.gridwidth = 3;
	3191	+// // aConstraints.gridheight = 3;
	3192	+// aWindowConstraints.gridx = 1;
	3193	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3194	+// bigThree.add(centralPanel, aWindowConstraints);
	3195	+// aWindowConstraints.weightx = 0;
	3196	+// aWindowConstraints.gridx = 4;
	3197	+// aWindowConstraints.gridwidth = 1;
	3198	+// // aConstraints.gridheight = 3;
	3199	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3200	+// bigThree.add(XYZPanel, aWindowConstraints);
	3201	+// bigThree.validate();
	3202	+// scenePanel.setVisible(false);
	3203	+// centralPanel.setVisible(true);
	3204	+// XYZPanel.setVisible(true);
	3205	+ bigThree.ClearUI();
	3206	+ bigThree.add(centralPanel);
	3207	+ bigThree.add(XYZPanel);
	3208	+ bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2579	3211	} else
2580		- if (event.getSource() == fourButton)
	3212	+ if (source == fourButton)
2581	3213	{
2582	3214	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();
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
	3218	+
	3219	+// bigThree.remove(scenePanel);
	3220	+// bigThree.remove(centralPanel);
	3221	+// bigThree.remove(XYZPanel);
	3222	+// aWindowConstraints.gridx = 0;
	3223	+// aWindowConstraints.gridy = 0;
	3224	+// aWindowConstraints.gridwidth = 1;
	3225	+// // aWindowConstraints.gridheight = 3;
	3226	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3227	+// aWindowConstraints.weightx = 1;
	3228	+// aWindowConstraints.weighty = 1;
	3229	+// bigThree.add(scenePanel, aWindowConstraints);
	3230	+// aWindowConstraints.weightx = 1;
	3231	+// aWindowConstraints.gridwidth = 3;
	3232	+// // aConstraints.gridheight = 3;
	3233	+// aWindowConstraints.gridx = 1;
	3234	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3235	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3236	+// aWindowConstraints.weightx = 0;
	3237	+// aWindowConstraints.gridx = 4;
	3238	+// aWindowConstraints.gridwidth = 1;
	3239	+// // aWindowConstraints.gridheight = 3;
	3240	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3241	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3242	+// bigThree.validate();
	3243	+// scenePanel.setVisible(true);
	3244	+// centralPanel.setVisible(false);
	3245	+// XYZPanel.setVisible(false);
	3246	+ bigThree.ClearUI();
	3247	+ bigThree.add(scenePanel);
	3248	+ bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2607	3251	} else
2608		- if (event.getSource() == sixButton)
	3252	+ if (source == sixButton)
2609	3253	{
2610	3254	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();
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
	3258	+
	3259	+// bigThree.remove(scenePanel);
	3260	+// bigThree.remove(centralPanel);
	3261	+// bigThree.remove(XYZPanel);
	3262	+// aWindowConstraints.gridx = 0;
	3263	+// aWindowConstraints.gridy = 0;
	3264	+// aWindowConstraints.gridwidth = 1;
	3265	+// // aConstraints.gridheight = 3;
	3266	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3267	+// aWindowConstraints.weightx = 0;
	3268	+// aWindowConstraints.weighty = 1;
	3269	+// bigThree.add(scenePanel, aWindowConstraints);
	3270	+// aWindowConstraints.weightx = 1;
	3271	+// aWindowConstraints.gridwidth = 3;
	3272	+// // aWindowConstraints.gridheight = 3;
	3273	+// aWindowConstraints.gridx = 1;
	3274	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3275	+// bigThree.add(centralPanel, aWindowConstraints);
	3276	+// aWindowConstraints.weightx = 0;
	3277	+// aWindowConstraints.gridx = 4;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3281	+// //bigThree.add(XYZPanel, aConstraints);
	3282	+// bigThree.validate();
	3283	+// scenePanel.setVisible(true);
	3284	+// centralPanel.setVisible(true);
	3285	+// XYZPanel.setVisible(false);
	3286	+ bigThree.ClearUI();
	3287	+ bigThree.add(scenePanel);
	3288	+ bigThree.add(centralPanel);
	3289	+ bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2635	3292	} else
2636		- if (event.getSource() == sevenButton)
	3293	+ if (source == sevenButton)
2637	3294	{
2638	3295	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();
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
	3299	+
	3300	+// bigThree.remove(scenePanel);
	3301	+// bigThree.remove(centralPanel);
	3302	+// bigThree.remove(XYZPanel);
	3303	+// aWindowConstraints.gridx = 0;
	3304	+// aWindowConstraints.gridy = 0;
	3305	+// aWindowConstraints.gridwidth = 1;
	3306	+// // aWindowConstraints.gridheight = 3;
	3307	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3308	+// aWindowConstraints.weightx = 0;
	3309	+// aWindowConstraints.weighty = 1;
	3310	+// bigThree.add(scenePanel, aWindowConstraints);
	3311	+// aWindowConstraints.weightx = 1;
	3312	+// aWindowConstraints.gridwidth = 3;
	3313	+// // aWindowConstraints.gridheight = 3;
	3314	+// aWindowConstraints.gridx = 1;
	3315	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3316	+// bigThree.add(centralPanel, aWindowConstraints);
	3317	+// aWindowConstraints.weightx = 0;
	3318	+// aWindowConstraints.gridx = 4;
	3319	+// aWindowConstraints.gridwidth = 1;
	3320	+// // aConstraints.gridheight = 3;
	3321	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3322	+// bigThree.add(XYZPanel, aWindowConstraints);
	3323	+// bigThree.validate();
	3324	+// scenePanel.setVisible(true);
	3325	+// centralPanel.setVisible(true);
	3326	+// XYZPanel.setVisible(true);
	3327	+ bigThree.ClearUI();
	3328	+ bigThree.add(scenePanel);
	3329	+ bigThree.add(centralPanel);
	3330	+ bigThree.add(XYZPanel);
	3331	+ bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2663	3334	} else
2664		- if (event.getSource() == rootButton)
	3335	+ if (source == rootButton)
2665	3336	{
2666	3337	Object3D obj;
2667	3338	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,66 +3342,84 @@
2671	3342	EditObject(obj);
2672	3343	}
2673	3344
	3345	+ cameraView.requestFocusInWindow();
2674	3346	refreshContents(true);
2675	3347	} else
2676		- if (event.getSource() == closeButton)
	3348	+ if (source == closeButton)
2677	3349	{
2678	3350	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3351	cRadio ab;
2680	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3353	{
2682	3354	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2685	3363	buttonGroup.remove(ab);
2686	3364	radioPanel.remove(ab);
2687	3365
2688		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2689	3368	// ab.GetObject().objectUI = null; // ?????????
2690	3369
2691	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	3371	break;
2693	3372	}
2694	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2695	3376	refreshContents(true);
2696	3377	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3378	+ if (source == editItem \|\| source == editButton)
2698	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2699	3386	EditSelection(false);
2700	3387	} else
2701		- if (event.getSource() == uneditButton)
	3388	+ if (source == uneditButton)
2702	3389	{
2703	3390	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3391	{
2705	3392	Object3D child = (Object3D)e.nextElement();
2706	3393	if(child.editWindow != null)
2707	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2708	3396	child.CloseUI();
2709	3397	listUI.remove(child);
2710	3398
2711		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2712	3400	}
2713		- objEditor.ctrlPanel.revalidate();
	3401	+ objEditor.ctrlPanel.FlushUI();
2714	3402	//objEditor.jTree.clearSelection();
2715	3403	//objEditor.ResetSliders();
2716	3404	refreshContents(true);
2717	3405	} else
2718		- if (event.getSource() == clearPanelButton)
	3406	+ if (source == clearPanelButton)
2719	3407	{
2720	3408	assert(copy == group);
2721	3409	//copy.ClearUI();
2722	3410	for (Object3D obj : listUI)
2723	3411	{
	3412	+ obj.pinned = false;
2724	3413	obj.CloseUI();
2725	3414	}
2726	3415	listUI.clear();
2727	3416	refreshContents(true);
2728	3417	} else
2729		- if (event.getSource() == allParamsButton)
	3418	+ if (source == allParamsButton)
2730	3419	{
2731	3420	assert(copy == group);
2732	3421
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	3423
2735	3424	for (Object3D obj : listUI)
2736	3425	{
..	..	@@ -2747,19 +3436,19 @@
2747	3436
2748	3437	refreshContents(true);
2749	3438	} else
2750		- if (event.getSource() == unselectButton)
	3439	+ if (source == unselectButton)
2751	3440	{
2752	3441	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3442	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3443	objEditor.ResetSliders();
2755	3444	refreshContents(true);
2756	3445	} else
2757		- if(event.getSource() instanceof cRadio)
	3446	+ if(source instanceof cRadio)
2758	3447	{
2759	3448	group.parent = keepparent;
2760	3449	group.attributes = 0;
2761	3450	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3451	+ /cRadio/ radio = (cRadio)source;
2763	3452	Object3D obj = radio.GetObject();
2764	3453	System.out.println("Edit " + obj);
2765	3454	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3468,7 @@
2779	3468	}
2780	3469
2781	3470	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3471	+ //Globals.theRenderer.object = group;
2783	3472	if(!useclient)
2784	3473	{
2785	3474	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,25 +3477,50 @@
2788	3477	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3478	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3479	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3480	+ //cameraView.lighttouched = true;
	3481	+ Globals.lighttouched = true;
2792	3482	topView.object = group;
2793	3483	frontView.object = group;
2794	3484	sideView.object = group;
2795	3485	}
2796		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
2797	3491	/*
2798	3492	currentLayout = radio.layout;
2799	3493	if (currentLayout == null)
2800	3494	currentLayout = sevenButton;
2801	3495	*/
2802	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
2803	3502	keepparent = group.parent;
2804	3503	// PARENT = NULL or not???
2805	3504	//group.parent = null; // ROOT
2806	3505	//group.attributes = -1;
2807	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
2808	3509	refreshContents(true);
2809		- }
	3510	+ } else if (event.getSource() == editCameraItem)
	3511	+ {
	3512	+ cameraView.ProtectCamera();
	3513	+ cameraView.repaint();
	3514	+ return;
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3516	+ {
	3517	+ cameraView.RevertCamera();
	3518	+ cameraView.repaint();
	3519	+ return;
	3520	+ // } else if (event.getSource() == textureButton)
	3521	+ // {
	3522	+ // return; // true;
	3523	+ }
2810	3524	else
2811	3525	{
2812	3526	//return super.action(event, arg);
..	..	@@ -2815,7 +3529,6 @@
2815	3529	}
2816	3530
2817	3531	boolean useclient = false;
2818		- cRadio radio;
2819	3532
2820	3533	void ToggleRoot()
2821	3534	{
..	..	@@ -2824,7 +3537,7 @@
2824	3537	if (useclient)
2825	3538	{
2826	3539	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3540	+ Globals.lighttouched = true;
2828	3541	//topView.object = client;
2829	3542	//frontView.object = client;
2830	3543	//sideView.object = client;
..	..	@@ -2832,7 +3545,7 @@
2832	3545	else
2833	3546	{
2834	3547	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3548	+ Globals.lighttouched = true;
2836	3549	//topView.object = group;
2837	3550	//frontView.object = group;
2838	3551	//sideView.object = group;
..	..	@@ -2867,6 +3580,28 @@
2867	3580	refreshContents();
2868	3581	}
2869	3582
	3583	+ void TransformChildren()
	3584	+ {
	3585	+ Object3D obj;
	3586	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3587	+ {
	3588	+ obj = (Object3D)e.nextElement();
	3589	+ obj.KeepTextureMatrices();
	3590	+ obj.TransformChildren();
	3591	+ obj.RestoreTextureMatrices();
	3592	+
	3593	+// if (obj.parent == null)
	3594	+// {
	3595	+// System.out.println("NULL PARENT!");
	3596	+// new Exception().printStackTrace();
	3597	+// }
	3598	+// else
	3599	+// TouchTransform(obj);
	3600	+// //obj.parent.Touch();
	3601	+ }
	3602	+
	3603	+ refreshContents();
	3604	+ }
2870	3605
2871	3606	void ResetTransform()
2872	3607	{
..	..	@@ -2979,7 +3714,7 @@
2979	3714	refreshContents();
2980	3715	}
2981	3716
2982		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
2983	3718	{
2984	3719	Object3D obj;
2985	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3729,16 @@
2994	3729	LA.matIdentity(Object3D.mat);
2995	3730	obj.getBounds(minima, maxima, false);
2996	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3000	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3003	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3767,8 @@
3028	3767
3029	3768	int size = obj.MemorySize();
3030	3769
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3770	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3771	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3772	}
3033	3773	}
3034	3774	catch (Exception e)
..	..	@@ -3065,9 +3805,9 @@
3065	3805	obj = (Object3D)e.nextElement();
3066	3806
3067	3807	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3069	3809	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3811
3072	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3813	}
..	..	@@ -3109,6 +3849,20 @@
3109	3849	void GenNormals(boolean crease)
3110	3850	{
3111	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
	3859	+
	3860	+ refreshContents();
	3861	+ }
	3862	+
	3863	+ void GenNormalsMINE()
	3864	+ {
	3865	+ group.selection.GenNormalsMINE();
3112	3866
3113	3867	refreshContents();
3114	3868	}
..	..	@@ -3157,104 +3911,259 @@
3157	3911
3158	3912	//Object3D buffer;
3159	3913	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		-
	3914	+// BoundaryRep temprep;
	3915	+// Object3D nodes;
	3916	+// Vector<Vertex> vertices;
	3917	+//
	3918	+// cGroup buffer;
	3919	+//
	3920	+// public void Vertex(Object3D node, Vertex v)
	3921	+// {
	3922	+//// vertices.add(v);
	3923	+//// nodes.addElement(node);
	3924	+////
	3925	+//// if (temprep.GetCache(v) != null)
	3926	+//// {
	3927	+//// temprep.Remove(v);
	3928	+//// } else
	3929	+//// {
	3930	+//// temprep.Remember(v);
	3931	+//// }
	3932	+//
	3933	+// //Object3D node = nodes.get(index);
	3934	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3935	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3936	+//
	3937	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3938	+//
	3939	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3940	+//
	3941	+// cGroup g = new cGroup();
	3942	+//
	3943	+// if (g.toParent == null)
	3944	+// {
	3945	+// g.toParent = LA.newMatrix();
	3946	+// g.fromParent = LA.newMatrix();
	3947	+// }
	3948	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3949	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3950	+//
	3951	+// g.add(GrafreeD.clipboard);
	3952	+//
	3953	+// buffer.add(g);
	3954	+// }
	3955	+//
	3956	+// public void Face(Object3D node, Face f)
	3957	+// {
	3958	+//
	3959	+// }
	3960	+//
	3961	+// void ParseVerticesOld() // ??
	3962	+// {
	3963	+// //if (group.selection.size() != 1)
	3964	+// // return;
	3965	+//
	3966	+// temprep = new BoundaryRep();
	3967	+// nodes = new Object3D();
	3968	+// vertices = new Vector<Vertex>();
	3969	+//
	3970	+// boolean epsequal = GrafreeD.epsequal;
	3971	+// GrafreeD.epsequal = true;
	3972	+//
	3973	+// for (int i=0; i<group.selection.size(); i++)
	3974	+// {
	3975	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3976	+//
	3977	+// group.selection.get(i).Parse(
	3978	+//this );
	3979	+//
	3980	+// int repsize = temprep.VertexCount();
	3981	+// int tablesize = temprep.vertextable.size();
	3982	+// int nodesize = nodes.size();
	3983	+//
	3984	+// assert(vertices.size() == nodes.size());
	3985	+//
	3986	+// temprep.vertextable.elements();
	3987	+//
	3988	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3989	+//
	3990	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3991	+// {
	3992	+// cGroup g = new cGroup();
	3993	+//
	3994	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3995	+//
	3996	+// Object3D node = nodes.get(index);
	3997	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3998	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3999	+//
	4000	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4001	+//
	4002	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4003	+//
	4004	+// if (g.toParent == null)
	4005	+// {
	4006	+// g.toParent = LA.newMatrix();
	4007	+// g.fromParent = LA.newMatrix();
	4008	+// }
	4009	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4010	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4011	+//
	4012	+// g.add(GrafreeD.clipboard);
	4013	+//
	4014	+// buffer.add(g);
	4015	+// }
	4016	+//
	4017	+// makeSomething(buffer, i==group.selection.size()-1);
	4018	+// }
	4019	+//
	4020	+// GrafreeD.epsequal = epsequal;
	4021	+//
	4022	+// //buffer = null;
	4023	+// temprep = null;
	4024	+// nodes = null;
	4025	+//
	4026	+// refreshContents();
	4027	+// }
	4028	+
3184	4029	void ParseVertices()
3185	4030	{
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;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3195	4033
3196	4034	for (int i=0; i<group.selection.size(); i++)
3197	4035	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4036	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	4037
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	4038	+ group.selection.get(i).Parse(
	4039	+
	4040	+ new iParse()
	4041	+ {
	4042	+ public void Vertex(Object3D node, Vertex v)
	4043	+ {
	4044	+ temp.set(v);
	4045	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4046
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();
	4047	+ cGroup g = new cGroup();
3211	4048
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4049	+ if (g.toParent == null)
	4050	+ {
	4051	+ g.toParent = LA.newMatrix();
	4052	+ g.fromParent = LA.newMatrix();
	4053	+ }
	4054	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4055	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4056
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);
	4057	+ g.add(Grafreed.clipboard);
3220	4058
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);
	4059	+ buffer.add(g);
	4060	+ }
3232	4061
3233		- g.add(GraphreeD.clipboard);
	4062	+ public void Face(Object3D node, Face f)
	4063	+ {
3234	4064
3235		- buffer.add(g);
3236		- }
	4065	+ }
	4066	+ }
	4067	+ );
3237	4068
3238	4069	makeSomething(buffer, i==group.selection.size()-1);
3239	4070	}
3240	4071
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4072	+ Grafreed.epsequal = epsequal;
3246	4073
3247	4074	refreshContents();
3248	4075	}
3249		-
	4076	+
	4077	+ void TextureVertices()
	4078	+ {
	4079	+ for (int i=0; i<group.selection.size(); i++)
	4080	+ {
	4081	+ group.selection.get(i).Parse(
	4082	+ new iParse()
	4083	+ {
	4084	+ public void Vertex(Object3D node, Vertex v)
	4085	+ {
	4086	+ cTexture tex = node.GetTextures();
	4087	+ String pigment = Object3D.GetPigment(tex);
	4088	+ //String bump = Object3D.GetBump(tex);
	4089	+
	4090	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4091	+
	4092	+ try
	4093	+ {
	4094	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4095	+ }
	4096	+ catch (Exception e)
	4097	+ {
	4098	+ System.err.println("FAIL: " + node);
	4099	+ }
	4100	+
	4101	+ double s = v.s;
	4102	+
	4103	+ if (s == 1)
	4104	+ s = 0;
	4105	+
	4106	+ double t = v.t;
	4107	+
	4108	+ if (t == 1)
	4109	+ t = 0;
	4110	+
	4111	+ int indexs = (int) (texturedata.getWidth() * s);
	4112	+ int indext = (int) (texturedata.getHeight() * t);
	4113	+
	4114	+ int index = indext * texturedata.getWidth() + indexs;
	4115	+
	4116	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4117	+
	4118	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4119	+
	4120	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4121	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4122	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4123	+ scale /= 3;
	4124	+
	4125	+ scale /= 0xFF;
	4126	+ // c'est quoi ca? scale /= 4;
	4127	+
	4128	+ //v.AO = scale;
	4129	+
	4130	+ v.x += v.norm.x * scale;
	4131	+ v.y += v.norm.y * scale;
	4132	+ v.z += v.norm.z * scale;
	4133	+ }
	4134	+
	4135	+ public void Face(Object3D node, Face f)
	4136	+ {
	4137	+ }
	4138	+ }
	4139	+ );
	4140	+ }
	4141	+
	4142	+ refreshContents();
	4143	+ }
	4144	+
3250	4145	void Align()
3251	4146	{
	4147	+ if (group.selection.size() == 0)
	4148	+ return;
	4149	+
	4150	+ cVector bbmin = new cVector();
	4151	+ cVector bbmax = new cVector();
	4152	+
	4153	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4154	+
	4155	+ double dx = bbmax.x - bbmin.x;
	4156	+ double dy = bbmax.y - bbmin.y;
	4157	+ double dz = bbmax.z - bbmin.z;
	4158	+
	4159	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4160	+
3252	4161	for (int i=0; i<group.selection.size(); i++)
3253	4162	{
3254	4163	Object3D obj = group.selection.get(i);
3255	4164
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4165	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4166	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4167	}
3259	4168
3260	4169	refreshContents();
..	..	@@ -3267,7 +4176,7 @@
3267	4176	// ref.SaveSupports();
3268	4177	// Object3D par = ref.parent;
3269	4178	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4179	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4180	// ref.parent = par;
3272	4181	// ref.RestoreSupports();
3273	4182
..	..	@@ -3275,11 +4184,11 @@
3275	4184
3276	4185	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4186
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4187	+ boolean random = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4189	lowres.linkVerticesThis(null);
3281	4190	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4191	+ CameraPane.SWITCH = random;
3283	4192
3284	4193	System.err.flush();
3285	4194
..	..	@@ -3297,7 +4206,7 @@
3297	4206	// lowres.SaveSupports();
3298	4207	// par = lowres.parent;
3299	4208	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4209	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4210	Object3D newlow = CloneObject(lowres, false);
3302	4211	newlow.name = sn.switchobject.get(i).name;
3303	4212	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4228,7 @@
3319	4228	return;
3320	4229
3321	4230	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4232
3324	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4234
..	..	@@ -3488,7 +4397,7 @@
3488	4397	group.selection.RelinkToSupport(); // july 2014
3489	4398	System.out.println("DONE.");
3490	4399	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4400	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4401	}
3493	4402
3494	4403	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4422,20 @@
3513	4422
3514	4423	void ClipMesh()
3515	4424	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4426	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3519	4428
3520	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4430	content = ((cGroup)content).get(0);
3522	4431
3523	4432	// for (int i=0; i<group.selection.size(); i++)
3524	4433	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4434	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4435	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4437	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4438	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4439	System.out.println("DONE.");
3531	4440	refreshContents();
3532	4441	}
..	..	@@ -3571,6 +4480,18 @@
3571	4480	void MarkLeaves(boolean hide)
3572	4481	{
3573	4482	group.selection.MarkLeaves(hide);
	4483	+ refreshContents();
	4484	+ }
	4485	+
	4486	+ void RewindLeaves(boolean hide)
	4487	+ {
	4488	+ group.selection.RewindLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RandomLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RandomLeaves(hide);
3574	4495	refreshContents();
3575	4496	}
3576	4497
..	..	@@ -3645,10 +4566,6 @@
3645	4566	// }
3646	4567	// }
3647	4568
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	4569	void EditSelection(boolean newWindow)
3653	4570	{
3654	4571	// aConstraints.gridy = 0;
..	..	@@ -3656,10 +4573,10 @@
3656	4573	{
3657	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4577
3661	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
3663	4580	{
3664	4581	// if (!(elem instanceof Composite))
3665	4582	// newWindow = false;
..	..	@@ -3741,7 +4658,8 @@
3741	4658	//new Exception().printStackTrace();
3742	4659
3743	4660	freezemodel = true;
3744		-
	4661	+ ClearUnpinned();
	4662	+
3745	4663	/**/
3746	4664	//switch (event.id)
3747	4665	{
..	..	@@ -3749,7 +4667,6 @@
3749	4667	//case 702: // Event.LIST_DESELECT
3750	4668	group.deselectAll();
3751	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4670	if (tps != null)
3754	4671	{
3755	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +4675,39 @@
3758	4675
3759	4676	//if (child.parent != null)
3760	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
3761	4679	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4680	}
3766	4681	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4682	+// else
	4683	+// {
	4684	+// objEditor.SetMaterial(group); // .GetMaterial());
	4685	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4686	+// System.err.println("info : " + group.GetPath());
	4687	+// }
3773	4688
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4689	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4690	CameraPane.flash = true;
3778	4691
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4693	// a camera
3781	4694	{
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;
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4696	+ {
	4697	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4698	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4699	+ }
	4700	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4701	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4702	}
3787	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
3788	4711	refreshContents();
3789	4712	//return true;
3790	4713	}
..	..	@@ -3793,6 +4716,35 @@
3793	4716
3794	4717	freezemodel = false;
3795	4718	}
	4719	+
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
	4728	+ void refreshContents(boolean cp)
	4729	+ {
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4732	+ {
	4733	+ objEditor.ClearInfo(); // .GetMaterial());
	4734	+
	4735	+ for (int i=0; i < group.selection.Size(); i++)
	4736	+ {
	4737	+ Object3D child = (Object3D) group.selection.get(i);
	4738	+
	4739	+ objEditor.AddInfo(child, this, true);
	4740	+ System.err.println("info : " + child.GetPath());
	4741	+ }
	4742	+
	4743	+ objEditor.SetText(); // jan 2014
	4744	+ }
	4745	+
	4746	+ super.refreshContents(cp);
	4747	+ }
3796	4748
3797	4749	void linkSomething(Object3D thing)
3798	4750	{
..	..	@@ -3864,16 +4816,19 @@
3864	4816	{
3865	4817	if (group.selection.isEmpty())
3866	4818	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
3868	4821	Composite tGroup = null;
3869	4822	if (group.selection.size() > 0) // 1)
3870	4823	{
3871	4824	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
3873	4826	}
3874	4827
3875	4828	if (cut)
3876	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
3877	4832	//int indices[] = jList.getSelectedIndices();
3878	4833	//for (int i = indices.length - 1; i >= 0; i--)
3879	4834	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4864,16 @@
3909	4864	//System.out.println("cut " + child);
3910	4865	//System.out.println("parent = " + child.parent);
3911	4866	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
3913	4868	tGroup.add/Child/(tmp);
3914	4869	else
3915		- GraphreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
3916	4871	}
3917	4872	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
3919	4874	tGroup.add/Child/(child);
3920	4875	else
3921		- GraphreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
3922	4877	}
3923	4878
3924	4879	//ResetModel();
..	..	@@ -3950,21 +4905,23 @@
3950	4905	//System.out.println("cut " + elem);
3951	4906	//System.out.println("parent = " + elem.parent);
3952	4907	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
3954	4909	tGroup.add/Child/(tmp);
3955	4910	else
3956		- GraphreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
3957	4912	}
3958	4913	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
3960	4915	tGroup.add/Child/(child);
3961	4916	else
3962		- GraphreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
3963	4918	}
3964	4919
3965	4920	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
3968	4925	if (cut)
3969	4926	{
3970	4927	ResetModel();
..	..	@@ -3974,11 +4931,11 @@
3974	4931
3975	4932	void paste(boolean expand)
3976	4933	{
3977		- // if (GraphreeD.clipboard == null)
	4934	+ // if (GrafreeD.clipboard == null)
3978	4935	// return;
3979	4936	boolean first = true;
3980	4937
3981		- if (GraphreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
3982	4939	{
3983	4940	Composite temp;
3984	4941
..	..	@@ -3989,7 +4946,7 @@
3989	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4947	*/
3991	4948	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4949	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4950	{
3994	4951	Object3D child = (Object3D)e.nextElement();
3995	4952
..	..	@@ -4003,7 +4960,7 @@
4003	4960	else
4004	4961	elem = child.deepCopy(); // ?
4005	4962	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4963	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4964	// elem = elem.get(0);
4008	4965	makeSomething(elem, true); // ?? first);
4009	4966	//group.addChild(elem);
..	..	@@ -4023,23 +4980,23 @@
4023	4980	//Object3D cb = Applet3D.clipboard;
4024	4981	//temp.addChild(cb);
4025	4982	//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());
	4983	+ assert(Grafreed.clipboard.parent == null);
	4984	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4985	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4986	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4987	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4988	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4991	}
4035	4992
4036	4993	ResetModel();
4037	4994	refreshContents();
4038	4995	}
4039	4996
4040		- void pasteInto(boolean copyit)
	4997	+ void pasteInto(boolean copyit, boolean clone)
4041	4998	{
4042		-// if (GraphreeD.clipboard == null)
	4999	+// if (GrafreeD.clipboard == null)
4043	5000	// return;
4044	5001
4045	5002	if (group.selection.size() != 1)
..	..	@@ -4066,15 +5023,22 @@
4066	5023	if (copyit)
4067	5024	{
4068	5025	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	5026	+ if (clone)
	5027	+ {
	5028	+ CloneClipboard(false); // sept 2014
	5029	+ }
	5030	+ else
	5031	+ {
	5032	+ paste(false);
	5033	+ }
4070	5034	}
4071	5035	else
4072	5036	{
4073	5037	boolean first = true;
4074	5038
4075		- if (GraphreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4076	5040	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5042	Object3D copy;
4079	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5044	{
..	..	@@ -4084,7 +5048,7 @@
4084	5048	}
4085	5049	} else
4086	5050	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5052	}
4089	5053	}
4090	5054	}
..	..	@@ -4276,6 +5240,26 @@
4276	5240	makeSomething(csg);
4277	5241	}
4278	5242
	5243	+ void Ungroup(Object3D g)
	5244	+ {
	5245	+ if (g instanceof HiddenObject)
	5246	+ {
	5247	+ HiddenObject h = (HiddenObject) g;
	5248	+
	5249	+ for (int i=0; i<h.ActualSize(); i++)
	5250	+ {
	5251	+ objEditor.makeSomething(h.get(i), false);
	5252	+ }
	5253	+ }
	5254	+ else
	5255	+ {
	5256	+ for (int i=0; i<g.Size(); i++)
	5257	+ {
	5258	+ objEditor.makeSomething(g.get(i), false);
	5259	+ }
	5260	+ }
	5261	+ }
	5262	+
4279	5263	void ungroup()
4280	5264	{
4281	5265	/*
..	..	@@ -4469,21 +5453,6 @@
4469	5453	}
4470	5454	*/
4471	5455
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	5456	/*
4488	5457	public void Callback(Object obj)
4489	5458	{
..	..	@@ -4507,26 +5476,9 @@
4507	5476	}
4508	5477	*/
4509	5478
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	5479	String GetFile(String dialogName)
4528	5480	{
4529		- if (GraphreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4530	5482	{
4531	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5484	browser.show();
..	..	@@ -4590,10 +5542,33 @@
4590	5542	cButton flashSelectionButton;
4591	5543	cButton editButton;
4592	5544	cButton uneditButton;
	5545	+ JCheckBox allParamsButton;
4593	5546	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5547	cButton unselectButton;
4596	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
	5552	+ cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
	5571	+
4597	5572	cButton screenfitButton;
4598	5573	cButton screenfitpointButton;
4599	5574	cButton snapobjectButton;
..	..	@@ -4605,14 +5580,6 @@
4605	5580
4606	5581	cButton setsupportButton;
4607	5582
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	5583	//
4617	5584	//Composite
4618	5585	Object3D // to do !!
..	..	@@ -4622,9 +5589,11 @@
4622	5589	//JTree jTree;
4623	5590	private MenuItem lookAtItem;
4624	5591	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
4626	5593	private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
4628	5597	private MenuItem cloneItem;
4629	5598	private MenuItem cloneSupportItem;
4630	5599	private MenuItem overwriteGeoItem;
..	..	@@ -4635,8 +5604,9 @@
4635	5604	private MenuItem resetsupportItem;
4636	5605	private MenuItem resetreferencesItem;
4637	5606	private MenuItem linkverticesItem;
	5607	+ private MenuItem relinkverticesItem;
4638	5608	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
4640	5610	private MenuItem stepAllItem;
4641	5611	private MenuItem revertMeshItem;
4642	5612	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5617,17 @@
4647	5617	private MenuItem mergeGeometriesItem;
4648	5618	private MenuItem copyItem;
4649	5619	private MenuItem pasteItem;
	5620	+ private MenuItem pasteIntoItem;
4650	5621	private MenuItem pasteLinkItem;
4651	5622	private MenuItem pasteCloneItem;
4652	5623	private MenuItem pasteExpandItem;
4653	5624	private MenuItem clearItem;
4654	5625	private MenuItem clearAllItem;
4655	5626	private MenuItem genUVItem;
	5627	+ private MenuItem genNormalsMESHItem;
4656	5628	private MenuItem genNormalsCADItem;
4657	5629	private MenuItem genNormalsORGANItem;
	5630	+ private MenuItem genNormalsMINEItem;
4658	5631	private MenuItem stripifyItem;
4659	5632	private MenuItem unstripifyItem;
4660	5633	private MenuItem trimItem;
..	..	@@ -4683,6 +5656,10 @@
4683	5656	private MenuItem showleavesItem;
4684	5657	private MenuItem markleavesItem;
4685	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
4686	5663
4687	5664	private MenuItem flipVItem;
4688	5665	private MenuItem unflipVItem;
..	..	@@ -4694,14 +5671,17 @@
4694	5671	private MenuItem panoTexturesItem;
4695	5672
4696	5673	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
4698	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
	5678	+ private MenuItem hideItem;
4699	5679	private MenuItem grabItem;
4700	5680	private MenuItem backItem;
4701	5681	private MenuItem frontItem;
4702	5682	private MenuItem cameraItem;
4703	5683	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
4705	5685	private MenuItem physicsItem;
4706	5686	private MenuItem frameselectorItem;
4707	5687	private MenuItem scriptNodeItem;
..	..	@@ -4716,6 +5696,7 @@
4716	5696
4717	5697	private MenuItem resetParentItem;
4718	5698	private MenuItem repairParentItem;
	5699	+ private MenuItem repairShadowItem;
4719	5700	private MenuItem sortbysizeItem;
4720	5701	private MenuItem sortbynameItem;
4721	5702
..	..	@@ -4728,16 +5709,19 @@
4728	5709	private MenuItem particleItem;
4729	5710	private MenuItem ragdollItem;
4730	5711	private MenuItem ragdoll2Item;
	5712	+ private MenuItem heightFieldItem;
	5713	+ private MenuItem textureFieldItem;
4731	5714	private MenuItem gridItem;
4732	5715	private MenuItem rectoidItem;
4733	5716	private MenuItem ellipsoidItem;
4734	5717	private MenuItem coneItem;
4735	5718	private MenuItem torusItem;
4736	5719	private MenuItem superItem;
	5720	+ private MenuItem kleinItem;
4737	5721	private MenuItem blobItem;
4738	5722	private MenuItem latheItem;
4739	5723	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5724	+ private MenuItem overlayItem;
4741	5725	private MenuItem meshItem;
4742	5726	// private MenuItem meshGroupItem;
4743	5727	private MenuItem springItem;
..	..	@@ -4746,6 +5730,7 @@
4746	5730	private MenuItem csgItem;
4747	5731	private MenuItem templateItem;
4748	5732	private MenuItem textureItem;
	5733	+ private MenuItem billboardItem;
4749	5734	private MenuItem shadowXItem;
4750	5735	private MenuItem shadowYItem;
4751	5736	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5743,6 @@
4758	5743	private MenuItem doubleItem;
4759	5744	private MenuItem tripleItem;
4760	5745
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5746	private MenuItem computeAOItem;
4767	5747	private MenuItem recompileItem;
4768	5748	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5752,8 @@
4772	5752	private MenuItem analyzeItem;
4773	5753	private MenuItem dumpItem;
4774	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
4775	5759	}