~nbriere/GrafreeD.git - Noware Git Repository

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