~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,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,7 +80,13 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
77	90	SetupUI2(objEditor);
78	91	objEditor.SetupUI(true);
79	92	SetupViews(objEditor);
..	..	@@ -83,7 +96,11 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
86		- // Object3D keep = GraphreeD.clipboard;
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
	103	+ // Object3D keep = GrafreeD.clipboard;
87	104	//Object3D obj;
88	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	106	{
..	..	@@ -93,18 +110,19 @@
93	110
94	111	makeSomething(clone, i==group.selection.size()-1);
95	112	}
	113	+ Globals.REPLACEONMAKE = keep;
96	114	}
97	115
98	116	void CloneClipboard(boolean supports)
99	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	123	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
108	126	}
109	127
110	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +136,7 @@
118	136	// obj.support = null;
119	137	if (!supports)
120	138	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	140	obj.parent = parent;
123	141	// obj.support = support;
124	142	// clone.support = support; // aout 2013
..	..	@@ -147,30 +165,29 @@
147	165
148	166	//JTextField nameField;
149	167
150		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
151	169	{
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);
	170	+ oe.jTree = new cTree();
	171	+
163	172	Menu menu;
164	173	oe.menuBar.add(menu = new Menu("Edit"));
165	174	//editItem = menu.add(new MenuItem("Edit"));
166	175	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	183	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	184	cloneItem = menu.add(new MenuItem("Clone"));
171	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
172	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	189	cloneSupportItem.addActionListener(this);
	190	+ }
174	191	menu.add("-");
175	192	cutItem = menu.add(new MenuItem("Cut"));
176	193	cutItem.addActionListener(this);
..	..	@@ -178,26 +195,123 @@
178	195	copyItem.addActionListener(this);
179	196	pasteItem = menu.add(new MenuItem("Paste"));
180	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
181	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	203	pasteLinkItem.addActionListener(this);
183	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	205	pasteCloneItem.addActionListener(this);
185	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	207	// pasteExpandItem.addActionListener(this);
	208	+ menu.add("-");
187	209	clearItem = menu.add(new MenuItem("Clear"));
188	210	clearItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
189	215	clearAllItem = menu.add(new MenuItem("Clear All"));
190	216	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);
	217	+ }
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
	254	+
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
	306	+ oe.menuBar.add(menu = new Menu("Setting"));
	307	+ if (Globals.ADVANCED)
	308	+ {
196	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	310	revertMeshItem.addActionListener(this);
198	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	312	resetreferencesItem.addActionListener(this);
200	313	menu.add("-");
	314	+ }
201	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	316	overwriteGeoItem.addActionListener(this);
203	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,72 +323,104 @@
209	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	324	overwriteUVItem.addActionListener(this);
211	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
212	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	329	generateMeshItem.addActionListener(this);
214	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	331	poseMeshItem.addActionListener(this);
216	332	menu.add("-");
	333	+ }
217	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	335	resetsupportItem.addActionListener(this);
219	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	337	linkverticesItem.addActionListener(this);
	338	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	339	+ relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
221	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	344	setMasterItem.addActionListener(this);
	345	+ }
223	346
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);
	347	+ oe.menuBar.add(menu = new Menu("Group"));
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
229	350	backItem = menu.add(new MenuItem("Back"));
230	351	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);
	352	+ frontItem = menu.add(new MenuItem("Front"));
	353	+ frontItem.addActionListener(this);
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	360	+ hideItem.addActionListener(this);
	361	+ }
	362	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	363	+ ungroupItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
240	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	372	switchGeoItem.addActionListener(this);
242	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	374	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
246	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	384	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);
	385	+ }
	386	+
	387	+ oe.menuBar.add(menu = new Menu("Object"));
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
	390	+ billboardItem = menu.add(new MenuItem("Billboard"));
	391	+ billboardItem.addActionListener(this);
253	392	csgItem = menu.add(new MenuItem("CSG"));
254	393	csgItem.addActionListener(this);
255		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
256	395	shadowXItem.addActionListener(this);
257		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
258	397	shadowYItem.addActionListener(this);
259		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
260	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
261	406	linkerItem = menu.add(new MenuItem("Linker"));
262	407	linkerItem.addActionListener(this);
263	408	templateItem = menu.add(new MenuItem("Template"));
264	409	templateItem.addActionListener(this);
265		- attributeItem = menu.add(new MenuItem("Attribute"));
266		- attributeItem.addActionListener(this);
267	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	411	pointflowItem.addActionListener(this);
	412	+ }
269	413	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	415	resetTransformItem.addActionListener(this);
274	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	417	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
278	424
279	425	oe.menuBar.add(menu = new Menu("Geometry"));
280	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +429,13 @@
283	429	genNormalsORGANItem.addActionListener(this);
284	430	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	431	genNormalsCADItem.addActionListener(this);
	432	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	433	+ genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	437	+ genNormalsMINEItem.addActionListener(this);
	438	+ }
286	439	stripifyItem = menu.add(new MenuItem("Stripify"));
287	440	stripifyItem.addActionListener(this);
288	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +445,6 @@
292	445	untrimItem = menu.add(new MenuItem("Untrim"));
293	446	untrimItem.addActionListener(this);
294	447	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	448	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	449	clearColorsItem.addActionListener(this);
299	450	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +457,34 @@
306	457	reduce34MeshItem.addActionListener(this);
307	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	459	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
	468	+
	469	+ oe.menuBar.add(menu = new Menu("Attributes"));
	470	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	471	+ clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
313	476	menu.add("-");
314	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	478	liveleavesItem.addActionListener(this);
316	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
318	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	484	supportleavesItem.addActionListener(this);
320	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	486	unsupportleavesItem.addActionListener(this);
	487	+ }
322	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	489	hideleavesItem.addActionListener(this);
324	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -327,32 +493,31 @@
327	493	markleavesItem.addActionListener(this);
328	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
329	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
330	504	menu.add("-");
331	505	flipVItem = menu.add(new MenuItem("Flip V"));
332	506	flipVItem.addActionListener(this);
333	507	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	508	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	509	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	510	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	511	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	512	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	513	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	514	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	515	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	516	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	517	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	518	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	519	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	520	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	521
357	522	oe.menuBar.add(menu = new Menu("Selection"));
358	523	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,14 +535,42 @@
370	535	sortbysizeItem.addActionListener(this);
371	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	537	sortbynameItem.addActionListener(this);
	538	+ menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
	546	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	547	+ extractGeometriesItem.addActionListener(this);
	548	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	549	+ cloneGeometriesItem.addActionListener(this);
	550	+ }
	551	+
373	552	oe.menuBar.add(menu = new Menu("Insert"));
374	553	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	554	+
	555	+ oe.menuBar.add(menu = new Menu("Tools"));
376	556	buildToolsMenu(menu);
377	557	}
378	558
	559	+
379	560	void SetupUI2(ObjEditor oe)
380	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
381	574	//new Exception().printStackTrace();
382	575
383	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -406,150 +599,230 @@
406	599	oe.radioPanel.add(dummyButton);
407	600	oe.buttonGroup.add(dummyButton);
408	601	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
412	605
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	606	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	607	+
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
414	660	liveCB.addItemListener(this);
415	661
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);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
434	668	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);
	669	+
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
441	675
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);
480		- screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
482	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	677	// 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	678
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;
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
499	687
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	689	+ twoButton.setToolTipText("Show center view only");
502	690	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	694	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	695	+ fourButton.setToolTipText("Show left panel only");
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ sixButton.setToolTipText("2-column layout left");
506	698	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ threeButton.setToolTipText("2-column layout right");
508	701	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ sevenButton.setToolTipText("3-column layout");
510	704	sevenButton.addActionListener(this);
511	705	//
512	706
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
514	709	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ closeButton.setToolTipText("Close tab");
517	713	closeButton.addActionListener(this);
518	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	715	//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	716
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
530	802	uneditButton.addActionListener(this);
531	803
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);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
544	806	allParamsButton.addActionListener(this);
545	807
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);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
551	814	unselectButton.addActionListener(this);
552	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
553	826	// oe.aConstraints.gridx += 1;
554	827	// oe.aConstraints.weighty = 0;
555	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +834,25 @@
561	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	835	// gcButton.addActionListener(this);
563	836
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;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
575	840	//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);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
577	842	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	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
598	856	//jList.addListSelectionListener(this);
599	857	oe.jTree.addTreeSelectionListener(this);
600	858	//jTree.setRootVisible(false);
..	..	@@ -616,20 +874,157 @@
616	874	radio.layout = sevenButton;
617	875	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	876	}
	877	+
	878	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	879	+ {
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
	912	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	913	+ // localCB.addItemListener(this);
	914	+
	915	+ panel.Return();
	916	+
	917	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	918	+ crowdCB.setToolTipText("Used for crowds");
	919	+ crowdCB.addItemListener(this);
	920	+
	921	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	922	+ smoothCB.setToolTipText("Snapping delay");
	923	+ smoothCB.addItemListener(this);
	924	+
	925	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	926	+ slowCB.setToolTipText("Smooth interpolation");
	927	+ slowCB.addItemListener(this);
	928	+
	929	+// constraints.gridy += 1;
	930	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	931	+// speakerMocapCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+
	935	+ if (false)
	936	+ {
	937	+ // handled in scripts
	938	+ //constraints.gridy += 1;
	939	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	940	+ speakerCameraCB.addItemListener(this);
	941	+
	942	+ //constraints.gridy += 1;
	943	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	944	+ speakerFocusCB.addItemListener(this);
	945	+
	946	+ //constraints.gridy += 1;
	947	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	948	+ smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
	950	+ }
	951	+
	952	+//constraints.gridx += 1;
	953	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	954	+// debugCB.addItemListener(this);
	955	+
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
	960	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
	962	+ oeilCB.addItemListener(this);
	963	+
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	985	+ lookAtCB.setToolTipText("Look-at target");
	986	+ lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
	1001	+
	1002	+ }
619	1003
620	1004	void EditObject(Object3D obj)
621	1005	{
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();
	1006	+ cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
	1015	+ radioButton.SetObject(obj);
	1016	+ radioButton.layout = sevenButton;
	1017	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1018	+ radioButton.addActionListener(this);
	1019	+ radioPanel.add(radioButton);
	1020	+ buttonGroup.add(radioButton);
	1021	+ radioButton.doClick();
630	1022	}
	1023	+
