~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("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,176 +580,199 @@
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 = 2;
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	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	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ redoButton.setToolTipText("Redo changes");
	611	+ redoButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ saveButton.setToolTipText("Save changes");
	615	+ saveButton.addActionListener(this);
	616	+
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	618	+ liveCB.setToolTipText("Enable animation");
442	619	liveCB.addItemListener(this);
443	620
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ oneStepButton.setToolTipText("Animate one step forward");
	623	+ oneStepButton.addActionListener(this);
	624	+
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
446	626	fastCB.setToolTipText("Fast mode");
447	627	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
515		- trackCB.setToolTipText("Enable tracking");
516		- trackCB.addItemListener(this);
517		-
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	628	+
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	632	screenfitButton.setToolTipText("Screen fit");
521	633	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
	638	+
523	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	640	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	641
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537		- flashSelectionButton.setToolTipText("Show selection");
538		- flashSelectionButton.addActionListener(this);
	642	+ if (Globals.ADVANCED)
	643	+ {
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	645	+ snapobjectButton.addActionListener(this);
	646	+ snapobjectButton.setToolTipText("Snap Object");
	647	+ }
	648	+
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
539	650
540		- oe.toolbarPanel.add(new cButton(" ", false));
541		-
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	652	twoButton.setToolTipText("Show center view only");
549	653	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	657	fourButton.addActionListener(this);
552	658	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	660	sixButton.setToolTipText("2-column layout left");
555	661	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	663	threeButton.setToolTipText("2-column layout right");
558	664	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	666	sevenButton.setToolTipText("3-column layout");
561	667	sevenButton.addActionListener(this);
562	668	//
563	669
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ rootButton.setToolTipText("Edit selection in new tab");
566	672	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	673	+
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	675	closeButton.setToolTipText("Close tab");
570	676	closeButton.addActionListener(this);
571	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	678	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574		-
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
577		- editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	679
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ editButton.setToolTipText("Edit selection");
	749	+ editButton.addActionListener(this);
	750	+
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ uneditButton.setToolTipText("Unedit selection");
583	753	uneditButton.addActionListener(this);
584	754
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	756	+ allParamsButton.setToolTipText("Edit all params");
597	757	allParamsButton.addActionListener(this);
598	758
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ clearPanelButton.setToolTipText("Clear edit panel");
	761	+ clearPanelButton.addActionListener(this);
	762	+
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ unselectButton.setToolTipText("Unselect");
604	765	unselectButton.addActionListener(this);
605	766
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
	770	+
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
	775	+
606	776	// oe.aConstraints.gridx += 1;
607	777	// oe.aConstraints.weighty = 0;
608	778	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +784,22 @@
614	784	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	785	// gcButton.addActionListener(this);
616	786
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	787	+ cGridBag jSPPanel = new cGridBag();
	788	+
	789	+ JScrollPane jSP;
628	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
630	792	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
635		-
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
640		- colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
643		- materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
646		- textureCB.addItemListener(this);
647		-
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
650	793
	794	+ oe.treePanel.add(jSPPanel);
	795	+ oe.treePanel.Return();
	796	+
	797	+ oe.treePanel.add(copyOptionsPanel);
	798	+ oe.treePanel.Return();
	799	+
	800	+// mainPanel.setDividerLocation(0.5); //1.0);
	801	+// mainPanel.setResizeWeight(0.5);
	802	+
651	803	//jList.addListSelectionListener(this);
652	804	oe.jTree.addTreeSelectionListener(this);
653	805	//jTree.setRootVisible(false);
..	..	@@ -669,10 +821,140 @@
669	821	radio.layout = sevenButton;
670	822	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	823	}
	824	+
	825	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	826	+ {
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
	830	+
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
	834	+
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
	841	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	842	+ boxCB.setToolTipText("Display bounding boxes");
	843	+ boxCB.addItemListener(this);
	844	+
	845	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	846	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	847	+ zoomBoxCB.addItemListener(this);
	848	+
	849	+ if (true) // Globals.ADVANCED)
	850	+ {
	851	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	852	+ supportCB.setToolTipText("Enable rigging");
	853	+ supportCB.addItemListener(this);
	854	+
	855	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	856	+ // localCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
	860	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	861	+ crowdCB.setToolTipText("Used for crowds");
	862	+ crowdCB.addItemListener(this);
	863	+
	864	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	865	+ smoothCB.setToolTipText("Snapping delay");
	866	+ smoothCB.addItemListener(this);
	867	+
	868	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	869	+ slowCB.setToolTipText("Smooth interpolation");
	870	+ slowCB.addItemListener(this);
	871	+
	872	+// constraints.gridy += 1;
	873	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	874	+// speakerMocapCB.addItemListener(this);
	875	+
	876	+ panel.Return();
	877	+
	878	+ if (false)
	879	+ {
	880	+ // handled in scripts
	881	+ //constraints.gridy += 1;
	882	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	883	+ speakerCameraCB.addItemListener(this);
	884	+
	885	+ //constraints.gridy += 1;
	886	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	887	+ speakerFocusCB.addItemListener(this);
	888	+
	889	+ //constraints.gridy += 1;
	890	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	891	+ smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
	893	+ }
	894	+
	895	+//constraints.gridx += 1;
	896	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	897	+// debugCB.addItemListener(this);
	898	+
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
	903	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
	905	+ oeilCB.addItemListener(this);
	906	+
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
	927	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	928	+ lookAtCB.setToolTipText("Look-at target");
	929	+ lookAtCB.addItemListener(this);
	930	+ }
	931	+
	932	+ }
	933	+
	934	+ cGridBag fill = new cGridBag();
	935	+ fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
	940	+
	941	+ panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
	944	+
	945	+ }
672	946
673	947	void EditObject(Object3D obj)
674	948	{
675	949	cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
676	958	radioButton.SetObject(obj);
677	959	radioButton.layout = sevenButton;
678	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -681,8 +963,11 @@
681	963	buttonGroup.add(radioButton);
682	964	radioButton.doClick();
683	965	}
	966	+
