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