631	1024	void SetupViews(ObjEditor oe)
632	1025	{
	1026	+ theFrame = this;
	1027	+
633	1028	oe.SetupViews();
634	1029
635	1030	System.out.println("SetupViews");
..	..	@@ -638,22 +1033,28 @@
638	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
639	1034	}
640	1035
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;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
651	1049	// JCheckBox speakerMocapCB;
652		- JCheckBox speakerCameraCB;
653		- JCheckBox speakerFocusCB;
654		- JCheckBox debugCB;
655		- JCheckBox oeilCB;
656		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
657	1058
658	1059	// static int COLOR = 1;
659	1060	// static int MATERIAL = 2;
..	..	@@ -661,9 +1062,9 @@
661	1062
662	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
663	1064
664		- JCheckBox colorCB;
665		- JCheckBox materialCB;
666		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
667	1068
668	1069	public void itemStateChanged(ItemEvent e)
669	1070	{
..	..	@@ -688,10 +1089,10 @@
688	1089	dropAttributes \|= Object3D.TEXTURE;
689	1090	else
690	1091	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	1092	+ } else if(e.getSource() == liveCB)
693	1093	{
694	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
695	1096	}
696	1097	else if(e.getSource() == supportCB)
697	1098	{
..	..	@@ -727,6 +1128,10 @@
727	1128	cameraView.repaint();
728	1129	// refreshContents();
729	1130	}
	1131	+ else if(e.getSource() == zoomBoxCB)
	1132	+ {
	1133	+ cameraView.ToggleZoomBoxMode();
	1134	+ }
730	1135	else if(e.getSource() == smoothfocusCB)
731	1136	{
732	1137	cameraView.ToggleSmoothFocus();
..	..	@@ -752,6 +1157,18 @@
752	1157	{
753	1158	cameraView.ToggleOeil();
754	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
755	1172	else if(e.getSource() == lookAtCB)
756	1173	{
757	1174	cameraView.ToggleLookAt();
..	..	@@ -768,7 +1185,8 @@
768	1185
769	1186	/**/
770	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
771		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
772	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
773	1191	// We can't move the root node or an empty selection
774	1192	return;
..	..	@@ -831,8 +1249,6 @@
831	1249	}
832	1250	}
833	1251
834		- String string = (String) object;
835		-
836	1252	System.out.println("Transfer = " + object + "; drop : " + target);
837	1253	// if( object instanceof java.io.File[])
838	1254	// {
..	..	@@ -840,7 +1256,11 @@
840	1256	// objEditor.DropFile((java.io.File[]) object, true);
841	1257	// return;
842	1258	// }
843		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1264	{
845	1265	// file(s)
846	1266	String[] names = string.split("\n");
..	..	@@ -867,7 +1287,7 @@
867	1287
868	1288	flashIt = false;
869	1289	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1292
873	1293	if (group.selection.size() == 1)
..	..	@@ -883,23 +1303,33 @@
883	1303
884	1304	assert target == objEditor.jTree;
885	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
886	1307	try {
887		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
888	1309	} catch (Exception e) {
889	1310	System.out.println("destinationPath : " + destinationPath);
890	1311	return;
891	1312	}
892	1313
893		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
894	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
895	1325	loadClipboard(true);
896	1326	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
898		- } else {
899		- loadClipboard(false);
900		- objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
902		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
903	1333	}
904	1334	public void dropActionChanged(DropTargetDragEvent dtde)
905	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1002,90 +1432,109 @@
1002	1432
1003	1433	void buildCreateMenu(Menu menu)
1004	1434	{
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);
	1435	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1436	+ //heightFieldItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
	1455	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1456	+ kleinItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1019	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1464	ragdollItem.addActionListener(this);
1021	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1023	1468	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1470	meshItem.addActionListener(this);
1026	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1028	1475	springItem = menu.add(new MenuItem("Spring"));
1029	1476	springItem.addActionListener(this);
1030	1477	flagItem = menu.add(new MenuItem("Flag"));
1031	1478	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	1479	blobItem = menu.add(new MenuItem("Blob"));
1037	1480	blobItem.addActionListener(this);
1038	1481	latheItem = menu.add(new MenuItem("Lathe"));
1039	1482	latheItem.addActionListener(this);
1040		- lightItem = menu.add(new MenuItem("Light"));
1041		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1042	1490	menu.add("-");
1043	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1044	1492	//superLoopItem.addActionListener(this);
1045		- loopItem = menu.add(new MenuItem("Loop"));
1046		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1047	1495	doubleItem = menu.add(new MenuItem("Fork"));
1048	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1049	1499	tripleItem = menu.add(new MenuItem("Trident"));
1050	1500	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);
	1501	+ }
1060	1502	}
1061	1503
1062	1504	void buildToolsMenu(Menu menu)
1063	1505	{
1064	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1507	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1067	1512
1068	1513	menu.add("-");
1069	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1515	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1516	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1517	+ textureFieldItem.addActionListener(this);
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1519	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1521	reduceMorphItem.addActionListener(this);
1077	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1523	reduce34MorphItem.addActionListener(this);
1079		-
1080		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1081		- computeAOItem.addActionListener(this);
1082	1524	menu.add("-");
1083		-
1084	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1086	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1087	1536	analyzeItem.addActionListener(this);
1088		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1089	1538	dumpItem.addActionListener(this);
1090	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1091	1540	// pathItem.addActionListener(this);
..	..	@@ -1094,6 +1543,8 @@
1094	1543	resetParentItem.addActionListener(this);
1095	1544	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1545	repairParentItem.addActionListener(this);
	1546	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1547	+ repairShadowItem.addActionListener(this);
1097	1548	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1549	invariantsItem.addActionListener(this);
1099	1550	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1552,7 @@
1101	1552	menu.add("-");
1102	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1554	editScriptItem.addActionListener(this);
	1555	+ }
1104	1556	}
1105	1557
1106	1558	void ScreenFit()
..	..	@@ -1223,9 +1675,24 @@
1223	1675	shadow.material = new cMaterial(obj.material);
1224	1676	shadow.material.diffuse = 0.0001f;
1225	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1226	1679
1227	1680	makeSomething(shadow);
1228	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1229	1696
1230	1697	/**
1231	1698	* applyExample
..	..	@@ -1429,9 +1896,9 @@
1429	1896
1430	1897	void Overwrite(int mask)
1431	1898	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1900	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1435	1902
1436	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1904	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1921,7 @@
1454	1921	//
1455	1922	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1923	{
	1924	+ Object source = event.getSource();
1457	1925	/*
1458	1926	if (event.getSource() == nameField)
1459	1927	{
..	..	@@ -1465,11 +1933,11 @@
1465	1933	}
1466	1934	else
1467	1935	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1936	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1937	{
1470	1938	ScreenFit();
1471	1939	} else
1472		- if (event.getSource() == switchItem)
	1940	+ if (source == switchViewItem)
1473	1941	{
1474	1942	cVector v1 = new cVector();
1475	1943	cVector v2 = new cVector();
..	..	@@ -1478,11 +1946,11 @@
1478	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1947	objEditor.cameraView.repaint();
1480	1948	} else
1481		- if (event.getSource() == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1482	1950	{
1483	1951	makeSomething(new Box());
1484	1952	} else
1485		- if (event.getSource() == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1486	1954	{
1487	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1971,9 @@
1503	1971	applyExample(particleGeom, "SMOKE");
1504	1972	makeSomething(particleGeom);
1505	1973	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1974	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1975	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1976	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1977
1510	1978	ragdoll.toParent = LA.newMatrix();
1511	1979	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1989,71 @@
1521	1989	makeSomething(ragdoll);
1522	1990	//makeSomething(new VehicleDemo());
1523	1991	} else
1524		- if (event.getSource() == gridItem)
	1992	+ /*
	1993	+ */
	1994	+ if (source == heightFieldItem)
	1995	+ {
	1996	+ Object3D obj = new Object3D();
	1997	+
	1998	+ obj.CreateMaterial();
	1999	+ obj.bRep = new BoundaryRep();
	2000	+
	2001	+ obj.bRep.CreateMesh(new iHeightField()
	2002	+ {
	2003	+ public double f(double x, double y)
	2004	+ {
	2005	+ // The Mandelbrot set is represented by coloring
	2006	+ // each point (x,y) according to the number of
	2007	+ // iterations it takes before the while loop in
	2008	+ // this method ends. For points that are actually
	2009	+ // in the Mandelbrot set, or very close to it, the
	2010	+ // count will reach the maximum value, 80. These
	2011	+ // points will be colored purple. All other colors
	2012	+ // represent points that are definitely NOT in the set.
	2013	+ x -= 600;
	2014	+ y -= 500;
	2015	+ x /= 200;
	2016	+ y /= 200;
	2017	+ int count = 0;
	2018	+ double zx = x;
	2019	+ double zy = y;
	2020	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	2021	+ double new_zx = zxzx - zyzy + x;
	2022	+ zy = 2zxzy + y;
	2023	+ zx = new_zx;
	2024	+ count++;
	2025	+ }
	2026	+ return count; // Math.sqrt(count);
	2027	+ }
	2028	+ }, 1000,1000);
	2029	+
	2030	+ makeSomething(obj);
	2031	+ } else
	2032	+ if (source == gridItem \|\| source == gridButton)
