~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
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	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +580,217 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
437	586
438	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	588
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
442	592
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
445	624	liveCB.addItemListener(this);
446	625
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ oneStepButton.setToolTipText("Animate one step forward");
	628	+ oneStepButton.addActionListener(this);
	629	+
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	631	+ fastCB.setToolTipText("Fast mode");
	632	+ fastCB.addItemListener(this);
	633	+
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	637	screenfitButton.setToolTipText("Screen fit");
455	638	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
	643	+
457	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	645	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	646
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
	647	+ if (Globals.ADVANCED)
	648	+ {
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ snapobjectButton.addActionListener(this);
	651	+ snapobjectButton.setToolTipText("Snap Object");
	652	+ }
	653	+
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	655
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	657	twoButton.setToolTipText("Show center view only");
483	658	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	662	fourButton.addActionListener(this);
486	663	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	665	sixButton.setToolTipText("2-column layout left");
489	666	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	668	threeButton.setToolTipText("2-column layout right");
492	669	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	671	sevenButton.setToolTipText("3-column layout");
495	672	sevenButton.addActionListener(this);
496	673	//
497	674
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ rootButton.setToolTipText("Edit selection in new tab");
500	677	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	678	+
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	680	closeButton.setToolTipText("Close tab");
504	681	closeButton.addActionListener(this);
505	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	683	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	684
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
	766	+ editButton.addActionListener(this);
	767	+
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
517	770	uneditButton.addActionListener(this);
518	771
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
531	774	allParamsButton.addActionListener(this);
532	775
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ clearPanelButton.setToolTipText("Clear edit panel");
	778	+ clearPanelButton.addActionListener(this);
	779	+
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ unselectButton.setToolTipText("Unselect");
538	782	unselectButton.addActionListener(this);
539	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
	793	+
540	794	// oe.aConstraints.gridx += 1;
541	795	// oe.aConstraints.weighty = 0;
542	796	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +802,22 @@
548	802	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	803	// gcButton.addActionListener(this);
550	804
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	805	+ cGridBag jSPPanel = new cGridBag();
	806	+
	807	+ JScrollPane jSP;
562	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	810	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	811
	812	+ oe.treePanel.add(jSPPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+ oe.treePanel.add(copyOptionsPanel);
	816	+ oe.treePanel.Return();
	817	+
	818	+// mainPanel.setDividerLocation(0.5); //1.0);
	819	+// mainPanel.setResizeWeight(0.5);
	820	+
585	821	//jList.addListSelectionListener(this);
586	822	oe.jTree.addTreeSelectionListener(this);
587	823	//jTree.setRootVisible(false);
..	..	@@ -604,83 +840,143 @@
604	840	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	841	}
606	842
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	843	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	844	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
618	848
619		- // constraints.gridy += 1;
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
	859	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	860	+ boxCB.setToolTipText("Display bounding boxes");
	861	+ boxCB.addItemListener(this);
	862	+
	863	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
	865	+ zoomBoxCB.addItemListener(this);
	866	+
	867	+ if (true) // Globals.ADVANCED)
	868	+ {
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
	876	+
620	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	878	// localCB.addItemListener(this);
622	879
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	880	+ panel.Return();
	881	+
	882	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	883	crowdCB.setToolTipText("Used for crowds");
626	884	crowdCB.addItemListener(this);
627	885
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	886	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	887	smoothCB.setToolTipText("Snapping delay");
631	888	smoothCB.addItemListener(this);
632	889
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	890	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	891	slowCB.setToolTipText("Smooth interpolation");
636	892	slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	893	+
646	894	// constraints.gridy += 1;
647	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	896	// speakerMocapCB.addItemListener(this);
649	897
	898	+ panel.Return();
	899	+
650	900	if (false)
651	901	{
652	902	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	903	+ //constraints.gridy += 1;
	904	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	905	speakerCameraCB.addItemListener(this);
656	906
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	907	+ //constraints.gridy += 1;
	908	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	909	speakerFocusCB.addItemListener(this);
660	910
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	911	+ //constraints.gridy += 1;
	912	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
664	915	}
665	916
666	917	//constraints.gridx += 1;
667	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	919	// debugCB.addItemListener(this);
669	920
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
	925	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
672	927	oeilCB.addItemListener(this);
673	928
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
	949	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	950	lookAtCB.setToolTipText("Look-at target");
677	951	lookAtCB.addItemListener(this);
	952	+ }
	953	+
	954	+ }
	955	+
	956	+ cGridBag fill = new cGridBag();
	957	+ fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
	962	+
	963	+ panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
678	966
679	967	}
680	968
681	969	void EditObject(Object3D obj)
682	970	{
683	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
684	980	radioButton.SetObject(obj);
685	981	radioButton.layout = sevenButton;
686	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +985,11 @@
689	985	buttonGroup.add(radioButton);
690	986	radioButton.doClick();
691	987	}
	988	+
692	989	void SetupViews(ObjEditor oe)
693	990	{
	991	+ theFrame = this;
	992	+
694	993	oe.SetupViews();
695	994
696	995	System.out.println("SetupViews");
..	..	@@ -699,23 +998,28 @@
699	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	999	}
701	1000
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
713	1014	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
719	1023
720	1024	// static int COLOR = 1;
721	1025	// static int MATERIAL = 2;
..	..	@@ -723,9 +1027,9 @@
723	1027
724	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1029
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
729	1033
730	1034	public void itemStateChanged(ItemEvent e)
731	1035	{
..	..	@@ -753,6 +1057,7 @@
753	1057	} else if(e.getSource() == liveCB)
754	1058	{
755	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
756	1061	}
757	1062	else if(e.getSource() == supportCB)
758	1063	{
..	..	@@ -817,6 +1122,18 @@
817	1122	{
818	1123	cameraView.ToggleOeil();
819	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
820	1137	else if(e.getSource() == lookAtCB)
821	1138	{
822	1139	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1150,8 @@
833	1150
834	1151	/**/
835	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1156	// We can't move the root node or an empty selection
839	1157	return;
..	..	@@ -905,7 +1223,9 @@
905	1223	// objEditor.DropFile((java.io.File[]) object, true);
906	1224	// return;
907	1225	// }
908		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1229	{
910	1230	// file(s)
911	1231	String[] names = string.split("\n");
..	..	@@ -932,7 +1252,7 @@
932	1252
933	1253	flashIt = false;
934	1254	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1257
938	1258	if (group.selection.size() == 1)
..	..	@@ -948,23 +1268,33 @@
948	1268
949	1269	assert target == objEditor.jTree;
950	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
951	1272	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1274	} catch (Exception e) {
954	1275	System.out.println("destinationPath : " + destinationPath);
955	1276	return;
956	1277	}
957	1278
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
959	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
960	1290	loadClipboard(true);
961	1291	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1292	+ pasteInto(false, false);
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
968	1298	}
969	1299	public void dropActionChanged(DropTargetDragEvent dtde)
970	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1399,104 @@
1069	1399	{
1070	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1401	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1084	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1421	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1088	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1429	ragdollItem.addActionListener(this);
1090	1430	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1431	ragdoll2Item.addActionListener(this);
	1432	+ }
1092	1433	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1434	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1435	meshItem.addActionListener(this);
1095	1436	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1437	// meshGroupItem.addActionListener(this);
	1438	+ if (Globals.ADVANCED)
	1439	+ {
1097	1440	springItem = menu.add(new MenuItem("Spring"));
1098	1441	springItem.addActionListener(this);
1099	1442	flagItem = menu.add(new MenuItem("Flag"));
1100	1443	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1444	blobItem = menu.add(new MenuItem("Blob"));
1106	1445	blobItem.addActionListener(this);
1107	1446	latheItem = menu.add(new MenuItem("Lathe"));
1108	1447	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1448	+ }
	1449	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1450	+ bezierItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1111	1455	menu.add("-");
1112	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1457	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1116	1460	doubleItem = menu.add(new MenuItem("Fork"));
1117	1461	doubleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1118	1464	tripleItem = menu.add(new MenuItem("Trident"));
1119	1465	tripleItem.addActionListener(this);
	1466	+ }
1120	1467	}
1121	1468
1122	1469	void buildToolsMenu(Menu menu)
1123	1470	{
1124	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1472	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1473	+ animationItem.setState(Globals.ANIMATION);
1127	1474
1128	1475	menu.add("-");
1129	1476	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1477	parseverticesItem.addActionListener(this);
1131	1478	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1479	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1480	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1481	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1482	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1483	reduceMorphItem.addActionListener(this);
1139	1484	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1485	reduce34MorphItem.addActionListener(this);
1141		-
	1486	+ menu.add("-");
1142	1487	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1488	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1489
	1490	+ if (Globals.ADVANCED)
	1491	+ {
	1492	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1493	+ mirrorItem.addActionListener(this);
	1494	+ menu.add("-");
1146	1495	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1496	memoryItem.addActionListener(this);
1148	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1498	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1500	dumpItem.addActionListener(this);
1152	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1502	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1514,7 @@
1165	1514	menu.add("-");
1166	1515	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1516	editScriptItem.addActionListener(this);
	1517	+ }
1168	1518	}
1169	1519
1170	1520	void ScreenFit()
..	..	@@ -1287,9 +1637,24 @@
1287	1637	shadow.material = new cMaterial(obj.material);
1288	1638	shadow.material.diffuse = 0.0001f;
1289	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1290	1641
1291	1642	makeSomething(shadow);
1292	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1293	1658
1294	1659	/**
1295	1660	* applyExample
..	..	@@ -1493,9 +1858,9 @@
1493	1858
1494	1859	void Overwrite(int mask)
1495	1860	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1862	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1863	+ Object3D content = Grafreed.clipboard.get(0);
1499	1864
1500	1865	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1866	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +1883,7 @@
1518	1883	//
1519	1884	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1885	{
	1886	+ Object source = event.getSource();
1521	1887	/*
1522	1888	if (event.getSource() == nameField)
1523	1889	{
..	..	@@ -1529,11 +1895,11 @@
1529	1895	}
1530	1896	else
1531	1897	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1898	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1899	{
1534	1900	ScreenFit();
1535	1901	} else
1536		- if (event.getSource() == switchItem)
	1902	+ if (source == switchViewItem)
1537	1903	{
1538	1904	cVector v1 = new cVector();
1539	1905	cVector v2 = new cVector();
..	..	@@ -1542,11 +1908,11 @@
1542	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1909	objEditor.cameraView.repaint();
1544	1910	} else
1545		- if (event.getSource() == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1546	1912	{
1547	1913	makeSomething(new Box());
1548	1914	} else
1549		- if (event.getSource() == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1550	1916	{
1551	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1933,9 @@
1567	1933	applyExample(particleGeom, "SMOKE");
1568	1934	makeSomething(particleGeom);
1569	1935	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1936	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1937	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1938	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1939
1574	1940	ragdoll.toParent = LA.newMatrix();
1575	1941	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1953,7 @@
1587	1953	} else
1588	1954	/*
1589	1955	*/
1590		- if (event.getSource() == heightFieldItem)
	1956	+ if (source == heightFieldItem)
