~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,153 +580,217 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	623	+ liveCB.setToolTipText("Enable animation");
441	624	liveCB.addItemListener(this);
442	625
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ oneStepButton.setToolTipText("Animate one step forward");
	628	+ oneStepButton.addActionListener(this);
	629	+
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	631	+ fastCB.setToolTipText("Fast mode");
461	632	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	633	+
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ screenfitButton.setToolTipText("Screen fit");
507	638	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
	643	+
509	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	645	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	646
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
	647	+ if (Globals.ADVANCED)
	648	+ {
	649	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ snapobjectButton.addActionListener(this);
	651	+ snapobjectButton.setToolTipText("Snap Object");
	652	+ }
	653	+
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	655
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ twoButton.setToolTipText("Show center view only");
532	658	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	662	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	663	+ fourButton.setToolTipText("Show left panel only");
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ sixButton.setToolTipText("2-column layout left");
536	666	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ threeButton.setToolTipText("2-column layout right");
538	669	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ sevenButton.setToolTipText("3-column layout");
540	672	sevenButton.addActionListener(this);
541	673	//
542	674
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ rootButton.setToolTipText("Edit selection in new tab");
544	677	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	678	+
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ closeButton.setToolTipText("Close tab");
547	681	closeButton.addActionListener(this);
548	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	683	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	684
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
	716	+
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
	766	+ editButton.addActionListener(this);
	767	+
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
560	770	uneditButton.addActionListener(this);
561	771
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
574	774	allParamsButton.addActionListener(this);
575	775
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ clearPanelButton.setToolTipText("Clear edit panel");
	778	+ clearPanelButton.addActionListener(this);
	779	+
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ unselectButton.setToolTipText("Unselect");
581	782	unselectButton.addActionListener(this);
582	783
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
	793	+
583	794	// oe.aConstraints.gridx += 1;
584	795	// oe.aConstraints.weighty = 0;
585	796	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +802,22 @@
591	802	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	803	// gcButton.addActionListener(this);
593	804
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	805	+ cGridBag jSPPanel = new cGridBag();
	806	+
	807	+ JScrollPane jSP;
605	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	810	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	811
	812	+ oe.treePanel.add(jSPPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+ oe.treePanel.add(copyOptionsPanel);
	816	+ oe.treePanel.Return();
	817	+
	818	+// mainPanel.setDividerLocation(0.5); //1.0);
	819	+// mainPanel.setResizeWeight(0.5);
	820	+
628	821	//jList.addListSelectionListener(this);
629	822	oe.jTree.addTreeSelectionListener(this);
630	823	//jTree.setRootVisible(false);
..	..	@@ -646,10 +839,144 @@
646	839	radio.layout = sevenButton;
647	840	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	841	}
	842	+
	843	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	844	+ {
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
	859	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	860	+ boxCB.setToolTipText("Display bounding boxes");
	861	+ boxCB.addItemListener(this);
	862	+
	863	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
	865	+ zoomBoxCB.addItemListener(this);
	866	+
	867	+ if (true) // Globals.ADVANCED)
	868	+ {
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
	876	+
	877	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	878	+ // localCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	883	+ crowdCB.setToolTipText("Used for crowds");
	884	+ crowdCB.addItemListener(this);
	885	+
	886	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	887	+ smoothCB.setToolTipText("Snapping delay");
	888	+ smoothCB.addItemListener(this);
	889	+
	890	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	891	+ slowCB.setToolTipText("Smooth interpolation");
	892	+ slowCB.addItemListener(this);
	893	+
	894	+// constraints.gridy += 1;
	895	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	896	+// speakerMocapCB.addItemListener(this);
	897	+
	898	+ panel.Return();
	899	+
	900	+ if (false)
	901	+ {
	902	+ // handled in scripts
	903	+ //constraints.gridy += 1;
	904	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	905	+ speakerCameraCB.addItemListener(this);
	906	+
	907	+ //constraints.gridy += 1;
	908	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	909	+ speakerFocusCB.addItemListener(this);
	910	+
	911	+ //constraints.gridy += 1;
	912	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	913	+ smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
	915	+ }
	916	+
	917	+//constraints.gridx += 1;
	918	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	919	+// debugCB.addItemListener(this);
	920	+
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
	925	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
	927	+ oeilCB.addItemListener(this);
	928	+
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
	949	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	950	+ lookAtCB.setToolTipText("Look-at target");
	951	+ lookAtCB.addItemListener(this);
	952	+ }
	953	+
	954	+ }
	955	+
	956	+ cGridBag fill = new cGridBag();
	957	+ fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
	962	+
	963	+ panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
	966	+
	967	+ }
649	968
650	969	void EditObject(Object3D obj)
651	970	{
652	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
653	980	radioButton.SetObject(obj);
654	981	radioButton.layout = sevenButton;
655	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -658,8 +985,11 @@
658	985	buttonGroup.add(radioButton);
659	986	radioButton.doClick();
660	987	}
	988	+
661	989	void SetupViews(ObjEditor oe)
662	990	{
	991	+ theFrame = this;
	992	+
663	993	oe.SetupViews();
664	994
665	995	System.out.println("SetupViews");
..	..	@@ -668,22 +998,28 @@
668	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	999	}
670	1000
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
681	1014	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
687	1023
688	1024	// static int COLOR = 1;
689	1025	// static int MATERIAL = 2;
..	..	@@ -691,9 +1027,9 @@
691	1027
692	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1029
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
697	1033
698	1034	public void itemStateChanged(ItemEvent e)
699	1035	{
..	..	@@ -721,6 +1057,7 @@
721	1057	} else if(e.getSource() == liveCB)
722	1058	{
723	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
724	1061	}
725	1062	else if(e.getSource() == supportCB)
726	1063	{
..	..	@@ -756,6 +1093,10 @@
756	1093	cameraView.repaint();
757	1094	// refreshContents();
758	1095	}
	1096	+ else if(e.getSource() == zoomBoxCB)
	1097	+ {
	1098	+ cameraView.ToggleZoomBoxMode();
	1099	+ }
759	1100	else if(e.getSource() == smoothfocusCB)
760	1101	{
761	1102	cameraView.ToggleSmoothFocus();
..	..	@@ -781,6 +1122,18 @@
781	1122	{
782	1123	cameraView.ToggleOeil();
783	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
784	1137	else if(e.getSource() == lookAtCB)
785	1138	{
786	1139	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1150,8 @@
797	1150
798	1151	/**/
799	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1156	// We can't move the root node or an empty selection
803	1157	return;
..	..	@@ -869,7 +1223,9 @@
869	1223	// objEditor.DropFile((java.io.File[]) object, true);
870	1224	// return;
871	1225	// }
872		- if (string.charAt(0) == '/')
	1226	+
	1227	+ // File path for Mac and Windows
	1228	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1229	{
874	1230	// file(s)
875	1231	String[] names = string.split("\n");
..	..	@@ -896,7 +1252,7 @@
896	1252
897	1253	flashIt = false;
898	1254	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1255	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1256	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1257
902	1258	if (group.selection.size() == 1)
..	..	@@ -912,23 +1268,33 @@
912	1268
913	1269	assert target == objEditor.jTree;
914	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
915	1272	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1274	} catch (Exception e) {
918	1275	System.out.println("destinationPath : " + destinationPath);
919	1276	return;
920	1277	}
921	1278
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
923	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
924	1290	loadClipboard(true);
925	1291	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1292	+ pasteInto(false, false);
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
932	1298	}
933	1299	public void dropActionChanged(DropTargetDragEvent dtde)
934	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1033,85 +1399,104 @@
1033	1399	{
1034	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1401	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1048	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1421	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1052	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1429	ragdollItem.addActionListener(this);
1054	1430	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1431	ragdoll2Item.addActionListener(this);
	1432	+ }
1056	1433	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1434	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1435	meshItem.addActionListener(this);
1059	1436	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1437	// meshGroupItem.addActionListener(this);
	1438	+ if (Globals.ADVANCED)
	1439	+ {
1061	1440	springItem = menu.add(new MenuItem("Spring"));
1062	1441	springItem.addActionListener(this);
1063	1442	flagItem = menu.add(new MenuItem("Flag"));
1064	1443	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1444	blobItem = menu.add(new MenuItem("Blob"));
1070	1445	blobItem.addActionListener(this);
1071	1446	latheItem = menu.add(new MenuItem("Lathe"));
1072	1447	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1448	+ }
	1449	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1450	+ bezierItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1075	1455	menu.add("-");
1076	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1457	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1080	1460	doubleItem = menu.add(new MenuItem("Fork"));
1081	1461	doubleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1082	1464	tripleItem = menu.add(new MenuItem("Trident"));
1083	1465	tripleItem.addActionListener(this);
	1466	+ }
1084	1467	}
1085	1468
1086	1469	void buildToolsMenu(Menu menu)
1087	1470	{
1088	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1472	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1473	+ animationItem.setState(Globals.ANIMATION);
1091	1474
1092	1475	menu.add("-");
1093	1476	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1477	parseverticesItem.addActionListener(this);
1095	1478	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1479	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1480	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1481	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1482	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1483	reduceMorphItem.addActionListener(this);
1103	1484	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1485	reduce34MorphItem.addActionListener(this);
1105		-
	1486	+ menu.add("-");
1106	1487	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1488	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1489
	1490	+ if (Globals.ADVANCED)
	1491	+ {
	1492	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1493	+ mirrorItem.addActionListener(this);
	1494	+ menu.add("-");
1110	1495	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1496	memoryItem.addActionListener(this);
1112	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1498	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1500	dumpItem.addActionListener(this);
1116	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1502	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1514,7 @@
1129	1514	menu.add("-");
1130	1515	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1516	editScriptItem.addActionListener(this);
	1517	+ }
1132	1518	}
1133	1519
1134	1520	void ScreenFit()
..	..	@@ -1251,9 +1637,24 @@
1251	1637	shadow.material = new cMaterial(obj.material);
1252	1638	shadow.material.diffuse = 0.0001f;
1253	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1254	1641
1255	1642	makeSomething(shadow);
1256	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1257	1658
1258	1659	/**
1259	1660	* applyExample
..	..	@@ -1457,9 +1858,9 @@
1457	1858
1458	1859	void Overwrite(int mask)
1459	1860	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1861	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1862	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1863	+ Object3D content = Grafreed.clipboard.get(0);
1463	1864
1464	1865	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1866	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1883,7 @@
1482	1883	//
1483	1884	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1885	{
	1886	+ Object source = event.getSource();
1485	1887	/*
1486	1888	if (event.getSource() == nameField)
1487	1889	{
..	..	@@ -1493,11 +1895,11 @@
1493	1895	}
1494	1896	else
1495	1897	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1898	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1899	{
1498	1900	ScreenFit();
1499	1901	} else
1500		- if (event.getSource() == switchItem)
	1902	+ if (source == switchViewItem)
1501	1903	{
1502	1904	cVector v1 = new cVector();
1503	1905	cVector v2 = new cVector();
..	..	@@ -1506,11 +1908,11 @@
1506	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1909	objEditor.cameraView.repaint();
1508	1910	} else
1509		- if (event.getSource() == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1510	1912	{
1511	1913	makeSomething(new Box());
1512	1914	} else
1513		- if (event.getSource() == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1514	1916	{
1515	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1933,9 @@
1531	1933	applyExample(particleGeom, "SMOKE");
1532	1934	makeSomething(particleGeom);
1533	1935	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1936	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1937	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1938	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1939
1538	1940	ragdoll.toParent = LA.newMatrix();
1539	1941	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1953,7 @@
1551	1953	} else
1552	1954	/*
1553	1955	*/
1554		- if (event.getSource() == heightFieldItem)
	1956	+ if (source == heightFieldItem)