1525	2033	{
1526	2034	makeSomething(new Grid());
1527	2035	} else
1528		- if (event.getSource() == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1529	2037	{
1530	2038	makeSomething(new Sphere());
1531	2039	} else
1532		- if (event.getSource() == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1533	2041	{
1534	2042	makeSomething(new Cone());
1535	2043	} else
1536		- if (event.getSource() == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1537	2045	{
1538	2046	makeSomething(new Torus());
1539	2047	} else
1540		- if (event.getSource() == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1541	2049	{
1542	2050	makeSomething(new Superellipsoid());
1543	2051	} else
1544		- if (event.getSource() == blobItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
	2053	+ {
	2054	+ makeSomething(new Klein());
	2055	+ } else
	2056	+ if (source == blobItem)
1545	2057	{
1546	2058	Blob blob = new Blob();
1547	2059	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +2061,15 @@
1549	2061	//blob.retile();
1550	2062	makeSomething(blob);
1551	2063	} else
1552		- if (event.getSource() == latheItem)
	2064	+ if (source == latheItem)
1553	2065	{
1554	2066	makeSomething(new Lathe());
1555	2067	} else
1556		- if (event.getSource() == bezierItem)
	2068	+ if (source == bezierItem)
1557	2069	{
1558	2070	makeSomething(new BezierSurface());
1559	2071	} else
1560		- if (event.getSource() == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1561	2073	{
1562	2074	/*
1563	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +2082,9 @@
1570	2082	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	2083	LA.matInvert(obj.toParent, obj.fromParent);
1572	2084	*/
1573		- makeSomething(new CheckerIG());
	2085	+ makeSomething(new Checker());
1574	2086	} else
1575		- if (event.getSource() == meshItem)
	2087	+ if (source == meshItem)
1576	2088	{
1577	2089	Object3D itemtomake = new Object3D();
1578	2090	Object3D child;
..	..	@@ -1593,35 +2105,35 @@
1593	2105	makeSomething(child);
1594	2106	}
1595	2107	} else
1596		- if (event.getSource() == springItem)
	2108	+ if (source == springItem)
1597	2109	{
1598	2110	cSpring s = new cSpring();
1599	2111	s.setup();
1600	2112	makeSomething(s);
1601	2113	} else
1602		- if (event.getSource() == flagItem)
	2114	+ if (source == flagItem)
1603	2115	{
1604	2116	cSpring s = new cFlag();
1605	2117	s.setup();
1606	2118	makeSomething(s);
1607	2119	} else
1608		- if (event.getSource() == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1609	2121	{
1610	2122	makeSomething(new Light());
1611	2123	} else
1612		- if (event.getSource() == csgItem)
	2124	+ if (source == csgItem)
1613	2125	{
1614	2126	group(new CSG());
1615	2127	} else
1616		- if (event.getSource() == templateItem)
	2128	+ if (source == templateItem)
1617	2129	{
1618	2130	group(new cTemplate());
1619	2131	} else
1620		- if (event.getSource() == attributeItem)
	2132	+ if (source == attributeItem)
1621	2133	{
1622	2134	makeSomething(new Attribute());
1623	2135	} else
1624		- if (event.getSource() == pointflowItem)
	2136	+ if (source == pointflowItem)
1625	2137	{
1626	2138	makeSomething(new PointFlow());
1627	2139	} else
..	..	@@ -1633,7 +2145,7 @@
1633	2145	} else
1634	2146	*/
1635	2147
1636		- if (event.getSource() == superLoopItem)
	2148	+ if (source == superLoopItem)
1637	2149	{
1638	2150	Composite g = new cGroup();
1639	2151	for (int i=0; i<15; i++)
..	..	@@ -1655,30 +2167,30 @@
1655	2167
1656	2168	group(g);
1657	2169	} else
1658		- if (event.getSource() == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1659	2171	{
1660	2172	Composite csg = new GroupLeaf();
1661	2173	csg.count = 5;
1662	2174	group(csg);
1663		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1664	2176	csg.addChild(child);
1665	2177	child.addChild(csg);
1666	2178	} else
1667		- if (event.getSource() == doubleItem)
	2179	+ if (source == doubleItem)
1668	2180	{
1669		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1670	2182	csg.count = 5;
1671	2183	group(csg);
1672		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1673	2185	csg.addChild(child);
1674	2186	child.addChild(csg);
1675		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1676	2188	csg.addChild(child);
1677	2189	child.addChild(csg);
1678	2190	} else
1679		- if (event.getSource() == tripleItem)
	2191	+ if (source == tripleItem)
1680	2192	{
1681		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1682	2194	csg.count = 4;
1683	2195	group(csg);
1684	2196	Composite child = new cGroup();
..	..	@@ -1691,73 +2203,98 @@
1691	2203	csg.addChild(child);
1692	2204	child.addChild(csg);
1693	2205	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	2206	+ if (source == computeAOItem)
1696	2207	{
1697		- ImportGFD();
	2208	+ Globals.drawMode = CameraPane.OCCLUSION;
	2209	+ Globals.theRenderer.repaint();
1698	2210	} 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)
	2211	+ if (source == recompileItem)
1717	2212	{
1718	2213	Recompile();
1719	2214	refreshContents();
1720	2215	} else
1721		- if (event.getSource() == editScriptItem)
	2216	+ if (source == editScriptItem)
1722	2217	{
1723	2218	OpenDialog();
1724	2219	refreshContents();
1725	2220	} else
1726		- if (event.getSource() == invariantsItem)
	2221	+ if (source == invariantsItem)
1727	2222	{
1728	2223	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1730	2225	} else
1731		- if (event.getSource() == memoryItem)
	2226	+ if (source == memoryItem)
1732	2227	{
1733	2228	//System.out.println("Invariants:");
1734	2229	PrintMemory();
1735	2230	} else
1736		- if (event.getSource() == pathItem)
	2231	+ if (source == pathItem)
1737	2232	{
1738	2233	PrintPath();
1739	2234	} else
1740		- if (event.getSource() == analyzeItem)
	2235	+ if (source == analyzeItem)
1741	2236	{
1742	2237	AnalyzeObject();
1743	2238	} else
1744		- if (event.getSource() == dumpItem)
	2239	+ if (source == dumpItem)
1745	2240	{
1746	2241	DumpObject();
1747	2242	} else
1748		- if (event.getSource() == screenfitButton)
	2243	+ if (source == minButton)
1749	2244	{
1750		- //Reload(lastConverter, lastFilename, true);
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
	2288	+ if (source == screenfitButton)
	2289	+ {
1751	2290	ScreenFit();
1752	2291	} else
1753		- if (event.getSource() == screenfitpointButton)
	2292	+ if (source == screenfitpointButton)
1754	2293	{
1755		- //Reload(lastConverter, lastFilename, true);
1756	2294	ScreenFitPoint();
1757	2295	} else
1758		- if (event.getSource() == snapobjectButton)
	2296	+ if (source == snapobjectButton)
1759	2297	{
1760		- //Reload(lastConverter, lastFilename, true);
1761	2298	SnapObject();
1762	2299	} else
1763	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1766,13 +2303,13 @@
1766	2303	// Recompile();
1767	2304	// refreshContents();
1768	2305	// } else
1769		- if (event.getSource() == gcButton)
	2306	+ if (source == gcButton)
1770	2307	{
1771	2308	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2309	System.gc();
1773	2310	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2311	} else
1775		- if (event.getSource() == editLeafItem)
	2312	+ if (source == editLeafItem)
1776	2313	{
1777	2314	Object3D obj;
1778	2315	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2323,78 @@
1786	2323	}
1787	2324	refreshContents(true);
1788	2325	} else
1789		- if (event.getSource() == openWindowItem)
	2326	+ if (source == openWindowItem)
1790	2327	{
1791	2328	EditSelection(true);
1792	2329	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2330	+ if (source == cutItem \|\| source == clearButton)
1794	2331	{
1795	2332	loadClipboard(true);
1796	2333	} else
1797		- if (event.getSource() == duplicateItem)
	2334	+ if (source == undoItem)
1798	2335	{
1799		- Object3D keep = GraphreeD.clipboard;
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
	2342	+ if (source == duplicateItem)
	2343	+ {
	2344	+ Object3D keep = Grafreed.clipboard;
1800	2345	loadClipboard(false);
1801	2346	paste(false);
1802		- GraphreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1803	2348	} else
1804		- if (event.getSource() == cloneItem)
	2349	+ if (source == cloneItem)
1805	2350	{
1806	2351	CloneSelection(false);
1807	2352	} else
1808		- if (event.getSource() == cloneSupportItem)
	2353	+ if (source == cloneSupportItem)
1809	2354	{
1810	2355	CloneSelection(true);
1811	2356	} else
1812		- if (event.getSource() == copyItem)
	2357	+ if (source == copyItem)
1813	2358	{
1814	2359	loadClipboard(false);
1815	2360	} else
1816		- if (event.getSource() == pasteItem)
	2361	+ if (source == pasteItem)
1817	2362	{
1818	2363	paste(false);
1819	2364	} else
1820		- if (event.getSource() == pasteLinkItem)
	2365	+ if (source == pasteIntoItem)
1821	2366	{
1822		- pasteInto(false);
	2367	+ pasteInto(true, false);
1823	2368	} else
1824		- if (event.getSource() == pasteCloneItem)
	2369	+ if (source == pasteLinkItem)
1825	2370	{
1826		- pasteInto(true);
	2371	+ pasteInto(false, false);
1827	2372	} else
1828		- if (event.getSource() == pasteExpandItem)
	2373	+ if (source == pasteCloneItem)
	2374	+ {
	2375	+ pasteInto(true, true);
	2376	+ } else
	2377	+ if (source == pasteExpandItem)
1829	2378	{
1830	2379	paste(true);
1831	2380	} else
1832		- if (event.getSource() == synchronizeItem)
	2381	+ if (source == synchronizeItem)
1833	2382	{
1834	2383	Overwrite(Object3D.TRANSFORM);
1835	2384	} else
1836		- if (event.getSource() == overwriteNameItem)
	2385	+ if (source == overwriteNameItem)
1837	2386	{
1838	2387	Overwrite(Object3D.NAME);
1839	2388	} else
1840		- if (event.getSource() == overwriteUVItem)
	2389	+ if (source == overwriteUVItem)
1841	2390	{
1842	2391	Overwrite(Object3D.UV);
1843	2392	} else
1844		- if (event.getSource() == overwriteMatItem)
	2393	+ if (source == overwriteMatItem)
1845	2394	{
	2395	+ /* july 2015
1846	2396	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2397	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2398	else
1849	2399	{
1850	2400	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2406,16 @@
1856	2406	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2407	}
1858	2408	}
	2409	+ */
	2410	+
	2411	+ Overwrite(dropAttributes);
1859	2412	}
1860		- if (event.getSource() == overwriteGeoItem)
	2413	+ if (source == overwriteGeoItem)
1861	2414	{
1862	2415	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2416	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2417	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2418	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2419	//
1867	2420	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2421	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2427,7 @@
1874	2427	// refreshContents();
1875	2428	// }
1876	2429	} else
1877		- if (event.getSource() == generateMeshItem)
	2430	+ if (source == generateMeshItem)
1878	2431	{
1879	2432	//if (group.selection.size() == 1)
1880	2433	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2438,7 @@
1885	2438	ResetModel();
1886	2439	refreshContents();
1887	2440	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2441	+ if (source == extractGeometriesItem)
1889	2442	{
1890	2443	boolean one = false;
1891	2444
..	..	@@ -1912,7 +2465,7 @@
1912	2465	ResetModel();
1913	2466	refreshContents();
1914	2467	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2468	+ if (source == cloneGeometriesItem)
1916	2469	{
1917	2470	boolean one = false;
1918	2471
..	..	@@ -1938,32 +2491,37 @@
1938	2491	ResetModel();
1939	2492	refreshContents();
1940	2493	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2494	+ if (source == shareGeometriesItem)
1942	2495	{
1943	2496	boolean one = false;
1944	2497
1945	2498	if (group.selection.size() == 1)
1946	2499	one = true;
1947	2500
	2501	+ Object3D merge = null;
	2502	+
1948	2503	Object3D content = new cGroup();
1949	2504
1950	2505	for (int i=0; i<group.selection.size(); i++)
1951	2506	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2507	+ merge = new Merge(group.selection.get(i));
1953	2508
1954	2509	if (one)
1955		- makeSomething(sel, false);
	2510	+ makeSomething(merge, false);
1956	2511	else
1957		- content.addChild(sel);
	2512	+ content.addChild(merge);
1958	2513	}
1959	2514
1960	2515	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2516	+ makeSomething(content, true);
	2517	+ else
	2518	+ {
	2519	+ ResetModel();
	2520	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2521	+ refreshContents();
	2522	+ }
1965	2523	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2524	+ if (source == mergeGeometriesItem)
1967	2525	{
1968	2526	boolean one = false;
1969	2527
..	..	@@ -1993,11 +2551,11 @@
1993	2551	ResetModel();
1994	2552	refreshContents();
1995	2553	} else
1996		- if (event.getSource() == linkverticesItem)
	2554	+ if (source == linkverticesItem)
1997	2555	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2556	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2557	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2558	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2559	//
2002	2560	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2561	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2564,48 @@
2006	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2565	// refreshContents();
2008	2566	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2568	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2012	2570
2013	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2572	content = ((cGroup)content).get(0);
2015	2573
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2574	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2575	for (int i=0; i<group.selection.size(); i++)
2018	2576	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2579	group.selection.get(i).linkVerticesThis(content);
2022	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2024	2582	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2583	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2584	refreshContents();
2027	2585	}
2028	2586	} else
2029		- if (event.getSource() == resetsupportItem)
	2587	+ if (source == resetsupportItem)
2030	2588	{
2031	2589	for (int i=0; i<group.selection.size(); i++)
2032	2590	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2593	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2037	2595	}
2038	2596
2039	2597	refreshContents();
2040	2598	} else
2041		- if (event.getSource() == resetreferencesItem)
	2599	+ if (source == relinkverticesItem)
	2600	+ {
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
	2603	+ group.selection.RelinkToSupport();
	2604	+ CameraPane.SWITCH = random;
	2605	+
	2606	+ refreshContents();
	2607	+ } else
	2608	+ if (source == resetreferencesItem)
2042	2609	{
2043	2610	for (int i=0; i<group.selection.size(); i++)
2044	2611	{
..	..	@@ -2047,11 +2614,11 @@
2047	2614
2048	2615	refreshContents();
2049	2616	} else
2050		- if (event.getSource() == setMasterItem)
	2617	+ if (source == setMasterItem)
2051	2618	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2620	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2055	2622
2056	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2624	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2627,13 @@
2060	2627	refreshContents();
2061	2628	}
2062	2629	} else
2063		- if (event.getSource() == poseMeshItem)
	2630	+ if (source == poseMeshItem)
2064	2631	{
2065	2632	if (group.selection.size() == 1)
2066	2633	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2068	2635	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2070	2637
2071	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2639	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2646,19 @@
2079	2646	}
2080	2647
2081	2648	} else
2082		- if (event.getSource() == revertMeshItem)
	2649	+ if (source == revertMeshItem)
2083	2650	{
2084	2651	RevertMeshes();
2085	2652	} else
2086		- if (event.getSource() == resetMeshItem)
	2653	+ if (source == resetAllItem)
2087	2654	{
2088	2655	ResetAll();
2089	2656	} else
2090		- if (event.getSource() == stepAllItem)
	2657	+ if (source == stepAllItem)
2091	2658	{
2092	2659	StepAll();
2093	2660	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2661	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2662	{
2096	2663	//int indices[] = jList.getSelectedIndices();
2097	2664	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2666,46 @@
2099	2666
2100	2667	ClearSelection(false);
2101	2668	} else
2102		- if (event.getSource() == clearAllItem)
	2669	+ if (source == clearAllItem)
2103	2670	{
2104	2671	ClearSelection(true);
2105	2672	} else
2106		- if (event.getSource() == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2107	2674	{
2108		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2109	2676	} else
2110		- if (event.getSource() == frontItem)
	2677	+ if (source == hideItem)
	2678	+ {
	2679	+ group(new HiddenObject());
	2680	+ } else
	2681	+ if (source == frontItem)
2111	2682	{
2112	2683	front();
2113	2684	} else
2114		- if (event.getSource() == backItem)
	2685	+ if (source == backItem)
2115	2686	{
2116	2687	back();
2117	2688	} else
2118		- if (event.getSource() == cameraItem)
	2689	+ if (source == cameraItem)
2119	2690	{
2120	2691	makeSomething(new Camera());
2121	2692	} else
2122		- if (event.getSource() == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2123	2694	{
2124	2695	group(new Composite());
2125	2696	} else
2126		- if (event.getSource() == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2127	2698	{
2128	2699	RandomNode random = new RandomNode();
2129	2700	group(random);
2130	2701	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2132	2703	} else
2133		- if (event.getSource() == physicsItem)
	2704	+ if (source == physicsItem)
2134	2705	{
2135	2706	group(new PhysicsNode());
2136	2707	} else
2137		- if (event.getSource() == frameselectorItem)
	2708	+ if (source == frameselectorItem)
2138	2709	{
2139	2710	for (int i=0; i<group.selection.size(); i++)
2140	2711	{
..	..	@@ -2146,7 +2717,7 @@
2146	2717	ResetModel();
2147	2718	refreshContents();
2148	2719	} else
2149		- if (event.getSource() == switchGeoItem)
	2720	+ if (source == switchGeoItem)
2150	2721	{
2151	2722	for (int i=0; i<group.selection.size(); i++)
2152	2723	{
..	..	@@ -2158,7 +2729,7 @@
2158	2729	ResetModel();
2159	2730	refreshContents();
2160	2731	} else
2161		- if (event.getSource() == switchTransfoItem)
	2732	+ if (source == switchTransfoItem)
2162	2733	{
2163	2734	for (int i=0; i<group.selection.size(); i++)
2164	2735	{
..	..	@@ -2170,7 +2741,7 @@
2170	2741	ResetModel();
2171	2742	refreshContents();
2172	2743	} else
2173		- if (event.getSource() == morphItem)
	2744	+ if (source == morphItem)
2174	2745	{
2175	2746	for (int i=0; i<group.selection.size(); i++)
2176	2747	{
..	..	@@ -2182,7 +2753,7 @@
2182	2753	ResetModel();
2183	2754	refreshContents();
2184	2755	} else
2185		- if (event.getSource() == scriptNodeItem)
	2756	+ if (source == scriptNodeItem)
2186	2757	{
2187	2758	boolean atleastone = false;
2188	2759
..	..	@@ -2221,191 +2792,252 @@
2221	2792	}
2222	2793	}
2223	2794	} else
2224		- if (event.getSource() == linkerItem)
	2795	+ if (source == linkerItem)
2225	2796	{
2226	2797	group(new cLinker());
2227	2798	} else
2228		- if (event.getSource() == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2229	2800	{
2230	2801	group(new TextureNode());
2231	2802	} else
2232		- if (event.getSource() == shadowXItem)
	2803	+ if (source == billboardItem)
	2804	+ {
	2805	+ group(new BillboardNode());
	2806	+ } else
	2807	+ if (source == shadowXItem)
2233	2808	{
2234	2809	CastShadow(0);
2235	2810	} else
2236		- if (event.getSource() == shadowYItem)
	2811	+ if (source == shadowYItem)
2237	2812	{
2238	2813	CastShadow(1);
2239	2814	} else
2240		- if (event.getSource() == shadowZItem)
	2815	+ if (source == shadowZItem)
2241	2816	{
2242	2817	CastShadow(2);
2243	2818	} else
2244		- if (event.getSource() == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2245	2820	{
2246		- ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
	2823	+ for (int i=0; i<group.selection.size(); i++)
	2824	+ {
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
	2830	+ }
	2831	+
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2247	2843	} else
2248		- if (event.getSource() == genUVItem)
	2844	+ if (source == genUVItem)
2249	2845	{
2250	2846	GenUV();
2251	2847	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2848	+ if (source == genNormalsCADItem)
2253	2849	{
2254	2850	GenNormals(true);
2255	2851	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2852	+ if (source == genNormalsMESHItem)
	2853	+ {
	2854	+ GenNormalsMESH();
	2855	+ } else
	2856	+ if (source == genNormalsORGANItem)
2257	2857	{
2258	2858	GenNormals(false);
2259	2859	} else
2260		- if (event.getSource() == stripifyItem)
	2860	+ if (source == genNormalsMINEItem)
	2861	+ {
	2862	+ GenNormalsMINE();
	2863	+ } else
	2864	+ if (source == stripifyItem)
2261	2865	{
2262	2866	Stripify();
2263	2867	} else
2264		- if (event.getSource() == unstripifyItem)
	2868	+ if (source == unstripifyItem)
2265	2869	{
2266	2870	Unstripify();
2267	2871	} else
2268		- if (event.getSource() == trimItem)
	2872	+ if (source == trimItem)
2269	2873	{
2270	2874	Trim();
2271	2875	} else
2272		- if (event.getSource() == untrimItem)
	2876	+ if (source == untrimItem)
2273	2877	{
2274	2878	Untrim();
2275	2879	} else
2276		- if (event.getSource() == clearColorsItem)
	2880	+ if (source == clearColorsItem)
2277	2881	{
2278	2882	ClearColors();
2279	2883	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2884	+ if (source == clearMaterialsItem)
2281	2885	{
2282	2886	ClearMaterials();
2283	2887	} else
2284		- if (event.getSource() == liveleavesItem)
	2888	+ if (source == liveleavesItem)
2285	2889	{
2286	2890	LiveLeaves(true);
2287	2891	} else
2288		- if (event.getSource() == unliveleavesItem)
	2892	+ if (source == unliveleavesItem)
2289	2893	{
2290	2894	LiveLeaves(false);
2291	2895	} else
2292		- if (event.getSource() == supportleavesItem)
	2896	+ if (source == supportleavesItem)
2293	2897	{
2294	2898	SupportLeaves(true);
2295	2899	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2900	+ if (source == unsupportleavesItem)
2297	2901	{
2298	2902	SupportLeaves(false);
2299	2903	} else
2300		- if (event.getSource() == hideleavesItem)
	2904	+ if (source == hideleavesItem)
2301	2905	{
2302	2906	HideLeaves(true);
2303	2907	} else
2304		- if (event.getSource() == showleavesItem)
	2908	+ if (source == showleavesItem)
2305	2909	{
2306	2910	HideLeaves(false);
2307	2911	} else
2308		- if (event.getSource() == markleavesItem)
	2912	+ if (source == markleavesItem)
2309	2913	{
2310	2914	MarkLeaves(true);
2311	2915	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2916	+ if (source == unmarkleavesItem)
2313	2917	{
2314	2918	MarkLeaves(false);
2315	2919	} else
2316		- if (event.getSource() == flipVItem)
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
	2935	+ } else
	2936	+ if (source == flipVItem)
2317	2937	{
2318	2938	FlipV(true);
2319	2939	} else
2320		- if (event.getSource() == unflipVItem)
	2940	+ if (source == unflipVItem)
2321	2941	{
2322	2942	FlipV(false);
2323	2943	} else
2324		- if (event.getSource() == lowTexturesItem)
	2944	+ if (source == lowTexturesItem)
2325	2945	{
2326	2946	SetTexRes(0);
2327	2947	} else
2328		- if (event.getSource() == normalTexturesItem)
	2948	+ if (source == normalTexturesItem)
2329	2949	{
2330	2950	SetTexRes(1);
2331	2951	} else
2332		- if (event.getSource() == highTexturesItem)
	2952	+ if (source == highTexturesItem)
2333	2953	{
2334	2954	SetTexRes(2);
2335	2955	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2956	+ if (source == veryhighTexturesItem)
2337	2957	{
2338	2958	SetTexRes(3);
2339	2959	} else
2340		- if (event.getSource() == maxTexturesItem)
	2960	+ if (source == maxTexturesItem)
2341	2961	{
2342	2962	SetTexRes(4);
2343	2963	} else
2344		- if (event.getSource() == panoTexturesItem)
	2964	+ if (source == panoTexturesItem)
2345	2965	{
2346	2966	SetTexRes(5);
2347	2967	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2968	+ if (source == reverseNormalsItem)
2349	2969	{
2350	2970	ReverseNormals();
2351	2971	} else
2352		- if (event.getSource() == parseverticesItem)
	2972	+ if (source == parseverticesItem)
2353	2973	{
2354	2974	ParseVertices();
2355	2975	} else
2356		- if (event.getSource() == alignItem)
	2976	+ if (source == textureFieldItem)
	2977	+ {
	2978	+ TextureVertices();
	2979	+ } else
	2980	+ if (source == alignItem)
2357	2981	{
2358	2982	Align();
2359	2983	} else
2360		- if (event.getSource() == mirrorItem)
	2984	+ if (source == mirrorItem)
2361	2985	{
2362	2986	MirrorPoses();
2363	2987	} else
2364		- if (event.getSource() == reduceMorphItem)
	2988	+ if (source == reduceMorphItem)
2365	2989	{
2366	2990	MeshReduction(false);
2367	2991	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2992	+ if (source == reduce34MorphItem)
2369	2993	{
2370	2994	MeshReduction(true);
2371	2995	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2996	+ if (source == reverseTrianglesItem)
2373	2997	{
2374	2998	ReverseTriangles();
2375	2999	} else
2376		- if (event.getSource() == reduceMeshItem)
	3000	+ if (source == reduceMeshItem)
2377	3001	{
2378	3002	ReduceMesh(false);
2379	3003	} else
2380		- if (event.getSource() == reduce34MeshItem)
	3004	+ if (source == reduce34MeshItem)
2381	3005	{
2382	3006	ReduceMesh(true);
2383	3007	} else
2384		- if (event.getSource() == increaseMeshItem)
	3008	+ if (source == increaseMeshItem)
2385	3009	{
2386	3010	IncreaseMesh();
2387	3011	} else
2388		- if (event.getSource() == clipMeshItem)
	3012	+ if (source == clipMeshItem)
2389	3013	{
2390	3014	ClipMesh();
2391	3015	} else
2392		- if (event.getSource() == smoothMeshItem)
	3016	+ if (source == smoothMeshItem)
2393	3017	{
2394	3018	SmoothMesh();
2395	3019	} else
2396		- if (event.getSource() == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2397	3021	{
2398	3022	TransformGeometry();
2399	3023	} else
2400		- if (event.getSource() == resetTransformItem)
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
	3027	+ } else
	3028	+ if (source == resetTransformItem)
2401	3029	{
2402	3030	ResetTransform();
2403	3031	} else
2404		- if (event.getSource() == resetCentroidItem)
	3032	+ if (source == resetCentroidItem)
2405	3033	{
2406		- ResetCentroid();
	3034	+ ResetCentroid(true);
2407	3035	} else
2408		- if (event.getSource() == resetParentItem)
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
	3039	+ } else
	3040	+ if (source == resetParentItem)
2409	3041	{
2410	3042	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	3043	{
..	..	@@ -2415,7 +3047,7 @@
2415	3047
2416	3048	refreshContents();
2417	3049	} else
2418		- if (event.getSource() == repairParentItem)
	3050	+ if (source == repairParentItem)
2419	3051	{
2420	3052	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	3053	{
..	..	@@ -2429,7 +3061,21 @@
2429	3061
2430	3062	refreshContents();
2431	3063	} else
2432		- if (event.getSource() == sortbysizeItem)
	3064	+ if (source == repairShadowItem)
	3065	+ {
	3066	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3067	+ {
	3068	+ Object3D obj = (Object3D)e.nextElement();
	3069	+ obj.RepairShadow();
	3070	+// for (int i=0; i<obj.size(); i++)
	3071	+// {
	3072	+// obj.get(i).parent = obj;
	3073	+// }
	3074	+ }
	3075	+
	3076	+ refreshContents();
	3077	+ } else
	3078	+ if (source == sortbysizeItem)
2433	3079	{
2434	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	3081	{
..	..	@@ -2441,7 +3087,7 @@
2441	3087	ResetModel();
2442	3088	refreshContents();
2443	3089	} else
2444		- if (event.getSource() == sortbynameItem)
	3090	+ if (source == sortbynameItem)
2445	3091	{
2446	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	3093	{
..	..	@@ -2453,7 +3099,7 @@
2453	3099	ResetModel();
2454	3100	refreshContents();
2455	3101	} else
2456		- if (event.getSource() == attachPigmentItem)
	3102	+ if (source == attachPigmentItem)
2457	3103	{
2458	3104	String texture = GetFile("Attach pigment");
2459	3105	Object3D obj;
..	..	@@ -2465,7 +3111,7 @@
2465	3111
2466	3112	refreshContents();
2467	3113	} else
2468		- if (event.getSource() == detachPigmentItem)
	3114	+ if (source == detachPigmentItem)
2469	3115	{
2470	3116	Object3D obj;
2471	3117	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +3122,7 @@
2476	3122
2477	3123	refreshContents();
2478	3124	} else
2479		- if (event.getSource() == attachBumpItem)
	3125	+ if (source == attachBumpItem)
2480	3126	{
2481	3127	String texture = GetFile("Attach bump");
2482	3128	Object3D obj;
..	..	@@ -2488,7 +3134,7 @@
2488	3134
2489	3135	refreshContents();
2490	3136	} else
2491		- if (event.getSource() == detachBumpItem)
	3137	+ if (source == detachBumpItem)
2492	3138	{
2493	3139	Object3D obj;
2494	3140	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +3145,7 @@
2499	3145
2500	3146	refreshContents();
2501	3147	} else
2502		- if (event.getSource() == pigmentBumpItem)
	3148	+ if (source == pigmentBumpItem)
2503	3149	{
2504	3150	Object3D obj;
2505	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +3156,237 @@
2510	3156
2511	3157	refreshContents();
2512	3158	} else
2513		- if (event.getSource() == flashSelectionButton)
	3159	+ if (source == flashSelectionButton)
2514	3160	{
2515	3161	CameraPane.flash = true;
2516	3162	refreshContents();
2517	3163	} else
2518		- if (event.getSource() == oneButton)
	3164	+ if (source == oneButton)
2519	3165	{
2520	3166	} else
2521		- if (event.getSource() == twoButton)
	3167	+ if (source == twoButton)
2522	3168	{
2523	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2524	3174	// bug
2525	3175	//gridPanel.setDividerLocation(1.0);
2526	3176	//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();
	3177	+// bigThree.remove(scenePanel);
	3178	+// bigThree.remove(centralPanel);
	3179	+// bigThree.remove(XYZPanel);
	3180	+// aWindowConstraints.gridx = 0;
	3181	+// aWindowConstraints.gridy = 0;
	3182	+// aWindowConstraints.gridwidth = 1;
	3183	+// // aConstraints.gridheight = 3;
	3184	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.weighty = 1;
	3187	+// //bigThree.add(jtp, aWindowConstraints);
	3188	+// aWindowConstraints.weightx = 1;
	3189	+// aWindowConstraints.gridwidth = 3;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.gridx = 1;
	3192	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3193	+// bigThree.add(centralPanel, aWindowConstraints);
	3194	+// aWindowConstraints.weightx = 0;
	3195	+// aWindowConstraints.gridx = 4;
	3196	+// aWindowConstraints.gridwidth = 1;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3199	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3200	+// scenePanel.setVisible(false);
	3201	+// centralPanel.setVisible(true);
	3202	+// XYZPanel.setVisible(false);
	3203	+ bigThree.ClearUI();
	3204	+ bigThree.add(centralPanel);
	3205	+ bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2551	3224	} else
2552		- if (event.getSource() == threeButton)
	3225	+ if (source == threeButton)
2553	3226	{
2554	3227	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();
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
	3231	+
	3232	+// bigThree.remove(scenePanel);
	3233	+// bigThree.remove(centralPanel);
	3234	+// bigThree.remove(XYZPanel);
	3235	+// aWindowConstraints.gridx = 0;
	3236	+// aWindowConstraints.gridy = 0;
	3237	+// aWindowConstraints.gridwidth = 1;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3240	+// aWindowConstraints.weightx = 0;
	3241	+// aWindowConstraints.weighty = 1;
	3242	+// //bigThree.add(jtp, aWindowConstraints);
	3243	+// aWindowConstraints.weightx = 1;
	3244	+// aWindowConstraints.gridwidth = 3;
	3245	+// // aConstraints.gridheight = 3;
	3246	+// aWindowConstraints.gridx = 1;
	3247	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3248	+// bigThree.add(centralPanel, aWindowConstraints);
	3249	+// aWindowConstraints.weightx = 0;
	3250	+// aWindowConstraints.gridx = 4;
	3251	+// aWindowConstraints.gridwidth = 1;
	3252	+// // aConstraints.gridheight = 3;
	3253	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3254	+// bigThree.add(XYZPanel, aWindowConstraints);
	3255	+// bigThree.validate();
	3256	+// scenePanel.setVisible(false);
	3257	+// centralPanel.setVisible(true);
	3258	+// XYZPanel.setVisible(true);
	3259	+ bigThree.ClearUI();
	3260	+ bigThree.add(centralPanel);
	3261	+ bigThree.add(XYZPanel);
	3262	+ bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2579	3265	} else
2580		- if (event.getSource() == fourButton)
	3266	+ if (source == fourButton)
2581	3267	{
2582	3268	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();
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
	3272	+
	3273	+// bigThree.remove(scenePanel);
	3274	+// bigThree.remove(centralPanel);
	3275	+// bigThree.remove(XYZPanel);
	3276	+// aWindowConstraints.gridx = 0;
	3277	+// aWindowConstraints.gridy = 0;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// aWindowConstraints.weightx = 1;
	3282	+// aWindowConstraints.weighty = 1;
	3283	+// bigThree.add(scenePanel, aWindowConstraints);
	3284	+// aWindowConstraints.weightx = 1;
	3285	+// aWindowConstraints.gridwidth = 3;
	3286	+// // aConstraints.gridheight = 3;
	3287	+// aWindowConstraints.gridx = 1;
	3288	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3289	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3290	+// aWindowConstraints.weightx = 0;
	3291	+// aWindowConstraints.gridx = 4;
	3292	+// aWindowConstraints.gridwidth = 1;
	3293	+// // aWindowConstraints.gridheight = 3;
	3294	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3295	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3296	+// bigThree.validate();
	3297	+// scenePanel.setVisible(true);
	3298	+// centralPanel.setVisible(false);
	3299	+// XYZPanel.setVisible(false);
	3300	+ bigThree.ClearUI();
	3301	+ bigThree.add(scenePanel);
	3302	+ bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2607	3305	} else
2608		- if (event.getSource() == sixButton)
	3306	+ if (source == sixButton)
2609	3307	{
2610	3308	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();
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
	3312	+
	3313	+// bigThree.remove(scenePanel);
	3314	+// bigThree.remove(centralPanel);
	3315	+// bigThree.remove(XYZPanel);
	3316	+// aWindowConstraints.gridx = 0;
	3317	+// aWindowConstraints.gridy = 0;
	3318	+// aWindowConstraints.gridwidth = 1;
	3319	+// // aConstraints.gridheight = 3;
	3320	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3321	+// aWindowConstraints.weightx = 0;
	3322	+// aWindowConstraints.weighty = 1;
	3323	+// bigThree.add(scenePanel, aWindowConstraints);
	3324	+// aWindowConstraints.weightx = 1;
	3325	+// aWindowConstraints.gridwidth = 3;
	3326	+// // aWindowConstraints.gridheight = 3;
	3327	+// aWindowConstraints.gridx = 1;
	3328	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3329	+// bigThree.add(centralPanel, aWindowConstraints);
	3330	+// aWindowConstraints.weightx = 0;
	3331	+// aWindowConstraints.gridx = 4;
	3332	+// aWindowConstraints.gridwidth = 1;
	3333	+// // aWindowConstraints.gridheight = 3;
	3334	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3335	+// //bigThree.add(XYZPanel, aConstraints);
	3336	+// bigThree.validate();
	3337	+// scenePanel.setVisible(true);
	3338	+// centralPanel.setVisible(true);
	3339	+// XYZPanel.setVisible(false);
	3340	+ bigThree.ClearUI();
	3341	+ bigThree.add(scenePanel);
	3342	+ bigThree.add(centralPanel);
	3343	+ bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2635	3346	} else
2636		- if (event.getSource() == sevenButton)
	3347	+ if (source == sevenButton)
2637	3348	{
2638	3349	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();
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
	3353	+
	3354	+// bigThree.remove(scenePanel);
	3355	+// bigThree.remove(centralPanel);
	3356	+// bigThree.remove(XYZPanel);
	3357	+// aWindowConstraints.gridx = 0;
	3358	+// aWindowConstraints.gridy = 0;
	3359	+// aWindowConstraints.gridwidth = 1;
	3360	+// // aWindowConstraints.gridheight = 3;
	3361	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3362	+// aWindowConstraints.weightx = 0;
	3363	+// aWindowConstraints.weighty = 1;
	3364	+// bigThree.add(scenePanel, aWindowConstraints);
	3365	+// aWindowConstraints.weightx = 1;
	3366	+// aWindowConstraints.gridwidth = 3;
	3367	+// // aWindowConstraints.gridheight = 3;
	3368	+// aWindowConstraints.gridx = 1;
	3369	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3370	+// bigThree.add(centralPanel, aWindowConstraints);
	3371	+// aWindowConstraints.weightx = 0;
	3372	+// aWindowConstraints.gridx = 4;
	3373	+// aWindowConstraints.gridwidth = 1;
	3374	+// // aConstraints.gridheight = 3;
	3375	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3376	+// bigThree.add(XYZPanel, aWindowConstraints);
	3377	+// bigThree.validate();
	3378	+// scenePanel.setVisible(true);
	3379	+// centralPanel.setVisible(true);
	3380	+// XYZPanel.setVisible(true);
	3381	+ bigThree.ClearUI();
	3382	+ bigThree.add(scenePanel);
	3383	+ bigThree.add(centralPanel);
	3384	+ bigThree.add(XYZPanel);
	3385	+ bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2663	3388	} else
2664		- if (event.getSource() == rootButton)
	3389	+ if (source == rootButton)
2665	3390	{
2666	3391	Object3D obj;
2667	3392	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2671,66 +3396,84 @@
2671	3396	EditObject(obj);
2672	3397	}
2673	3398
	3399	+ cameraView.requestFocusInWindow();
2674	3400	refreshContents(true);
2675	3401	} else
2676		- if (event.getSource() == closeButton)
	3402	+ if (source == closeButton)
2677	3403	{
2678	3404	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3405	cRadio ab;
2680	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2681	3407	{
2682	3408	ab = (cRadio)e.nextElement();
2683		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2684	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2685	3417	buttonGroup.remove(ab);
2686	3418	radioPanel.remove(ab);
2687	3419
2688		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2689	3422	// ab.GetObject().objectUI = null; // ?????????
2690	3423
2691	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2692	3425	break;
2693	3426	}
2694	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2695	3430	refreshContents(true);
2696	3431	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3432	+ if (source == editItem \|\| source == editButton)
2698	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2699	3440	EditSelection(false);
2700	3441	} else
2701		- if (event.getSource() == uneditButton)
	3442	+ if (source == uneditButton)
2702	3443	{
2703	3444	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3445	{
2705	3446	Object3D child = (Object3D)e.nextElement();
2706	3447	if(child.editWindow != null)
2707	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2708	3450	child.CloseUI();
2709	3451	listUI.remove(child);
2710	3452
2711		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2712	3454	}
2713		- objEditor.ctrlPanel.revalidate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2714	3456	//objEditor.jTree.clearSelection();
2715	3457	//objEditor.ResetSliders();
2716	3458	refreshContents(true);
2717	3459	} else
2718		- if (event.getSource() == clearPanelButton)
	3460	+ if (source == clearPanelButton)
2719	3461	{
2720	3462	assert(copy == group);
2721	3463	//copy.ClearUI();
2722	3464	for (Object3D obj : listUI)
2723	3465	{
	3466	+ obj.pinned = false;
2724	3467	obj.CloseUI();
2725	3468	}
2726	3469	listUI.clear();
2727	3470	refreshContents(true);
2728	3471	} else
2729		- if (event.getSource() == allParamsButton)
	3472	+ if (source == allParamsButton)
2730	3473	{
2731	3474	assert(copy == group);
2732	3475
2733		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2734	3477
2735	3478	for (Object3D obj : listUI)
2736	3479	{
..	..	@@ -2747,19 +3490,19 @@
2747	3490
2748	3491	refreshContents(true);
2749	3492	} else
2750		- if (event.getSource() == unselectButton)
	3493	+ if (source == unselectButton)
2751	3494	{
2752	3495	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3496	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3497	objEditor.ResetSliders();
2755	3498	refreshContents(true);
2756	3499	} else
2757		- if(event.getSource() instanceof cRadio)
	3500	+ if(source instanceof cRadio)
2758	3501	{
2759	3502	group.parent = keepparent;
2760	3503	group.attributes = 0;
2761	3504	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3505	+ /cRadio/ radio = (cRadio)source;
2763	3506	Object3D obj = radio.GetObject();
2764	3507	System.out.println("Edit " + obj);
2765	3508	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3522,10 @@
2779	3522	}
2780	3523
2781	3524	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
	3528	+ //Globals.theRenderer.object = group;
2783	3529	if(!useclient)
2784	3530	{
2785	3531	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,25 +3534,52 @@
2788	3534	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3535	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3536	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3537	+ //cameraView.lighttouched = true;
	3538	+ Globals.lighttouched = true;
2792	3539	topView.object = group;
2793	3540	frontView.object = group;
2794	3541	sideView.object = group;
2795	3542	}
2796		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2797	3548	/*
2798	3549	currentLayout = radio.layout;
2799	3550	if (currentLayout == null)
2800	3551	currentLayout = sevenButton;
2801	3552	*/
2802	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
2803	3561	keepparent = group.parent;
2804	3562	// PARENT = NULL or not???
2805	3563	//group.parent = null; // ROOT
2806	3564	//group.attributes = -1;
2807	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
2808	3568	refreshContents(true);
2809		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
2810	3583	else
2811	3584	{
2812	3585	//return super.action(event, arg);
..	..	@@ -2815,7 +3588,6 @@
2815	3588	}
2816	3589
2817	3590	boolean useclient = false;
2818		- cRadio radio;
2819	3591
2820	3592	void ToggleRoot()
2821	3593	{
..	..	@@ -2824,7 +3596,7 @@
2824	3596	if (useclient)
2825	3597	{
2826	3598	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3599	+ Globals.lighttouched = true;
2828	3600	//topView.object = client;
2829	3601	//frontView.object = client;
2830	3602	//sideView.object = client;
..	..	@@ -2832,7 +3604,7 @@
2832	3604	else
2833	3605	{
2834	3606	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3607	+ Globals.lighttouched = true;
2836	3608	//topView.object = group;
2837	3609	//frontView.object = group;
2838	3610	//sideView.object = group;
..	..	@@ -2867,6 +3639,28 @@
2867	3639	refreshContents();
2868	3640	}
2869	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
2870	3664
2871	3665	void ResetTransform()
2872	3666	{
..	..	@@ -2979,7 +3773,7 @@
2979	3773	refreshContents();
2980	3774	}
2981	3775
2982		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
2983	3777	{
2984	3778	Object3D obj;
2985	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3788,16 @@
2994	3788	LA.matIdentity(Object3D.mat);
2995	3789	obj.getBounds(minima, maxima, false);
2996	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3000	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3003	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3028,7 +3826,8 @@
3028	3826
3029	3827	int size = obj.MemorySize();
3030	3828
3031		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3032	3831	}
3033	3832	}
3034	3833	catch (Exception e)
..	..	@@ -3065,9 +3864,9 @@
3065	3864	obj = (Object3D)e.nextElement();
3066	3865
3067	3866	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3069	3868	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3870
3072	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3872	}
..	..	@@ -3109,6 +3908,20 @@
3109	3908	void GenNormals(boolean crease)
3110	3909	{
3111	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
	3918	+
	3919	+ refreshContents();
	3920	+ }
	3921	+
	3922	+ void GenNormalsMINE()
	3923	+ {
	3924	+ group.selection.GenNormalsMINE();
3112	3925
3113	3926	refreshContents();
3114	3927	}
..	..	@@ -3157,104 +3970,259 @@
3157	3970
3158	3971	//Object3D buffer;
3159	3972	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		-
	3973	+// BoundaryRep temprep;
	3974	+// Object3D nodes;
	3975	+// Vector<Vertex> vertices;
	3976	+//
	3977	+// cGroup buffer;
	3978	+//
	3979	+// public void Vertex(Object3D node, Vertex v)
	3980	+// {
	3981	+//// vertices.add(v);
	3982	+//// nodes.addElement(node);
	3983	+////
	3984	+//// if (temprep.GetCache(v) != null)
	3985	+//// {
	3986	+//// temprep.Remove(v);
	3987	+//// } else
	3988	+//// {
	3989	+//// temprep.Remember(v);
	3990	+//// }
	3991	+//
	3992	+// //Object3D node = nodes.get(index);
	3993	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3994	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3995	+//
	3996	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3997	+//
	3998	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3999	+//
	4000	+// cGroup g = new cGroup();
	4001	+//
	4002	+// if (g.toParent == null)
	4003	+// {
	4004	+// g.toParent = LA.newMatrix();
	4005	+// g.fromParent = LA.newMatrix();
	4006	+// }
	4007	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4008	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4009	+//
	4010	+// g.add(GrafreeD.clipboard);
	4011	+//
	4012	+// buffer.add(g);
	4013	+// }
	4014	+//
	4015	+// public void Face(Object3D node, Face f)
	4016	+// {
	4017	+//
	4018	+// }
	4019	+//
	4020	+// void ParseVerticesOld() // ??
	4021	+// {
	4022	+// //if (group.selection.size() != 1)
	4023	+// // return;
	4024	+//
	4025	+// temprep = new BoundaryRep();
	4026	+// nodes = new Object3D();
	4027	+// vertices = new Vector<Vertex>();
	4028	+//
	4029	+// boolean epsequal = GrafreeD.epsequal;
	4030	+// GrafreeD.epsequal = true;
	4031	+//
	4032	+// for (int i=0; i<group.selection.size(); i++)
	4033	+// {
	4034	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4035	+//
	4036	+// group.selection.get(i).Parse(
	4037	+//this );
	4038	+//
	4039	+// int repsize = temprep.VertexCount();
	4040	+// int tablesize = temprep.vertextable.size();
	4041	+// int nodesize = nodes.size();
	4042	+//
	4043	+// assert(vertices.size() == nodes.size());
	4044	+//
	4045	+// temprep.vertextable.elements();
	4046	+//
	4047	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	4048	+//
	4049	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	4050	+// {
	4051	+// cGroup g = new cGroup();
	4052	+//
	4053	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	4054	+//
	4055	+// Object3D node = nodes.get(index);
	4056	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	4057	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	4058	+//
	4059	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	4060	+//
	4061	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	4062	+//
	4063	+// if (g.toParent == null)
	4064	+// {
	4065	+// g.toParent = LA.newMatrix();
	4066	+// g.fromParent = LA.newMatrix();
	4067	+// }
	4068	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4069	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	4070	+//
	4071	+// g.add(GrafreeD.clipboard);
	4072	+//
	4073	+// buffer.add(g);
	4074	+// }
	4075	+//
	4076	+// makeSomething(buffer, i==group.selection.size()-1);
	4077	+// }
	4078	+//
	4079	+// GrafreeD.epsequal = epsequal;
	4080	+//
	4081	+// //buffer = null;
	4082	+// temprep = null;
	4083	+// nodes = null;
	4084	+//
	4085	+// refreshContents();
	4086	+// }
	4087	+
3184	4088	void ParseVertices()
3185	4089	{
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;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3195	4092
3196	4093	for (int i=0; i<group.selection.size(); i++)
3197	4094	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	4095	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	4096
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	4097	+ group.selection.get(i).Parse(
	4098	+
	4099	+ new iParse()
	4100	+ {
	4101	+ public void Vertex(Object3D node, Vertex v)
	4102	+ {
	4103	+ temp.set(v);
	4104	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	4105
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();
	4106	+ cGroup g = new cGroup();
3211	4107
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	4108	+ if (g.toParent == null)
	4109	+ {
	4110	+ g.toParent = LA.newMatrix();
	4111	+ g.fromParent = LA.newMatrix();
	4112	+ }
	4113	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	4114	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	4115
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);
	4116	+ g.add(Grafreed.clipboard);
3220	4117
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);
	4118	+ buffer.add(g);
	4119	+ }
3232	4120
3233		- g.add(GraphreeD.clipboard);
	4121	+ public void Face(Object3D node, Face f)
	4122	+ {
3234	4123
3235		- buffer.add(g);
3236		- }
	4124	+ }
	4125	+ }
	4126	+ );
3237	4127
3238	4128	makeSomething(buffer, i==group.selection.size()-1);
3239	4129	}
3240	4130
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	4131	+ Grafreed.epsequal = epsequal;
3246	4132
3247	4133	refreshContents();
3248	4134	}
3249		-
	4135	+
	4136	+ void TextureVertices()
	4137	+ {
	4138	+ for (int i=0; i<group.selection.size(); i++)
	4139	+ {
	4140	+ group.selection.get(i).Parse(
	4141	+ new iParse()
	4142	+ {
	4143	+ public void Vertex(Object3D node, Vertex v)
	4144	+ {
	4145	+ cTexture tex = node.GetTextures();
	4146	+ String pigment = Object3D.GetPigment(tex);
	4147	+ //String bump = Object3D.GetBump(tex);
	4148	+
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
	4159	+
	4160	+ double s = v.s;
	4161	+
	4162	+ if (s == 1)
	4163	+ s = 0;
	4164	+
	4165	+ double t = v.t;
	4166	+
	4167	+ if (t == 1)
	4168	+ t = 0;
	4169	+
	4170	+ int indexs = (int) (texturedata.getWidth() * s);
	4171	+ int indext = (int) (texturedata.getHeight() * t);
	4172	+
	4173	+ int index = indext * texturedata.getWidth() + indexs;
	4174	+
	4175	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	4176	+
	4177	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	4178	+
	4179	+ float scale = bytebuf.get(index*slide) & 0xFF;
	4180	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	4181	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	4182	+ scale /= 3;
	4183	+
	4184	+ scale /= 0xFF;
	4185	+ // c'est quoi ca? scale /= 4;
	4186	+
	4187	+ //v.AO = scale;
	4188	+
	4189	+ v.x += v.norm.x * scale;
	4190	+ v.y += v.norm.y * scale;
	4191	+ v.z += v.norm.z * scale;
	4192	+ }
	4193	+
	4194	+ public void Face(Object3D node, Face f)
	4195	+ {
	4196	+ }
	4197	+ }
	4198	+ );
	4199	+ }
	4200	+
	4201	+ refreshContents();
	4202	+ }
	4203	+
3250	4204	void Align()
3251	4205	{
	4206	+ if (group.selection.size() == 0)
	4207	+ return;
	4208	+
	4209	+ cVector bbmin = new cVector();
	4210	+ cVector bbmax = new cVector();
	4211	+
	4212	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4213	+
	4214	+ double dx = bbmax.x - bbmin.x;
	4215	+ double dy = bbmax.y - bbmin.y;
	4216	+ double dz = bbmax.z - bbmin.z;
	4217	+
	4218	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4219	+
3252	4220	for (int i=0; i<group.selection.size(); i++)
3253	4221	{
3254	4222	Object3D obj = group.selection.get(i);
3255	4223
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4224	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4225	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	4226	}
3259	4227
3260	4228	refreshContents();
..	..	@@ -3267,7 +4235,7 @@
3267	4235	// ref.SaveSupports();
3268	4236	// Object3D par = ref.parent;
3269	4237	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4238	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	4239	// ref.parent = par;
3272	4240	// ref.RestoreSupports();
3273	4241
..	..	@@ -3275,11 +4243,11 @@
3275	4243
3276	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	4245
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3280	4248	lowres.linkVerticesThis(null);
3281	4249	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3283	4251
3284	4252	System.err.flush();
3285	4253
..	..	@@ -3297,7 +4265,7 @@
3297	4265	// lowres.SaveSupports();
3298	4266	// par = lowres.parent;
3299	4267	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4268	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	4269	Object3D newlow = CloneObject(lowres, false);
3302	4270	newlow.name = sn.switchobject.get(i).name;
3303	4271	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +4287,7 @@
3319	4287	return;
3320	4288
3321	4289	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3323	4291
3324	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	4293
..	..	@@ -3488,7 +4456,7 @@
3488	4456	group.selection.RelinkToSupport(); // july 2014
3489	4457	System.out.println("DONE.");
3490	4458	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4459	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4460	}
3493	4461
3494	4462	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4481,20 @@
3513	4481
3514	4482	void ClipMesh()
3515	4483	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4485	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3519	4487
3520	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4489	content = ((cGroup)content).get(0);
3522	4490
3523	4491	// for (int i=0; i<group.selection.size(); i++)
3524	4492	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4493	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4494	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4496	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4497	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4498	System.out.println("DONE.");
3531	4499	refreshContents();
3532	4500	}
..	..	@@ -3571,6 +4539,18 @@
3571	4539	void MarkLeaves(boolean hide)
3572	4540	{
3573	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3574	4554	refreshContents();
3575	4555	}
3576	4556
..	..	@@ -3645,10 +4625,6 @@
3645	4625	// }
3646	4626	// }
3647	4627
3648		- static boolean allparams = true;
3649		-
3650		- static Vector<Object3D> listUI = new Vector<Object3D>();
3651		-
3652	4628	void EditSelection(boolean newWindow)
3653	4629	{
3654	4630	// aConstraints.gridy = 0;
..	..	@@ -3656,10 +4632,10 @@
3656	4632	{
3657	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3658	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3659		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4636
3661	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
3663	4639	{
3664	4640	// if (!(elem instanceof Composite))
3665	4641	// newWindow = false;
..	..	@@ -3741,7 +4717,8 @@
3741	4717	//new Exception().printStackTrace();
3742	4718
3743	4719	freezemodel = true;
3744		-
	4720	+ ClearUnpinned();
	4721	+
3745	4722	/**/
3746	4723	//switch (event.id)
3747	4724	{
..	..	@@ -3749,7 +4726,6 @@
3749	4726	//case 702: // Event.LIST_DESELECT
3750	4727	group.deselectAll();
3751	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3752		- objEditor.ClearInfo(); // .GetMaterial());
3753	4729	if (tps != null)
3754	4730	{
3755	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -3758,33 +4734,39 @@
3758	4734
3759	4735	//if (child.parent != null)
3760	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
3761	4738	group.addSelectee(child);
3762		- objEditor.SetMaterial(child); // .GetMaterial());
3763		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3764		- System.err.println("info : " + child.GetPath());
3765	4739	}
3766	4740	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
3773	4747
3774		- objEditor.SetText(); // jan 2014
3775		-
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4749	CameraPane.flash = true;
3778	4750
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4752	// a camera
3781	4753	{
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;
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
	4759	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4760	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4761	}
3787	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
3788	4770	refreshContents();
3789	4771	//return true;
3790	4772	}
..	..	@@ -3793,6 +4775,35 @@
3793	4775
3794	4776	freezemodel = false;
3795	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
3796	4807
3797	4808	void linkSomething(Object3D thing)
3798	4809	{
..	..	@@ -3864,16 +4875,19 @@
3864	4875	{
3865	4876	if (group.selection.isEmpty())
3866	4877	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
3868	4880	Composite tGroup = null;
3869	4881	if (group.selection.size() > 0) // 1)
3870	4882	{
3871	4883	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
3873	4885	}
3874	4886
3875	4887	if (cut)
3876	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
3877	4891	//int indices[] = jList.getSelectedIndices();
3878	4892	//for (int i = indices.length - 1; i >= 0; i--)
3879	4893	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4923,16 @@
3909	4923	//System.out.println("cut " + child);
3910	4924	//System.out.println("parent = " + child.parent);
3911	4925	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
3913	4927	tGroup.add/Child/(tmp);
3914	4928	else
3915		- GraphreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
3916	4930	}
3917	4931	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
3919	4933	tGroup.add/Child/(child);
3920	4934	else
3921		- GraphreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
3922	4936	}
3923	4937
3924	4938	//ResetModel();
..	..	@@ -3950,21 +4964,23 @@
3950	4964	//System.out.println("cut " + elem);
3951	4965	//System.out.println("parent = " + elem.parent);
3952	4966	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
3954	4968	tGroup.add/Child/(tmp);
3955	4969	else
3956		- GraphreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
3957	4971	}
3958	4972	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
3960	4974	tGroup.add/Child/(child);
3961	4975	else
3962		- GraphreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
3963	4977	}
3964	4978
3965	4979	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
3968	4984	if (cut)
3969	4985	{
3970	4986	ResetModel();
..	..	@@ -3974,11 +4990,15 @@
3974	4990
3975	4991	void paste(boolean expand)
3976	4992	{
3977		- // if (GraphreeD.clipboard == null)
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
	4997	+ // if (GrafreeD.clipboard == null)
3978	4998	// return;
3979	4999	boolean first = true;
3980	5000
3981		- if (GraphreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
3982	5002	{
3983	5003	Composite temp;
3984	5004
..	..	@@ -3989,7 +5009,7 @@
3989	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	5010	*/
3991	5011	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	5013	{
3994	5014	Object3D child = (Object3D)e.nextElement();
3995	5015
..	..	@@ -4003,7 +5023,7 @@
4003	5023	else
4004	5024	elem = child.deepCopy(); // ?
4005	5025	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5026	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	5027	// elem = elem.get(0);
4008	5028	makeSomething(elem, true); // ?? first);
4009	5029	//group.addChild(elem);
..	..	@@ -4023,23 +5043,24 @@
4023	5043	//Object3D cb = Applet3D.clipboard;
4024	5044	//temp.addChild(cb);
4025	5045	//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());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	5051	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	5054	}
4035	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4036	5057	ResetModel();
4037	5058	refreshContents();
4038	5059	}
4039	5060
4040		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4041	5062	{
4042		-// if (GraphreeD.clipboard == null)
	5063	+// if (GrafreeD.clipboard == null)
4043	5064	// return;
4044	5065
4045	5066	if (group.selection.size() != 1)
..	..	@@ -4066,15 +5087,22 @@
4066	5087	if (copyit)
4067	5088	{
4068	5089	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4070	5098	}
4071	5099	else
4072	5100	{
4073	5101	boolean first = true;
4074	5102
4075		- if (GraphreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4076	5104	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4078	5106	Object3D copy;
4079	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	5108	{
..	..	@@ -4084,7 +5112,7 @@
4084	5112	}
4085	5113	} else
4086	5114	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	5116	}
4089	5117	}
4090	5118	}
..	..	@@ -4161,6 +5189,10 @@
4161	5189
4162	5190	void group(Object3D csg, boolean grab)
4163	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4164	5196	if (//false) // why??
4165	5197	!group.selection.isEmpty())
4166	5198	{
..	..	@@ -4274,8 +5306,34 @@
4274	5306	//node.add(csg);
4275	5307	//makeSomething(node);
4276	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4277	5310	}
4278	5311
	5312	+ void Ungroup(Object3D g)
	5313	+ {
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
	5318	+ if (g instanceof HiddenObject)
	5319	+ {
	5320	+ HiddenObject h = (HiddenObject) g;
	5321	+
	5322	+ for (int i=0; i<h.ActualSize(); i++)
	5323	+ {
	5324	+ objEditor.makeSomething(h.get(i), false);
	5325	+ }
	5326	+ }
	5327	+ else
	5328	+ {
	5329	+ for (int i=0; i<g.Size(); i++)
	5330	+ {
	5331	+ objEditor.makeSomething(g.get(i), false);
	5332	+ }
	5333	+ }
	5334	+ Globals.REPLACEONMAKE = keep;
	5335	+ }
	5336	+
4279	5337	void ungroup()
4280	5338	{
4281	5339	/*
..	..	@@ -4469,21 +5527,6 @@
4469	5527	}
4470	5528	*/
4471	5529
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	5530	/*
4488	5531	public void Callback(Object obj)
4489	5532	{
..	..	@@ -4507,26 +5550,9 @@
4507	5550	}
4508	5551	*/
4509	5552
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	5553	String GetFile(String dialogName)
4528	5554	{
4529		- if (GraphreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4530	5556	{
4531	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5558	browser.show();
..	..	@@ -4590,10 +5616,33 @@
4590	5616	cButton flashSelectionButton;
4591	5617	cButton editButton;
4592	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4593	5620	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5621	cButton unselectButton;
4596	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4597	5646	cButton screenfitButton;
4598	5647	cButton screenfitpointButton;
4599	5648	cButton snapobjectButton;
..	..	@@ -4605,14 +5654,6 @@
4605	5654
4606	5655	cButton setsupportButton;
4607	5656
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	5657	//
4617	5658	//Composite
4618	5659	Object3D // to do !!
..	..	@@ -4622,9 +5663,11 @@
4622	5663	//JTree jTree;
4623	5664	private MenuItem lookAtItem;
4624	5665	private MenuItem lookFromItem;
4625		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4626	5667	private MenuItem cutItem;
4627		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4628	5671	private MenuItem cloneItem;
4629	5672	private MenuItem cloneSupportItem;
4630	5673	private MenuItem overwriteGeoItem;
..	..	@@ -4635,8 +5678,9 @@
4635	5678	private MenuItem resetsupportItem;
4636	5679	private MenuItem resetreferencesItem;
4637	5680	private MenuItem linkverticesItem;
	5681	+ private MenuItem relinkverticesItem;
4638	5682	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
4640	5684	private MenuItem stepAllItem;
4641	5685	private MenuItem revertMeshItem;
4642	5686	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5691,17 @@
4647	5691	private MenuItem mergeGeometriesItem;
4648	5692	private MenuItem copyItem;
4649	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
4650	5695	private MenuItem pasteLinkItem;
4651	5696	private MenuItem pasteCloneItem;
4652	5697	private MenuItem pasteExpandItem;
4653	5698	private MenuItem clearItem;
4654	5699	private MenuItem clearAllItem;
4655	5700	private MenuItem genUVItem;
	5701	+ private MenuItem genNormalsMESHItem;
4656	5702	private MenuItem genNormalsCADItem;
4657	5703	private MenuItem genNormalsORGANItem;
	5704	+ private MenuItem genNormalsMINEItem;
4658	5705	private MenuItem stripifyItem;
4659	5706	private MenuItem unstripifyItem;
4660	5707	private MenuItem trimItem;
..	..	@@ -4683,6 +5730,10 @@
4683	5730	private MenuItem showleavesItem;
4684	5731	private MenuItem markleavesItem;
4685	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
4686	5737
4687	5738	private MenuItem flipVItem;
4688	5739	private MenuItem unflipVItem;
..	..	@@ -4694,14 +5745,17 @@
4694	5745	private MenuItem panoTexturesItem;
4695	5746
4696	5747	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
4698	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
	5752	+ private MenuItem hideItem;
4699	5753	private MenuItem grabItem;
4700	5754	private MenuItem backItem;
4701	5755	private MenuItem frontItem;
4702	5756	private MenuItem cameraItem;
4703	5757	private MenuItem compositeItem;
4704		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
4705	5759	private MenuItem physicsItem;
4706	5760	private MenuItem frameselectorItem;
4707	5761	private MenuItem scriptNodeItem;
..	..	@@ -4716,6 +5770,7 @@
4716	5770
4717	5771	private MenuItem resetParentItem;
4718	5772	private MenuItem repairParentItem;
	5773	+ private MenuItem repairShadowItem;
4719	5774	private MenuItem sortbysizeItem;
4720	5775	private MenuItem sortbynameItem;
4721	5776
..	..	@@ -4728,16 +5783,19 @@
4728	5783	private MenuItem particleItem;
4729	5784	private MenuItem ragdollItem;
4730	5785	private MenuItem ragdoll2Item;
	5786	+ private MenuItem heightFieldItem;
	5787	+ private MenuItem textureFieldItem;
4731	5788	private MenuItem gridItem;
4732	5789	private MenuItem rectoidItem;
4733	5790	private MenuItem ellipsoidItem;
4734	5791	private MenuItem coneItem;
4735	5792	private MenuItem torusItem;
4736	5793	private MenuItem superItem;
	5794	+ private MenuItem kleinItem;
4737	5795	private MenuItem blobItem;
4738	5796	private MenuItem latheItem;
4739	5797	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
4741	5799	private MenuItem meshItem;
4742	5800	// private MenuItem meshGroupItem;
4743	5801	private MenuItem springItem;
..	..	@@ -4746,6 +5804,7 @@
4746	5804	private MenuItem csgItem;
4747	5805	private MenuItem templateItem;
4748	5806	private MenuItem textureItem;
	5807	+ private MenuItem billboardItem;
4749	5808	private MenuItem shadowXItem;
4750	5809	private MenuItem shadowYItem;
4751	5810	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5817,6 @@
4758	5817	private MenuItem doubleItem;
4759	5818	private MenuItem tripleItem;
4760	5819
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5820	private MenuItem computeAOItem;
4767	5821	private MenuItem recompileItem;
4768	5822	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5826,8 @@
4772	5826	private MenuItem analyzeItem;
4773	5827	private MenuItem dumpItem;
4774	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
4775	5833	}