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