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