1555	1957	{
1556	1958	Object3D obj = new Object3D();
1557	1959
..	..	@@ -1589,31 +1991,31 @@
1589	1991
1590	1992	makeSomething(obj);
1591	1993	} else
1592		- if (event.getSource() == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1593	1995	{
1594	1996	makeSomething(new Grid());
1595	1997	} else
1596		- if (event.getSource() == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1597	1999	{
1598	2000	makeSomething(new Sphere());
1599	2001	} else
1600		- if (event.getSource() == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1601	2003	{
1602	2004	makeSomething(new Cone());
1603	2005	} else
1604		- if (event.getSource() == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1605	2007	{
1606	2008	makeSomething(new Torus());
1607	2009	} else
1608		- if (event.getSource() == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1609	2011	{
1610	2012	makeSomething(new Superellipsoid());
1611	2013	} else
1612		- if (event.getSource() == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1613	2015	{
1614	2016	makeSomething(new Klein());
1615	2017	} else
1616		- if (event.getSource() == blobItem)
	2018	+ if (source == blobItem)
1617	2019	{
1618	2020	Blob blob = new Blob();
1619	2021	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +2023,15 @@
1621	2023	//blob.retile();
1622	2024	makeSomething(blob);
1623	2025	} else
1624		- if (event.getSource() == latheItem)
	2026	+ if (source == latheItem)
1625	2027	{
1626	2028	makeSomething(new Lathe());
1627	2029	} else
1628		- if (event.getSource() == bezierItem)
	2030	+ if (source == bezierItem)
1629	2031	{
1630	2032	makeSomething(new BezierSurface());
1631	2033	} else
1632		- if (event.getSource() == checkerItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1633	2035	{
1634	2036	/*
1635	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +2046,7 @@
1644	2046	*/
1645	2047	makeSomething(new Checker());
1646	2048	} else
1647		- if (event.getSource() == meshItem)
	2049	+ if (source == meshItem)
1648	2050	{
1649	2051	Object3D itemtomake = new Object3D();
1650	2052	Object3D child;
..	..	@@ -1665,35 +2067,35 @@
1665	2067	makeSomething(child);
1666	2068	}
1667	2069	} else
1668		- if (event.getSource() == springItem)
	2070	+ if (source == springItem)
1669	2071	{
1670	2072	cSpring s = new cSpring();
1671	2073	s.setup();
1672	2074	makeSomething(s);
1673	2075	} else
1674		- if (event.getSource() == flagItem)
	2076	+ if (source == flagItem)
1675	2077	{
1676	2078	cSpring s = new cFlag();
1677	2079	s.setup();
1678	2080	makeSomething(s);
1679	2081	} else
1680		- if (event.getSource() == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1681	2083	{
1682	2084	makeSomething(new Light());
1683	2085	} else
1684		- if (event.getSource() == csgItem)
	2086	+ if (source == csgItem)
1685	2087	{
1686	2088	group(new CSG());
1687	2089	} else
1688		- if (event.getSource() == templateItem)
	2090	+ if (source == templateItem)
1689	2091	{
1690	2092	group(new cTemplate());
1691	2093	} else
1692		- if (event.getSource() == attributeItem)
	2094	+ if (source == attributeItem)
1693	2095	{
1694	2096	makeSomething(new Attribute());
1695	2097	} else
1696		- if (event.getSource() == pointflowItem)
	2098	+ if (source == pointflowItem)
1697	2099	{
1698	2100	makeSomething(new PointFlow());
1699	2101	} else
..	..	@@ -1705,7 +2107,7 @@
1705	2107	} else
1706	2108	*/
1707	2109
1708		- if (event.getSource() == superLoopItem)
	2110	+ if (source == superLoopItem)
1709	2111	{
1710	2112	Composite g = new cGroup();
1711	2113	for (int i=0; i<15; i++)
..	..	@@ -1727,30 +2129,30 @@
1727	2129
1728	2130	group(g);
1729	2131	} else
1730		- if (event.getSource() == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1731	2133	{
1732	2134	Composite csg = new GroupLeaf();
1733	2135	csg.count = 5;
1734	2136	group(csg);
1735		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1736	2138	csg.addChild(child);
1737	2139	child.addChild(csg);
1738	2140	} else
1739		- if (event.getSource() == doubleItem)
	2141	+ if (source == doubleItem)
1740	2142	{
1741		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1742	2144	csg.count = 5;
1743	2145	group(csg);
1744		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1745	2147	csg.addChild(child);
1746	2148	child.addChild(csg);
1747		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1748	2150	csg.addChild(child);
1749	2151	child.addChild(csg);
1750	2152	} else
1751		- if (event.getSource() == tripleItem)
	2153	+ if (source == tripleItem)
1752	2154	{
1753		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1754	2156	csg.count = 4;
1755	2157	group(csg);
1756	2158	Composite child = new cGroup();
..	..	@@ -1763,71 +2165,83 @@
1763	2165	csg.addChild(child);
1764	2166	child.addChild(csg);
1765	2167	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	2168	+ if (source == computeAOItem)
1784	2169	{
1785	2170	Globals.drawMode = CameraPane.OCCLUSION;
1786	2171	Globals.theRenderer.repaint();
1787	2172	} else
1788		- if (event.getSource() == recompileItem)
	2173	+ if (source == recompileItem)
1789	2174	{
1790	2175	Recompile();
1791	2176	refreshContents();
1792	2177	} else
1793		- if (event.getSource() == editScriptItem)
	2178	+ if (source == editScriptItem)
1794	2179	{
1795	2180	OpenDialog();
1796	2181	refreshContents();
1797	2182	} else
1798		- if (event.getSource() == invariantsItem)
	2183	+ if (source == invariantsItem)
1799	2184	{
1800	2185	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2186	+ Grafreed.grafreeD.universe.invariants();
1802	2187	} else
1803		- if (event.getSource() == memoryItem)
	2188	+ if (source == memoryItem)
1804	2189	{
1805	2190	//System.out.println("Invariants:");
1806	2191	PrintMemory();
1807	2192	} else
1808		- if (event.getSource() == pathItem)
	2193	+ if (source == pathItem)
1809	2194	{
1810	2195	PrintPath();
1811	2196	} else
1812		- if (event.getSource() == analyzeItem)
	2197	+ if (source == analyzeItem)
1813	2198	{
1814	2199	AnalyzeObject();
1815	2200	} else
1816		- if (event.getSource() == dumpItem)
	2201	+ if (source == dumpItem)
1817	2202	{
1818	2203	DumpObject();
1819	2204	} else
1820		- if (event.getSource() == screenfitButton)
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
	2228	+ } else
	2229	+ if (source == oneStepButton)
	2230	+ {
	2231	+ Globals.ONESTEP = true;
	2232	+ cameraView.repaint();
	2233	+ } else
	2234	+ if (source == screenfitButton)
1821	2235	{
1822	2236	//Reload(lastConverter, lastFilename, true);
1823	2237	ScreenFit();
1824	2238	} else
1825		- if (event.getSource() == screenfitpointButton)
	2239	+ if (source == screenfitpointButton)
1826	2240	{
1827	2241	//Reload(lastConverter, lastFilename, true);
1828	2242	ScreenFitPoint();
1829	2243	} else
1830		- if (event.getSource() == snapobjectButton)
	2244	+ if (source == snapobjectButton)
1831	2245	{
1832	2246	//Reload(lastConverter, lastFilename, true);
1833	2247	SnapObject();
..	..	@@ -1838,13 +2252,13 @@
1838	2252	// Recompile();
1839	2253	// refreshContents();
1840	2254	// } else
1841		- if (event.getSource() == gcButton)
	2255	+ if (source == gcButton)
1842	2256	{
1843	2257	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2258	System.gc();
1845	2259	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2260	} else
1847		- if (event.getSource() == editLeafItem)
	2261	+ if (source == editLeafItem)
1848	2262	{
1849	2263	Object3D obj;
1850	2264	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2272,74 @@
1858	2272	}
1859	2273	refreshContents(true);
1860	2274	} else
1861		- if (event.getSource() == openWindowItem)
	2275	+ if (source == openWindowItem)
1862	2276	{
1863	2277	EditSelection(true);
1864	2278	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2279	+ if (source == cutItem \|\| source == clearButton)
1866	2280	{
1867	2281	loadClipboard(true);
1868	2282	} else
1869		- if (event.getSource() == duplicateItem)
	2283	+ if (source == undoItem)
1870	2284	{
1871		- Object3D keep = GrafreeD.clipboard;
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
	2290	+ } else
	2291	+ if (source == duplicateItem)
	2292	+ {
	2293	+ Object3D keep = Grafreed.clipboard;
1872	2294	loadClipboard(false);
1873	2295	paste(false);
1874		- GrafreeD.clipboard = keep;
	2296	+ Grafreed.clipboard = keep;
1875	2297	} else
1876		- if (event.getSource() == cloneItem)
	2298	+ if (source == cloneItem)
1877	2299	{
1878	2300	CloneSelection(false);
1879	2301	} else
1880		- if (event.getSource() == cloneSupportItem)
	2302	+ if (source == cloneSupportItem)
1881	2303	{
1882	2304	CloneSelection(true);
1883	2305	} else
1884		- if (event.getSource() == copyItem)
	2306	+ if (source == copyItem)
1885	2307	{
1886	2308	loadClipboard(false);
1887	2309	} else
1888		- if (event.getSource() == pasteItem)
	2310	+ if (source == pasteItem)
1889	2311	{
1890	2312	paste(false);
1891	2313	} else
1892		- if (event.getSource() == pasteLinkItem)
	2314	+ if (source == pasteIntoItem)
1893	2315	{
1894		- pasteInto(false);
	2316	+ pasteInto(true, false);
1895	2317	} else
1896		- if (event.getSource() == pasteCloneItem)
	2318	+ if (source == pasteLinkItem)
1897	2319	{
1898		- pasteInto(true);
	2320	+ pasteInto(false, false);
1899	2321	} else
1900		- if (event.getSource() == pasteExpandItem)
	2322	+ if (source == pasteCloneItem)
	2323	+ {
	2324	+ pasteInto(true, true);
	2325	+ } else
	2326	+ if (source == pasteExpandItem)
1901	2327	{
1902	2328	paste(true);
1903	2329	} else
1904		- if (event.getSource() == synchronizeItem)
	2330	+ if (source == synchronizeItem)
1905	2331	{
1906	2332	Overwrite(Object3D.TRANSFORM);
1907	2333	} else
1908		- if (event.getSource() == overwriteNameItem)
	2334	+ if (source == overwriteNameItem)
1909	2335	{
1910	2336	Overwrite(Object3D.NAME);
1911	2337	} else
1912		- if (event.getSource() == overwriteUVItem)
	2338	+ if (source == overwriteUVItem)
1913	2339	{
1914	2340	Overwrite(Object3D.UV);
1915	2341	} else
1916		- if (event.getSource() == overwriteMatItem)
	2342	+ if (source == overwriteMatItem)
1917	2343	{
1918	2344	/* july 2015
1919	2345	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2359,7 @@
1933	2359
1934	2360	Overwrite(dropAttributes);
1935	2361	}
1936		- if (event.getSource() == overwriteGeoItem)
	2362	+ if (source == overwriteGeoItem)
1937	2363	{
1938	2364	Overwrite(Object3D.GEOMETRY);
1939	2365	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2376,7 @@
1950	2376	// refreshContents();
1951	2377	// }
1952	2378	} else
1953		- if (event.getSource() == generateMeshItem)
	2379	+ if (source == generateMeshItem)
1954	2380	{
1955	2381	//if (group.selection.size() == 1)
1956	2382	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2387,7 @@
1961	2387	ResetModel();
1962	2388	refreshContents();
1963	2389	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2390	+ if (source == extractGeometriesItem)
1965	2391	{
1966	2392	boolean one = false;
1967	2393
..	..	@@ -1988,7 +2414,7 @@
1988	2414	ResetModel();
1989	2415	refreshContents();
1990	2416	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2417	+ if (source == cloneGeometriesItem)
1992	2418	{
1993	2419	boolean one = false;
1994	2420
..	..	@@ -2014,7 +2440,7 @@
2014	2440	ResetModel();
2015	2441	refreshContents();
2016	2442	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2443	+ if (source == shareGeometriesItem)
2018	2444	{
2019	2445	boolean one = false;
2020	2446
..	..	@@ -2044,7 +2470,7 @@
2044	2470	refreshContents();
2045	2471	}
2046	2472	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2473	+ if (source == mergeGeometriesItem)
2048	2474	{
2049	2475	boolean one = false;
2050	2476
..	..	@@ -2074,7 +2500,7 @@
2074	2500	ResetModel();
2075	2501	refreshContents();
2076	2502	} else
2077		- if (event.getSource() == linkverticesItem)
	2503	+ if (source == linkverticesItem)
2078	2504	{
2079	2505	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2506	// {
..	..	@@ -2087,9 +2513,9 @@
2087	2513	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2514	// refreshContents();
2089	2515	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2516	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2517	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2518	+ Object3D content = Grafreed.clipboard.get(0);
2093	2519
2094	2520	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2521	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +2523,38 @@
2097	2523	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2524	for (int i=0; i<group.selection.size(); i++)
2099	2525	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2526	+ boolean random = CameraPane.SWITCH;
	2527	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2528	group.selection.get(i).linkVerticesThis(content);
2103	2529	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2530	+ CameraPane.SWITCH = random;
2105	2531	}
2106	2532	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2533	refreshContents();
2108	2534	}
2109	2535	} else
2110		- if (event.getSource() == resetsupportItem)
	2536	+ if (source == resetsupportItem)
2111	2537	{
2112	2538	for (int i=0; i<group.selection.size(); i++)
2113	2539	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2540	+ boolean random = CameraPane.SWITCH;
	2541	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2542	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2543	+ CameraPane.SWITCH = random;
2118	2544	}
2119	2545
2120	2546	refreshContents();
2121	2547	} else
2122		- if (event.getSource() == relinkverticesItem)
	2548	+ if (source == relinkverticesItem)
2123	2549	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2550	+ boolean random = CameraPane.SWITCH;
	2551	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2552	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2553	+ CameraPane.SWITCH = random;
2128	2554
2129	2555	refreshContents();
2130	2556	} else
2131		- if (event.getSource() == resetreferencesItem)
	2557	+ if (source == resetreferencesItem)
2132	2558	{
2133	2559	for (int i=0; i<group.selection.size(); i++)
2134	2560	{
..	..	@@ -2137,11 +2563,11 @@
2137	2563
2138	2564	refreshContents();
2139	2565	} else
2140		- if (event.getSource() == setMasterItem)
	2566	+ if (source == setMasterItem)
2141	2567	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2568	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2569	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2570	+ Object3D content = Grafreed.clipboard.get(0);
2145	2571
2146	2572	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2573	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2576,13 @@
2150	2576	refreshContents();
2151	2577	}
2152	2578	} else
2153		- if (event.getSource() == poseMeshItem)
	2579	+ if (source == poseMeshItem)
2154	2580	{
2155	2581	if (group.selection.size() == 1)
2156	2582	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2583	+ if (Grafreed.clipboard.size() == 1)
2158	2584	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2585	+ Object3D content = Grafreed.clipboard.get(0);
2160	2586
2161	2587	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2588	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2595,19 @@
2169	2595	}
2170	2596
2171	2597	} else
2172		- if (event.getSource() == revertMeshItem)
	2598	+ if (source == revertMeshItem)
2173	2599	{
2174	2600	RevertMeshes();
2175	2601	} else
2176		- if (event.getSource() == resetMeshItem)
	2602	+ if (source == resetAllItem)
2177	2603	{
2178	2604	ResetAll();
2179	2605	} else
2180		- if (event.getSource() == stepAllItem)
	2606	+ if (source == stepAllItem)
2181	2607	{
2182	2608	StepAll();
2183	2609	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2610	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2611	{
2186	2612	//int indices[] = jList.getSelectedIndices();
2187	2613	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2615,46 @@
2189	2615
2190	2616	ClearSelection(false);
2191	2617	} else
2192		- if (event.getSource() == clearAllItem)
	2618	+ if (source == clearAllItem)
2193	2619	{
2194	2620	ClearSelection(true);
2195	2621	} else
2196		- if (event.getSource() == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2197	2623	{
2198		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2199	2625	} else
2200		- if (event.getSource() == hideItem)
	2626	+ if (source == hideItem)
2201	2627	{
2202	2628	group(new HiddenObject());
2203	2629	} else
2204		- if (event.getSource() == frontItem)
	2630	+ if (source == frontItem)
2205	2631	{
2206	2632	front();
2207	2633	} else
2208		- if (event.getSource() == backItem)
	2634	+ if (source == backItem)
2209	2635	{
2210	2636	back();
2211	2637	} else
2212		- if (event.getSource() == cameraItem)
	2638	+ if (source == cameraItem)
2213	2639	{
2214	2640	makeSomething(new Camera());
2215	2641	} else
2216		- if (event.getSource() == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2217	2643	{
2218	2644	group(new Composite());
2219	2645	} else
2220		- if (event.getSource() == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2221	2647	{
2222	2648	RandomNode random = new RandomNode();
2223	2649	group(random);
2224	2650	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2651	+ random.name = random.get(0).name + "Switch";
2226	2652	} else
2227		- if (event.getSource() == physicsItem)
	2653	+ if (source == physicsItem)
2228	2654	{
2229	2655	group(new PhysicsNode());
2230	2656	} else
2231		- if (event.getSource() == frameselectorItem)
	2657	+ if (source == frameselectorItem)
2232	2658	{
2233	2659	for (int i=0; i<group.selection.size(); i++)
2234	2660	{
..	..	@@ -2240,7 +2666,7 @@
2240	2666	ResetModel();
2241	2667	refreshContents();
2242	2668	} else
2243		- if (event.getSource() == switchGeoItem)
	2669	+ if (source == switchGeoItem)
2244	2670	{
2245	2671	for (int i=0; i<group.selection.size(); i++)
2246	2672	{
..	..	@@ -2252,7 +2678,7 @@
2252	2678	ResetModel();
2253	2679	refreshContents();
2254	2680	} else
2255		- if (event.getSource() == switchTransfoItem)
	2681	+ if (source == switchTransfoItem)
2256	2682	{
2257	2683	for (int i=0; i<group.selection.size(); i++)
2258	2684	{
..	..	@@ -2264,7 +2690,7 @@
2264	2690	ResetModel();
2265	2691	refreshContents();
2266	2692	} else
2267		- if (event.getSource() == morphItem)
	2693	+ if (source == morphItem)
2268	2694	{
2269	2695	for (int i=0; i<group.selection.size(); i++)
2270	2696	{
..	..	@@ -2276,7 +2702,7 @@
2276	2702	ResetModel();
2277	2703	refreshContents();
2278	2704	} else
2279		- if (event.getSource() == scriptNodeItem)
	2705	+ if (source == scriptNodeItem)
2280	2706	{
2281	2707	boolean atleastone = false;
2282	2708
..	..	@@ -2315,215 +2741,252 @@
2315	2741	}
2316	2742	}
2317	2743	} else
2318		- if (event.getSource() == linkerItem)
	2744	+ if (source == linkerItem)
2319	2745	{
2320	2746	group(new cLinker());
2321	2747	} else
2322		- if (event.getSource() == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2323	2749	{
2324	2750	group(new TextureNode());
2325	2751	} else
2326		- if (event.getSource() == billboardItem)
	2752	+ if (source == billboardItem)
2327	2753	{
2328	2754	group(new BillboardNode());
2329	2755	} else
2330		- if (event.getSource() == shadowXItem)
	2756	+ if (source == shadowXItem)
2331	2757	{
2332	2758	CastShadow(0);
2333	2759	} else
2334		- if (event.getSource() == shadowYItem)
	2760	+ if (source == shadowYItem)
2335	2761	{
2336	2762	CastShadow(1);
2337	2763	} else
2338		- if (event.getSource() == shadowZItem)
	2764	+ if (source == shadowZItem)
2339	2765	{
2340	2766	CastShadow(2);
2341	2767	} else
2342		- if (event.getSource() == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2343	2769	{
2344		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2345	2772	for (int i=0; i<group.selection.size(); i++)
2346	2773	{
2347		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2348	2779	}
2349	2780
2350		- ClearSelection(false);
2351		-
2352		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2353	2792	} else
2354		- if (event.getSource() == genUVItem)
	2793	+ if (source == genUVItem)
2355	2794	{
2356	2795	GenUV();
2357	2796	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2797	+ if (source == genNormalsCADItem)
2359	2798	{
2360	2799	GenNormals(true);
2361	2800	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2801	+ if (source == genNormalsMESHItem)
2363	2802	{
2364		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2365	2804	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2805	+ if (source == genNormalsORGANItem)
2367	2806	{
2368	2807	GenNormals(false);
2369	2808	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2809	+ if (source == genNormalsMINEItem)
2371	2810	{
2372	2811	GenNormalsMINE();
2373	2812	} else
2374		- if (event.getSource() == stripifyItem)
	2813	+ if (source == stripifyItem)
2375	2814	{
2376	2815	Stripify();
2377	2816	} else
2378		- if (event.getSource() == unstripifyItem)
	2817	+ if (source == unstripifyItem)
2379	2818	{
2380	2819	Unstripify();
2381	2820	} else
2382		- if (event.getSource() == trimItem)
	2821	+ if (source == trimItem)
2383	2822	{
2384	2823	Trim();
2385	2824	} else
2386		- if (event.getSource() == untrimItem)
	2825	+ if (source == untrimItem)
2387	2826	{
2388	2827	Untrim();
2389	2828	} else
2390		- if (event.getSource() == clearColorsItem)
	2829	+ if (source == clearColorsItem)
2391	2830	{
2392	2831	ClearColors();
2393	2832	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2833	+ if (source == clearMaterialsItem)
2395	2834	{
2396	2835	ClearMaterials();
2397	2836	} else
2398		- if (event.getSource() == liveleavesItem)
	2837	+ if (source == liveleavesItem)
2399	2838	{
2400	2839	LiveLeaves(true);
2401	2840	} else
2402		- if (event.getSource() == unliveleavesItem)
	2841	+ if (source == unliveleavesItem)
2403	2842	{
2404	2843	LiveLeaves(false);
2405	2844	} else
2406		- if (event.getSource() == supportleavesItem)
	2845	+ if (source == supportleavesItem)
2407	2846	{
2408	2847	SupportLeaves(true);
2409	2848	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2849	+ if (source == unsupportleavesItem)
2411	2850	{
2412	2851	SupportLeaves(false);
2413	2852	} else
2414		- if (event.getSource() == hideleavesItem)
	2853	+ if (source == hideleavesItem)
2415	2854	{
2416	2855	HideLeaves(true);
2417	2856	} else
2418		- if (event.getSource() == showleavesItem)
	2857	+ if (source == showleavesItem)
2419	2858	{
2420	2859	HideLeaves(false);
2421	2860	} else
2422		- if (event.getSource() == markleavesItem)
	2861	+ if (source == markleavesItem)
2423	2862	{
2424	2863	MarkLeaves(true);
2425	2864	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2865	+ if (source == unmarkleavesItem)
2427	2866	{
2428	2867	MarkLeaves(false);
2429	2868	} else
2430		- if (event.getSource() == flipVItem)
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
	2884	+ } else
	2885	+ if (source == flipVItem)
2431	2886	{
2432	2887	FlipV(true);
2433	2888	} else
2434		- if (event.getSource() == unflipVItem)
	2889	+ if (source == unflipVItem)
2435	2890	{
2436	2891	FlipV(false);
2437	2892	} else
2438		- if (event.getSource() == lowTexturesItem)
	2893	+ if (source == lowTexturesItem)
2439	2894	{
2440	2895	SetTexRes(0);
2441	2896	} else
2442		- if (event.getSource() == normalTexturesItem)
	2897	+ if (source == normalTexturesItem)
2443	2898	{
2444	2899	SetTexRes(1);
2445	2900	} else
2446		- if (event.getSource() == highTexturesItem)
	2901	+ if (source == highTexturesItem)
2447	2902	{
2448	2903	SetTexRes(2);
2449	2904	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2905	+ if (source == veryhighTexturesItem)
2451	2906	{
2452	2907	SetTexRes(3);
2453	2908	} else
2454		- if (event.getSource() == maxTexturesItem)
	2909	+ if (source == maxTexturesItem)
2455	2910	{
2456	2911	SetTexRes(4);
2457	2912	} else
2458		- if (event.getSource() == panoTexturesItem)
	2913	+ if (source == panoTexturesItem)
2459	2914	{
2460	2915	SetTexRes(5);
2461	2916	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2917	+ if (source == reverseNormalsItem)
2463	2918	{
2464	2919	ReverseNormals();
2465	2920	} else
2466		- if (event.getSource() == parseverticesItem)
	2921	+ if (source == parseverticesItem)
2467	2922	{
2468	2923	ParseVertices();
2469	2924	} else
2470		- if (event.getSource() == textureFieldItem)
	2925	+ if (source == textureFieldItem)
2471	2926	{
2472	2927	TextureVertices();
2473	2928	} else
2474		- if (event.getSource() == alignItem)
	2929	+ if (source == alignItem)
2475	2930	{
2476	2931	Align();
2477	2932	} else
2478		- if (event.getSource() == mirrorItem)
	2933	+ if (source == mirrorItem)
2479	2934	{
2480	2935	MirrorPoses();
2481	2936	} else
2482		- if (event.getSource() == reduceMorphItem)
	2937	+ if (source == reduceMorphItem)
2483	2938	{
2484	2939	MeshReduction(false);
2485	2940	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2941	+ if (source == reduce34MorphItem)
2487	2942	{
2488	2943	MeshReduction(true);
2489	2944	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2945	+ if (source == reverseTrianglesItem)
2491	2946	{
2492	2947	ReverseTriangles();
2493	2948	} else
2494		- if (event.getSource() == reduceMeshItem)
	2949	+ if (source == reduceMeshItem)
2495	2950	{
2496	2951	ReduceMesh(false);
2497	2952	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2953	+ if (source == reduce34MeshItem)
2499	2954	{
2500	2955	ReduceMesh(true);
2501	2956	} else
2502		- if (event.getSource() == increaseMeshItem)
	2957	+ if (source == increaseMeshItem)
2503	2958	{
2504	2959	IncreaseMesh();
2505	2960	} else
2506		- if (event.getSource() == clipMeshItem)
	2961	+ if (source == clipMeshItem)
2507	2962	{
2508	2963	ClipMesh();
2509	2964	} else
2510		- if (event.getSource() == smoothMeshItem)
	2965	+ if (source == smoothMeshItem)
2511	2966	{
2512	2967	SmoothMesh();
2513	2968	} else
2514		- if (event.getSource() == transformgeometryItem)
	2969	+ if (source == transformGeometryItem)
2515	2970	{
2516	2971	TransformGeometry();
2517	2972	} else
2518		- if (event.getSource() == resetTransformItem)
	2973	+ if (source == transformChildrenItem)
	2974	+ {
	2975	+ TransformChildren();
	2976	+ } else
	2977	+ if (source == resetTransformItem)
2519	2978	{
2520	2979	ResetTransform();
2521	2980	} else
2522		- if (event.getSource() == resetCentroidItem)
	2981	+ if (source == resetCentroidItem)
2523	2982	{
2524		- ResetCentroid();
	2983	+ ResetCentroid(true);
2525	2984	} else
2526		- if (event.getSource() == resetParentItem)
	2985	+ if (source == resetCentroidXZItem)
	2986	+ {
	2987	+ ResetCentroid(false);
	2988	+ } else
	2989	+ if (source == resetParentItem)
2527	2990	{
2528	2991	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2992	{
..	..	@@ -2533,7 +2996,7 @@
2533	2996
2534	2997	refreshContents();
2535	2998	} else
2536		- if (event.getSource() == repairParentItem)
	2999	+ if (source == repairParentItem)
2537	3000	{
2538	3001	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	3002	{
..	..	@@ -2547,7 +3010,7 @@
2547	3010
2548	3011	refreshContents();
2549	3012	} else
2550		- if (event.getSource() == repairShadowItem)
	3013	+ if (source == repairShadowItem)
2551	3014	{
2552	3015	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	3016	{
..	..	@@ -2561,7 +3024,7 @@
2561	3024
2562	3025	refreshContents();
2563	3026	} else
2564		- if (event.getSource() == sortbysizeItem)
	3027	+ if (source == sortbysizeItem)
2565	3028	{
2566	3029	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	3030	{
..	..	@@ -2573,7 +3036,7 @@
2573	3036	ResetModel();
2574	3037	refreshContents();
2575	3038	} else
2576		- if (event.getSource() == sortbynameItem)
	3039	+ if (source == sortbynameItem)
2577	3040	{
2578	3041	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	3042	{
..	..	@@ -2585,7 +3048,7 @@
2585	3048	ResetModel();
2586	3049	refreshContents();
2587	3050	} else
2588		- if (event.getSource() == attachPigmentItem)
	3051	+ if (source == attachPigmentItem)
2589	3052	{
2590	3053	String texture = GetFile("Attach pigment");
2591	3054	Object3D obj;
..	..	@@ -2597,7 +3060,7 @@
2597	3060
2598	3061	refreshContents();
2599	3062	} else
2600		- if (event.getSource() == detachPigmentItem)
	3063	+ if (source == detachPigmentItem)
2601	3064	{
2602	3065	Object3D obj;
2603	3066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +3071,7 @@
2608	3071
2609	3072	refreshContents();
2610	3073	} else
2611		- if (event.getSource() == attachBumpItem)
	3074	+ if (source == attachBumpItem)
2612	3075	{
2613	3076	String texture = GetFile("Attach bump");
2614	3077	Object3D obj;
..	..	@@ -2620,7 +3083,7 @@
2620	3083
2621	3084	refreshContents();
2622	3085	} else
2623		- if (event.getSource() == detachBumpItem)
	3086	+ if (source == detachBumpItem)
2624	3087	{
2625	3088	Object3D obj;
2626	3089	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +3094,7 @@
2631	3094
2632	3095	refreshContents();
2633	3096	} else
2634		- if (event.getSource() == pigmentBumpItem)
	3097	+ if (source == pigmentBumpItem)
2635	3098	{
2636	3099	Object3D obj;
2637	3100	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +3105,237 @@
2642	3105
2643	3106	refreshContents();
2644	3107	} else
2645		- if (event.getSource() == flashSelectionButton)
	3108	+ if (source == flashSelectionButton)
2646	3109	{
2647	3110	CameraPane.flash = true;
2648	3111	refreshContents();
2649	3112	} else
2650		- if (event.getSource() == oneButton)
	3113	+ if (source == oneButton)
2651	3114	{
2652	3115	} else
2653		- if (event.getSource() == twoButton)
	3116	+ if (source == twoButton)
2654	3117	{
2655	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2656	3123	// bug
2657	3124	//gridPanel.setDividerLocation(1.0);
2658	3125	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	3126	+// bigThree.remove(scenePanel);
	3127	+// bigThree.remove(centralPanel);
	3128	+// bigThree.remove(XYZPanel);
	3129	+// aWindowConstraints.gridx = 0;
	3130	+// aWindowConstraints.gridy = 0;
	3131	+// aWindowConstraints.gridwidth = 1;
	3132	+// // aConstraints.gridheight = 3;
	3133	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3134	+// aWindowConstraints.weightx = 0;
	3135	+// aWindowConstraints.weighty = 1;
	3136	+// //bigThree.add(jtp, aWindowConstraints);
	3137	+// aWindowConstraints.weightx = 1;
	3138	+// aWindowConstraints.gridwidth = 3;
	3139	+// // aConstraints.gridheight = 3;
	3140	+// aWindowConstraints.gridx = 1;
	3141	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3142	+// bigThree.add(centralPanel, aWindowConstraints);
	3143	+// aWindowConstraints.weightx = 0;
	3144	+// aWindowConstraints.gridx = 4;
	3145	+// aWindowConstraints.gridwidth = 1;
	3146	+// // aConstraints.gridheight = 3;
	3147	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3148	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3149	+// scenePanel.setVisible(false);
	3150	+// centralPanel.setVisible(true);
	3151	+// XYZPanel.setVisible(false);
	3152	+ bigThree.ClearUI();
	3153	+ bigThree.add(centralPanel);
	3154	+ bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2683	3173	} else
2684		- if (event.getSource() == threeButton)
	3174	+ if (source == threeButton)
2685	3175	{
2686	3176	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
	3180	+
	3181	+// bigThree.remove(scenePanel);
	3182	+// bigThree.remove(centralPanel);
	3183	+// bigThree.remove(XYZPanel);
	3184	+// aWindowConstraints.gridx = 0;
	3185	+// aWindowConstraints.gridy = 0;
	3186	+// aWindowConstraints.gridwidth = 1;
	3187	+// // aConstraints.gridheight = 3;
	3188	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3189	+// aWindowConstraints.weightx = 0;
	3190	+// aWindowConstraints.weighty = 1;
	3191	+// //bigThree.add(jtp, aWindowConstraints);
	3192	+// aWindowConstraints.weightx = 1;
	3193	+// aWindowConstraints.gridwidth = 3;
	3194	+// // aConstraints.gridheight = 3;
	3195	+// aWindowConstraints.gridx = 1;
	3196	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3197	+// bigThree.add(centralPanel, aWindowConstraints);
	3198	+// aWindowConstraints.weightx = 0;
	3199	+// aWindowConstraints.gridx = 4;
	3200	+// aWindowConstraints.gridwidth = 1;
	3201	+// // aConstraints.gridheight = 3;
	3202	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3203	+// bigThree.add(XYZPanel, aWindowConstraints);
	3204	+// bigThree.validate();
	3205	+// scenePanel.setVisible(false);
	3206	+// centralPanel.setVisible(true);
	3207	+// XYZPanel.setVisible(true);
	3208	+ bigThree.ClearUI();
	3209	+ bigThree.add(centralPanel);
	3210	+ bigThree.add(XYZPanel);
	3211	+ bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2711	3214	} else
2712		- if (event.getSource() == fourButton)
	3215	+ if (source == fourButton)
2713	3216	{
2714	3217	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
	3221	+
	3222	+// bigThree.remove(scenePanel);
	3223	+// bigThree.remove(centralPanel);
	3224	+// bigThree.remove(XYZPanel);
	3225	+// aWindowConstraints.gridx = 0;
	3226	+// aWindowConstraints.gridy = 0;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aWindowConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3230	+// aWindowConstraints.weightx = 1;
	3231	+// aWindowConstraints.weighty = 1;
	3232	+// bigThree.add(scenePanel, aWindowConstraints);
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.gridwidth = 3;
	3235	+// // aConstraints.gridheight = 3;
	3236	+// aWindowConstraints.gridx = 1;
	3237	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3238	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3239	+// aWindowConstraints.weightx = 0;
	3240	+// aWindowConstraints.gridx = 4;
	3241	+// aWindowConstraints.gridwidth = 1;
	3242	+// // aWindowConstraints.gridheight = 3;
	3243	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3244	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3245	+// bigThree.validate();
	3246	+// scenePanel.setVisible(true);
	3247	+// centralPanel.setVisible(false);
	3248	+// XYZPanel.setVisible(false);
	3249	+ bigThree.ClearUI();
	3250	+ bigThree.add(scenePanel);
	3251	+ bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2739	3254	} else
2740		- if (event.getSource() == sixButton)
	3255	+ if (source == sixButton)
2741	3256	{
2742	3257	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
	3261	+
	3262	+// bigThree.remove(scenePanel);
	3263	+// bigThree.remove(centralPanel);
	3264	+// bigThree.remove(XYZPanel);
	3265	+// aWindowConstraints.gridx = 0;
	3266	+// aWindowConstraints.gridy = 0;
	3267	+// aWindowConstraints.gridwidth = 1;
	3268	+// // aConstraints.gridheight = 3;
	3269	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3270	+// aWindowConstraints.weightx = 0;
	3271	+// aWindowConstraints.weighty = 1;
	3272	+// bigThree.add(scenePanel, aWindowConstraints);
	3273	+// aWindowConstraints.weightx = 1;
	3274	+// aWindowConstraints.gridwidth = 3;
	3275	+// // aWindowConstraints.gridheight = 3;
	3276	+// aWindowConstraints.gridx = 1;
	3277	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3278	+// bigThree.add(centralPanel, aWindowConstraints);
	3279	+// aWindowConstraints.weightx = 0;
	3280	+// aWindowConstraints.gridx = 4;
	3281	+// aWindowConstraints.gridwidth = 1;
	3282	+// // aWindowConstraints.gridheight = 3;
	3283	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3284	+// //bigThree.add(XYZPanel, aConstraints);
	3285	+// bigThree.validate();
	3286	+// scenePanel.setVisible(true);
	3287	+// centralPanel.setVisible(true);
	3288	+// XYZPanel.setVisible(false);
	3289	+ bigThree.ClearUI();
	3290	+ bigThree.add(scenePanel);
	3291	+ bigThree.add(centralPanel);
	3292	+ bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2767	3295	} else
2768		- if (event.getSource() == sevenButton)
	3296	+ if (source == sevenButton)
2769	3297	{
2770	3298	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
	3302	+
	3303	+// bigThree.remove(scenePanel);
	3304	+// bigThree.remove(centralPanel);
	3305	+// bigThree.remove(XYZPanel);
	3306	+// aWindowConstraints.gridx = 0;
	3307	+// aWindowConstraints.gridy = 0;
	3308	+// aWindowConstraints.gridwidth = 1;
	3309	+// // aWindowConstraints.gridheight = 3;
	3310	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3311	+// aWindowConstraints.weightx = 0;
	3312	+// aWindowConstraints.weighty = 1;
	3313	+// bigThree.add(scenePanel, aWindowConstraints);
	3314	+// aWindowConstraints.weightx = 1;
	3315	+// aWindowConstraints.gridwidth = 3;
	3316	+// // aWindowConstraints.gridheight = 3;
	3317	+// aWindowConstraints.gridx = 1;
	3318	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3319	+// bigThree.add(centralPanel, aWindowConstraints);
	3320	+// aWindowConstraints.weightx = 0;
	3321	+// aWindowConstraints.gridx = 4;
	3322	+// aWindowConstraints.gridwidth = 1;
	3323	+// // aConstraints.gridheight = 3;
	3324	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3325	+// bigThree.add(XYZPanel, aWindowConstraints);
	3326	+// bigThree.validate();
	3327	+// scenePanel.setVisible(true);
	3328	+// centralPanel.setVisible(true);
	3329	+// XYZPanel.setVisible(true);
	3330	+ bigThree.ClearUI();
	3331	+ bigThree.add(scenePanel);
	3332	+ bigThree.add(centralPanel);
	3333	+ bigThree.add(XYZPanel);
	3334	+ bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2795	3337	} else
2796		- if (event.getSource() == rootButton)
	3338	+ if (source == rootButton)
2797	3339	{
2798	3340	Object3D obj;
2799	3341	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2803,66 +3345,84 @@
2803	3345	EditObject(obj);
2804	3346	}
2805	3347
	3348	+ cameraView.requestFocusInWindow();
2806	3349	refreshContents(true);
2807	3350	} else
2808		- if (event.getSource() == closeButton)
	3351	+ if (source == closeButton)
2809	3352	{
2810	3353	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3354	cRadio ab;
2812	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3356	{
2814	3357	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
2817	3366	buttonGroup.remove(ab);
2818	3367	radioPanel.remove(ab);
2819	3368
2820		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
2821	3371	// ab.GetObject().objectUI = null; // ?????????
2822	3372
2823	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3374	break;
2825	3375	}
2826	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
2827	3379	refreshContents(true);
2828	3380	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3381	+ if (source == editItem \|\| source == editButton)
2830	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
2831	3389	EditSelection(false);
2832	3390	} else
2833		- if (event.getSource() == uneditButton)
	3391	+ if (source == uneditButton)
2834	3392	{
2835	3393	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3394	{
2837	3395	Object3D child = (Object3D)e.nextElement();
2838	3396	if(child.editWindow != null)
2839	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
2840	3399	child.CloseUI();
2841	3400	listUI.remove(child);
2842	3401
2843		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
2844	3403	}
2845		- objEditor.ctrlPanel.revalidate();
	3404	+ objEditor.ctrlPanel.FlushUI();
2846	3405	//objEditor.jTree.clearSelection();
2847	3406	//objEditor.ResetSliders();
2848	3407	refreshContents(true);
2849	3408	} else
2850		- if (event.getSource() == clearPanelButton)
	3409	+ if (source == clearPanelButton)
2851	3410	{
2852	3411	assert(copy == group);
2853	3412	//copy.ClearUI();
2854	3413	for (Object3D obj : listUI)
2855	3414	{
	3415	+ obj.pinned = false;
2856	3416	obj.CloseUI();
2857	3417	}
2858	3418	listUI.clear();
2859	3419	refreshContents(true);
2860	3420	} else
2861		- if (event.getSource() == allParamsButton)
	3421	+ if (source == allParamsButton)
2862	3422	{
2863	3423	assert(copy == group);
2864	3424
2865		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2866	3426
2867	3427	for (Object3D obj : listUI)
2868	3428	{
..	..	@@ -2879,19 +3439,19 @@
2879	3439
2880	3440	refreshContents(true);
2881	3441	} else
2882		- if (event.getSource() == unselectButton)
	3442	+ if (source == unselectButton)
2883	3443	{
2884	3444	objEditor.jTree.clearSelection();
2885	3445	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3446	objEditor.ResetSliders();
2887	3447	refreshContents(true);
2888	3448	} else
2889		- if(event.getSource() instanceof cRadio)
	3449	+ if(source instanceof cRadio)
2890	3450	{
2891	3451	group.parent = keepparent;
2892	3452	group.attributes = 0;
2893	3453	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3454	+ /cRadio/ radio = (cRadio)source;
2895	3455	Object3D obj = radio.GetObject();
2896	3456	System.out.println("Edit " + obj);
2897	3457	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2926,20 +3486,44 @@
2926	3486	frontView.object = group;
2927	3487	sideView.object = group;
2928	3488	}
2929		- group.editWindow = this;
	3489	+
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
	3493	+
2930	3494	/*
2931	3495	currentLayout = radio.layout;
2932	3496	if (currentLayout == null)
2933	3497	currentLayout = sevenButton;
2934	3498	*/
2935	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
2936	3505	keepparent = group.parent;
2937	3506	// PARENT = NULL or not???
2938	3507	//group.parent = null; // ROOT
2939	3508	//group.attributes = -1;
2940	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
2941	3512	refreshContents(true);
2942		- }
	3513	+ } else if (event.getSource() == editCameraItem)
	3514	+ {
	3515	+ cameraView.ProtectCamera();
	3516	+ cameraView.repaint();
	3517	+ return;
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3519	+ {
	3520	+ cameraView.RevertCamera();
	3521	+ cameraView.repaint();
	3522	+ return;
	3523	+ // } else if (event.getSource() == textureButton)
	3524	+ // {
	3525	+ // return; // true;
	3526	+ }
2943	3527	else
2944	3528	{
2945	3529	//return super.action(event, arg);
..	..	@@ -2948,7 +3532,6 @@
2948	3532	}
2949	3533
2950	3534	boolean useclient = false;
2951		- cRadio radio;
2952	3535
2953	3536	void ToggleRoot()
2954	3537	{
..	..	@@ -3000,6 +3583,28 @@
3000	3583	refreshContents();
3001	3584	}
3002	3585
	3586	+ void TransformChildren()
	3587	+ {
	3588	+ Object3D obj;
	3589	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3590	+ {
	3591	+ obj = (Object3D)e.nextElement();
	3592	+ obj.KeepTextureMatrices();
	3593	+ obj.TransformChildren();
	3594	+ obj.RestoreTextureMatrices();
	3595	+
	3596	+// if (obj.parent == null)
	3597	+// {
	3598	+// System.out.println("NULL PARENT!");
	3599	+// new Exception().printStackTrace();
	3600	+// }
	3601	+// else
	3602	+// TouchTransform(obj);
	3603	+// //obj.parent.Touch();
	3604	+ }
	3605	+
	3606	+ refreshContents();
	3607	+ }
3003	3608
3004	3609	void ResetTransform()
3005	3610	{
..	..	@@ -3112,7 +3717,7 @@
3112	3717	refreshContents();
3113	3718	}
3114	3719
3115		- void ResetCentroid()
	3720	+ void ResetCentroid(boolean full)
3116	3721	{
3117	3722	Object3D obj;
3118	3723	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +3732,16 @@
3127	3732	LA.matIdentity(Object3D.mat);
3128	3733	obj.getBounds(minima, maxima, false);
3129	3734	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3735	+ if (full)
	3736	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	3737	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	3738	obj.TransformMesh(Object3D.mat);
	3739	+
3133	3740	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3741	+ if (full)
	3742	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	3743	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3744	+
3136	3745	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	3746	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	3747	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +3770,8 @@
3161	3770
3162	3771	int size = obj.MemorySize();
3163	3772
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	3775	}
3166	3776	}
3167	3777	catch (Exception e)
..	..	@@ -3198,9 +3808,9 @@
3198	3808	obj = (Object3D)e.nextElement();
3199	3809
3200	3810	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	3811	+ Grafreed.AnalyzeObject(obj);
3202	3812	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	3813	+ Grafreed.AnalyzeObject(obj.bRep);
3204	3814
3205	3815	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	3816	}
..	..	@@ -3242,6 +3852,13 @@
3242	3852	void GenNormals(boolean crease)
3243	3853	{
3244	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3245	3862
3246	3863	refreshContents();
3247	3864	}
..	..	@@ -3414,8 +4031,8 @@
3414	4031
3415	4032	void ParseVertices()
3416	4033	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	4034	+ boolean epsequal = Grafreed.epsequal;
	4035	+ Grafreed.epsequal = true;
3419	4036
3420	4037	for (int i=0; i<group.selection.size(); i++)
3421	4038	{
..	..	@@ -3440,7 +4057,7 @@
3440	4057	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	4058	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	4059
3443		- g.add(GrafreeD.clipboard);
	4060	+ g.add(Grafreed.clipboard);
3444	4061
3445	4062	buffer.add(g);
3446	4063	}
..	..	@@ -3455,7 +4072,7 @@
3455	4072	makeSomething(buffer, i==group.selection.size()-1);
3456	4073	}
3457	4074
3458		- GrafreeD.epsequal = epsequal;
	4075	+ Grafreed.epsequal = epsequal;
3459	4076
3460	4077	refreshContents();
3461	4078	}
..	..	@@ -3473,7 +4090,16 @@
3473	4090	String pigment = Object3D.GetPigment(tex);
3474	4091	//String bump = Object3D.GetBump(tex);
3475	4092
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4093	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4094	+
	4095	+ try
	4096	+ {
	4097	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4098	+ }
	4099	+ catch (Exception e)
	4100	+ {
	4101	+ System.err.println("FAIL: " + node);
	4102	+ }
3477	4103
3478	4104	double s = v.s;
3479	4105
..	..	@@ -3561,11 +4187,11 @@
3561	4187
3562	4188	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	4189
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	4190	+ boolean random = CameraPane.SWITCH;
	4191	+ CameraPane.SWITCH = false; // parse all random nodes
3566	4192	lowres.linkVerticesThis(null);
3567	4193	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	4194	+ CameraPane.SWITCH = random;
3569	4195
3570	4196	System.err.flush();
3571	4197
..	..	@@ -3605,7 +4231,7 @@
3605	4231	return;
3606	4232
3607	4233	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4234	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4235
3610	4236	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4237
..	..	@@ -3799,9 +4425,9 @@
3799	4425
3800	4426	void ClipMesh()
3801	4427	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4428	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4429	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4430	+ Object3D content = Grafreed.clipboard.get(0);
3805	4431
3806	4432	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4433	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4436,7 @@
3810	4436	// {
3811	4437	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4438	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4439	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4440	}
3815	4441	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4442	System.out.println("DONE.");
..	..	@@ -3857,6 +4483,18 @@
3857	4483	void MarkLeaves(boolean hide)
3858	4484	{
3859	4485	group.selection.MarkLeaves(hide);
	4486	+ refreshContents();
	4487	+ }
	4488	+
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
3860	4498	refreshContents();
3861	4499	}
3862	4500
..	..	@@ -3931,10 +4569,6 @@
3931	4569	// }
3932	4570	// }
3933	4571
3934		- static boolean allparams = true;
3935		-
3936		- static Vector<Object3D> listUI = new Vector<Object3D>();
3937		-
3938	4572	void EditSelection(boolean newWindow)
3939	4573	{
3940	4574	// aConstraints.gridy = 0;
..	..	@@ -3942,10 +4576,10 @@
3942	4576	{
3943	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3944	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3945		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4580
3947	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4582	+ if(elem != group \|\| !newWindow)
3949	4583	{
3950	4584	// if (!(elem instanceof Composite))
3951	4585	// newWindow = false;
..	..	@@ -4027,7 +4661,8 @@
4027	4661	//new Exception().printStackTrace();
4028	4662
4029	4663	freezemodel = true;
4030		-
	4664	+ ClearUnpinned();
	4665	+
4031	4666	/**/
4032	4667	//switch (event.id)
4033	4668	{
..	..	@@ -4035,7 +4670,6 @@
4035	4670	//case 702: // Event.LIST_DESELECT
4036	4671	group.deselectAll();
4037	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	4673	if (tps != null)
4040	4674	{
4041	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,33 +4678,39 @@
4044	4678
4045	4679	//if (child.parent != null)
4046	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4047	4682	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	4683	}
4052	4684	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	4685	+// else
	4686	+// {
	4687	+// objEditor.SetMaterial(group); // .GetMaterial());
	4688	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4689	+// System.err.println("info : " + group.GetPath());
	4690	+// }
4059	4691
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	4693	CameraPane.flash = true;
4064	4694
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	4696	// a camera
4067	4697	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4699	+ {
	4700	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4701	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4702	+ }
4070	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	4705	}
4073	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4074	4714	refreshContents();
4075	4715	//return true;
4076	4716	}
..	..	@@ -4079,6 +4719,35 @@
4079	4719
4080	4720	freezemodel = false;
4081	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4082	4751
4083	4752	void linkSomething(Object3D thing)
4084	4753	{
..	..	@@ -4150,16 +4819,19 @@
4150	4819	{
4151	4820	if (group.selection.isEmpty())
4152	4821	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	4822	+
	4823	+ Grafreed.clipboardIsTempGroup = false;
4154	4824	Composite tGroup = null;
4155	4825	if (group.selection.size() > 0) // 1)
4156	4826	{
4157	4827	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	4828	+ Grafreed.clipboardIsTempGroup = true;
4159	4829	}
4160	4830
4161	4831	if (cut)
4162	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4163	4835	//int indices[] = jList.getSelectedIndices();
4164	4836	//for (int i = indices.length - 1; i >= 0; i--)
4165	4837	//jList.remove(indices[i]);
..	..	@@ -4195,16 +4867,16 @@
4195	4867	//System.out.println("cut " + child);
4196	4868	//System.out.println("parent = " + child.parent);
4197	4869	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	4870	+ if (Grafreed.clipboardIsTempGroup)
4199	4871	tGroup.add/Child/(tmp);
4200	4872	else
4201		- GrafreeD.clipboard = tmp;
	4873	+ Grafreed.clipboard = tmp;
4202	4874	}
4203	4875	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	4876	+ if (Grafreed.clipboardIsTempGroup)
4205	4877	tGroup.add/Child/(child);
4206	4878	else
4207		- GrafreeD.clipboard = child;
	4879	+ Grafreed.clipboard = child;
4208	4880	}
4209	4881
4210	4882	//ResetModel();
..	..	@@ -4236,21 +4908,23 @@
4236	4908	//System.out.println("cut " + elem);
4237	4909	//System.out.println("parent = " + elem.parent);
4238	4910	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	4911	+ if (Grafreed.clipboardIsTempGroup)
4240	4912	tGroup.add/Child/(tmp);
4241	4913	else
4242		- GrafreeD.clipboard = tmp;
	4914	+ Grafreed.clipboard = tmp;
4243	4915	}
4244	4916	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	4917	+ if (Grafreed.clipboardIsTempGroup)
4246	4918	tGroup.add/Child/(child);
4247	4919	else
4248		- GrafreeD.clipboard = child;
	4920	+ Grafreed.clipboard = child;
4249	4921	}
4250	4922
4251	4923	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	4924	+
	4925	+ if (Grafreed.clipboardIsTempGroup)
	4926	+ Grafreed.clipboard = tGroup;
	4927	+
4254	4928	if (cut)
4255	4929	{
4256	4930	ResetModel();
..	..	@@ -4264,7 +4938,7 @@
4264	4938	// return;
4265	4939	boolean first = true;
4266	4940
4267		- if (GrafreeD.clipboardIsTempGroup)
	4941	+ if (Grafreed.clipboardIsTempGroup)
4268	4942	{
4269	4943	Composite temp;
4270	4944
..	..	@@ -4275,7 +4949,7 @@
4275	4949	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	4950	*/
4277	4951	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4952	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	4953	{
4280	4954	Object3D child = (Object3D)e.nextElement();
4281	4955
..	..	@@ -4309,21 +4983,21 @@
4309	4983	//Object3D cb = Applet3D.clipboard;
4310	4984	//temp.addChild(cb);
4311	4985	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4986	+ assert(Grafreed.clipboard.parent == null);
	4987	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4988	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4989	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4990	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	4991	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	4992	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4993	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	4994	}
4321	4995
4322	4996	ResetModel();
4323	4997	refreshContents();
4324	4998	}
4325	4999
4326		- void pasteInto(boolean copyit)
	5000	+ void pasteInto(boolean copyit, boolean clone)
4327	5001	{
4328	5002	// if (GrafreeD.clipboard == null)
4329	5003	// return;
..	..	@@ -4352,15 +5026,22 @@
4352	5026	if (copyit)
4353	5027	{
4354	5028	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	5029	+ if (clone)
	5030	+ {
	5031	+ CloneClipboard(false); // sept 2014
	5032	+ }
	5033	+ else
	5034	+ {
	5035	+ paste(false);
	5036	+ }
4356	5037	}
4357	5038	else
4358	5039	{
4359	5040	boolean first = true;
4360	5041
4361		- if (GrafreeD.clipboardIsTempGroup)
	5042	+ if (Grafreed.clipboardIsTempGroup)
4362	5043	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	5044	+ Composite temp = (Composite)Grafreed.clipboard;
4364	5045	Object3D copy;
4365	5046	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	5047	{
..	..	@@ -4370,7 +5051,7 @@
4370	5051	}
4371	5052	} else
4372	5053	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	5054	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	5055	}
4375	5056	}
4376	5057	}
..	..	@@ -4775,21 +5456,6 @@
4775	5456	}
4776	5457	*/
4777	5458
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	5459	/*
4794	5460	public void Callback(Object obj)
4795	5461	{
..	..	@@ -4813,26 +5479,9 @@
4813	5479	}
4814	5480	*/
4815	5481
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	5482	String GetFile(String dialogName)
4834	5483	{
4835		- if (GrafreeD.standAlone)
	5484	+ if (Grafreed.standAlone)
4836	5485	{
4837	5486	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5487	browser.show();
..	..	@@ -4896,10 +5545,33 @@
4896	5545	cButton flashSelectionButton;
4897	5546	cButton editButton;
4898	5547	cButton uneditButton;
	5548	+ JCheckBox allParamsButton;
4899	5549	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5550	cButton unselectButton;
4902	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
	5555	+ cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
	5574	+
4903	5575	cButton screenfitButton;
4904	5576	cButton screenfitpointButton;
4905	5577	cButton snapobjectButton;
..	..	@@ -4911,14 +5583,6 @@
4911	5583
4912	5584	cButton setsupportButton;
4913	5585
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921		-
4922	5586	//
4923	5587	//Composite
4924	5588	Object3D // to do !!
..	..	@@ -4928,9 +5592,11 @@
4928	5592	//JTree jTree;
4929	5593	private MenuItem lookAtItem;
4930	5594	private MenuItem lookFromItem;
4931		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
4932	5596	private MenuItem cutItem;
4933		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
4934	5600	private MenuItem cloneItem;
4935	5601	private MenuItem cloneSupportItem;
4936	5602	private MenuItem overwriteGeoItem;
..	..	@@ -4943,7 +5609,7 @@
4943	5609	private MenuItem linkverticesItem;
4944	5610	private MenuItem relinkverticesItem;
4945	5611	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	5612	+ private MenuItem resetAllItem;
4947	5613	private MenuItem stepAllItem;
4948	5614	private MenuItem revertMeshItem;
4949	5615	private MenuItem poseMeshItem;
..	..	@@ -4954,6 +5620,7 @@
4954	5620	private MenuItem mergeGeometriesItem;
4955	5621	private MenuItem copyItem;
4956	5622	private MenuItem pasteItem;
	5623	+ private MenuItem pasteIntoItem;
4957	5624	private MenuItem pasteLinkItem;
4958	5625	private MenuItem pasteCloneItem;
4959	5626	private MenuItem pasteExpandItem;
..	..	@@ -4992,6 +5659,10 @@
4992	5659	private MenuItem showleavesItem;
4993	5660	private MenuItem markleavesItem;
4994	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
4995	5666
4996	5667	private MenuItem flipVItem;
4997	5668	private MenuItem unflipVItem;
..	..	@@ -5003,15 +5674,17 @@
5003	5674	private MenuItem panoTexturesItem;
5004	5675
5005	5676	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	5677	+ private MenuItem resetCentroidXZItem;
5007	5678	private MenuItem resetTransformItem;
	5679	+ private MenuItem transformGeometryItem;
	5680	+ private MenuItem transformChildrenItem;
5008	5681	private MenuItem hideItem;
5009	5682	private MenuItem grabItem;
5010	5683	private MenuItem backItem;
5011	5684	private MenuItem frontItem;
5012	5685	private MenuItem cameraItem;
5013	5686	private MenuItem compositeItem;
5014		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5015	5688	private MenuItem physicsItem;
5016	5689	private MenuItem frameselectorItem;
5017	5690	private MenuItem scriptNodeItem;
..	..	@@ -5051,7 +5724,7 @@
5051	5724	private MenuItem blobItem;
5052	5725	private MenuItem latheItem;
5053	5726	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	5727	+ private MenuItem overlayItem;
5055	5728	private MenuItem meshItem;
5056	5729	// private MenuItem meshGroupItem;
5057	5730	private MenuItem springItem;
..	..	@@ -5073,11 +5746,6 @@
5073	5746	private MenuItem doubleItem;
5074	5747	private MenuItem tripleItem;
5075	5748
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	5749	private MenuItem computeAOItem;
5082	5750	private MenuItem recompileItem;
5083	5751	private MenuItem editScriptItem;
..	..	@@ -5087,4 +5755,8 @@
5087	5755	private MenuItem analyzeItem;
5088	5756	private MenuItem dumpItem;
5089	5757	//boolean freezemodel = false;
	5758	+
	5759	+ Menu cameraMenu;
	5760	+ MenuItem editCameraItem;
	5761	+ MenuItem restoreCameraItem;
5090	5762	}