684	967	void SetupViews(ObjEditor oe)
685	968	{
	969	+ theFrame = this;
	970	+
686	971	oe.SetupViews();
687	972
688	973	System.out.println("SetupViews");
..	..	@@ -691,23 +976,27 @@
691	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
692	977	}
693	978
694		- JCheckBox liveCB;
695		- JCheckBox supportCB;
696		- JCheckBox localCB;
697		- JCheckBox crowdCB;
698		- JCheckBox smoothCB;
699		- JCheckBox fastCB;
700		- JCheckBox slowCB;
701		- JCheckBox boxCB;
702		- JCheckBox zoomBoxCB;
703		- JCheckBox trackCB;
704		- JCheckBox smoothfocusCB;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
705	991	// JCheckBox speakerMocapCB;
706		- JCheckBox speakerCameraCB;
707		- JCheckBox speakerFocusCB;
708		- JCheckBox debugCB;
709		- JCheckBox oeilCB;
710		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
711	1000
712	1001	// static int COLOR = 1;
713	1002	// static int MATERIAL = 2;
..	..	@@ -715,9 +1004,9 @@
715	1004
716	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
717	1006
718		- JCheckBox colorCB;
719		- JCheckBox materialCB;
720		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
721	1010
722	1011	public void itemStateChanged(ItemEvent e)
723	1012	{
..	..	@@ -745,6 +1034,7 @@
745	1034	} else if(e.getSource() == liveCB)
746	1035	{
747	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
748	1038	}
749	1039	else if(e.getSource() == supportCB)
750	1040	{
..	..	@@ -809,6 +1099,14 @@
809	1099	{
810	1100	cameraView.ToggleOeil();
811	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
812	1110	else if(e.getSource() == lookAtCB)
813	1111	{
814	1112	cameraView.ToggleLookAt();
..	..	@@ -825,7 +1123,8 @@
825	1123
826	1124	/**/
827	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
829	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
830	1129	// We can't move the root node or an empty selection
831	1130	return;
..	..	@@ -897,7 +1196,9 @@
897	1196	// objEditor.DropFile((java.io.File[]) object, true);
898	1197	// return;
899	1198	// }
900		- if (string.charAt(0) == '/')
	1199	+
	1200	+ // File path for Mac and Windows
	1201	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1202	{
902	1203	// file(s)
903	1204	String[] names = string.split("\n");
..	..	@@ -924,7 +1225,7 @@
924	1225
925	1226	flashIt = false;
926	1227	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1230
930	1231	if (group.selection.size() == 1)
..	..	@@ -940,23 +1241,33 @@
940	1241
941	1242	assert target == objEditor.jTree;
942	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
943	1245	try {
944		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
945	1247	} catch (Exception e) {
946	1248	System.out.println("destinationPath : " + destinationPath);
947	1249	return;
948	1250	}
949	1251
950		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
951	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
952	1263	loadClipboard(true);
953	1264	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
955		- } else {
956		- loadClipboard(false);
957		- objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
959		- }
	1265	+ pasteInto(false, false);
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
960	1271	}
961	1272	public void dropActionChanged(DropTargetDragEvent dtde)
962	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1061,85 +1372,104 @@
1061	1372	{
1062	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1063	1374	//heightFieldItem.addActionListener(this);
1064		- gridItem = menu.add(new MenuItem("Grid"));
1065		- gridItem.addActionListener(this);
1066		- rectoidItem = menu.add(new MenuItem("Box"));
1067		- rectoidItem.addActionListener(this);
1068		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1069		- ellipsoidItem.addActionListener(this);
1070		- coneItem = menu.add(new MenuItem("Cone"));
1071		- coneItem.addActionListener(this);
1072		- torusItem = menu.add(new MenuItem("Torus"));
1073		- torusItem.addActionListener(this);
1074		- superItem = menu.add(new MenuItem("Superellipsoid"));
1075		- superItem.addActionListener(this);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
1076	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1077	1394	kleinItem.addActionListener(this);
1078		- particleItem = menu.add(new MenuItem("Particle system"));
1079		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
	1399	+ if (Globals.ADVANCED)
	1400	+ {
1080	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1402	ragdollItem.addActionListener(this);
1082	1403	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1404	ragdoll2Item.addActionListener(this);
	1405	+ }
1084	1406	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1407	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1408	meshItem.addActionListener(this);
1087	1409	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1410	// meshGroupItem.addActionListener(this);
	1411	+ if (Globals.ADVANCED)
	1412	+ {
1089	1413	springItem = menu.add(new MenuItem("Spring"));
1090	1414	springItem.addActionListener(this);
1091	1415	flagItem = menu.add(new MenuItem("Flag"));
1092	1416	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1417	blobItem = menu.add(new MenuItem("Blob"));
1098	1418	blobItem.addActionListener(this);
1099	1419	latheItem = menu.add(new MenuItem("Lathe"));
1100	1420	latheItem.addActionListener(this);
1101		- lightItem = menu.add(new MenuItem("Light"));
1102		- lightItem.addActionListener(this);
	1421	+ }
	1422	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1423	+ bezierItem.addActionListener(this);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1103	1428	menu.add("-");
1104	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1105	1430	//superLoopItem.addActionListener(this);
1106		- loopItem = menu.add(new MenuItem("Loop"));
1107		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1108	1433	doubleItem = menu.add(new MenuItem("Fork"));
1109	1434	doubleItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1110	1437	tripleItem = menu.add(new MenuItem("Trident"));
1111	1438	tripleItem.addActionListener(this);
	1439	+ }
1112	1440	}
1113	1441
1114	1442	void buildToolsMenu(Menu menu)
1115	1443	{
1116	1444	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1445	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1446	+ animationItem.setState(Globals.ANIMATION);
1119	1447
1120	1448	menu.add("-");
1121	1449	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1450	parseverticesItem.addActionListener(this);
1123	1451	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1452	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1453	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1454	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1455	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1456	reduceMorphItem.addActionListener(this);
1131	1457	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1458	reduce34MorphItem.addActionListener(this);
1133		-
	1459	+ menu.add("-");
1134	1460	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1461	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1462
	1463	+ if (Globals.ADVANCED)
	1464	+ {
	1465	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1466	+ mirrorItem.addActionListener(this);
	1467	+ menu.add("-");
1138	1468	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1469	memoryItem.addActionListener(this);
1140	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1471	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1473	dumpItem.addActionListener(this);
1144	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1475	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1487,7 @@
1157	1487	menu.add("-");
1158	1488	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1489	editScriptItem.addActionListener(this);
	1490	+ }
1160	1491	}
1161	1492
1162	1493	void ScreenFit()
..	..	@@ -1279,6 +1610,7 @@
1279	1610	shadow.material = new cMaterial(obj.material);
1280	1611	shadow.material.diffuse = 0.0001f;
1281	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1282	1614
1283	1615	makeSomething(shadow);
1284	1616	}
..	..	@@ -1485,9 +1817,9 @@
1485	1817
1486	1818	void Overwrite(int mask)
1487	1819	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1821	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1491	1823
1492	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1825	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1842,7 @@
1510	1842	//
1511	1843	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1844	{
	1845	+ Object source = event.getSource();
1513	1846	/*
1514	1847	if (event.getSource() == nameField)
1515	1848	{
..	..	@@ -1521,11 +1854,11 @@
1521	1854	}
1522	1855	else
1523	1856	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1857	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1858	{
1526	1859	ScreenFit();
1527	1860	} else
1528		- if (event.getSource() == switchItem)
	1861	+ if (source == switchViewItem)
1529	1862	{
1530	1863	cVector v1 = new cVector();
1531	1864	cVector v2 = new cVector();
..	..	@@ -1534,11 +1867,11 @@
1534	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1868	objEditor.cameraView.repaint();
1536	1869	} else
1537		- if (event.getSource() == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1538	1871	{
1539	1872	makeSomething(new Box());
1540	1873	} else
1541		- if (event.getSource() == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1542	1875	{
1543	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1892,9 @@
1559	1892	applyExample(particleGeom, "SMOKE");
1560	1893	makeSomething(particleGeom);
1561	1894	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1895	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1896	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1897	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1898
1566	1899	ragdoll.toParent = LA.newMatrix();
1567	1900	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1912,7 @@
1579	1912	} else
1580	1913	/*
1581	1914	*/
1582		- if (event.getSource() == heightFieldItem)
	1915	+ if (source == heightFieldItem)
1583	1916	{
1584	1917	Object3D obj = new Object3D();
1585	1918
..	..	@@ -1617,31 +1950,31 @@
1617	1950
1618	1951	makeSomething(obj);
1619	1952	} else
1620		- if (event.getSource() == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1621	1954	{
1622	1955	makeSomething(new Grid());
1623	1956	} else
1624		- if (event.getSource() == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1625	1958	{
1626	1959	makeSomething(new Sphere());
1627	1960	} else
1628		- if (event.getSource() == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1629	1962	{
1630	1963	makeSomething(new Cone());
1631	1964	} else
1632		- if (event.getSource() == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1633	1966	{
1634	1967	makeSomething(new Torus());
1635	1968	} else
1636		- if (event.getSource() == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1637	1970	{
1638	1971	makeSomething(new Superellipsoid());
1639	1972	} else
1640		- if (event.getSource() == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1641	1974	{
1642	1975	makeSomething(new Klein());
1643	1976	} else
1644		- if (event.getSource() == blobItem)
	1977	+ if (source == blobItem)
1645	1978	{
1646	1979	Blob blob = new Blob();
1647	1980	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1982,15 @@
1649	1982	//blob.retile();
1650	1983	makeSomething(blob);
1651	1984	} else
1652		- if (event.getSource() == latheItem)
	1985	+ if (source == latheItem)
1653	1986	{
1654	1987	makeSomething(new Lathe());
1655	1988	} else
1656		- if (event.getSource() == bezierItem)
	1989	+ if (source == bezierItem)
1657	1990	{
1658	1991	makeSomething(new BezierSurface());
1659	1992	} else
1660		- if (event.getSource() == checkerItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1661	1994	{
1662	1995	/*
1663	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +2005,7 @@
1672	2005	*/
1673	2006	makeSomething(new Checker());
1674	2007	} else
1675		- if (event.getSource() == meshItem)
	2008	+ if (source == meshItem)
1676	2009	{
1677	2010	Object3D itemtomake = new Object3D();
1678	2011	Object3D child;
..	..	@@ -1693,35 +2026,35 @@
1693	2026	makeSomething(child);
1694	2027	}
1695	2028	} else
1696		- if (event.getSource() == springItem)
	2029	+ if (source == springItem)
1697	2030	{
1698	2031	cSpring s = new cSpring();
1699	2032	s.setup();
1700	2033	makeSomething(s);
1701	2034	} else
1702		- if (event.getSource() == flagItem)
	2035	+ if (source == flagItem)
1703	2036	{
1704	2037	cSpring s = new cFlag();
1705	2038	s.setup();
1706	2039	makeSomething(s);
1707	2040	} else
1708		- if (event.getSource() == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1709	2042	{
1710	2043	makeSomething(new Light());
1711	2044	} else
1712		- if (event.getSource() == csgItem)
	2045	+ if (source == csgItem)
1713	2046	{
1714	2047	group(new CSG());
1715	2048	} else
1716		- if (event.getSource() == templateItem)
	2049	+ if (source == templateItem)
1717	2050	{
1718	2051	group(new cTemplate());
1719	2052	} else
1720		- if (event.getSource() == attributeItem)
	2053	+ if (source == attributeItem)
1721	2054	{
1722	2055	makeSomething(new Attribute());
1723	2056	} else
1724		- if (event.getSource() == pointflowItem)
	2057	+ if (source == pointflowItem)
1725	2058	{
1726	2059	makeSomething(new PointFlow());
1727	2060	} else
..	..	@@ -1733,7 +2066,7 @@
1733	2066	} else
1734	2067	*/
1735	2068
1736		- if (event.getSource() == superLoopItem)
	2069	+ if (source == superLoopItem)
1737	2070	{
1738	2071	Composite g = new cGroup();
1739	2072	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +2088,7 @@
1755	2088
1756	2089	group(g);
1757	2090	} else
1758		- if (event.getSource() == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1759	2092	{
1760	2093	Composite csg = new GroupLeaf();
1761	2094	csg.count = 5;
..	..	@@ -1764,7 +2097,7 @@
1764	2097	csg.addChild(child);
1765	2098	child.addChild(csg);
1766	2099	} else
1767		- if (event.getSource() == doubleItem)
	2100	+ if (source == doubleItem)
1768	2101	{
1769	2102	Composite csg = new GroupLeaf();
1770	2103	csg.count = 5;
..	..	@@ -1776,7 +2109,7 @@
1776	2109	csg.addChild(child);
1777	2110	child.addChild(csg);
1778	2111	} else
1779		- if (event.getSource() == tripleItem)
	2112	+ if (source == tripleItem)
1780	2113	{
1781	2114	Composite csg = new GroupLeaf();
1782	2115	csg.count = 4;
..	..	@@ -1791,71 +2124,83 @@
1791	2124	csg.addChild(child);
1792	2125	child.addChild(csg);
1793	2126	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	2127	+ if (source == computeAOItem)
1812	2128	{
1813	2129	Globals.drawMode = CameraPane.OCCLUSION;
1814	2130	Globals.theRenderer.repaint();
1815	2131	} else
1816		- if (event.getSource() == recompileItem)
	2132	+ if (source == recompileItem)
1817	2133	{
1818	2134	Recompile();
1819	2135	refreshContents();
1820	2136	} else
1821		- if (event.getSource() == editScriptItem)
	2137	+ if (source == editScriptItem)
1822	2138	{
1823	2139	OpenDialog();
1824	2140	refreshContents();
1825	2141	} else
1826		- if (event.getSource() == invariantsItem)
	2142	+ if (source == invariantsItem)
1827	2143	{
1828	2144	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1830	2146	} else
1831		- if (event.getSource() == memoryItem)
	2147	+ if (source == memoryItem)
1832	2148	{
1833	2149	//System.out.println("Invariants:");
1834	2150	PrintMemory();
1835	2151	} else
1836		- if (event.getSource() == pathItem)
	2152	+ if (source == pathItem)
1837	2153	{
1838	2154	PrintPath();
1839	2155	} else
1840		- if (event.getSource() == analyzeItem)
	2156	+ if (source == analyzeItem)
1841	2157	{
1842	2158	AnalyzeObject();
1843	2159	} else
1844		- if (event.getSource() == dumpItem)
	2160	+ if (source == dumpItem)
1845	2161	{
1846	2162	DumpObject();
1847	2163	} else
1848		- if (event.getSource() == screenfitButton)
	2164	+ if (source == minButton)
	2165	+ {
	2166	+ Minimize();
	2167	+ } else
	2168	+ if (source == maxButton)
	2169	+ {
	2170	+ Maximize();
	2171	+ } else
	2172	+ if (source == fullButton)
	2173	+ {
	2174	+ ToggleFullScreen();
	2175	+ } else
	2176	+ if (source == undoButton)
	2177	+ {
	2178	+ Undo();
	2179	+ } else
	2180	+ if (source == redoButton)
	2181	+ {
	2182	+ Redo();
	2183	+ } else
	2184	+ if (source == saveButton)
	2185	+ {
	2186	+ Save();
	2187	+ } else
	2188	+ if (source == oneStepButton)
	2189	+ {
	2190	+ Globals.ONESTEP = true;
	2191	+ cameraView.repaint();
	2192	+ } else
	2193	+ if (source == screenfitButton)
1849	2194	{
1850	2195	//Reload(lastConverter, lastFilename, true);
1851	2196	ScreenFit();
1852	2197	} else
1853		- if (event.getSource() == screenfitpointButton)
	2198	+ if (source == screenfitpointButton)
1854	2199	{
1855	2200	//Reload(lastConverter, lastFilename, true);
1856	2201	ScreenFitPoint();
1857	2202	} else
1858		- if (event.getSource() == snapobjectButton)
	2203	+ if (source == snapobjectButton)
1859	2204	{
1860	2205	//Reload(lastConverter, lastFilename, true);
1861	2206	SnapObject();
..	..	@@ -1866,13 +2211,13 @@
1866	2211	// Recompile();
1867	2212	// refreshContents();
1868	2213	// } else
1869		- if (event.getSource() == gcButton)
	2214	+ if (source == gcButton)
1870	2215	{
1871	2216	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2217	System.gc();
1873	2218	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2219	} else
1875		- if (event.getSource() == editLeafItem)
	2220	+ if (source == editLeafItem)
1876	2221	{
1877	2222	Object3D obj;
1878	2223	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2231,74 @@
1886	2231	}
1887	2232	refreshContents(true);
1888	2233	} else
1889		- if (event.getSource() == openWindowItem)
	2234	+ if (source == openWindowItem)
1890	2235	{
1891	2236	EditSelection(true);
1892	2237	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2238	+ if (source == cutItem \|\| source == clearButton)
1894	2239	{
1895	2240	loadClipboard(true);
1896	2241	} else
1897		- if (event.getSource() == duplicateItem)
	2242	+ if (source == undoItem)
1898	2243	{
1899		- Object3D keep = GrafreeD.clipboard;
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
	2250	+ if (source == duplicateItem)
	2251	+ {
	2252	+ Object3D keep = Grafreed.clipboard;
1900	2253	loadClipboard(false);
1901	2254	paste(false);
1902		- GrafreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1903	2256	} else
1904		- if (event.getSource() == cloneItem)
	2257	+ if (source == cloneItem)
1905	2258	{
1906	2259	CloneSelection(false);
1907	2260	} else
1908		- if (event.getSource() == cloneSupportItem)
	2261	+ if (source == cloneSupportItem)
1909	2262	{
1910	2263	CloneSelection(true);
1911	2264	} else
1912		- if (event.getSource() == copyItem)
	2265	+ if (source == copyItem)
1913	2266	{
1914	2267	loadClipboard(false);
1915	2268	} else
1916		- if (event.getSource() == pasteItem)
	2269	+ if (source == pasteItem)
1917	2270	{
1918	2271	paste(false);
1919	2272	} else
1920		- if (event.getSource() == pasteLinkItem)
	2273	+ if (source == pasteIntoItem)
1921	2274	{
1922		- pasteInto(false);
	2275	+ pasteInto(true, false);
1923	2276	} else
1924		- if (event.getSource() == pasteCloneItem)
	2277	+ if (source == pasteLinkItem)
1925	2278	{
1926		- pasteInto(true);
	2279	+ pasteInto(false, false);
1927	2280	} else
1928		- if (event.getSource() == pasteExpandItem)
	2281	+ if (source == pasteCloneItem)
	2282	+ {
	2283	+ pasteInto(true, true);
	2284	+ } else
	2285	+ if (source == pasteExpandItem)
1929	2286	{
1930	2287	paste(true);
1931	2288	} else
1932		- if (event.getSource() == synchronizeItem)
	2289	+ if (source == synchronizeItem)
1933	2290	{
1934	2291	Overwrite(Object3D.TRANSFORM);
1935	2292	} else
1936		- if (event.getSource() == overwriteNameItem)
	2293	+ if (source == overwriteNameItem)
1937	2294	{
1938	2295	Overwrite(Object3D.NAME);
1939	2296	} else
1940		- if (event.getSource() == overwriteUVItem)
	2297	+ if (source == overwriteUVItem)
1941	2298	{
1942	2299	Overwrite(Object3D.UV);
1943	2300	} else
1944		- if (event.getSource() == overwriteMatItem)
	2301	+ if (source == overwriteMatItem)
1945	2302	{
1946	2303	/* july 2015
1947	2304	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2318,7 @@
1961	2318
1962	2319	Overwrite(dropAttributes);
1963	2320	}
1964		- if (event.getSource() == overwriteGeoItem)
	2321	+ if (source == overwriteGeoItem)
1965	2322	{
1966	2323	Overwrite(Object3D.GEOMETRY);
1967	2324	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2335,7 @@
1978	2335	// refreshContents();
1979	2336	// }
1980	2337	} else
1981		- if (event.getSource() == generateMeshItem)
	2338	+ if (source == generateMeshItem)
1982	2339	{
1983	2340	//if (group.selection.size() == 1)
1984	2341	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2346,7 @@
1989	2346	ResetModel();
1990	2347	refreshContents();
1991	2348	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2349	+ if (source == extractGeometriesItem)
1993	2350	{
1994	2351	boolean one = false;
1995	2352
..	..	@@ -2016,7 +2373,7 @@
2016	2373	ResetModel();
2017	2374	refreshContents();
2018	2375	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2376	+ if (source == cloneGeometriesItem)
2020	2377	{
2021	2378	boolean one = false;
2022	2379
..	..	@@ -2042,7 +2399,7 @@
2042	2399	ResetModel();
2043	2400	refreshContents();
2044	2401	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2402	+ if (source == shareGeometriesItem)
2046	2403	{
2047	2404	boolean one = false;
2048	2405
..	..	@@ -2072,7 +2429,7 @@
2072	2429	refreshContents();
2073	2430	}
2074	2431	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2432	+ if (source == mergeGeometriesItem)
2076	2433	{
2077	2434	boolean one = false;
2078	2435
..	..	@@ -2102,7 +2459,7 @@
2102	2459	ResetModel();
2103	2460	refreshContents();
2104	2461	} else
2105		- if (event.getSource() == linkverticesItem)
	2462	+ if (source == linkverticesItem)
2106	2463	{
2107	2464	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2465	// {
..	..	@@ -2115,9 +2472,9 @@
2115	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2473	// refreshContents();
2117	2474	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2476	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2121	2478
2122	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2480	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2482,38 @@
2125	2482	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2483	for (int i=0; i<group.selection.size(); i++)
2127	2484	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2485	+ boolean random = CameraPane.SWITCH;
	2486	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2487	group.selection.get(i).linkVerticesThis(content);
2131	2488	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2489	+ CameraPane.SWITCH = random;
2133	2490	}
2134	2491	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2492	refreshContents();
2136	2493	}
2137	2494	} else
2138		- if (event.getSource() == resetsupportItem)
	2495	+ if (source == resetsupportItem)
2139	2496	{
2140	2497	for (int i=0; i<group.selection.size(); i++)
2141	2498	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2501	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2502	+ CameraPane.SWITCH = random;
2146	2503	}
2147	2504
2148	2505	refreshContents();
2149	2506	} else
2150		- if (event.getSource() == relinkverticesItem)
	2507	+ if (source == relinkverticesItem)
2151	2508	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2509	+ boolean random = CameraPane.SWITCH;
	2510	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2511	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2512	+ CameraPane.SWITCH = random;
2156	2513
2157	2514	refreshContents();
2158	2515	} else
2159		- if (event.getSource() == resetreferencesItem)
	2516	+ if (source == resetreferencesItem)
2160	2517	{
2161	2518	for (int i=0; i<group.selection.size(); i++)
2162	2519	{
..	..	@@ -2165,11 +2522,11 @@
2165	2522
2166	2523	refreshContents();
2167	2524	} else
2168		- if (event.getSource() == setMasterItem)
	2525	+ if (source == setMasterItem)
2169	2526	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2528	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2173	2530
2174	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2532	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2535,13 @@
2178	2535	refreshContents();
2179	2536	}
2180	2537	} else
2181		- if (event.getSource() == poseMeshItem)
	2538	+ if (source == poseMeshItem)
2182	2539	{
2183	2540	if (group.selection.size() == 1)
2184	2541	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2186	2543	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2188	2545
2189	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2547	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2554,19 @@
2197	2554	}
2198	2555
2199	2556	} else
2200		- if (event.getSource() == revertMeshItem)
	2557	+ if (source == revertMeshItem)
2201	2558	{
2202	2559	RevertMeshes();
2203	2560	} else
2204		- if (event.getSource() == resetMeshItem)
	2561	+ if (source == resetAllItem)
2205	2562	{
2206	2563	ResetAll();
2207	2564	} else
2208		- if (event.getSource() == stepAllItem)
	2565	+ if (source == stepAllItem)
2209	2566	{
2210	2567	StepAll();
2211	2568	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2569	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2570	{
2214	2571	//int indices[] = jList.getSelectedIndices();
2215	2572	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2574,46 @@
2217	2574
2218	2575	ClearSelection(false);
2219	2576	} else
2220		- if (event.getSource() == clearAllItem)
	2577	+ if (source == clearAllItem)
2221	2578	{
2222	2579	ClearSelection(true);
2223	2580	} else
2224		- if (event.getSource() == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2225	2582	{
2226		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2227	2584	} else
2228		- if (event.getSource() == hideItem)
	2585	+ if (source == hideItem)
2229	2586	{
2230	2587	group(new HiddenObject());
2231	2588	} else
2232		- if (event.getSource() == frontItem)
	2589	+ if (source == frontItem)
2233	2590	{
2234	2591	front();
2235	2592	} else
2236		- if (event.getSource() == backItem)
	2593	+ if (source == backItem)
2237	2594	{
2238	2595	back();
2239	2596	} else
2240		- if (event.getSource() == cameraItem)
	2597	+ if (source == cameraItem)
2241	2598	{
2242	2599	makeSomething(new Camera());
2243	2600	} else
2244		- if (event.getSource() == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2245	2602	{
2246	2603	group(new Composite());
2247	2604	} else
2248		- if (event.getSource() == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2249	2606	{
2250	2607	RandomNode random = new RandomNode();
2251	2608	group(random);
2252	2609	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2610	+ random.name = random.get(0).name + "Switch";
2254	2611	} else
2255		- if (event.getSource() == physicsItem)
	2612	+ if (source == physicsItem)
2256	2613	{
2257	2614	group(new PhysicsNode());
2258	2615	} else
2259		- if (event.getSource() == frameselectorItem)
	2616	+ if (source == frameselectorItem)
2260	2617	{
2261	2618	for (int i=0; i<group.selection.size(); i++)
2262	2619	{
..	..	@@ -2268,7 +2625,7 @@
2268	2625	ResetModel();
2269	2626	refreshContents();
2270	2627	} else
2271		- if (event.getSource() == switchGeoItem)
	2628	+ if (source == switchGeoItem)
2272	2629	{
2273	2630	for (int i=0; i<group.selection.size(); i++)
2274	2631	{
..	..	@@ -2280,7 +2637,7 @@
2280	2637	ResetModel();
2281	2638	refreshContents();
2282	2639	} else
2283		- if (event.getSource() == switchTransfoItem)
	2640	+ if (source == switchTransfoItem)
2284	2641	{
2285	2642	for (int i=0; i<group.selection.size(); i++)
2286	2643	{
..	..	@@ -2292,7 +2649,7 @@
2292	2649	ResetModel();
2293	2650	refreshContents();
2294	2651	} else
2295		- if (event.getSource() == morphItem)
	2652	+ if (source == morphItem)
2296	2653	{
2297	2654	for (int i=0; i<group.selection.size(); i++)
2298	2655	{
..	..	@@ -2304,7 +2661,7 @@
2304	2661	ResetModel();
2305	2662	refreshContents();
2306	2663	} else
2307		- if (event.getSource() == scriptNodeItem)
	2664	+ if (source == scriptNodeItem)
2308	2665	{
2309	2666	boolean atleastone = false;
2310	2667
..	..	@@ -2343,31 +2700,31 @@
2343	2700	}
2344	2701	}
2345	2702	} else
2346		- if (event.getSource() == linkerItem)
	2703	+ if (source == linkerItem)
2347	2704	{
2348	2705	group(new cLinker());
2349	2706	} else
2350		- if (event.getSource() == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2351	2708	{
2352	2709	group(new TextureNode());
2353	2710	} else
2354		- if (event.getSource() == billboardItem)
	2711	+ if (source == billboardItem)
2355	2712	{
2356	2713	group(new BillboardNode());
2357	2714	} else
2358		- if (event.getSource() == shadowXItem)
	2715	+ if (source == shadowXItem)
2359	2716	{
2360	2717	CastShadow(0);
2361	2718	} else
2362		- if (event.getSource() == shadowYItem)
	2719	+ if (source == shadowYItem)
2363	2720	{
2364	2721	CastShadow(1);
2365	2722	} else
2366		- if (event.getSource() == shadowZItem)
	2723	+ if (source == shadowZItem)
2367	2724	{
2368	2725	CastShadow(2);
2369	2726	} else
2370		- if (event.getSource() == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2371	2728	{
2372	2729	//ungroup();
2373	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2736,203 @@
2379	2736
2380	2737	refreshContents();
2381	2738	} else
2382		- if (event.getSource() == genUVItem)
	2739	+ if (source == genUVItem)
2383	2740	{
2384	2741	GenUV();
2385	2742	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2743	+ if (source == genNormalsCADItem)
2387	2744	{
2388	2745	GenNormals(true);
2389	2746	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2747	+ if (source == genNormalsMESHItem)
2391	2748	{
2392		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2393	2750	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2751	+ if (source == genNormalsORGANItem)
2395	2752	{
2396	2753	GenNormals(false);
2397	2754	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2755	+ if (source == genNormalsMINEItem)
2399	2756	{
2400	2757	GenNormalsMINE();
2401	2758	} else
2402		- if (event.getSource() == stripifyItem)
	2759	+ if (source == stripifyItem)
2403	2760	{
2404	2761	Stripify();
2405	2762	} else
2406		- if (event.getSource() == unstripifyItem)
	2763	+ if (source == unstripifyItem)
2407	2764	{
2408	2765	Unstripify();
2409	2766	} else
2410		- if (event.getSource() == trimItem)
	2767	+ if (source == trimItem)
2411	2768	{
2412	2769	Trim();
2413	2770	} else
2414		- if (event.getSource() == untrimItem)
	2771	+ if (source == untrimItem)
2415	2772	{
2416	2773	Untrim();
2417	2774	} else
2418		- if (event.getSource() == clearColorsItem)
	2775	+ if (source == clearColorsItem)
2419	2776	{
2420	2777	ClearColors();
2421	2778	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2779	+ if (source == clearMaterialsItem)
2423	2780	{
2424	2781	ClearMaterials();
2425	2782	} else
2426		- if (event.getSource() == liveleavesItem)
	2783	+ if (source == liveleavesItem)
2427	2784	{
2428	2785	LiveLeaves(true);
2429	2786	} else
2430		- if (event.getSource() == unliveleavesItem)
	2787	+ if (source == unliveleavesItem)
2431	2788	{
2432	2789	LiveLeaves(false);
2433	2790	} else
2434		- if (event.getSource() == supportleavesItem)
	2791	+ if (source == supportleavesItem)
2435	2792	{
2436	2793	SupportLeaves(true);
2437	2794	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2795	+ if (source == unsupportleavesItem)
2439	2796	{
2440	2797	SupportLeaves(false);
2441	2798	} else
2442		- if (event.getSource() == hideleavesItem)
	2799	+ if (source == hideleavesItem)
2443	2800	{
2444	2801	HideLeaves(true);
2445	2802	} else
2446		- if (event.getSource() == showleavesItem)
	2803	+ if (source == showleavesItem)
2447	2804	{
2448	2805	HideLeaves(false);
2449	2806	} else
2450		- if (event.getSource() == markleavesItem)
	2807	+ if (source == markleavesItem)
2451	2808	{
2452	2809	MarkLeaves(true);
2453	2810	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2811	+ if (source == unmarkleavesItem)
2455	2812	{
2456	2813	MarkLeaves(false);
2457	2814	} else
2458		- if (event.getSource() == flipVItem)
	2815	+ if (source == rewindleavesItem)
	2816	+ {
	2817	+ RewindLeaves(true);
	2818	+ } else
	2819	+ if (source == unrewindleavesItem)
	2820	+ {
	2821	+ RewindLeaves(false);
	2822	+ } else
	2823	+ if (source == randomleavesItem)
	2824	+ {
	2825	+ RandomLeaves(true);
	2826	+ } else
	2827	+ if (source == unrandomleavesItem)
	2828	+ {
	2829	+ RandomLeaves(false);
	2830	+ } else
	2831	+ if (source == flipVItem)
2459	2832	{
2460	2833	FlipV(true);
2461	2834	} else
2462		- if (event.getSource() == unflipVItem)
	2835	+ if (source == unflipVItem)
2463	2836	{
2464	2837	FlipV(false);
2465	2838	} else
2466		- if (event.getSource() == lowTexturesItem)
	2839	+ if (source == lowTexturesItem)
2467	2840	{
2468	2841	SetTexRes(0);
2469	2842	} else
2470		- if (event.getSource() == normalTexturesItem)
	2843	+ if (source == normalTexturesItem)
2471	2844	{
2472	2845	SetTexRes(1);
2473	2846	} else
2474		- if (event.getSource() == highTexturesItem)
	2847	+ if (source == highTexturesItem)
2475	2848	{
2476	2849	SetTexRes(2);
2477	2850	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2851	+ if (source == veryhighTexturesItem)
2479	2852	{
2480	2853	SetTexRes(3);
2481	2854	} else
2482		- if (event.getSource() == maxTexturesItem)
	2855	+ if (source == maxTexturesItem)
2483	2856	{
2484	2857	SetTexRes(4);
2485	2858	} else
2486		- if (event.getSource() == panoTexturesItem)
	2859	+ if (source == panoTexturesItem)
2487	2860	{
2488	2861	SetTexRes(5);
2489	2862	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2863	+ if (source == reverseNormalsItem)
2491	2864	{
2492	2865	ReverseNormals();
2493	2866	} else
2494		- if (event.getSource() == parseverticesItem)
	2867	+ if (source == parseverticesItem)
2495	2868	{
2496	2869	ParseVertices();
2497	2870	} else
2498		- if (event.getSource() == textureFieldItem)
	2871	+ if (source == textureFieldItem)
2499	2872	{
2500	2873	TextureVertices();
2501	2874	} else
2502		- if (event.getSource() == alignItem)
	2875	+ if (source == alignItem)
2503	2876	{
2504	2877	Align();
2505	2878	} else
2506		- if (event.getSource() == mirrorItem)
	2879	+ if (source == mirrorItem)
2507	2880	{
2508	2881	MirrorPoses();
2509	2882	} else
2510		- if (event.getSource() == reduceMorphItem)
	2883	+ if (source == reduceMorphItem)
2511	2884	{
2512	2885	MeshReduction(false);
2513	2886	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2887	+ if (source == reduce34MorphItem)
2515	2888	{
2516	2889	MeshReduction(true);
2517	2890	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2891	+ if (source == reverseTrianglesItem)
2519	2892	{
2520	2893	ReverseTriangles();
2521	2894	} else
2522		- if (event.getSource() == reduceMeshItem)
	2895	+ if (source == reduceMeshItem)
2523	2896	{
2524	2897	ReduceMesh(false);
2525	2898	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2899	+ if (source == reduce34MeshItem)
2527	2900	{
2528	2901	ReduceMesh(true);
2529	2902	} else
2530		- if (event.getSource() == increaseMeshItem)
	2903	+ if (source == increaseMeshItem)
2531	2904	{
2532	2905	IncreaseMesh();
2533	2906	} else
2534		- if (event.getSource() == clipMeshItem)
	2907	+ if (source == clipMeshItem)
2535	2908	{
2536	2909	ClipMesh();
2537	2910	} else
2538		- if (event.getSource() == smoothMeshItem)
	2911	+ if (source == smoothMeshItem)
2539	2912	{
2540	2913	SmoothMesh();
2541	2914	} else
2542		- if (event.getSource() == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2543	2916	{
2544	2917	TransformGeometry();
2545	2918	} else
2546		- if (event.getSource() == resetTransformItem)
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
	2922	+ } else
	2923	+ if (source == resetTransformItem)
2547	2924	{
2548	2925	ResetTransform();
2549	2926	} else
2550		- if (event.getSource() == resetCentroidItem)
	2927	+ if (source == resetCentroidItem)
2551	2928	{
2552		- ResetCentroid();
	2929	+ ResetCentroid(true);
2553	2930	} else
2554		- if (event.getSource() == resetParentItem)
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
	2934	+ } else
	2935	+ if (source == resetParentItem)
2555	2936	{
2556	2937	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2938	{
..	..	@@ -2561,7 +2942,7 @@
2561	2942
2562	2943	refreshContents();
2563	2944	} else
2564		- if (event.getSource() == repairParentItem)
	2945	+ if (source == repairParentItem)
2565	2946	{
2566	2947	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2948	{
..	..	@@ -2575,7 +2956,7 @@
2575	2956
2576	2957	refreshContents();
2577	2958	} else
2578		- if (event.getSource() == repairShadowItem)
	2959	+ if (source == repairShadowItem)
2579	2960	{
2580	2961	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2962	{
..	..	@@ -2589,7 +2970,7 @@
2589	2970
2590	2971	refreshContents();
2591	2972	} else
2592		- if (event.getSource() == sortbysizeItem)
	2973	+ if (source == sortbysizeItem)
2593	2974	{
2594	2975	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2976	{
..	..	@@ -2601,7 +2982,7 @@
2601	2982	ResetModel();
2602	2983	refreshContents();
2603	2984	} else
2604		- if (event.getSource() == sortbynameItem)
	2985	+ if (source == sortbynameItem)
2605	2986	{
2606	2987	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2988	{
..	..	@@ -2613,7 +2994,7 @@
2613	2994	ResetModel();
2614	2995	refreshContents();
2615	2996	} else
2616		- if (event.getSource() == attachPigmentItem)
	2997	+ if (source == attachPigmentItem)
2617	2998	{
2618	2999	String texture = GetFile("Attach pigment");
2619	3000	Object3D obj;
..	..	@@ -2625,7 +3006,7 @@
2625	3006
2626	3007	refreshContents();
2627	3008	} else
2628		- if (event.getSource() == detachPigmentItem)
	3009	+ if (source == detachPigmentItem)
2629	3010	{
2630	3011	Object3D obj;
2631	3012	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +3017,7 @@
2636	3017
2637	3018	refreshContents();
2638	3019	} else
2639		- if (event.getSource() == attachBumpItem)
	3020	+ if (source == attachBumpItem)
2640	3021	{
2641	3022	String texture = GetFile("Attach bump");
2642	3023	Object3D obj;
..	..	@@ -2648,7 +3029,7 @@
2648	3029
2649	3030	refreshContents();
2650	3031	} else
2651		- if (event.getSource() == detachBumpItem)
	3032	+ if (source == detachBumpItem)
2652	3033	{
2653	3034	Object3D obj;
2654	3035	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +3040,7 @@
2659	3040
2660	3041	refreshContents();
2661	3042	} else
2662		- if (event.getSource() == pigmentBumpItem)
	3043	+ if (source == pigmentBumpItem)
2663	3044	{
2664	3045	Object3D obj;
2665	3046	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +3051,237 @@
2670	3051
2671	3052	refreshContents();
2672	3053	} else
2673		- if (event.getSource() == flashSelectionButton)
	3054	+ if (source == flashSelectionButton)
2674	3055	{
2675	3056	CameraPane.flash = true;
2676	3057	refreshContents();
2677	3058	} else
2678		- if (event.getSource() == oneButton)
	3059	+ if (source == oneButton)
2679	3060	{
2680	3061	} else
2681		- if (event.getSource() == twoButton)
	3062	+ if (source == twoButton)
2682	3063	{
2683	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2684	3069	// bug
2685	3070	//gridPanel.setDividerLocation(1.0);
2686	3071	//bigPanel.setDividerLocation(0.0);
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		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3072	+// bigThree.remove(scenePanel);
	3073	+// bigThree.remove(centralPanel);
	3074	+// bigThree.remove(XYZPanel);
	3075	+// aWindowConstraints.gridx = 0;
	3076	+// aWindowConstraints.gridy = 0;
	3077	+// aWindowConstraints.gridwidth = 1;
	3078	+// // aConstraints.gridheight = 3;
	3079	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3080	+// aWindowConstraints.weightx = 0;
	3081	+// aWindowConstraints.weighty = 1;
	3082	+// //bigThree.add(jtp, aWindowConstraints);
	3083	+// aWindowConstraints.weightx = 1;
	3084	+// aWindowConstraints.gridwidth = 3;
	3085	+// // aConstraints.gridheight = 3;
	3086	+// aWindowConstraints.gridx = 1;
	3087	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3088	+// bigThree.add(centralPanel, aWindowConstraints);
	3089	+// aWindowConstraints.weightx = 0;
	3090	+// aWindowConstraints.gridx = 4;
	3091	+// aWindowConstraints.gridwidth = 1;
	3092	+// // aConstraints.gridheight = 3;
	3093	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3094	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3095	+// scenePanel.setVisible(false);
	3096	+// centralPanel.setVisible(true);
	3097	+// XYZPanel.setVisible(false);
	3098	+ bigThree.ClearUI();
	3099	+ bigThree.add(centralPanel);
	3100	+ bigThree.FlushUI();
	3101	+
	3102	+ cameraView.requestFocusInWindow();
	3103	+
	3104	+// refreshContents(true);
	3105	+//
	3106	+// try
	3107	+// {
	3108	+// java.awt.Robot bot = new java.awt.Robot();
	3109	+// int mask = InputEvent.BUTTON1_MASK;
	3110	+// bot.mouseMove(100, 100);
	3111	+// bot.mousePress(mask);
	3112	+// bot.mouseRelease(mask);
	3113	+// }
	3114	+// catch (Exception e)
	3115	+// {
	3116	+//
	3117	+// }
	3118	+
2711	3119	} else
2712		- if (event.getSource() == threeButton)
	3120	+ if (source == threeButton)
2713	3121	{
2714	3122	radio.layout = threeButton;
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		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, 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(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
	3126	+
	3127	+// bigThree.remove(scenePanel);
	3128	+// bigThree.remove(centralPanel);
	3129	+// bigThree.remove(XYZPanel);
	3130	+// aWindowConstraints.gridx = 0;
	3131	+// aWindowConstraints.gridy = 0;
	3132	+// aWindowConstraints.gridwidth = 1;
	3133	+// // aConstraints.gridheight = 3;
	3134	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3135	+// aWindowConstraints.weightx = 0;
	3136	+// aWindowConstraints.weighty = 1;
	3137	+// //bigThree.add(jtp, aWindowConstraints);
	3138	+// aWindowConstraints.weightx = 1;
	3139	+// aWindowConstraints.gridwidth = 3;
	3140	+// // aConstraints.gridheight = 3;
	3141	+// aWindowConstraints.gridx = 1;
	3142	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3143	+// bigThree.add(centralPanel, aWindowConstraints);
	3144	+// aWindowConstraints.weightx = 0;
	3145	+// aWindowConstraints.gridx = 4;
	3146	+// aWindowConstraints.gridwidth = 1;
	3147	+// // aConstraints.gridheight = 3;
	3148	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3149	+// bigThree.add(XYZPanel, aWindowConstraints);
	3150	+// bigThree.validate();
	3151	+// scenePanel.setVisible(false);
	3152	+// centralPanel.setVisible(true);
	3153	+// XYZPanel.setVisible(true);
	3154	+ bigThree.ClearUI();
	3155	+ bigThree.add(centralPanel);
	3156	+ bigThree.add(XYZPanel);
	3157	+ bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2739	3160	} else
2740		- if (event.getSource() == fourButton)
	3161	+ if (source == fourButton)
2741	3162	{
2742	3163	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, 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, aWindowConstraints);
2766		- bigThree.revalidate();
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
	3167	+
	3168	+// bigThree.remove(scenePanel);
	3169	+// bigThree.remove(centralPanel);
	3170	+// bigThree.remove(XYZPanel);
	3171	+// aWindowConstraints.gridx = 0;
	3172	+// aWindowConstraints.gridy = 0;
	3173	+// aWindowConstraints.gridwidth = 1;
	3174	+// // aWindowConstraints.gridheight = 3;
	3175	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3176	+// aWindowConstraints.weightx = 1;
	3177	+// aWindowConstraints.weighty = 1;
	3178	+// bigThree.add(scenePanel, aWindowConstraints);
	3179	+// aWindowConstraints.weightx = 1;
	3180	+// aWindowConstraints.gridwidth = 3;
	3181	+// // aConstraints.gridheight = 3;
	3182	+// aWindowConstraints.gridx = 1;
	3183	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3184	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.gridx = 4;
	3187	+// aWindowConstraints.gridwidth = 1;
	3188	+// // aWindowConstraints.gridheight = 3;
	3189	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3190	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3191	+// bigThree.validate();
	3192	+// scenePanel.setVisible(true);
	3193	+// centralPanel.setVisible(false);
	3194	+// XYZPanel.setVisible(false);
	3195	+ bigThree.ClearUI();
	3196	+ bigThree.add(scenePanel);
	3197	+ bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2767	3200	} else
2768		- if (event.getSource() == sixButton)
	3201	+ if (source == sixButton)
2769	3202	{
2770	3203	radio.layout = sixButton;
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		- // aConstraints.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		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
	3207	+
	3208	+// bigThree.remove(scenePanel);
	3209	+// bigThree.remove(centralPanel);
	3210	+// bigThree.remove(XYZPanel);
	3211	+// aWindowConstraints.gridx = 0;
	3212	+// aWindowConstraints.gridy = 0;
	3213	+// aWindowConstraints.gridwidth = 1;
	3214	+// // aConstraints.gridheight = 3;
	3215	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3216	+// aWindowConstraints.weightx = 0;
	3217	+// aWindowConstraints.weighty = 1;
	3218	+// bigThree.add(scenePanel, aWindowConstraints);
	3219	+// aWindowConstraints.weightx = 1;
	3220	+// aWindowConstraints.gridwidth = 3;
	3221	+// // aWindowConstraints.gridheight = 3;
	3222	+// aWindowConstraints.gridx = 1;
	3223	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3224	+// bigThree.add(centralPanel, aWindowConstraints);
	3225	+// aWindowConstraints.weightx = 0;
	3226	+// aWindowConstraints.gridx = 4;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aWindowConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3230	+// //bigThree.add(XYZPanel, aConstraints);
	3231	+// bigThree.validate();
	3232	+// scenePanel.setVisible(true);
	3233	+// centralPanel.setVisible(true);
	3234	+// XYZPanel.setVisible(false);
	3235	+ bigThree.ClearUI();
	3236	+ bigThree.add(scenePanel);
	3237	+ bigThree.add(centralPanel);
	3238	+ bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2795	3241	} else
2796		- if (event.getSource() == sevenButton)
	3242	+ if (source == sevenButton)
2797	3243	{
2798	3244	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
	3248	+
	3249	+// bigThree.remove(scenePanel);
	3250	+// bigThree.remove(centralPanel);
	3251	+// bigThree.remove(XYZPanel);
	3252	+// aWindowConstraints.gridx = 0;
	3253	+// aWindowConstraints.gridy = 0;
	3254	+// aWindowConstraints.gridwidth = 1;
	3255	+// // aWindowConstraints.gridheight = 3;
	3256	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3257	+// aWindowConstraints.weightx = 0;
	3258	+// aWindowConstraints.weighty = 1;
	3259	+// bigThree.add(scenePanel, aWindowConstraints);
	3260	+// aWindowConstraints.weightx = 1;
	3261	+// aWindowConstraints.gridwidth = 3;
	3262	+// // aWindowConstraints.gridheight = 3;
	3263	+// aWindowConstraints.gridx = 1;
	3264	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3265	+// bigThree.add(centralPanel, aWindowConstraints);
	3266	+// aWindowConstraints.weightx = 0;
	3267	+// aWindowConstraints.gridx = 4;
	3268	+// aWindowConstraints.gridwidth = 1;
	3269	+// // aConstraints.gridheight = 3;
	3270	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3271	+// bigThree.add(XYZPanel, aWindowConstraints);
	3272	+// bigThree.validate();
	3273	+// scenePanel.setVisible(true);
	3274	+// centralPanel.setVisible(true);
	3275	+// XYZPanel.setVisible(true);
	3276	+ bigThree.ClearUI();
	3277	+ bigThree.add(scenePanel);
	3278	+ bigThree.add(centralPanel);
	3279	+ bigThree.add(XYZPanel);
	3280	+ bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2823	3283	} else
2824		- if (event.getSource() == rootButton)
	3284	+ if (source == rootButton)
2825	3285	{
2826	3286	Object3D obj;
2827	3287	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,34 +3291,44 @@
2831	3291	EditObject(obj);
2832	3292	}
2833	3293
	3294	+ cameraView.requestFocusInWindow();
2834	3295	refreshContents(true);
2835	3296	} else
2836		- if (event.getSource() == closeButton)
	3297	+ if (source == closeButton)
2837	3298	{
2838	3299	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3300	cRadio ab;
2840	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2841	3302	{
2842	3303	ab = (cRadio)e.nextElement();
2843		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2844	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2845	3312	buttonGroup.remove(ab);
2846	3313	radioPanel.remove(ab);
2847	3314
2848		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2849	3317	// ab.GetObject().objectUI = null; // ?????????
2850	3318
2851	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2852	3320	break;
2853	3321	}
2854	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2855	3325	refreshContents(true);
2856	3326	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3327	+ if (source == editItem \|\| source == editButton)
2858	3328	{
2859	3329	EditSelection(false);
2860	3330	} else
2861		- if (event.getSource() == uneditButton)
	3331	+ if (source == uneditButton)
2862	3332	{
2863	3333	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3334	{
..	..	@@ -2868,14 +3338,14 @@
2868	3338	child.CloseUI();
2869	3339	listUI.remove(child);
2870	3340
2871		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2872	3342	}
2873		- objEditor.ctrlPanel.revalidate();
	3343	+ objEditor.ctrlPanel.FlushUI();
2874	3344	//objEditor.jTree.clearSelection();
2875	3345	//objEditor.ResetSliders();
2876	3346	refreshContents(true);
2877	3347	} else
2878		- if (event.getSource() == clearPanelButton)
	3348	+ if (source == clearPanelButton)
2879	3349	{
2880	3350	assert(copy == group);
2881	3351	//copy.ClearUI();
..	..	@@ -2886,7 +3356,7 @@
2886	3356	listUI.clear();
2887	3357	refreshContents(true);
2888	3358	} else
2889		- if (event.getSource() == allParamsButton)
	3359	+ if (source == allParamsButton)
2890	3360	{
2891	3361	assert(copy == group);
2892	3362
..	..	@@ -2907,19 +3377,19 @@
2907	3377
2908	3378	refreshContents(true);
2909	3379	} else
2910		- if (event.getSource() == unselectButton)
	3380	+ if (source == unselectButton)
2911	3381	{
2912	3382	objEditor.jTree.clearSelection();
2913	3383	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3384	objEditor.ResetSliders();
2915	3385	refreshContents(true);
2916	3386	} else
2917		- if(event.getSource() instanceof cRadio)
	3387	+ if(source instanceof cRadio)
2918	3388	{
2919	3389	group.parent = keepparent;
2920	3390	group.attributes = 0;
2921	3391	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3392	+ /cRadio/ radio = (cRadio)source;
2923	3393	Object3D obj = radio.GetObject();
2924	3394	System.out.println("Edit " + obj);
2925	3395	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2954,7 +3424,11 @@
2954	3424	frontView.object = group;
2955	3425	sideView.object = group;
2956	3426	}
2957		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
2958	3432	/*
2959	3433	currentLayout = radio.layout;
2960	3434	if (currentLayout == null)
..	..	@@ -2966,8 +3440,23 @@
2966	3440	//group.parent = null; // ROOT
2967	3441	//group.attributes = -1;
2968	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
2969	3445	refreshContents(true);
2970		- }
	3446	+ } else if (event.getSource() == editCameraItem)
	3447	+ {
	3448	+ cameraView.ProtectCamera();
	3449	+ cameraView.repaint();
	3450	+ return;
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3452	+ {
	3453	+ cameraView.RevertCamera();
	3454	+ cameraView.repaint();
	3455	+ return;
	3456	+ // } else if (event.getSource() == textureButton)
	3457	+ // {
	3458	+ // return; // true;
	3459	+ }
2971	3460	else
2972	3461	{
2973	3462	//return super.action(event, arg);
..	..	@@ -2976,7 +3465,6 @@
2976	3465	}
2977	3466
2978	3467	boolean useclient = false;
2979		- cRadio radio;
2980	3468
2981	3469	void ToggleRoot()
2982	3470	{
..	..	@@ -3028,6 +3516,28 @@
3028	3516	refreshContents();
3029	3517	}
3030	3518
	3519	+ void TransformChildren()
	3520	+ {
	3521	+ Object3D obj;
	3522	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3523	+ {
	3524	+ obj = (Object3D)e.nextElement();
	3525	+ obj.KeepTextureMatrices();
	3526	+ obj.TransformChildren();
	3527	+ obj.RestoreTextureMatrices();
	3528	+
	3529	+// if (obj.parent == null)
	3530	+// {
	3531	+// System.out.println("NULL PARENT!");
	3532	+// new Exception().printStackTrace();
	3533	+// }
	3534	+// else
	3535	+// TouchTransform(obj);
	3536	+// //obj.parent.Touch();
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
3031	3541
3032	3542	void ResetTransform()
3033	3543	{
..	..	@@ -3140,7 +3650,7 @@
3140	3650	refreshContents();
3141	3651	}
3142	3652
3143		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3144	3654	{
3145	3655	Object3D obj;
3146	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3665,16 @@
3155	3665	LA.matIdentity(Object3D.mat);
3156	3666	obj.getBounds(minima, maxima, false);
3157	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3161	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3164	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3703,8 @@
3189	3703
3190	3704	int size = obj.MemorySize();
3191	3705
3192		- System.err.println((size/1024) + " KB is the size of " + obj);
	3706	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3707	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3193	3708	}
3194	3709	}
3195	3710	catch (Exception e)
..	..	@@ -3226,9 +3741,9 @@
3226	3741	obj = (Object3D)e.nextElement();
3227	3742
3228	3743	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3230	3745	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3747
3233	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3749	}
..	..	@@ -3270,6 +3785,13 @@
3270	3785	void GenNormals(boolean crease)
3271	3786	{
3272	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3273	3795
3274	3796	refreshContents();
3275	3797	}
..	..	@@ -3442,8 +3964,8 @@
3442	3964
3443	3965	void ParseVertices()
3444	3966	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3447	3969
3448	3970	for (int i=0; i<group.selection.size(); i++)
3449	3971	{
..	..	@@ -3468,7 +3990,7 @@
3468	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3992
3471		- g.add(GrafreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3472	3994
3473	3995	buffer.add(g);
3474	3996	}
..	..	@@ -3483,7 +4005,7 @@
3483	4005	makeSomething(buffer, i==group.selection.size()-1);
3484	4006	}
3485	4007
3486		- GrafreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3487	4009
3488	4010	refreshContents();
3489	4011	}
..	..	@@ -3501,7 +4023,16 @@
3501	4023	String pigment = Object3D.GetPigment(tex);
3502	4024	//String bump = Object3D.GetBump(tex);
3503	4025
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4026	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4027	+
	4028	+ try
	4029	+ {
	4030	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4031	+ }
	4032	+ catch (Exception e)
	4033	+ {
	4034	+ System.err.println("FAIL: " + node);
	4035	+ }
3505	4036
3506	4037	double s = v.s;
3507	4038
..	..	@@ -3589,11 +4120,11 @@
3589	4120
3590	4121	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	4122
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	4123	+ boolean random = CameraPane.SWITCH;
	4124	+ CameraPane.SWITCH = false; // parse all random nodes
3594	4125	lowres.linkVerticesThis(null);
3595	4126	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	4127	+ CameraPane.SWITCH = random;
3597	4128
3598	4129	System.err.flush();
3599	4130
..	..	@@ -3633,7 +4164,7 @@
3633	4164	return;
3634	4165
3635	4166	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3637	4168
3638	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	4170
..	..	@@ -3827,9 +4358,9 @@
3827	4358
3828	4359	void ClipMesh()
3829	4360	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4362	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3833	4364
3834	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4366	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4369,7 @@
3838	4369	// {
3839	4370	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4371	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4373	}
3843	4374	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4375	System.out.println("DONE.");
..	..	@@ -3885,6 +4416,18 @@
3885	4416	void MarkLeaves(boolean hide)
3886	4417	{
3887	4418	group.selection.MarkLeaves(hide);
	4419	+ refreshContents();
	4420	+ }
	4421	+
	4422	+ void RewindLeaves(boolean hide)
	4423	+ {
	4424	+ group.selection.RewindLeaves(hide);
	4425	+ refreshContents();
	4426	+ }
	4427	+
	4428	+ void RandomLeaves(boolean hide)
	4429	+ {
	4430	+ group.selection.RandomLeaves(hide);
3888	4431	refreshContents();
3889	4432	}
3890	4433
..	..	@@ -3970,10 +4513,10 @@
3970	4513	{
3971	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3972	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4517
3975	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
3977	4520	{
3978	4521	// if (!(elem instanceof Composite))
3979	4522	// newWindow = false;
..	..	@@ -4063,7 +4606,6 @@
4063	4606	//case 702: // Event.LIST_DESELECT
4064	4607	group.deselectAll();
4065	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4609	if (tps != null)
4068	4610	{
4069	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,29 +4614,28 @@
4072	4614
4073	4615	//if (child.parent != null)
4074	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4075	4618	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4619	}
4080	4620	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4621	+// else
	4622	+// {
	4623	+// objEditor.SetMaterial(group); // .GetMaterial());
	4624	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4625	+// System.err.println("info : " + group.GetPath());
	4626	+// }
4087	4627
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4629	CameraPane.flash = true;
4092	4630
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4632	// a camera
4095	4633	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4635	+ {
	4636	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4637	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4638	+ }
4098	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4641	}
..	..	@@ -4107,6 +4648,27 @@
4107	4648
4108	4649	freezemodel = false;
4109	4650	}
	4651	+
	4652	+ void refreshContents(boolean cp)
	4653	+ {
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4656	+ {
	4657	+ objEditor.ClearInfo(); // .GetMaterial());
	4658	+
	4659	+ for (int i=0; i < group.selection.Size(); i++)
	4660	+ {
	4661	+ Object3D child = (Object3D) group.selection.get(i);
	4662	+
	4663	+ objEditor.AddInfo(child, this, true);
	4664	+ System.err.println("info : " + child.GetPath());
	4665	+ }
	4666	+
	4667	+ objEditor.SetText(); // jan 2014
	4668	+ }
	4669	+
	4670	+ super.refreshContents(cp);
	4671	+ }
4110	4672
4111	4673	void linkSomething(Object3D thing)
4112	4674	{
..	..	@@ -4178,16 +4740,19 @@
4178	4740	{
4179	4741	if (group.selection.isEmpty())
4180	4742	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4182	4745	Composite tGroup = null;
4183	4746	if (group.selection.size() > 0) // 1)
4184	4747	{
4185	4748	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4187	4750	}
4188	4751
4189	4752	if (cut)
4190	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4191	4756	//int indices[] = jList.getSelectedIndices();
4192	4757	//for (int i = indices.length - 1; i >= 0; i--)
4193	4758	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4788,16 @@
4223	4788	//System.out.println("cut " + child);
4224	4789	//System.out.println("parent = " + child.parent);
4225	4790	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4227	4792	tGroup.add/Child/(tmp);
4228	4793	else
4229		- GrafreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4230	4795	}
4231	4796	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4233	4798	tGroup.add/Child/(child);
4234	4799	else
4235		- GrafreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4236	4801	}
4237	4802
4238	4803	//ResetModel();
..	..	@@ -4264,21 +4829,23 @@
4264	4829	//System.out.println("cut " + elem);
4265	4830	//System.out.println("parent = " + elem.parent);
4266	4831	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4268	4833	tGroup.add/Child/(tmp);
4269	4834	else
4270		- GrafreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4271	4836	}
4272	4837	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4274	4839	tGroup.add/Child/(child);
4275	4840	else
4276		- GrafreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4277	4842	}
4278	4843
4279	4844	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4282	4849	if (cut)
4283	4850	{
4284	4851	ResetModel();
..	..	@@ -4292,7 +4859,7 @@
4292	4859	// return;
4293	4860	boolean first = true;
4294	4861
4295		- if (GrafreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4296	4863	{
4297	4864	Composite temp;
4298	4865
..	..	@@ -4303,7 +4870,7 @@
4303	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4871	*/
4305	4872	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4873	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	4874	{
4308	4875	Object3D child = (Object3D)e.nextElement();
4309	4876
..	..	@@ -4337,21 +4904,21 @@
4337	4904	//Object3D cb = Applet3D.clipboard;
4338	4905	//temp.addChild(cb);
4339	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4907	+ assert(Grafreed.clipboard.parent == null);
	4908	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4909	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4910	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4911	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	4912	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4915	}
4349	4916
4350	4917	ResetModel();
4351	4918	refreshContents();
4352	4919	}
4353	4920
4354		- void pasteInto(boolean copyit)
	4921	+ void pasteInto(boolean copyit, boolean clone)
4355	4922	{
4356	4923	// if (GrafreeD.clipboard == null)
4357	4924	// return;
..	..	@@ -4380,15 +4947,22 @@
4380	4947	if (copyit)
4381	4948	{
4382	4949	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4950	+ if (clone)
	4951	+ {
	4952	+ CloneClipboard(false); // sept 2014
	4953	+ }
	4954	+ else
	4955	+ {
	4956	+ paste(false);
	4957	+ }
4384	4958	}
4385	4959	else
4386	4960	{
4387	4961	boolean first = true;
4388	4962
4389		- if (GrafreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4390	4964	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4966	Object3D copy;
4393	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4968	{
..	..	@@ -4398,7 +4972,7 @@
4398	4972	}
4399	4973	} else
4400	4974	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4976	}
4403	4977	}
4404	4978	}
..	..	@@ -4803,21 +5377,6 @@
4803	5377	}
4804	5378	*/
4805	5379
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5380	/*
4822	5381	public void Callback(Object obj)
4823	5382	{
..	..	@@ -4841,26 +5400,9 @@
4841	5400	}
4842	5401	*/
4843	5402
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5403	String GetFile(String dialogName)
4862	5404	{
4863		- if (GrafreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4864	5406	{
4865	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5408	browser.show();
..	..	@@ -4924,10 +5466,38 @@
4924	5466	cButton flashSelectionButton;
4925	5467	cButton editButton;
4926	5468	cButton uneditButton;
	5469	+ JCheckBox allParamsButton;
4927	5470	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5471	cButton unselectButton;
4930	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
	5481	+ cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
	5500	+
4931	5501	cButton screenfitButton;
4932	5502	cButton screenfitpointButton;
4933	5503	cButton snapobjectButton;
..	..	@@ -4939,14 +5509,6 @@
4939	5509
4940	5510	cButton setsupportButton;
4941	5511
4942		- cButton twoButton;
4943		- cButton sixButton;
4944		- cButton threeButton;
4945		- cButton sevenButton;
4946		- cButton fourButton; // full panel
4947		- cButton oneButton; // full XYZ
4948		- //cButton currentLayout;
4949		-
4950	5512	//
4951	5513	//Composite
4952	5514	Object3D // to do !!
..	..	@@ -4956,9 +5518,11 @@
4956	5518	//JTree jTree;
4957	5519	private MenuItem lookAtItem;
4958	5520	private MenuItem lookFromItem;
4959		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
4960	5522	private MenuItem cutItem;
4961		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
4962	5526	private MenuItem cloneItem;
4963	5527	private MenuItem cloneSupportItem;
4964	5528	private MenuItem overwriteGeoItem;
..	..	@@ -4971,7 +5535,7 @@
4971	5535	private MenuItem linkverticesItem;
4972	5536	private MenuItem relinkverticesItem;
4973	5537	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
4975	5539	private MenuItem stepAllItem;
4976	5540	private MenuItem revertMeshItem;
4977	5541	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5546,7 @@
4982	5546	private MenuItem mergeGeometriesItem;
4983	5547	private MenuItem copyItem;
4984	5548	private MenuItem pasteItem;
	5549	+ private MenuItem pasteIntoItem;
4985	5550	private MenuItem pasteLinkItem;
4986	5551	private MenuItem pasteCloneItem;
4987	5552	private MenuItem pasteExpandItem;
..	..	@@ -5020,6 +5585,10 @@
5020	5585	private MenuItem showleavesItem;
5021	5586	private MenuItem markleavesItem;
5022	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5023	5592
5024	5593	private MenuItem flipVItem;
5025	5594	private MenuItem unflipVItem;
..	..	@@ -5031,15 +5600,17 @@
5031	5600	private MenuItem panoTexturesItem;
5032	5601
5033	5602	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
5035	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
5036	5607	private MenuItem hideItem;
5037	5608	private MenuItem grabItem;
5038	5609	private MenuItem backItem;
5039	5610	private MenuItem frontItem;
5040	5611	private MenuItem cameraItem;
5041	5612	private MenuItem compositeItem;
5042		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5043	5614	private MenuItem physicsItem;
5044	5615	private MenuItem frameselectorItem;
5045	5616	private MenuItem scriptNodeItem;
..	..	@@ -5079,7 +5650,7 @@
5079	5650	private MenuItem blobItem;
5080	5651	private MenuItem latheItem;
5081	5652	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5653	+ private MenuItem overlayItem;
5083	5654	private MenuItem meshItem;
5084	5655	// private MenuItem meshGroupItem;
5085	5656	private MenuItem springItem;
..	..	@@ -5101,11 +5672,6 @@
5101	5672	private MenuItem doubleItem;
5102	5673	private MenuItem tripleItem;
5103	5674
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5675	private MenuItem computeAOItem;
5110	5676	private MenuItem recompileItem;
5111	5677	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5681,8 @@
5115	5681	private MenuItem analyzeItem;
5116	5682	private MenuItem dumpItem;
5117	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
5118	5688	}