1591	1957	{
1592	1958	Object3D obj = new Object3D();
1593	1959
..	..	@@ -1625,31 +1991,31 @@
1625	1991
1626	1992	makeSomething(obj);
1627	1993	} else
1628		- if (event.getSource() == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1629	1995	{
1630	1996	makeSomething(new Grid());
1631	1997	} else
1632		- if (event.getSource() == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1633	1999	{
1634	2000	makeSomething(new Sphere());
1635	2001	} else
1636		- if (event.getSource() == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1637	2003	{
1638	2004	makeSomething(new Cone());
1639	2005	} else
1640		- if (event.getSource() == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1641	2007	{
1642	2008	makeSomething(new Torus());
1643	2009	} else
1644		- if (event.getSource() == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1645	2011	{
1646	2012	makeSomething(new Superellipsoid());
1647	2013	} else
1648		- if (event.getSource() == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1649	2015	{
1650	2016	makeSomething(new Klein());
1651	2017	} else
1652		- if (event.getSource() == blobItem)
	2018	+ if (source == blobItem)
1653	2019	{
1654	2020	Blob blob = new Blob();
1655	2021	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +2023,15 @@
1657	2023	//blob.retile();
1658	2024	makeSomething(blob);
1659	2025	} else
1660		- if (event.getSource() == latheItem)
	2026	+ if (source == latheItem)
1661	2027	{
1662	2028	makeSomething(new Lathe());
1663	2029	} else
1664		- if (event.getSource() == bezierItem)
	2030	+ if (source == bezierItem)
1665	2031	{
1666	2032	makeSomething(new BezierSurface());
1667	2033	} else
1668		- if (event.getSource() == checkerItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1669	2035	{
1670	2036	/*
1671	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +2046,7 @@
1680	2046	*/
1681	2047	makeSomething(new Checker());
1682	2048	} else
1683		- if (event.getSource() == meshItem)
	2049	+ if (source == meshItem)
1684	2050	{
1685	2051	Object3D itemtomake = new Object3D();
1686	2052	Object3D child;
..	..	@@ -1701,35 +2067,35 @@
1701	2067	makeSomething(child);
1702	2068	}
1703	2069	} else
1704		- if (event.getSource() == springItem)
	2070	+ if (source == springItem)
1705	2071	{
1706	2072	cSpring s = new cSpring();
1707	2073	s.setup();
1708	2074	makeSomething(s);
1709	2075	} else
1710		- if (event.getSource() == flagItem)
	2076	+ if (source == flagItem)
1711	2077	{
1712	2078	cSpring s = new cFlag();
1713	2079	s.setup();
1714	2080	makeSomething(s);
1715	2081	} else
1716		- if (event.getSource() == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1717	2083	{
1718	2084	makeSomething(new Light());
1719	2085	} else
1720		- if (event.getSource() == csgItem)
	2086	+ if (source == csgItem)
1721	2087	{
1722	2088	group(new CSG());
1723	2089	} else
1724		- if (event.getSource() == templateItem)
	2090	+ if (source == templateItem)
1725	2091	{
1726	2092	group(new cTemplate());
1727	2093	} else
1728		- if (event.getSource() == attributeItem)
	2094	+ if (source == attributeItem)
1729	2095	{
1730	2096	makeSomething(new Attribute());
1731	2097	} else
1732		- if (event.getSource() == pointflowItem)
	2098	+ if (source == pointflowItem)
1733	2099	{
1734	2100	makeSomething(new PointFlow());
1735	2101	} else
..	..	@@ -1741,7 +2107,7 @@
1741	2107	} else
1742	2108	*/
1743	2109
1744		- if (event.getSource() == superLoopItem)
	2110	+ if (source == superLoopItem)
1745	2111	{
1746	2112	Composite g = new cGroup();
1747	2113	for (int i=0; i<15; i++)
..	..	@@ -1763,30 +2129,30 @@
1763	2129
1764	2130	group(g);
1765	2131	} else
1766		- if (event.getSource() == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1767	2133	{
1768	2134	Composite csg = new GroupLeaf();
1769	2135	csg.count = 5;
1770	2136	group(csg);
1771		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1772	2138	csg.addChild(child);
1773	2139	child.addChild(csg);
1774	2140	} else
1775		- if (event.getSource() == doubleItem)
	2141	+ if (source == doubleItem)
1776	2142	{
1777		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1778	2144	csg.count = 5;
1779	2145	group(csg);
1780		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1781	2147	csg.addChild(child);
1782	2148	child.addChild(csg);
1783		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1784	2150	csg.addChild(child);
1785	2151	child.addChild(csg);
1786	2152	} else
1787		- if (event.getSource() == tripleItem)
	2153	+ if (source == tripleItem)
1788	2154	{
1789		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1790	2156	csg.count = 4;
1791	2157	group(csg);
1792	2158	Composite child = new cGroup();
..	..	@@ -1799,71 +2165,83 @@
1799	2165	csg.addChild(child);
1800	2166	child.addChild(csg);
1801	2167	} else
1802		-
1803		- if (event.getSource() == importGFDItem)
1804		- {
1805		- ImportGFD();
1806		- } else
1807		- if (event.getSource() == importVRMLX3DItem)
1808		- {
1809		- ImportVRMLX3D();
1810		- } else
1811		- if (event.getSource() == import3DSItem)
1812		- {
1813		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814		- } else
1815		- if (event.getSource() == importOBJItem)
1816		- {
1817		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818		- } else
1819		- if (event.getSource() == computeAOItem)
	2168	+ if (source == computeAOItem)
1820	2169	{
1821	2170	Globals.drawMode = CameraPane.OCCLUSION;
1822	2171	Globals.theRenderer.repaint();
1823	2172	} else
1824		- if (event.getSource() == recompileItem)
	2173	+ if (source == recompileItem)
1825	2174	{
1826	2175	Recompile();
1827	2176	refreshContents();
1828	2177	} else
1829		- if (event.getSource() == editScriptItem)
	2178	+ if (source == editScriptItem)
1830	2179	{
1831	2180	OpenDialog();
1832	2181	refreshContents();
1833	2182	} else
1834		- if (event.getSource() == invariantsItem)
	2183	+ if (source == invariantsItem)
1835	2184	{
1836	2185	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	2186	+ Grafreed.grafreeD.universe.invariants();
1838	2187	} else
1839		- if (event.getSource() == memoryItem)
	2188	+ if (source == memoryItem)
1840	2189	{
1841	2190	//System.out.println("Invariants:");
1842	2191	PrintMemory();
1843	2192	} else
1844		- if (event.getSource() == pathItem)
	2193	+ if (source == pathItem)
1845	2194	{
1846	2195	PrintPath();
1847	2196	} else
1848		- if (event.getSource() == analyzeItem)
	2197	+ if (source == analyzeItem)
1849	2198	{
1850	2199	AnalyzeObject();
1851	2200	} else
1852		- if (event.getSource() == dumpItem)
	2201	+ if (source == dumpItem)
1853	2202	{
1854	2203	DumpObject();
1855	2204	} else
1856		- if (event.getSource() == screenfitButton)
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
	2228	+ } else
	2229	+ if (source == oneStepButton)
	2230	+ {
	2231	+ Globals.ONESTEP = true;
	2232	+ cameraView.repaint();
	2233	+ } else
	2234	+ if (source == screenfitButton)
1857	2235	{
1858	2236	//Reload(lastConverter, lastFilename, true);
1859	2237	ScreenFit();
1860	2238	} else
1861		- if (event.getSource() == screenfitpointButton)
	2239	+ if (source == screenfitpointButton)
1862	2240	{
1863	2241	//Reload(lastConverter, lastFilename, true);
1864	2242	ScreenFitPoint();
1865	2243	} else
1866		- if (event.getSource() == snapobjectButton)
	2244	+ if (source == snapobjectButton)
1867	2245	{
1868	2246	//Reload(lastConverter, lastFilename, true);
1869	2247	SnapObject();
..	..	@@ -1874,13 +2252,13 @@
1874	2252	// Recompile();
1875	2253	// refreshContents();
1876	2254	// } else
1877		- if (event.getSource() == gcButton)
	2255	+ if (source == gcButton)
1878	2256	{
1879	2257	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	2258	System.gc();
1881	2259	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	2260	} else
1883		- if (event.getSource() == editLeafItem)
	2261	+ if (source == editLeafItem)
1884	2262	{
1885	2263	Object3D obj;
1886	2264	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +2272,74 @@
1894	2272	}
1895	2273	refreshContents(true);
1896	2274	} else
1897		- if (event.getSource() == openWindowItem)
	2275	+ if (source == openWindowItem)
1898	2276	{
1899	2277	EditSelection(true);
1900	2278	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2279	+ if (source == cutItem \|\| source == clearButton)
1902	2280	{
1903	2281	loadClipboard(true);
1904	2282	} else
1905		- if (event.getSource() == duplicateItem)
	2283	+ if (source == undoItem)
1906	2284	{
1907		- Object3D keep = GrafreeD.clipboard;
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
	2290	+ } else
	2291	+ if (source == duplicateItem)
	2292	+ {
	2293	+ Object3D keep = Grafreed.clipboard;
1908	2294	loadClipboard(false);
1909	2295	paste(false);
1910		- GrafreeD.clipboard = keep;
	2296	+ Grafreed.clipboard = keep;
1911	2297	} else
1912		- if (event.getSource() == cloneItem)
	2298	+ if (source == cloneItem)
1913	2299	{
1914	2300	CloneSelection(false);
1915	2301	} else
1916		- if (event.getSource() == cloneSupportItem)
	2302	+ if (source == cloneSupportItem)
1917	2303	{
1918	2304	CloneSelection(true);
1919	2305	} else
1920		- if (event.getSource() == copyItem)
	2306	+ if (source == copyItem)
1921	2307	{
1922	2308	loadClipboard(false);
1923	2309	} else
1924		- if (event.getSource() == pasteItem)
	2310	+ if (source == pasteItem)
1925	2311	{
1926	2312	paste(false);
1927	2313	} else
1928		- if (event.getSource() == pasteLinkItem)
	2314	+ if (source == pasteIntoItem)
1929	2315	{
1930		- pasteInto(false);
	2316	+ pasteInto(true, false);
1931	2317	} else
1932		- if (event.getSource() == pasteCloneItem)
	2318	+ if (source == pasteLinkItem)
1933	2319	{
1934		- pasteInto(true);
	2320	+ pasteInto(false, false);
1935	2321	} else
1936		- if (event.getSource() == pasteExpandItem)
	2322	+ if (source == pasteCloneItem)
	2323	+ {
	2324	+ pasteInto(true, true);
	2325	+ } else
	2326	+ if (source == pasteExpandItem)
1937	2327	{
1938	2328	paste(true);
1939	2329	} else
1940		- if (event.getSource() == synchronizeItem)
	2330	+ if (source == synchronizeItem)
1941	2331	{
1942	2332	Overwrite(Object3D.TRANSFORM);
1943	2333	} else
1944		- if (event.getSource() == overwriteNameItem)
	2334	+ if (source == overwriteNameItem)
1945	2335	{
1946	2336	Overwrite(Object3D.NAME);
1947	2337	} else
1948		- if (event.getSource() == overwriteUVItem)
	2338	+ if (source == overwriteUVItem)
1949	2339	{
1950	2340	Overwrite(Object3D.UV);
1951	2341	} else
1952		- if (event.getSource() == overwriteMatItem)
	2342	+ if (source == overwriteMatItem)
1953	2343	{
1954	2344	/* july 2015
1955	2345	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2359,7 @@
1969	2359
1970	2360	Overwrite(dropAttributes);
1971	2361	}
1972		- if (event.getSource() == overwriteGeoItem)
	2362	+ if (source == overwriteGeoItem)
1973	2363	{
1974	2364	Overwrite(Object3D.GEOMETRY);
1975	2365	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2376,7 @@
1986	2376	// refreshContents();
1987	2377	// }
1988	2378	} else
1989		- if (event.getSource() == generateMeshItem)
	2379	+ if (source == generateMeshItem)
1990	2380	{
1991	2381	//if (group.selection.size() == 1)
1992	2382	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2387,7 @@
1997	2387	ResetModel();
1998	2388	refreshContents();
1999	2389	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2390	+ if (source == extractGeometriesItem)
2001	2391	{
2002	2392	boolean one = false;
2003	2393
..	..	@@ -2024,7 +2414,7 @@
2024	2414	ResetModel();
2025	2415	refreshContents();
2026	2416	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2417	+ if (source == cloneGeometriesItem)
2028	2418	{
2029	2419	boolean one = false;
2030	2420
..	..	@@ -2050,7 +2440,7 @@
2050	2440	ResetModel();
2051	2441	refreshContents();
2052	2442	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2443	+ if (source == shareGeometriesItem)
2054	2444	{
2055	2445	boolean one = false;
2056	2446
..	..	@@ -2080,7 +2470,7 @@
2080	2470	refreshContents();
2081	2471	}
2082	2472	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2473	+ if (source == mergeGeometriesItem)
2084	2474	{
2085	2475	boolean one = false;
2086	2476
..	..	@@ -2110,7 +2500,7 @@
2110	2500	ResetModel();
2111	2501	refreshContents();
2112	2502	} else
2113		- if (event.getSource() == linkverticesItem)
	2503	+ if (source == linkverticesItem)
2114	2504	{
2115	2505	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2506	// {
..	..	@@ -2123,9 +2513,9 @@
2123	2513	// group.selection.get(0).setMasterThis(content); // should be identity
2124	2514	// refreshContents();
2125	2515	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2516	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	2517	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	2518	+ Object3D content = Grafreed.clipboard.get(0);
2129	2519
2130	2520	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	2521	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +2523,38 @@
2133	2523	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2524	for (int i=0; i<group.selection.size(); i++)
2135	2525	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2526	+ boolean random = CameraPane.SWITCH;
	2527	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2528	group.selection.get(i).linkVerticesThis(content);
2139	2529	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2530	+ CameraPane.SWITCH = random;
2141	2531	}
2142	2532	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2533	refreshContents();
2144	2534	}
2145	2535	} else
2146		- if (event.getSource() == resetsupportItem)
	2536	+ if (source == resetsupportItem)
2147	2537	{
2148	2538	for (int i=0; i<group.selection.size(); i++)
2149	2539	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2540	+ boolean random = CameraPane.SWITCH;
	2541	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2542	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2543	+ CameraPane.SWITCH = random;
2154	2544	}
2155	2545
2156	2546	refreshContents();
2157	2547	} else
2158		- if (event.getSource() == relinkverticesItem)
	2548	+ if (source == relinkverticesItem)
2159	2549	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2550	+ boolean random = CameraPane.SWITCH;
	2551	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2552	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2553	+ CameraPane.SWITCH = random;
2164	2554
2165	2555	refreshContents();
2166	2556	} else
2167		- if (event.getSource() == resetreferencesItem)
	2557	+ if (source == resetreferencesItem)
2168	2558	{
2169	2559	for (int i=0; i<group.selection.size(); i++)
2170	2560	{
..	..	@@ -2173,11 +2563,11 @@
2173	2563
2174	2564	refreshContents();
2175	2565	} else
2176		- if (event.getSource() == setMasterItem)
	2566	+ if (source == setMasterItem)
2177	2567	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2568	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	2569	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	2570	+ Object3D content = Grafreed.clipboard.get(0);
2181	2571
2182	2572	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	2573	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +2576,13 @@
2186	2576	refreshContents();
2187	2577	}
2188	2578	} else
2189		- if (event.getSource() == poseMeshItem)
	2579	+ if (source == poseMeshItem)
2190	2580	{
2191	2581	if (group.selection.size() == 1)
2192	2582	{
2193		- if (GrafreeD.clipboard.size() == 1)
	2583	+ if (Grafreed.clipboard.size() == 1)
2194	2584	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2585	+ Object3D content = Grafreed.clipboard.get(0);
2196	2586
2197	2587	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2588	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +2595,19 @@
2205	2595	}
2206	2596
2207	2597	} else
2208		- if (event.getSource() == revertMeshItem)
	2598	+ if (source == revertMeshItem)
2209	2599	{
2210	2600	RevertMeshes();
2211	2601	} else
2212		- if (event.getSource() == resetMeshItem)
	2602	+ if (source == resetAllItem)
2213	2603	{
2214	2604	ResetAll();
2215	2605	} else
2216		- if (event.getSource() == stepAllItem)
	2606	+ if (source == stepAllItem)
2217	2607	{
2218	2608	StepAll();
2219	2609	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2610	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2611	{
2222	2612	//int indices[] = jList.getSelectedIndices();
2223	2613	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2615,46 @@
2225	2615
2226	2616	ClearSelection(false);
2227	2617	} else
2228		- if (event.getSource() == clearAllItem)
	2618	+ if (source == clearAllItem)
2229	2619	{
2230	2620	ClearSelection(true);
2231	2621	} else
2232		- if (event.getSource() == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2233	2623	{
2234		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2235	2625	} else
2236		- if (event.getSource() == hideItem)
	2626	+ if (source == hideItem)
2237	2627	{
2238	2628	group(new HiddenObject());
2239	2629	} else
2240		- if (event.getSource() == frontItem)
	2630	+ if (source == frontItem)
2241	2631	{
2242	2632	front();
2243	2633	} else
2244		- if (event.getSource() == backItem)
	2634	+ if (source == backItem)
2245	2635	{
2246	2636	back();
2247	2637	} else
2248		- if (event.getSource() == cameraItem)
	2638	+ if (source == cameraItem)
2249	2639	{
2250	2640	makeSomething(new Camera());
2251	2641	} else
2252		- if (event.getSource() == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2253	2643	{
2254	2644	group(new Composite());
2255	2645	} else
2256		- if (event.getSource() == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2257	2647	{
2258	2648	RandomNode random = new RandomNode();
2259	2649	group(random);
2260	2650	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2651	+ random.name = random.get(0).name + "Switch";
2262	2652	} else
2263		- if (event.getSource() == physicsItem)
	2653	+ if (source == physicsItem)
2264	2654	{
2265	2655	group(new PhysicsNode());
2266	2656	} else
2267		- if (event.getSource() == frameselectorItem)
	2657	+ if (source == frameselectorItem)
2268	2658	{
2269	2659	for (int i=0; i<group.selection.size(); i++)
2270	2660	{
..	..	@@ -2276,7 +2666,7 @@
2276	2666	ResetModel();
2277	2667	refreshContents();
2278	2668	} else
2279		- if (event.getSource() == switchGeoItem)
	2669	+ if (source == switchGeoItem)
2280	2670	{
2281	2671	for (int i=0; i<group.selection.size(); i++)
2282	2672	{
..	..	@@ -2288,7 +2678,7 @@
2288	2678	ResetModel();
2289	2679	refreshContents();
2290	2680	} else
2291		- if (event.getSource() == switchTransfoItem)
	2681	+ if (source == switchTransfoItem)
2292	2682	{
2293	2683	for (int i=0; i<group.selection.size(); i++)
2294	2684	{
..	..	@@ -2300,7 +2690,7 @@
2300	2690	ResetModel();
2301	2691	refreshContents();
2302	2692	} else
2303		- if (event.getSource() == morphItem)
	2693	+ if (source == morphItem)
2304	2694	{
2305	2695	for (int i=0; i<group.selection.size(); i++)
2306	2696	{
..	..	@@ -2312,7 +2702,7 @@
2312	2702	ResetModel();
2313	2703	refreshContents();
2314	2704	} else
2315		- if (event.getSource() == scriptNodeItem)
	2705	+ if (source == scriptNodeItem)
2316	2706	{
2317	2707	boolean atleastone = false;
2318	2708
..	..	@@ -2351,215 +2741,252 @@
2351	2741	}
2352	2742	}
2353	2743	} else
2354		- if (event.getSource() == linkerItem)
	2744	+ if (source == linkerItem)
2355	2745	{
2356	2746	group(new cLinker());
2357	2747	} else
2358		- if (event.getSource() == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2359	2749	{
2360	2750	group(new TextureNode());
2361	2751	} else
2362		- if (event.getSource() == billboardItem)
	2752	+ if (source == billboardItem)
2363	2753	{
2364	2754	group(new BillboardNode());
2365	2755	} else
2366		- if (event.getSource() == shadowXItem)
	2756	+ if (source == shadowXItem)
2367	2757	{
2368	2758	CastShadow(0);
2369	2759	} else
2370		- if (event.getSource() == shadowYItem)
	2760	+ if (source == shadowYItem)
2371	2761	{
2372	2762	CastShadow(1);
2373	2763	} else
2374		- if (event.getSource() == shadowZItem)
	2764	+ if (source == shadowZItem)
2375	2765	{
2376	2766	CastShadow(2);
2377	2767	} else
2378		- if (event.getSource() == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2379	2769	{
2380		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2381	2772	for (int i=0; i<group.selection.size(); i++)
2382	2773	{
2383		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2384	2779	}
2385	2780
2386		- ClearSelection(false);
2387		-
2388		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2389	2792	} else
2390		- if (event.getSource() == genUVItem)
	2793	+ if (source == genUVItem)
2391	2794	{
2392	2795	GenUV();
2393	2796	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2797	+ if (source == genNormalsCADItem)
2395	2798	{
2396	2799	GenNormals(true);
2397	2800	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2801	+ if (source == genNormalsMESHItem)
2399	2802	{
2400		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2401	2804	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2805	+ if (source == genNormalsORGANItem)
2403	2806	{
2404	2807	GenNormals(false);
2405	2808	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2809	+ if (source == genNormalsMINEItem)
2407	2810	{
2408	2811	GenNormalsMINE();
2409	2812	} else
2410		- if (event.getSource() == stripifyItem)
	2813	+ if (source == stripifyItem)
2411	2814	{
2412	2815	Stripify();
2413	2816	} else
2414		- if (event.getSource() == unstripifyItem)
	2817	+ if (source == unstripifyItem)
2415	2818	{
2416	2819	Unstripify();
2417	2820	} else
2418		- if (event.getSource() == trimItem)
	2821	+ if (source == trimItem)
2419	2822	{
2420	2823	Trim();
2421	2824	} else
2422		- if (event.getSource() == untrimItem)
	2825	+ if (source == untrimItem)
2423	2826	{
2424	2827	Untrim();
2425	2828	} else
2426		- if (event.getSource() == clearColorsItem)
	2829	+ if (source == clearColorsItem)
2427	2830	{
2428	2831	ClearColors();
2429	2832	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2833	+ if (source == clearMaterialsItem)
2431	2834	{
2432	2835	ClearMaterials();
2433	2836	} else
2434		- if (event.getSource() == liveleavesItem)
	2837	+ if (source == liveleavesItem)
2435	2838	{
2436	2839	LiveLeaves(true);
2437	2840	} else
2438		- if (event.getSource() == unliveleavesItem)
	2841	+ if (source == unliveleavesItem)
2439	2842	{
2440	2843	LiveLeaves(false);
2441	2844	} else
2442		- if (event.getSource() == supportleavesItem)
	2845	+ if (source == supportleavesItem)
2443	2846	{
2444	2847	SupportLeaves(true);
2445	2848	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2849	+ if (source == unsupportleavesItem)
2447	2850	{
2448	2851	SupportLeaves(false);
2449	2852	} else
2450		- if (event.getSource() == hideleavesItem)
	2853	+ if (source == hideleavesItem)
2451	2854	{
2452	2855	HideLeaves(true);
2453	2856	} else
2454		- if (event.getSource() == showleavesItem)
	2857	+ if (source == showleavesItem)
2455	2858	{
2456	2859	HideLeaves(false);
2457	2860	} else
2458		- if (event.getSource() == markleavesItem)
	2861	+ if (source == markleavesItem)
2459	2862	{
2460	2863	MarkLeaves(true);
2461	2864	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2865	+ if (source == unmarkleavesItem)
2463	2866	{
2464	2867	MarkLeaves(false);
2465	2868	} else
2466		- if (event.getSource() == flipVItem)
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
	2884	+ } else
	2885	+ if (source == flipVItem)
2467	2886	{
2468	2887	FlipV(true);
2469	2888	} else
2470		- if (event.getSource() == unflipVItem)
	2889	+ if (source == unflipVItem)
2471	2890	{
2472	2891	FlipV(false);
2473	2892	} else
2474		- if (event.getSource() == lowTexturesItem)
	2893	+ if (source == lowTexturesItem)
2475	2894	{
2476	2895	SetTexRes(0);
2477	2896	} else
2478		- if (event.getSource() == normalTexturesItem)
	2897	+ if (source == normalTexturesItem)
2479	2898	{
2480	2899	SetTexRes(1);
2481	2900	} else
2482		- if (event.getSource() == highTexturesItem)
	2901	+ if (source == highTexturesItem)
2483	2902	{
2484	2903	SetTexRes(2);
2485	2904	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2905	+ if (source == veryhighTexturesItem)
2487	2906	{
2488	2907	SetTexRes(3);
2489	2908	} else
2490		- if (event.getSource() == maxTexturesItem)
	2909	+ if (source == maxTexturesItem)
2491	2910	{
2492	2911	SetTexRes(4);
2493	2912	} else
2494		- if (event.getSource() == panoTexturesItem)
	2913	+ if (source == panoTexturesItem)
2495	2914	{
2496	2915	SetTexRes(5);
2497	2916	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2917	+ if (source == reverseNormalsItem)
2499	2918	{
2500	2919	ReverseNormals();
2501	2920	} else
2502		- if (event.getSource() == parseverticesItem)
	2921	+ if (source == parseverticesItem)
2503	2922	{
2504	2923	ParseVertices();
2505	2924	} else
2506		- if (event.getSource() == textureFieldItem)
	2925	+ if (source == textureFieldItem)
2507	2926	{
2508	2927	TextureVertices();
2509	2928	} else
2510		- if (event.getSource() == alignItem)
	2929	+ if (source == alignItem)
2511	2930	{
2512	2931	Align();
2513	2932	} else
2514		- if (event.getSource() == mirrorItem)
	2933	+ if (source == mirrorItem)
2515	2934	{
2516	2935	MirrorPoses();
2517	2936	} else
2518		- if (event.getSource() == reduceMorphItem)
	2937	+ if (source == reduceMorphItem)
2519	2938	{
2520	2939	MeshReduction(false);
2521	2940	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2941	+ if (source == reduce34MorphItem)
2523	2942	{
2524	2943	MeshReduction(true);
2525	2944	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2945	+ if (source == reverseTrianglesItem)
2527	2946	{
2528	2947	ReverseTriangles();
2529	2948	} else
2530		- if (event.getSource() == reduceMeshItem)
	2949	+ if (source == reduceMeshItem)
2531	2950	{
2532	2951	ReduceMesh(false);
2533	2952	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2953	+ if (source == reduce34MeshItem)
2535	2954	{
2536	2955	ReduceMesh(true);
2537	2956	} else
2538		- if (event.getSource() == increaseMeshItem)
	2957	+ if (source == increaseMeshItem)
2539	2958	{
2540	2959	IncreaseMesh();
2541	2960	} else
2542		- if (event.getSource() == clipMeshItem)
	2961	+ if (source == clipMeshItem)
2543	2962	{
2544	2963	ClipMesh();
2545	2964	} else
2546		- if (event.getSource() == smoothMeshItem)
	2965	+ if (source == smoothMeshItem)
2547	2966	{
2548	2967	SmoothMesh();
2549	2968	} else
2550		- if (event.getSource() == transformgeometryItem)
	2969	+ if (source == transformGeometryItem)
2551	2970	{
2552	2971	TransformGeometry();
2553	2972	} else
2554		- if (event.getSource() == resetTransformItem)
	2973	+ if (source == transformChildrenItem)
	2974	+ {
	2975	+ TransformChildren();
	2976	+ } else
	2977	+ if (source == resetTransformItem)
2555	2978	{
2556	2979	ResetTransform();
2557	2980	} else
2558		- if (event.getSource() == resetCentroidItem)
	2981	+ if (source == resetCentroidItem)
2559	2982	{
2560		- ResetCentroid();
	2983	+ ResetCentroid(true);
2561	2984	} else
2562		- if (event.getSource() == resetParentItem)
	2985	+ if (source == resetCentroidXZItem)
	2986	+ {
	2987	+ ResetCentroid(false);
	2988	+ } else
	2989	+ if (source == resetParentItem)
2563	2990	{
2564	2991	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2992	{
..	..	@@ -2569,7 +2996,7 @@
2569	2996
2570	2997	refreshContents();
2571	2998	} else
2572		- if (event.getSource() == repairParentItem)
	2999	+ if (source == repairParentItem)
2573	3000	{
2574	3001	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	3002	{
..	..	@@ -2583,7 +3010,7 @@
2583	3010
2584	3011	refreshContents();
2585	3012	} else
2586		- if (event.getSource() == repairShadowItem)
	3013	+ if (source == repairShadowItem)
2587	3014	{
2588	3015	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	3016	{
..	..	@@ -2597,7 +3024,7 @@
2597	3024
2598	3025	refreshContents();
2599	3026	} else
2600		- if (event.getSource() == sortbysizeItem)
	3027	+ if (source == sortbysizeItem)
2601	3028	{
2602	3029	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	3030	{
..	..	@@ -2609,7 +3036,7 @@
2609	3036	ResetModel();
2610	3037	refreshContents();
2611	3038	} else
2612		- if (event.getSource() == sortbynameItem)
	3039	+ if (source == sortbynameItem)
2613	3040	{
2614	3041	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	3042	{
..	..	@@ -2621,7 +3048,7 @@
2621	3048	ResetModel();
2622	3049	refreshContents();
2623	3050	} else
2624		- if (event.getSource() == attachPigmentItem)
	3051	+ if (source == attachPigmentItem)
2625	3052	{
2626	3053	String texture = GetFile("Attach pigment");
2627	3054	Object3D obj;
..	..	@@ -2633,7 +3060,7 @@
2633	3060
2634	3061	refreshContents();
2635	3062	} else
2636		- if (event.getSource() == detachPigmentItem)
	3063	+ if (source == detachPigmentItem)
2637	3064	{
2638	3065	Object3D obj;
2639	3066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +3071,7 @@
2644	3071
2645	3072	refreshContents();
2646	3073	} else
2647		- if (event.getSource() == attachBumpItem)
	3074	+ if (source == attachBumpItem)
2648	3075	{
2649	3076	String texture = GetFile("Attach bump");
2650	3077	Object3D obj;
..	..	@@ -2656,7 +3083,7 @@
2656	3083
2657	3084	refreshContents();
2658	3085	} else
2659		- if (event.getSource() == detachBumpItem)
	3086	+ if (source == detachBumpItem)
2660	3087	{
2661	3088	Object3D obj;
2662	3089	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +3094,7 @@
2667	3094
2668	3095	refreshContents();
2669	3096	} else
2670		- if (event.getSource() == pigmentBumpItem)
	3097	+ if (source == pigmentBumpItem)
2671	3098	{
2672	3099	Object3D obj;
2673	3100	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +3105,237 @@
2678	3105
2679	3106	refreshContents();
2680	3107	} else
2681		- if (event.getSource() == flashSelectionButton)
	3108	+ if (source == flashSelectionButton)
2682	3109	{
2683	3110	CameraPane.flash = true;
2684	3111	refreshContents();
2685	3112	} else
2686		- if (event.getSource() == oneButton)
	3113	+ if (source == oneButton)
2687	3114	{
2688	3115	} else
2689		- if (event.getSource() == twoButton)
	3116	+ if (source == twoButton)
2690	3117	{
2691	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2692	3123	// bug
2693	3124	//gridPanel.setDividerLocation(1.0);
2694	3125	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- //bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- //bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3126	+// bigThree.remove(scenePanel);
	3127	+// bigThree.remove(centralPanel);
	3128	+// bigThree.remove(XYZPanel);
	3129	+// aWindowConstraints.gridx = 0;
	3130	+// aWindowConstraints.gridy = 0;
	3131	+// aWindowConstraints.gridwidth = 1;
	3132	+// // aConstraints.gridheight = 3;
	3133	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3134	+// aWindowConstraints.weightx = 0;
	3135	+// aWindowConstraints.weighty = 1;
	3136	+// //bigThree.add(jtp, aWindowConstraints);
	3137	+// aWindowConstraints.weightx = 1;
	3138	+// aWindowConstraints.gridwidth = 3;
	3139	+// // aConstraints.gridheight = 3;
	3140	+// aWindowConstraints.gridx = 1;
	3141	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3142	+// bigThree.add(centralPanel, aWindowConstraints);
	3143	+// aWindowConstraints.weightx = 0;
	3144	+// aWindowConstraints.gridx = 4;
	3145	+// aWindowConstraints.gridwidth = 1;
	3146	+// // aConstraints.gridheight = 3;
	3147	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3148	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3149	+// scenePanel.setVisible(false);
	3150	+// centralPanel.setVisible(true);
	3151	+// XYZPanel.setVisible(false);
	3152	+ bigThree.ClearUI();
	3153	+ bigThree.add(centralPanel);
	3154	+ bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2719	3173	} else
2720		- if (event.getSource() == threeButton)
	3174	+ if (source == threeButton)
2721	3175	{
2722	3176	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
	3180	+
	3181	+// bigThree.remove(scenePanel);
	3182	+// bigThree.remove(centralPanel);
	3183	+// bigThree.remove(XYZPanel);
	3184	+// aWindowConstraints.gridx = 0;
	3185	+// aWindowConstraints.gridy = 0;
	3186	+// aWindowConstraints.gridwidth = 1;
	3187	+// // aConstraints.gridheight = 3;
	3188	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3189	+// aWindowConstraints.weightx = 0;
	3190	+// aWindowConstraints.weighty = 1;
	3191	+// //bigThree.add(jtp, aWindowConstraints);
	3192	+// aWindowConstraints.weightx = 1;
	3193	+// aWindowConstraints.gridwidth = 3;
	3194	+// // aConstraints.gridheight = 3;
	3195	+// aWindowConstraints.gridx = 1;
	3196	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3197	+// bigThree.add(centralPanel, aWindowConstraints);
	3198	+// aWindowConstraints.weightx = 0;
	3199	+// aWindowConstraints.gridx = 4;
	3200	+// aWindowConstraints.gridwidth = 1;
	3201	+// // aConstraints.gridheight = 3;
	3202	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3203	+// bigThree.add(XYZPanel, aWindowConstraints);
	3204	+// bigThree.validate();
	3205	+// scenePanel.setVisible(false);
	3206	+// centralPanel.setVisible(true);
	3207	+// XYZPanel.setVisible(true);
	3208	+ bigThree.ClearUI();
	3209	+ bigThree.add(centralPanel);
	3210	+ bigThree.add(XYZPanel);
	3211	+ bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2747	3214	} else
2748		- if (event.getSource() == fourButton)
	3215	+ if (source == fourButton)
2749	3216	{
2750	3217	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
	3221	+
	3222	+// bigThree.remove(scenePanel);
	3223	+// bigThree.remove(centralPanel);
	3224	+// bigThree.remove(XYZPanel);
	3225	+// aWindowConstraints.gridx = 0;
	3226	+// aWindowConstraints.gridy = 0;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aWindowConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3230	+// aWindowConstraints.weightx = 1;
	3231	+// aWindowConstraints.weighty = 1;
	3232	+// bigThree.add(scenePanel, aWindowConstraints);
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.gridwidth = 3;
	3235	+// // aConstraints.gridheight = 3;
	3236	+// aWindowConstraints.gridx = 1;
	3237	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3238	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3239	+// aWindowConstraints.weightx = 0;
	3240	+// aWindowConstraints.gridx = 4;
	3241	+// aWindowConstraints.gridwidth = 1;
	3242	+// // aWindowConstraints.gridheight = 3;
	3243	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3244	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3245	+// bigThree.validate();
	3246	+// scenePanel.setVisible(true);
	3247	+// centralPanel.setVisible(false);
	3248	+// XYZPanel.setVisible(false);
	3249	+ bigThree.ClearUI();
	3250	+ bigThree.add(scenePanel);
	3251	+ bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2775	3254	} else
2776		- if (event.getSource() == sixButton)
	3255	+ if (source == sixButton)
2777	3256	{
2778	3257	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
	3261	+
	3262	+// bigThree.remove(scenePanel);
	3263	+// bigThree.remove(centralPanel);
	3264	+// bigThree.remove(XYZPanel);
	3265	+// aWindowConstraints.gridx = 0;
	3266	+// aWindowConstraints.gridy = 0;
	3267	+// aWindowConstraints.gridwidth = 1;
	3268	+// // aConstraints.gridheight = 3;
	3269	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3270	+// aWindowConstraints.weightx = 0;
	3271	+// aWindowConstraints.weighty = 1;
	3272	+// bigThree.add(scenePanel, aWindowConstraints);
	3273	+// aWindowConstraints.weightx = 1;
	3274	+// aWindowConstraints.gridwidth = 3;
	3275	+// // aWindowConstraints.gridheight = 3;
	3276	+// aWindowConstraints.gridx = 1;
	3277	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3278	+// bigThree.add(centralPanel, aWindowConstraints);
	3279	+// aWindowConstraints.weightx = 0;
	3280	+// aWindowConstraints.gridx = 4;
	3281	+// aWindowConstraints.gridwidth = 1;
	3282	+// // aWindowConstraints.gridheight = 3;
	3283	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3284	+// //bigThree.add(XYZPanel, aConstraints);
	3285	+// bigThree.validate();
	3286	+// scenePanel.setVisible(true);
	3287	+// centralPanel.setVisible(true);
	3288	+// XYZPanel.setVisible(false);
	3289	+ bigThree.ClearUI();
	3290	+ bigThree.add(scenePanel);
	3291	+ bigThree.add(centralPanel);
	3292	+ bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2803	3295	} else
2804		- if (event.getSource() == sevenButton)
	3296	+ if (source == sevenButton)
2805	3297	{
2806	3298	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
	3302	+
	3303	+// bigThree.remove(scenePanel);
	3304	+// bigThree.remove(centralPanel);
	3305	+// bigThree.remove(XYZPanel);
	3306	+// aWindowConstraints.gridx = 0;
	3307	+// aWindowConstraints.gridy = 0;
	3308	+// aWindowConstraints.gridwidth = 1;
	3309	+// // aWindowConstraints.gridheight = 3;
	3310	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3311	+// aWindowConstraints.weightx = 0;
	3312	+// aWindowConstraints.weighty = 1;
	3313	+// bigThree.add(scenePanel, aWindowConstraints);
	3314	+// aWindowConstraints.weightx = 1;
	3315	+// aWindowConstraints.gridwidth = 3;
	3316	+// // aWindowConstraints.gridheight = 3;
	3317	+// aWindowConstraints.gridx = 1;
	3318	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3319	+// bigThree.add(centralPanel, aWindowConstraints);
	3320	+// aWindowConstraints.weightx = 0;
	3321	+// aWindowConstraints.gridx = 4;
	3322	+// aWindowConstraints.gridwidth = 1;
	3323	+// // aConstraints.gridheight = 3;
	3324	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3325	+// bigThree.add(XYZPanel, aWindowConstraints);
	3326	+// bigThree.validate();
	3327	+// scenePanel.setVisible(true);
	3328	+// centralPanel.setVisible(true);
	3329	+// XYZPanel.setVisible(true);
	3330	+ bigThree.ClearUI();
	3331	+ bigThree.add(scenePanel);
	3332	+ bigThree.add(centralPanel);
	3333	+ bigThree.add(XYZPanel);
	3334	+ bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2831	3337	} else
2832		- if (event.getSource() == rootButton)
	3338	+ if (source == rootButton)
2833	3339	{
2834	3340	Object3D obj;
2835	3341	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2839,66 +3345,84 @@
2839	3345	EditObject(obj);
2840	3346	}
2841	3347
	3348	+ cameraView.requestFocusInWindow();
2842	3349	refreshContents(true);
2843	3350	} else
2844		- if (event.getSource() == closeButton)
	3351	+ if (source == closeButton)
2845	3352	{
2846	3353	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	3354	cRadio ab;
2848	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2849	3356	{
2850	3357	ab = (cRadio)e.nextElement();
2851		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2852	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
2853	3366	buttonGroup.remove(ab);
2854	3367	radioPanel.remove(ab);
2855	3368
2856		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
2857	3371	// ab.GetObject().objectUI = null; // ?????????
2858	3372
2859	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2860	3374	break;
2861	3375	}
2862	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
2863	3379	refreshContents(true);
2864	3380	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3381	+ if (source == editItem \|\| source == editButton)
2866	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
2867	3389	EditSelection(false);
2868	3390	} else
2869		- if (event.getSource() == uneditButton)
	3391	+ if (source == uneditButton)
2870	3392	{
2871	3393	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	3394	{
2873	3395	Object3D child = (Object3D)e.nextElement();
2874	3396	if(child.editWindow != null)
2875	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
2876	3399	child.CloseUI();
2877	3400	listUI.remove(child);
2878	3401
2879		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
2880	3403	}
2881		- objEditor.ctrlPanel.revalidate();
	3404	+ objEditor.ctrlPanel.FlushUI();
2882	3405	//objEditor.jTree.clearSelection();
2883	3406	//objEditor.ResetSliders();
2884	3407	refreshContents(true);
2885	3408	} else
2886		- if (event.getSource() == clearPanelButton)
	3409	+ if (source == clearPanelButton)
2887	3410	{
2888	3411	assert(copy == group);
2889	3412	//copy.ClearUI();
2890	3413	for (Object3D obj : listUI)
2891	3414	{
	3415	+ obj.pinned = false;
2892	3416	obj.CloseUI();
2893	3417	}
2894	3418	listUI.clear();
2895	3419	refreshContents(true);
2896	3420	} else
2897		- if (event.getSource() == allParamsButton)
	3421	+ if (source == allParamsButton)
2898	3422	{
2899	3423	assert(copy == group);
2900	3424
2901		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2902	3426
2903	3427	for (Object3D obj : listUI)
2904	3428	{
..	..	@@ -2915,19 +3439,19 @@
2915	3439
2916	3440	refreshContents(true);
2917	3441	} else
2918		- if (event.getSource() == unselectButton)
	3442	+ if (source == unselectButton)
2919	3443	{
2920	3444	objEditor.jTree.clearSelection();
2921	3445	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3446	objEditor.ResetSliders();
2923	3447	refreshContents(true);
2924	3448	} else
2925		- if(event.getSource() instanceof cRadio)
	3449	+ if(source instanceof cRadio)
2926	3450	{
2927	3451	group.parent = keepparent;
2928	3452	group.attributes = 0;
2929	3453	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3454	+ /cRadio/ radio = (cRadio)source;
2931	3455	Object3D obj = radio.GetObject();
2932	3456	System.out.println("Edit " + obj);
2933	3457	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2962,20 +3486,44 @@
2962	3486	frontView.object = group;
2963	3487	sideView.object = group;
2964	3488	}
2965		- group.editWindow = this;
	3489	+
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
	3493	+
2966	3494	/*
2967	3495	currentLayout = radio.layout;
2968	3496	if (currentLayout == null)
2969	3497	currentLayout = sevenButton;
2970	3498	*/
2971	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
2972	3505	keepparent = group.parent;
2973	3506	// PARENT = NULL or not???
2974	3507	//group.parent = null; // ROOT
2975	3508	//group.attributes = -1;
2976	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
2977	3512	refreshContents(true);
2978		- }
	3513	+ } else if (event.getSource() == editCameraItem)
	3514	+ {
	3515	+ cameraView.ProtectCamera();
	3516	+ cameraView.repaint();
	3517	+ return;
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3519	+ {
	3520	+ cameraView.RevertCamera();
	3521	+ cameraView.repaint();
	3522	+ return;
	3523	+ // } else if (event.getSource() == textureButton)
	3524	+ // {
	3525	+ // return; // true;
	3526	+ }
2979	3527	else
2980	3528	{
2981	3529	//return super.action(event, arg);
..	..	@@ -2984,7 +3532,6 @@
2984	3532	}
2985	3533
2986	3534	boolean useclient = false;
2987		- cRadio radio;
2988	3535
2989	3536	void ToggleRoot()
2990	3537	{
..	..	@@ -3036,6 +3583,28 @@
3036	3583	refreshContents();
3037	3584	}
3038	3585
	3586	+ void TransformChildren()
	3587	+ {
	3588	+ Object3D obj;
	3589	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3590	+ {
	3591	+ obj = (Object3D)e.nextElement();
	3592	+ obj.KeepTextureMatrices();
	3593	+ obj.TransformChildren();
	3594	+ obj.RestoreTextureMatrices();
	3595	+
	3596	+// if (obj.parent == null)
	3597	+// {
	3598	+// System.out.println("NULL PARENT!");
	3599	+// new Exception().printStackTrace();
	3600	+// }
	3601	+// else
	3602	+// TouchTransform(obj);
	3603	+// //obj.parent.Touch();
	3604	+ }
	3605	+
	3606	+ refreshContents();
	3607	+ }
3039	3608
3040	3609	void ResetTransform()
3041	3610	{
..	..	@@ -3148,7 +3717,7 @@
3148	3717	refreshContents();
3149	3718	}
3150	3719
3151		- void ResetCentroid()
	3720	+ void ResetCentroid(boolean full)
3152	3721	{
3153	3722	Object3D obj;
3154	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +3732,16 @@
3163	3732	LA.matIdentity(Object3D.mat);
3164	3733	obj.getBounds(minima, maxima, false);
3165	3734	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3735	+ if (full)
	3736	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	3737	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	3738	obj.TransformMesh(Object3D.mat);
	3739	+
3169	3740	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3741	+ if (full)
	3742	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	3743	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3744	+
3172	3745	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	3746	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	3747	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3197,7 +3770,8 @@
3197	3770
3198	3771	int size = obj.MemorySize();
3199	3772
3200		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3201	3775	}
3202	3776	}
3203	3777	catch (Exception e)
..	..	@@ -3234,9 +3808,9 @@
3234	3808	obj = (Object3D)e.nextElement();
3235	3809
3236	3810	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	3811	+ Grafreed.AnalyzeObject(obj);
3238	3812	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	3813	+ Grafreed.AnalyzeObject(obj.bRep);
3240	3814
3241	3815	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	3816	}
..	..	@@ -3278,6 +3852,13 @@
3278	3852	void GenNormals(boolean crease)
3279	3853	{
3280	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3281	3862
3282	3863	refreshContents();
3283	3864	}
..	..	@@ -3450,8 +4031,8 @@
3450	4031
3451	4032	void ParseVertices()
3452	4033	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	4034	+ boolean epsequal = Grafreed.epsequal;
	4035	+ Grafreed.epsequal = true;
3455	4036
3456	4037	for (int i=0; i<group.selection.size(); i++)
3457	4038	{
..	..	@@ -3476,7 +4057,7 @@
3476	4057	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	4058	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	4059
3479		- g.add(GrafreeD.clipboard);
	4060	+ g.add(Grafreed.clipboard);
3480	4061
3481	4062	buffer.add(g);
3482	4063	}
..	..	@@ -3491,7 +4072,7 @@
3491	4072	makeSomething(buffer, i==group.selection.size()-1);
3492	4073	}
3493	4074
3494		- GrafreeD.epsequal = epsequal;
	4075	+ Grafreed.epsequal = epsequal;
3495	4076
3496	4077	refreshContents();
3497	4078	}
..	..	@@ -3509,7 +4090,16 @@
3509	4090	String pigment = Object3D.GetPigment(tex);
3510	4091	//String bump = Object3D.GetBump(tex);
3511	4092
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4093	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4094	+
	4095	+ try
	4096	+ {
	4097	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4098	+ }
	4099	+ catch (Exception e)
	4100	+ {
	4101	+ System.err.println("FAIL: " + node);
	4102	+ }
3513	4103
3514	4104	double s = v.s;
3515	4105
..	..	@@ -3597,11 +4187,11 @@
3597	4187
3598	4188	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	4189
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	4190	+ boolean random = CameraPane.SWITCH;
	4191	+ CameraPane.SWITCH = false; // parse all random nodes
3602	4192	lowres.linkVerticesThis(null);
3603	4193	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	4194	+ CameraPane.SWITCH = random;
3605	4195
3606	4196	System.err.flush();
3607	4197
..	..	@@ -3641,7 +4231,7 @@
3641	4231	return;
3642	4232
3643	4233	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	4234	+ Object3D ref = Grafreed.clipboard.get(0);
3645	4235
3646	4236	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	4237
..	..	@@ -3835,9 +4425,9 @@
3835	4425
3836	4426	void ClipMesh()
3837	4427	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4428	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	4429	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	4430	+ Object3D content = Grafreed.clipboard.get(0);
3841	4431
3842	4432	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	4433	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +4436,7 @@
3846	4436	// {
3847	4437	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	4438	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	4439	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	4440	}
3851	4441	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	4442	System.out.println("DONE.");
..	..	@@ -3893,6 +4483,18 @@
3893	4483	void MarkLeaves(boolean hide)
3894	4484	{
3895	4485	group.selection.MarkLeaves(hide);
	4486	+ refreshContents();
	4487	+ }
	4488	+
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
3896	4498	refreshContents();
3897	4499	}
3898	4500
..	..	@@ -3967,10 +4569,6 @@
3967	4569	// }
3968	4570	// }
3969	4571
3970		- static boolean allparams = true;
3971		-
3972		- static Vector<Object3D> listUI = new Vector<Object3D>();
3973		-
3974	4572	void EditSelection(boolean newWindow)
3975	4573	{
3976	4574	// aConstraints.gridy = 0;
..	..	@@ -3978,10 +4576,10 @@
3978	4576	{
3979	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3980	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3981		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3982	4580
3983	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
3984		- if(elem != group)
	4582	+ if(elem != group \|\| !newWindow)
3985	4583	{
3986	4584	// if (!(elem instanceof Composite))
3987	4585	// newWindow = false;
..	..	@@ -4063,7 +4661,8 @@
4063	4661	//new Exception().printStackTrace();
4064	4662
4065	4663	freezemodel = true;
4066		-
	4664	+ ClearUnpinned();
	4665	+
4067	4666	/**/
4068	4667	//switch (event.id)
4069	4668	{
..	..	@@ -4071,7 +4670,6 @@
4071	4670	//case 702: // Event.LIST_DESELECT
4072	4671	group.deselectAll();
4073	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4074		- objEditor.ClearInfo(); // .GetMaterial());
4075	4673	if (tps != null)
4076	4674	{
4077	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4080,33 +4678,39 @@
4080	4678
4081	4679	//if (child.parent != null)
4082	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4083	4682	group.addSelectee(child);
4084		- objEditor.SetMaterial(child); // .GetMaterial());
4085		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4086		- System.err.println("info : " + child.GetPath());
4087	4683	}
4088	4684	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4685	+// else
	4686	+// {
	4687	+// objEditor.SetMaterial(group); // .GetMaterial());
	4688	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4689	+// System.err.println("info : " + group.GetPath());
	4690	+// }
4095	4691
4096		- objEditor.SetText(); // jan 2014
4097		-
4098		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4099	4693	CameraPane.flash = true;
4100	4694
4101		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4102	4696	// a camera
4103	4697	{
4104		- CameraPane.camerachangeframe = 0; // don't refuse it
4105		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4699	+ {
	4700	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4701	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4702	+ }
4106	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4107	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4108	4705	}
4109	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4110	4714	refreshContents();
4111	4715	//return true;
4112	4716	}
..	..	@@ -4115,6 +4719,35 @@
4115	4719
4116	4720	freezemodel = false;
4117	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4118	4751
4119	4752	void linkSomething(Object3D thing)
4120	4753	{
..	..	@@ -4186,16 +4819,19 @@
4186	4819	{
4187	4820	if (group.selection.isEmpty())
4188	4821	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	4822	+
	4823	+ Grafreed.clipboardIsTempGroup = false;
4190	4824	Composite tGroup = null;
4191	4825	if (group.selection.size() > 0) // 1)
4192	4826	{
4193	4827	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	4828	+ Grafreed.clipboardIsTempGroup = true;
4195	4829	}
4196	4830
4197	4831	if (cut)
4198	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4199	4835	//int indices[] = jList.getSelectedIndices();
4200	4836	//for (int i = indices.length - 1; i >= 0; i--)
4201	4837	//jList.remove(indices[i]);
..	..	@@ -4231,16 +4867,16 @@
4231	4867	//System.out.println("cut " + child);
4232	4868	//System.out.println("parent = " + child.parent);
4233	4869	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	4870	+ if (Grafreed.clipboardIsTempGroup)
4235	4871	tGroup.add/Child/(tmp);
4236	4872	else
4237		- GrafreeD.clipboard = tmp;
	4873	+ Grafreed.clipboard = tmp;
4238	4874	}
4239	4875	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	4876	+ if (Grafreed.clipboardIsTempGroup)
4241	4877	tGroup.add/Child/(child);
4242	4878	else
4243		- GrafreeD.clipboard = child;
	4879	+ Grafreed.clipboard = child;
4244	4880	}
4245	4881
4246	4882	//ResetModel();
..	..	@@ -4272,21 +4908,23 @@
4272	4908	//System.out.println("cut " + elem);
4273	4909	//System.out.println("parent = " + elem.parent);
4274	4910	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	4911	+ if (Grafreed.clipboardIsTempGroup)
4276	4912	tGroup.add/Child/(tmp);
4277	4913	else
4278		- GrafreeD.clipboard = tmp;
	4914	+ Grafreed.clipboard = tmp;
4279	4915	}
4280	4916	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	4917	+ if (Grafreed.clipboardIsTempGroup)
4282	4918	tGroup.add/Child/(child);
4283	4919	else
4284		- GrafreeD.clipboard = child;
	4920	+ Grafreed.clipboard = child;
4285	4921	}
4286	4922
4287	4923	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	4924	+
	4925	+ if (Grafreed.clipboardIsTempGroup)
	4926	+ Grafreed.clipboard = tGroup;
	4927	+
4290	4928	if (cut)
4291	4929	{
4292	4930	ResetModel();
..	..	@@ -4300,7 +4938,7 @@
4300	4938	// return;
4301	4939	boolean first = true;
4302	4940
4303		- if (GrafreeD.clipboardIsTempGroup)
	4941	+ if (Grafreed.clipboardIsTempGroup)
4304	4942	{
4305	4943	Composite temp;
4306	4944
..	..	@@ -4311,7 +4949,7 @@
4311	4949	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	4950	*/
4313	4951	Object3D elem;
4314		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4952	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4315	4953	{
4316	4954	Object3D child = (Object3D)e.nextElement();
4317	4955
..	..	@@ -4345,21 +4983,21 @@
4345	4983	//Object3D cb = Applet3D.clipboard;
4346	4984	//temp.addChild(cb);
4347	4985	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4348		- assert(GrafreeD.clipboard.parent == null);
4349		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4350		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4351		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4352		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4986	+ assert(Grafreed.clipboard.parent == null);
	4987	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4988	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4989	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4990	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4353	4991	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	4992	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4993	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	4994	}
4357	4995
4358	4996	ResetModel();
4359	4997	refreshContents();
4360	4998	}
4361	4999
4362		- void pasteInto(boolean copyit)
	5000	+ void pasteInto(boolean copyit, boolean clone)
4363	5001	{
4364	5002	// if (GrafreeD.clipboard == null)
4365	5003	// return;
..	..	@@ -4388,15 +5026,22 @@
4388	5026	if (copyit)
4389	5027	{
4390	5028	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	5029	+ if (clone)
	5030	+ {
	5031	+ CloneClipboard(false); // sept 2014
	5032	+ }
	5033	+ else
	5034	+ {
	5035	+ paste(false);
	5036	+ }
4392	5037	}
4393	5038	else
4394	5039	{
4395	5040	boolean first = true;
4396	5041
4397		- if (GrafreeD.clipboardIsTempGroup)
	5042	+ if (Grafreed.clipboardIsTempGroup)
4398	5043	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	5044	+ Composite temp = (Composite)Grafreed.clipboard;
4400	5045	Object3D copy;
4401	5046	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	5047	{
..	..	@@ -4406,7 +5051,7 @@
4406	5051	}
4407	5052	} else
4408	5053	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	5054	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	5055	}
4411	5056	}
4412	5057	}
..	..	@@ -4811,21 +5456,6 @@
4811	5456	}
4812	5457	*/
4813	5458
4814		- void ImportGFD()
4815		- {
4816		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4817		- browser.show();
4818		- String filename = browser.getFile();
4819		- if (filename != null && filename.length() > 0)
4820		- {
4821		- String fullname = browser.getDirectory() + filename;
4822		-
4823		- //Object3D readobj =
4824		- objEditor.ReadGFD(fullname, objEditor);
4825		- //makeSomething(readobj);
4826		- }
4827		- }
4828		-
4829	5459	/*
4830	5460	public void Callback(Object obj)
4831	5461	{
..	..	@@ -4849,26 +5479,9 @@
4849	5479	}
4850	5480	*/
4851	5481
4852		- void ImportVRMLX3D()
4853		- {
4854		- if (GrafreeD.standAlone)
4855		- {
4856		- /**/
4857		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4858		- browser.show();
4859		- String filename = browser.getFile();
4860		- if (filename != null && filename.length() > 0)
4861		- {
4862		- String fullname = browser.getDirectory() + filename;
4863		- LoadVRMLX3D(fullname);
4864		- }
4865		- /**/
4866		- }
4867		- }
4868		-
4869	5482	String GetFile(String dialogName)
4870	5483	{
4871		- if (GrafreeD.standAlone)
	5484	+ if (Grafreed.standAlone)
4872	5485	{
4873	5486	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	5487	browser.show();
..	..	@@ -4932,10 +5545,33 @@
4932	5545	cButton flashSelectionButton;
4933	5546	cButton editButton;
4934	5547	cButton uneditButton;
	5548	+ JCheckBox allParamsButton;
4935	5549	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5550	cButton unselectButton;
4938	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
	5555	+ cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
	5574	+
4939	5575	cButton screenfitButton;
4940	5576	cButton screenfitpointButton;
4941	5577	cButton snapobjectButton;
..	..	@@ -4947,14 +5583,6 @@
4947	5583
4948	5584	cButton setsupportButton;
4949	5585
4950		- cButton twoButton;
4951		- cButton sixButton;
4952		- cButton threeButton;
4953		- cButton sevenButton;
4954		- cButton fourButton; // full panel
4955		- cButton oneButton; // full XYZ
4956		- //cButton currentLayout;
4957		-
4958	5586	//
4959	5587	//Composite
4960	5588	Object3D // to do !!
..	..	@@ -4964,9 +5592,11 @@
4964	5592	//JTree jTree;
4965	5593	private MenuItem lookAtItem;
4966	5594	private MenuItem lookFromItem;
4967		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
4968	5596	private MenuItem cutItem;
4969		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
4970	5600	private MenuItem cloneItem;
4971	5601	private MenuItem cloneSupportItem;
4972	5602	private MenuItem overwriteGeoItem;
..	..	@@ -4979,7 +5609,7 @@
4979	5609	private MenuItem linkverticesItem;
4980	5610	private MenuItem relinkverticesItem;
4981	5611	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	5612	+ private MenuItem resetAllItem;
4983	5613	private MenuItem stepAllItem;
4984	5614	private MenuItem revertMeshItem;
4985	5615	private MenuItem poseMeshItem;
..	..	@@ -4990,6 +5620,7 @@
4990	5620	private MenuItem mergeGeometriesItem;
4991	5621	private MenuItem copyItem;
4992	5622	private MenuItem pasteItem;
	5623	+ private MenuItem pasteIntoItem;
4993	5624	private MenuItem pasteLinkItem;
4994	5625	private MenuItem pasteCloneItem;
4995	5626	private MenuItem pasteExpandItem;
..	..	@@ -5028,6 +5659,10 @@
5028	5659	private MenuItem showleavesItem;
5029	5660	private MenuItem markleavesItem;
5030	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5031	5666
5032	5667	private MenuItem flipVItem;
5033	5668	private MenuItem unflipVItem;
..	..	@@ -5039,15 +5674,17 @@
5039	5674	private MenuItem panoTexturesItem;
5040	5675
5041	5676	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	5677	+ private MenuItem resetCentroidXZItem;
5043	5678	private MenuItem resetTransformItem;
	5679	+ private MenuItem transformGeometryItem;
	5680	+ private MenuItem transformChildrenItem;
5044	5681	private MenuItem hideItem;
5045	5682	private MenuItem grabItem;
5046	5683	private MenuItem backItem;
5047	5684	private MenuItem frontItem;
5048	5685	private MenuItem cameraItem;
5049	5686	private MenuItem compositeItem;
5050		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5051	5688	private MenuItem physicsItem;
5052	5689	private MenuItem frameselectorItem;
5053	5690	private MenuItem scriptNodeItem;
..	..	@@ -5087,7 +5724,7 @@
5087	5724	private MenuItem blobItem;
5088	5725	private MenuItem latheItem;
5089	5726	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5727	+ private MenuItem overlayItem;
5091	5728	private MenuItem meshItem;
5092	5729	// private MenuItem meshGroupItem;
5093	5730	private MenuItem springItem;
..	..	@@ -5109,11 +5746,6 @@
5109	5746	private MenuItem doubleItem;
5110	5747	private MenuItem tripleItem;
5111	5748
5112		- private MenuItem importGFDItem;
5113		- private MenuItem importVRMLX3DItem;
5114		- private MenuItem import3DSItem;
5115		- private MenuItem importOBJItem;
5116		-
5117	5749	private MenuItem computeAOItem;
5118	5750	private MenuItem recompileItem;
5119	5751	private MenuItem editScriptItem;
..	..	@@ -5123,4 +5755,8 @@
5123	5755	private MenuItem analyzeItem;
5124	5756	private MenuItem dumpItem;
5125	5757	//boolean freezemodel = false;
	5758	+
	5759	+ Menu cameraMenu;
	5760	+ MenuItem editCameraItem;
	5761	+ MenuItem restoreCameraItem;
5126	5762	}