~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,8 +148,131 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ oe.jTree = new cTree();
	154	+
	155	+ Menu menu;
	156	+ oe.menuBar.add(menu = new Menu("Edit"));
	157	+ //editItem = menu.add(new MenuItem("Edit"));
	158	+ //editItem.addActionListener(this);
	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"));
	166	+ duplicateItem.addActionListener(this);
	167	+ cloneItem = menu.add(new MenuItem("Clone"));
	168	+ cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
	171	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	172	+ cloneSupportItem.addActionListener(this);
	173	+ }
	174	+ menu.add("-");
	175	+ cutItem = menu.add(new MenuItem("Cut"));
	176	+ cutItem.addActionListener(this);
	177	+ copyItem = menu.add(new MenuItem("Copy"));
	178	+ copyItem.addActionListener(this);
	179	+ pasteItem = menu.add(new MenuItem("Paste"));
	180	+ pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
	185	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	186	+ pasteLinkItem.addActionListener(this);
	187	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	188	+ pasteCloneItem.addActionListener(this);
	189	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	190	+// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
	192	+ clearItem = menu.add(new MenuItem("Clear"));
	193	+ clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
	198	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	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(revertCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ revertCameraItem.addActionListener(this);
	209	+
	210	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+ toggleFullScreenItem.addItemListener(this);
	212	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+ cameraMenu.add("-");
	214	+
	215	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+ toggleTextureItem.addItemListener(this);
	217	+ toggleTextureItem.setState(CameraPane.textureon);
	218	+
	219	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+ toggleSwitchItem.addItemListener(this);
	221	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
	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	+ {
152	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	278	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +284,17 @@
160	284	lookAtItem.addActionListener(this);
161	285	//lookFromItem.addActinoListener(this);
162	286	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	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,17 +306,26 @@
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);
	321	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	322	+ relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
222	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	327	setMasterItem.addActionListener(this);
	328	+ }
224	329
225	330	oe.menuBar.add(menu = new Menu("Group"));
226	331	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,52 +336,75 @@
231	336	frontItem.addActionListener(this);
232	337	compositeItem = menu.add(new MenuItem("Composite"));
233	338	compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	343	+ hideItem.addActionListener(this);
	344	+ }
	345	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	346	+ ungroupItem.addActionListener(this);
	347	+
234	348	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	349	+
	350	+ randomItem = menu.add(new MenuItem("Switch node"));
236	351	randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
241	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	355	switchGeoItem.addActionListener(this);
243	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	357	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	367	scriptNodeItem.addActionListener(this);
249	368	cameraItem = menu.add(new MenuItem("Camera"));
250	369	cameraItem.addActionListener(this);
	370	+ }
251	371
252	372	oe.menuBar.add(menu = new Menu("Object"));
253	373	textureItem = menu.add(new MenuItem("Texture"));
254	374	textureItem.addActionListener(this);
	375	+ billboardItem = menu.add(new MenuItem("Billboard"));
	376	+ billboardItem.addActionListener(this);
255	377	csgItem = menu.add(new MenuItem("CSG"));
256	378	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	379	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	380	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	381	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	382	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	383	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	384	shadowZItem.addActionListener(this);
	385	+ if (Globals.ADVANCED)
	386	+ {
	387	+ menu.add("-");
263	388	linkerItem = menu.add(new MenuItem("Linker"));
264	389	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	390	attributeItem = menu.add(new MenuItem("Attribute"));
268	391	attributeItem.addActionListener(this);
	392	+ templateItem = menu.add(new MenuItem("Template"));
	393	+ templateItem.addActionListener(this);
269	394	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	395	pointflowItem.addActionListener(this);
	396	+ }
271	397	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	398	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	399	resetTransformItem.addActionListener(this);
276	400	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	401	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	402	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	403	+ resetCentroidXZItem.addActionListener(this);
	404	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	405	+ transformGeometryItem.addActionListener(this);
	406	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	407	+ transformChildrenItem.addActionListener(this);
280	408
281	409	oe.menuBar.add(menu = new Menu("Geometry"));
282	410	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +413,13 @@
285	413	genNormalsORGANItem.addActionListener(this);
286	414	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	415	genNormalsCADItem.addActionListener(this);
	416	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	417	+ genNormalsMESHItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
	420	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	421	+ genNormalsMINEItem.addActionListener(this);
	422	+ }
288	423	stripifyItem = menu.add(new MenuItem("Stripify"));
289	424	stripifyItem.addActionListener(this);
290	425	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +441,34 @@
306	441	reduce34MeshItem.addActionListener(this);
307	442	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	443	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	444	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	445	clipMeshItem.addActionListener(this);
	446	+
	447	+ if (Globals.ADVANCED)
	448	+ {
	449	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	450	+ smoothMeshItem.addActionListener(this);
	451	+ }
313	452
314	453	oe.menuBar.add(menu = new Menu("Attributes"));
315	454	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	455	clearMaterialsItem.addActionListener(this);
	456	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	457	+ resetAllItem.addActionListener(this);
	458	+ stepAllItem = menu.add(new MenuItem("Step All"));
	459	+ stepAllItem.addActionListener(this);
317	460	menu.add("-");
318	461	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	462	liveleavesItem.addActionListener(this);
320	463	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	464	unliveleavesItem.addActionListener(this);
	465	+ if (Globals.ADVANCED)
	466	+ {
322	467	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	468	supportleavesItem.addActionListener(this);
324	469	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	470	unsupportleavesItem.addActionListener(this);
	471	+ }
326	472	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	473	hideleavesItem.addActionListener(this);
328	474	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +477,14 @@
331	477	markleavesItem.addActionListener(this);
332	478	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	479	unmarkleavesItem.addActionListener(this);
	480	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	481	+ rewindleavesItem.addActionListener(this);
	482	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	483	+ unrewindleavesItem.addActionListener(this);
	484	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	485	+ randomleavesItem.addActionListener(this);
	486	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	487	+ unrandomleavesItem.addActionListener(this);
334	488	menu.add("-");
335	489	flipVItem = menu.add(new MenuItem("Flip V"));
336	490	flipVItem.addActionListener(this);
..	..	@@ -366,35 +520,40 @@
366	520	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	521	sortbynameItem.addActionListener(this);
368	522	menu.add("-");
	523	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	524	+ shareGeometriesItem.addActionListener(this);
	525	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	526	+ mergeGeometriesItem.addActionListener(this);
	527	+ if (Globals.ADVANCED)
	528	+ {
	529	+ // Pretty much the same as duplicate and clone.
369	530	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	531	extractGeometriesItem.addActionListener(this);
371	532	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	533	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	534	+ }
377	535
378	536	oe.menuBar.add(menu = new Menu("Insert"));
379	537	buildCreateMenu(menu);
380	538
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	539	oe.menuBar.add(menu = new Menu("Tools"));
393	540	buildToolsMenu(menu);
394	541	}
395	542
396	543	void SetupUI2(ObjEditor oe)
397	544	{
	545	+ // June 2019
	546	+ if (oe == null)
	547	+ {
	548	+ //super.SetupUI2(this);
	549	+ //return;
	550	+ }
	551	+
	552	+ if (copy != group)
	553	+ {
	554	+ //super.SetupUI2(this);
	555	+ }
	556	+
398	557	//new Exception().printStackTrace();
399	558
400	559	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +582,171 @@
423	582	oe.radioPanel.add(dummyButton);
424	583	oe.buttonGroup.add(dummyButton);
425	584	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	585	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	586
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ //minButton.setToolTipText("Minimize window");
	589	+ //minButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ maxButton.setToolTipText("Maximize window");
	593	+ maxButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ fullButton.setToolTipText("Full-screen window");
	597	+ fullButton.addActionListener(this);
	598	+
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ undoButton.setToolTipText("Undo changes");
	601	+ undoButton.addActionListener(this);
	602	+
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ redoButton.setToolTipText("Redo changes");
	605	+ redoButton.addActionListener(this);
	606	+
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ saveButton.setToolTipText("Save changes");
	609	+ saveButton.addActionListener(this);
	610	+
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	612	+ liveCB.setToolTipText("Enable animation");
431	613	liveCB.addItemListener(this);
432	614
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oneStepButton.setToolTipText("Animate one step forward");
	617	+ oneStepButton.addActionListener(this);
	618	+
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	620	+ fastCB.setToolTipText("Fast mode");
451	621	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	622	+
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	626	+ trackCB.setToolTipText("Enable tracking");
493	627	trackCB.addItemListener(this);
494	628
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ screenfitButton.setToolTipText("Screen fit");
497	631	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	632	+
499	633	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	634	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	635
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	636	+ if (Globals.ADVANCED)
	637	+ {
	638	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ snapobjectButton.addActionListener(this);
	640	+ snapobjectButton.setToolTipText("Snap Object");
	641	+ }
	642	+
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
512	645	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	646
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	648	+
	649	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ twoButton.setToolTipText("Show center view only");
519	651	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	652	+ this.fullscreenLayout = twoButton;
	653	+
	654	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	655	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	656	+ fourButton.setToolTipText("Show left panel only");
	657	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ sixButton.setToolTipText("2-column layout left");
523	659	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ threeButton.setToolTipText("2-column layout right");
525	662	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	663	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ sevenButton.setToolTipText("3-column layout");
527	665	sevenButton.addActionListener(this);
528	666	//
529	667
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ rootButton.setToolTipText("Edit selection in new tab");
531	670	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	671	+
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ closeButton.setToolTipText("Close tab");
534	674	closeButton.addActionListener(this);
535	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	676	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	677
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
	725	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	726	+ editButton.setToolTipText("Edit selection");
	727	+ editButton.addActionListener(this);
	728	+
	729	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ uneditButton.setToolTipText("Unedit selection");
547	731	uneditButton.addActionListener(this);
548	732
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	733	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	734	+ allParamsButton.setToolTipText("Edit all params");
561	735	allParamsButton.addActionListener(this);
562	736
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	737	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ clearPanelButton.setToolTipText("Clear edit panel");
	739	+ clearPanelButton.addActionListener(this);
	740	+
	741	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ unselectButton.setToolTipText("Unselect");
568	743	unselectButton.addActionListener(this);
569	744
	745	+ editCommandsPanel.preferredHeight = 1;
	746	+
	747	+// oe.treePanel.add(commandsPanel);
	748	+// oe.treePanel.Return();
	749	+
570	750	// oe.aConstraints.gridx += 1;
571	751	// oe.aConstraints.weighty = 0;
572	752	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +758,37 @@
578	758	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	759	// gcButton.addActionListener(this);
580	760
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	761	+ cGridBag jSPPanel = new cGridBag();
	762	+
	763	+ JScrollPane jSP;
592	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	766	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	767	+
	768	+ oe.treePanel.add(jSPPanel);
	769	+ oe.treePanel.Return();
599	770
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	771	+ cGridBag copyOptionsPanel = new cGridBag();
	772	+
	773	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	774	+ colorCB.setToolTipText("Copy color when dropped");
604	775	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	776	+
	777	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	778	+ materialCB.setToolTipText("Copy material when dropped");
607	779	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	780	+
	781	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	782	+ textureCB.setToolTipText("Copy texture when dropped");
610	783	textureCB.addItemListener(this);
611	784
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	785	+ copyOptionsPanel.preferredHeight = 1;
	786	+ oe.treePanel.add(copyOptionsPanel);
	787	+ oe.treePanel.Return();
614	788
	789	+// mainPanel.setDividerLocation(0.5); //1.0);
	790	+// mainPanel.setResizeWeight(0.5);
	791	+
615	792	//jList.addListSelectionListener(this);
616	793	oe.jTree.addTreeSelectionListener(this);
617	794	//jTree.setRootVisible(false);
..	..	@@ -633,20 +810,115 @@
633	810	radio.layout = sevenButton;
634	811	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	812	}
	813	+
	814	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	815	+ {
	816	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	817	+ boxCB.setToolTipText("Display bounding boxes");
	818	+ boxCB.addItemListener(this);
	819	+
	820	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	821	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	822	+ zoomBoxCB.addItemListener(this);
	823	+
	824	+ if (true) // Globals.ADVANCED)
	825	+ {
	826	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	827	+ supportCB.setToolTipText("Enable rigging");
	828	+ supportCB.addItemListener(this);
	829	+
	830	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	831	+ // localCB.addItemListener(this);
	832	+
	833	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	834	+ crowdCB.setToolTipText("Used for crowds");
	835	+ crowdCB.addItemListener(this);
	836	+
	837	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	838	+ smoothCB.setToolTipText("Snapping delay");
	839	+ smoothCB.addItemListener(this);
	840	+
	841	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	842	+ slowCB.setToolTipText("Smooth interpolation");
	843	+ slowCB.addItemListener(this);
	844	+
	845	+// constraints.gridy += 1;
	846	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	847	+// speakerMocapCB.addItemListener(this);
	848	+
	849	+ if (false)
	850	+ {
	851	+ // handled in scripts
	852	+ //constraints.gridy += 1;
	853	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	854	+ speakerCameraCB.addItemListener(this);
	855	+
	856	+ //constraints.gridy += 1;
	857	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	858	+ speakerFocusCB.addItemListener(this);
	859	+
	860	+ //constraints.gridy += 1;
	861	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	862	+ smoothfocusCB.addItemListener(this);
	863	+ }
	864	+
	865	+//constraints.gridx += 1;
	866	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	867	+// debugCB.addItemListener(this);
	868	+
	869	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
	871	+ oeilCB.addItemListener(this);
	872	+
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
	883	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	884	+ lookAtCB.setToolTipText("Look-at target");
	885	+ lookAtCB.addItemListener(this);
	886	+ }
	887	+
	888	+ }
	889	+
	890	+ cGridBag fill = new cGridBag();
	891	+
	892	+ fill.preferredHeight = 200;
	893	+
	894	+ panel.add(fill);
	895	+
	896	+ }
636	897
637	898	void EditObject(Object3D obj)
638	899	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	900	+ cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
	909	+ radioButton.SetObject(obj);
	910	+ radioButton.layout = sevenButton;
	911	+ radioButton.SetCamera(cameraView.renderCamera, false);
	912	+ radioButton.addActionListener(this);
	913	+ radioPanel.add(radioButton);
	914	+ buttonGroup.add(radioButton);
	915	+ radioButton.doClick();
647	916	}
	917	+
648	918	void SetupViews(ObjEditor oe)
649	919	{
	920	+ theFrame = this;
	921	+
650	922	oe.SetupViews();
651	923
652	924	System.out.println("SetupViews");
..	..	@@ -655,22 +927,26 @@
655	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	928	}
657	929
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
668	941	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
674	950
675	951	// static int COLOR = 1;
676	952	// static int MATERIAL = 2;
..	..	@@ -678,9 +954,9 @@
678	954
679	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	956
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
684	960
685	961	public void itemStateChanged(ItemEvent e)
686	962	{
..	..	@@ -705,10 +981,10 @@
705	981	dropAttributes \|= Object3D.TEXTURE;
706	982	else
707	983	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	984	+ } else if(e.getSource() == liveCB)
710	985	{
711	986	cameraView.ToggleLive();
	987	+ refreshContents(false);
712	988	}
713	989	else if(e.getSource() == supportCB)
714	990	{
..	..	@@ -744,6 +1020,10 @@
744	1020	cameraView.repaint();
745	1021	// refreshContents();
746	1022	}
	1023	+ else if(e.getSource() == zoomBoxCB)
	1024	+ {
	1025	+ cameraView.ToggleZoomBoxMode();
	1026	+ }
747	1027	else if(e.getSource() == smoothfocusCB)
748	1028	{
749	1029	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1049,14 @@
769	1049	{
770	1050	cameraView.ToggleOeil();
771	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
772	1060	else if(e.getSource() == lookAtCB)
773	1061	{
774	1062	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1073,8 @@
785	1073
786	1074	/**/
787	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1079	// We can't move the root node or an empty selection
791	1080	return;
..	..	@@ -857,7 +1146,9 @@
857	1146	// objEditor.DropFile((java.io.File[]) object, true);
858	1147	// return;
859	1148	// }
860		- if (string.charAt(0) == '/')
	1149	+
	1150	+ // File path for Mac and Windows
	1151	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1152	{
862	1153	// file(s)
863	1154	String[] names = string.split("\n");
..	..	@@ -884,7 +1175,7 @@
884	1175
885	1176	flashIt = false;
886	1177	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1178	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1179	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1180
890	1181	if (group.selection.size() == 1)
..	..	@@ -907,16 +1198,16 @@
907	1198	return;
908	1199	}
909	1200
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
911		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
912	1203	loadClipboard(true);
913	1204	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1205	+ pasteInto(false, false);
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
920	1211	}
921	1212	public void dropActionChanged(DropTargetDragEvent dtde)
922	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1033,29 +1324,37 @@
1033	1324	torusItem.addActionListener(this);
1034	1325	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1326	superItem.addActionListener(this);
	1327	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1328	+ kleinItem.addActionListener(this);
1036	1329	particleItem = menu.add(new MenuItem("Particle system"));
1037	1330	particleItem.addActionListener(this);
	1331	+ if (Globals.ADVANCED)
	1332	+ {
1038	1333	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1334	ragdollItem.addActionListener(this);
1040	1335	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1336	ragdoll2Item.addActionListener(this);
	1337	+ }
1042	1338	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1339	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1340	meshItem.addActionListener(this);
1045	1341	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1342	// meshGroupItem.addActionListener(this);
	1343	+ if (Globals.ADVANCED)
	1344	+ {
1047	1345	springItem = menu.add(new MenuItem("Spring"));
1048	1346	springItem.addActionListener(this);
1049	1347	flagItem = menu.add(new MenuItem("Flag"));
1050	1348	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1349	blobItem = menu.add(new MenuItem("Blob"));
1056	1350	blobItem.addActionListener(this);
1057	1351	latheItem = menu.add(new MenuItem("Lathe"));
1058	1352	latheItem.addActionListener(this);
	1353	+ }
	1354	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1355	+ bezierItem.addActionListener(this);
	1356	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1357	+ overlayItem.addActionListener(this);
1059	1358	lightItem = menu.add(new MenuItem("Light"));
1060	1359	lightItem.addActionListener(this);
1061	1360	menu.add("-");
..	..	@@ -1065,39 +1364,44 @@
1065	1364	loopItem.addActionListener(this);
1066	1365	doubleItem = menu.add(new MenuItem("Fork"));
1067	1366	doubleItem.addActionListener(this);
	1367	+ if (Globals.ADVANCED)
	1368	+ {
1068	1369	tripleItem = menu.add(new MenuItem("Trident"));
1069	1370	tripleItem.addActionListener(this);
	1371	+ }
1070	1372	}
1071	1373
1072	1374	void buildToolsMenu(Menu menu)
1073	1375	{
1074	1376	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1377	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1378	+ animationItem.setState(Globals.ANIMATION);
1077	1379
1078	1380	menu.add("-");
1079	1381	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1382	parseverticesItem.addActionListener(this);
1081	1383	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1384	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1385	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1386	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1387	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1388	reduceMorphItem.addActionListener(this);
1089	1389	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1390	reduce34MorphItem.addActionListener(this);
1091		-
	1391	+ menu.add("-");
1092	1392	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1393	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1394
	1395	+ if (Globals.ADVANCED)
	1396	+ {
	1397	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1398	+ mirrorItem.addActionListener(this);
	1399	+ menu.add("-");
1096	1400	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1401	memoryItem.addActionListener(this);
1098	1402	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1403	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1404	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1405	dumpItem.addActionListener(this);
1102	1406	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1407	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1410,8 @@
1106	1410	resetParentItem.addActionListener(this);
1107	1411	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1412	repairParentItem.addActionListener(this);
	1413	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1414	+ repairShadowItem.addActionListener(this);
1109	1415	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1416	invariantsItem.addActionListener(this);
1111	1417	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1419,7 @@
1113	1419	menu.add("-");
1114	1420	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1421	editScriptItem.addActionListener(this);
	1422	+ }
1116	1423	}
1117	1424
1118	1425	void ScreenFit()
..	..	@@ -1235,6 +1542,7 @@
1235	1542	shadow.material = new cMaterial(obj.material);
1236	1543	shadow.material.diffuse = 0.0001f;
1237	1544	shadow.material.specular = 0.0001f;
	1545	+ //shadow.projectedVertices[1].x = 300;
1238	1546
1239	1547	makeSomething(shadow);
1240	1548	}
..	..	@@ -1441,9 +1749,9 @@
1441	1749
1442	1750	void Overwrite(int mask)
1443	1751	{
1444		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1752	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1753	{
1446		- Object3D content = GrafreeD.clipboard.get(0);
	1754	+ Object3D content = Grafreed.clipboard.get(0);
1447	1755
1448	1756	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1757	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1774,7 @@
1466	1774	//
1467	1775	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1776	{
	1777	+ Object source = event.getSource();
1469	1778	/*
1470	1779	if (event.getSource() == nameField)
1471	1780	{
..	..	@@ -1477,11 +1786,11 @@
1477	1786	}
1478	1787	else
1479	1788	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1789	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1790	{
1482	1791	ScreenFit();
1483	1792	} else
1484		- if (event.getSource() == switchItem)
	1793	+ if (source == switchItem)
1485	1794	{
1486	1795	cVector v1 = new cVector();
1487	1796	cVector v2 = new cVector();
..	..	@@ -1490,11 +1799,11 @@
1490	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1800	objEditor.cameraView.repaint();
1492	1801	} else
1493		- if (event.getSource() == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1494	1803	{
1495	1804	makeSomething(new Box());
1496	1805	} else
1497		- if (event.getSource() == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1498	1807	{
1499	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1824,9 @@
1515	1824	applyExample(particleGeom, "SMOKE");
1516	1825	makeSomething(particleGeom);
1517	1826	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1827	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1828	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1829	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1830
1522	1831	ragdoll.toParent = LA.newMatrix();
1523	1832	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1844,7 @@
1535	1844	} else
1536	1845	/*
1537	1846	*/
1538		- if (event.getSource() == heightFieldItem)
	1847	+ if (source == heightFieldItem)
1539	1848	{
1540	1849	Object3D obj = new Object3D();
1541	1850
..	..	@@ -1573,27 +1882,31 @@
1573	1882
1574	1883	makeSomething(obj);
1575	1884	} else
1576		- if (event.getSource() == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1577	1886	{
1578	1887	makeSomething(new Grid());
1579	1888	} else
1580		- if (event.getSource() == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	1890	{
1582	1891	makeSomething(new Sphere());
1583	1892	} else
1584		- if (event.getSource() == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1585	1894	{
1586	1895	makeSomething(new Cone());
1587	1896	} else
1588		- if (event.getSource() == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1589	1898	{
1590	1899	makeSomething(new Torus());
1591	1900	} else
1592		- if (event.getSource() == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1593	1902	{
1594	1903	makeSomething(new Superellipsoid());
1595	1904	} else
1596		- if (event.getSource() == blobItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
	1906	+ {
	1907	+ makeSomething(new Klein());
	1908	+ } else
	1909	+ if (source == blobItem)
1597	1910	{
1598	1911	Blob blob = new Blob();
1599	1912	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1914,15 @@
1601	1914	//blob.retile();
1602	1915	makeSomething(blob);
1603	1916	} else
1604		- if (event.getSource() == latheItem)
	1917	+ if (source == latheItem)
1605	1918	{
1606	1919	makeSomething(new Lathe());
1607	1920	} else
1608		- if (event.getSource() == bezierItem)
	1921	+ if (source == bezierItem)
1609	1922	{
1610	1923	makeSomething(new BezierSurface());
1611	1924	} else
1612		- if (event.getSource() == checkerItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1613	1926	{
1614	1927	/*
1615	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1937,7 @@
1624	1937	*/
1625	1938	makeSomething(new Checker());
1626	1939	} else
1627		- if (event.getSource() == meshItem)
	1940	+ if (source == meshItem)
1628	1941	{
1629	1942	Object3D itemtomake = new Object3D();
1630	1943	Object3D child;
..	..	@@ -1645,35 +1958,35 @@
1645	1958	makeSomething(child);
1646	1959	}
1647	1960	} else
1648		- if (event.getSource() == springItem)
	1961	+ if (source == springItem)
1649	1962	{
1650	1963	cSpring s = new cSpring();
1651	1964	s.setup();
1652	1965	makeSomething(s);
1653	1966	} else
1654		- if (event.getSource() == flagItem)
	1967	+ if (source == flagItem)
1655	1968	{
1656	1969	cSpring s = new cFlag();
1657	1970	s.setup();
1658	1971	makeSomething(s);
1659	1972	} else
1660		- if (event.getSource() == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1661	1974	{
1662	1975	makeSomething(new Light());
1663	1976	} else
1664		- if (event.getSource() == csgItem)
	1977	+ if (source == csgItem)
1665	1978	{
1666	1979	group(new CSG());
1667	1980	} else
1668		- if (event.getSource() == templateItem)
	1981	+ if (source == templateItem)
1669	1982	{
1670	1983	group(new cTemplate());
1671	1984	} else
1672		- if (event.getSource() == attributeItem)
	1985	+ if (source == attributeItem)
1673	1986	{
1674	1987	makeSomething(new Attribute());
1675	1988	} else
1676		- if (event.getSource() == pointflowItem)
	1989	+ if (source == pointflowItem)
1677	1990	{
1678	1991	makeSomething(new PointFlow());
1679	1992	} else
..	..	@@ -1685,7 +1998,7 @@
1685	1998	} else
1686	1999	*/
1687	2000
1688		- if (event.getSource() == superLoopItem)
	2001	+ if (source == superLoopItem)
1689	2002	{
1690	2003	Composite g = new cGroup();
1691	2004	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +2020,7 @@
1707	2020
1708	2021	group(g);
1709	2022	} else
1710		- if (event.getSource() == loopItem)
	2023	+ if (source == loopItem)
1711	2024	{
1712	2025	Composite csg = new GroupLeaf();
1713	2026	csg.count = 5;
..	..	@@ -1716,7 +2029,7 @@
1716	2029	csg.addChild(child);
1717	2030	child.addChild(csg);
1718	2031	} else
1719		- if (event.getSource() == doubleItem)
	2032	+ if (source == doubleItem)
1720	2033	{
1721	2034	Composite csg = new GroupLeaf();
1722	2035	csg.count = 5;
..	..	@@ -1728,7 +2041,7 @@
1728	2041	csg.addChild(child);
1729	2042	child.addChild(csg);
1730	2043	} else
1731		- if (event.getSource() == tripleItem)
	2044	+ if (source == tripleItem)
1732	2045	{
1733	2046	Composite csg = new GroupLeaf();
1734	2047	csg.count = 4;
..	..	@@ -1743,71 +2056,83 @@
1743	2056	csg.addChild(child);
1744	2057	child.addChild(csg);
1745	2058	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2059	+ if (source == computeAOItem)
1748	2060	{
1749		- ImportGFD();
	2061	+ Globals.drawMode = CameraPane.OCCLUSION;
	2062	+ Globals.theRenderer.repaint();
1750	2063	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2064	+ if (source == recompileItem)
1769	2065	{
1770	2066	Recompile();
1771	2067	refreshContents();
1772	2068	} else
1773		- if (event.getSource() == editScriptItem)
	2069	+ if (source == editScriptItem)
1774	2070	{
1775	2071	OpenDialog();
1776	2072	refreshContents();
1777	2073	} else
1778		- if (event.getSource() == invariantsItem)
	2074	+ if (source == invariantsItem)
1779	2075	{
1780	2076	System.out.println("Invariants:");
1781		- GrafreeD.theApplet3D.universe.invariants();
	2077	+ Grafreed.grafreeD.universe.invariants();
1782	2078	} else
1783		- if (event.getSource() == memoryItem)
	2079	+ if (source == memoryItem)
1784	2080	{
1785	2081	//System.out.println("Invariants:");
1786	2082	PrintMemory();
1787	2083	} else
1788		- if (event.getSource() == pathItem)
	2084	+ if (source == pathItem)
1789	2085	{
1790	2086	PrintPath();
1791	2087	} else
1792		- if (event.getSource() == analyzeItem)
	2088	+ if (source == analyzeItem)
1793	2089	{
1794	2090	AnalyzeObject();
1795	2091	} else
1796		- if (event.getSource() == dumpItem)
	2092	+ if (source == dumpItem)
1797	2093	{
1798	2094	DumpObject();
1799	2095	} else
1800		- if (event.getSource() == screenfitButton)
	2096	+ if (source == minButton)
	2097	+ {
	2098	+ Minimize();
	2099	+ } else
	2100	+ if (source == maxButton)
	2101	+ {
	2102	+ Maximize();
	2103	+ } else
	2104	+ if (source == fullButton)
	2105	+ {
	2106	+ ToggleFullScreen();
	2107	+ } else
	2108	+ if (source == undoButton)
	2109	+ {
	2110	+ Undo();
	2111	+ } else
	2112	+ if (source == redoButton)
	2113	+ {
	2114	+ Redo();
	2115	+ } else
	2116	+ if (source == saveButton)
	2117	+ {
	2118	+ Save();
	2119	+ } else
	2120	+ if (source == oneStepButton)
	2121	+ {
	2122	+ Globals.ONESTEP = true;
	2123	+ cameraView.repaint();
	2124	+ } else
	2125	+ if (source == screenfitButton)
1801	2126	{
1802	2127	//Reload(lastConverter, lastFilename, true);
1803	2128	ScreenFit();
1804	2129	} else
1805		- if (event.getSource() == screenfitpointButton)
	2130	+ if (source == screenfitpointButton)
1806	2131	{
1807	2132	//Reload(lastConverter, lastFilename, true);
1808	2133	ScreenFitPoint();
1809	2134	} else
1810		- if (event.getSource() == snapobjectButton)
	2135	+ if (source == snapobjectButton)
1811	2136	{
1812	2137	//Reload(lastConverter, lastFilename, true);
1813	2138	SnapObject();
..	..	@@ -1818,13 +2143,13 @@
1818	2143	// Recompile();
1819	2144	// refreshContents();
1820	2145	// } else
1821		- if (event.getSource() == gcButton)
	2146	+ if (source == gcButton)
1822	2147	{
1823	2148	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2149	System.gc();
1825	2150	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2151	} else
1827		- if (event.getSource() == editLeafItem)
	2152	+ if (source == editLeafItem)
1828	2153	{
1829	2154	Object3D obj;
1830	2155	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,62 +2163,74 @@
1838	2163	}
1839	2164	refreshContents(true);
1840	2165	} else
1841		- if (event.getSource() == openWindowItem)
	2166	+ if (source == openWindowItem)
1842	2167	{
1843	2168	EditSelection(true);
1844	2169	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2170	+ if (source == cutItem \|\| source == clearButton)
1846	2171	{
1847	2172	loadClipboard(true);
1848	2173	} else
1849		- if (event.getSource() == duplicateItem)
	2174	+ if (source == undoItem)
1850	2175	{
1851		- Object3D keep = GrafreeD.clipboard;
	2176	+ Undo();
	2177	+ } else
	2178	+ if (source == redoItem)
	2179	+ {
	2180	+ Redo();
	2181	+ } else
	2182	+ if (source == duplicateItem)
	2183	+ {
	2184	+ Object3D keep = Grafreed.clipboard;
1852	2185	loadClipboard(false);
1853	2186	paste(false);
1854		- GrafreeD.clipboard = keep;
	2187	+ Grafreed.clipboard = keep;
1855	2188	} else
1856		- if (event.getSource() == cloneItem)
	2189	+ if (source == cloneItem)
1857	2190	{
1858	2191	CloneSelection(false);
1859	2192	} else
1860		- if (event.getSource() == cloneSupportItem)
	2193	+ if (source == cloneSupportItem)
1861	2194	{
1862	2195	CloneSelection(true);
1863	2196	} else
1864		- if (event.getSource() == copyItem)
	2197	+ if (source == copyItem)
1865	2198	{
1866	2199	loadClipboard(false);
1867	2200	} else
1868		- if (event.getSource() == pasteItem)
	2201	+ if (source == pasteItem)
1869	2202	{
1870	2203	paste(false);
1871	2204	} else
1872		- if (event.getSource() == pasteLinkItem)
	2205	+ if (source == pasteIntoItem)
1873	2206	{
1874		- pasteInto(false);
	2207	+ pasteInto(true, false);
1875	2208	} else
1876		- if (event.getSource() == pasteCloneItem)
	2209	+ if (source == pasteLinkItem)
1877	2210	{
1878		- pasteInto(true);
	2211	+ pasteInto(false, false);
1879	2212	} else
1880		- if (event.getSource() == pasteExpandItem)
	2213	+ if (source == pasteCloneItem)
	2214	+ {
	2215	+ pasteInto(true, true);
	2216	+ } else
	2217	+ if (source == pasteExpandItem)
1881	2218	{
1882	2219	paste(true);
1883	2220	} else
1884		- if (event.getSource() == synchronizeItem)
	2221	+ if (source == synchronizeItem)
1885	2222	{
1886	2223	Overwrite(Object3D.TRANSFORM);
1887	2224	} else
1888		- if (event.getSource() == overwriteNameItem)
	2225	+ if (source == overwriteNameItem)
1889	2226	{
1890	2227	Overwrite(Object3D.NAME);
1891	2228	} else
1892		- if (event.getSource() == overwriteUVItem)
	2229	+ if (source == overwriteUVItem)
1893	2230	{
1894	2231	Overwrite(Object3D.UV);
1895	2232	} else
1896		- if (event.getSource() == overwriteMatItem)
	2233	+ if (source == overwriteMatItem)
1897	2234	{
1898	2235	/* july 2015
1899	2236	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1913,7 +2250,7 @@
1913	2250
1914	2251	Overwrite(dropAttributes);
1915	2252	}
1916		- if (event.getSource() == overwriteGeoItem)
	2253	+ if (source == overwriteGeoItem)
1917	2254	{
1918	2255	Overwrite(Object3D.GEOMETRY);
1919	2256	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1930,7 +2267,7 @@
1930	2267	// refreshContents();
1931	2268	// }
1932	2269	} else
1933		- if (event.getSource() == generateMeshItem)
	2270	+ if (source == generateMeshItem)
1934	2271	{
1935	2272	//if (group.selection.size() == 1)
1936	2273	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1941,7 +2278,7 @@
1941	2278	ResetModel();
1942	2279	refreshContents();
1943	2280	} else
1944		- if (event.getSource() == extractGeometriesItem)
	2281	+ if (source == extractGeometriesItem)
1945	2282	{
1946	2283	boolean one = false;
1947	2284
..	..	@@ -1968,7 +2305,7 @@
1968	2305	ResetModel();
1969	2306	refreshContents();
1970	2307	} else
1971		- if (event.getSource() == cloneGeometriesItem)
	2308	+ if (source == cloneGeometriesItem)
1972	2309	{
1973	2310	boolean one = false;
1974	2311
..	..	@@ -1994,32 +2331,37 @@
1994	2331	ResetModel();
1995	2332	refreshContents();
1996	2333	} else
1997		- if (event.getSource() == shareGeometriesItem)
	2334	+ if (source == shareGeometriesItem)
1998	2335	{
1999	2336	boolean one = false;
2000	2337
2001	2338	if (group.selection.size() == 1)
2002	2339	one = true;
2003	2340
	2341	+ Object3D merge = null;
	2342	+
2004	2343	Object3D content = new cGroup();
2005	2344
2006	2345	for (int i=0; i<group.selection.size(); i++)
2007	2346	{
2008		- Object3D sel = new Merge(group.selection.get(i));
	2347	+ merge = new Merge(group.selection.get(i));
2009	2348
2010	2349	if (one)
2011		- makeSomething(sel, false);
	2350	+ makeSomething(merge, false);
2012	2351	else
2013		- content.addChild(sel);
	2352	+ content.addChild(merge);
2014	2353	}
2015	2354
2016	2355	if (!one)
2017		- makeSomething(content, false);
2018		-
2019		- ResetModel();
2020		- refreshContents();
	2356	+ makeSomething(content, true);
	2357	+ else
	2358	+ {
	2359	+ ResetModel();
	2360	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2361	+ refreshContents();
	2362	+ }
2021	2363	} else
2022		- if (event.getSource() == mergeGeometriesItem)
	2364	+ if (source == mergeGeometriesItem)
2023	2365	{
2024	2366	boolean one = false;
2025	2367
..	..	@@ -2049,7 +2391,7 @@
2049	2391	ResetModel();
2050	2392	refreshContents();
2051	2393	} else
2052		- if (event.getSource() == linkverticesItem)
	2394	+ if (source == linkverticesItem)
2053	2395	{
2054	2396	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2055	2397	// {
..	..	@@ -2062,39 +2404,48 @@
2062	2404	// group.selection.get(0).setMasterThis(content); // should be identity
2063	2405	// refreshContents();
2064	2406	// }
2065		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2407	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2066	2408	{
2067		- Object3D content = GrafreeD.clipboard.get(0);
	2409	+ Object3D content = Grafreed.clipboard.get(0);
2068	2410
2069	2411	if (content instanceof cGroup && ((cGroup)content).transientlink )
2070	2412	content = ((cGroup)content).get(0);
2071	2413
2072		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2414	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2073	2415	for (int i=0; i<group.selection.size(); i++)
2074	2416	{
2075		- boolean random = CameraPane.RANDOM;
2076		- CameraPane.RANDOM = false; // parse all random nodes
	2417	+ boolean random = CameraPane.SWITCH;
	2418	+ CameraPane.SWITCH = false; // parse all random nodes
2077	2419	group.selection.get(i).linkVerticesThis(content);
2078	2420	// group.selection.get(i).setMasterThis(content); // should be identity
2079		- CameraPane.RANDOM = random;
	2421	+ CameraPane.SWITCH = random;
2080	2422	}
2081		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2423	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2082	2424	refreshContents();
2083	2425	}
2084	2426	} else
2085		- if (event.getSource() == resetsupportItem)
	2427	+ if (source == resetsupportItem)
2086	2428	{
2087	2429	for (int i=0; i<group.selection.size(); i++)
2088	2430	{
2089		- boolean random = CameraPane.RANDOM;
2090		- CameraPane.RANDOM = false; // parse all random nodes
	2431	+ boolean random = CameraPane.SWITCH;
	2432	+ CameraPane.SWITCH = false; // parse all random nodes
2091	2433	group.selection.get(i).linkVerticesThis(null);
2092		- CameraPane.RANDOM = random;
	2434	+ CameraPane.SWITCH = random;
2093	2435	}
2094	2436
2095	2437	refreshContents();
2096	2438	} else
2097		- if (event.getSource() == resetreferencesItem)
	2439	+ if (source == relinkverticesItem)
	2440	+ {
	2441	+ boolean random = CameraPane.SWITCH;
	2442	+ CameraPane.SWITCH = false; // parse all random nodes
	2443	+ group.selection.RelinkToSupport();
	2444	+ CameraPane.SWITCH = random;
	2445	+
	2446	+ refreshContents();
	2447	+ } else
	2448	+ if (source == resetreferencesItem)
2098	2449	{
2099	2450	for (int i=0; i<group.selection.size(); i++)
2100	2451	{
..	..	@@ -2103,11 +2454,11 @@
2103	2454
2104	2455	refreshContents();
2105	2456	} else
2106		- if (event.getSource() == setMasterItem)
	2457	+ if (source == setMasterItem)
2107	2458	{
2108		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2459	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2109	2460	{
2110		- Object3D content = GrafreeD.clipboard.get(0);
	2461	+ Object3D content = Grafreed.clipboard.get(0);
2111	2462
2112	2463	if (content instanceof cGroup && ((cGroup)content).transientlink )
2113	2464	content = ((cGroup)content).get(0);
..	..	@@ -2116,13 +2467,13 @@
2116	2467	refreshContents();
2117	2468	}
2118	2469	} else
2119		- if (event.getSource() == poseMeshItem)
	2470	+ if (source == poseMeshItem)
2120	2471	{
2121	2472	if (group.selection.size() == 1)
2122	2473	{
2123		- if (GrafreeD.clipboard.size() == 1)
	2474	+ if (Grafreed.clipboard.size() == 1)
2124	2475	{
2125		- Object3D content = GrafreeD.clipboard.get(0);
	2476	+ Object3D content = Grafreed.clipboard.get(0);
2126	2477
2127	2478	if (content instanceof cGroup && ((cGroup)content).transientlink )
2128	2479	content = ((cGroup)content).get(0);
..	..	@@ -2135,19 +2486,19 @@
2135	2486	}
2136	2487
2137	2488	} else
2138		- if (event.getSource() == revertMeshItem)
	2489	+ if (source == revertMeshItem)
2139	2490	{
2140	2491	RevertMeshes();
2141	2492	} else
2142		- if (event.getSource() == resetMeshItem)
	2493	+ if (source == resetAllItem)
2143	2494	{
2144	2495	ResetAll();
2145	2496	} else
2146		- if (event.getSource() == stepAllItem)
	2497	+ if (source == stepAllItem)
2147	2498	{
2148	2499	StepAll();
2149	2500	} else
2150		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2501	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2151	2502	{
2152	2503	//int indices[] = jList.getSelectedIndices();
2153	2504	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2155,42 +2506,46 @@
2155	2506
2156	2507	ClearSelection(false);
2157	2508	} else
2158		- if (event.getSource() == clearAllItem)
	2509	+ if (source == clearAllItem)
2159	2510	{
2160	2511	ClearSelection(true);
2161	2512	} else
2162		- if (event.getSource() == grabItem)
	2513	+ if (source == grabItem)
2163	2514	{
2164	2515	group(new cGroup(), true);
2165	2516	} else
2166		- if (event.getSource() == frontItem)
	2517	+ if (source == hideItem)
	2518	+ {
	2519	+ group(new HiddenObject());
	2520	+ } else
	2521	+ if (source == frontItem)
2167	2522	{
2168	2523	front();
2169	2524	} else
2170		- if (event.getSource() == backItem)
	2525	+ if (source == backItem)
2171	2526	{
2172	2527	back();
2173	2528	} else
2174		- if (event.getSource() == cameraItem)
	2529	+ if (source == cameraItem)
2175	2530	{
2176	2531	makeSomething(new Camera());
2177	2532	} else
2178		- if (event.getSource() == compositeItem)
	2533	+ if (source == compositeItem)
2179	2534	{
2180	2535	group(new Composite());
2181	2536	} else
2182		- if (event.getSource() == randomItem)
	2537	+ if (source == randomItem)
2183	2538	{
2184	2539	RandomNode random = new RandomNode();
2185	2540	group(random);
2186	2541	if (random.size() > 0)
2187		- random.name = random.get(0).name + "Rnd";
	2542	+ random.name = random.get(0).name + "Switch";
2188	2543	} else
2189		- if (event.getSource() == physicsItem)
	2544	+ if (source == physicsItem)
2190	2545	{
2191	2546	group(new PhysicsNode());
2192	2547	} else
2193		- if (event.getSource() == frameselectorItem)
	2548	+ if (source == frameselectorItem)
2194	2549	{
2195	2550	for (int i=0; i<group.selection.size(); i++)
2196	2551	{
..	..	@@ -2202,7 +2557,7 @@
2202	2557	ResetModel();
2203	2558	refreshContents();
2204	2559	} else
2205		- if (event.getSource() == switchGeoItem)
	2560	+ if (source == switchGeoItem)
2206	2561	{
2207	2562	for (int i=0; i<group.selection.size(); i++)
2208	2563	{
..	..	@@ -2214,7 +2569,7 @@
2214	2569	ResetModel();
2215	2570	refreshContents();
2216	2571	} else
2217		- if (event.getSource() == switchTransfoItem)
	2572	+ if (source == switchTransfoItem)
2218	2573	{
2219	2574	for (int i=0; i<group.selection.size(); i++)
2220	2575	{
..	..	@@ -2226,7 +2581,7 @@
2226	2581	ResetModel();
2227	2582	refreshContents();
2228	2583	} else
2229		- if (event.getSource() == morphItem)
	2584	+ if (source == morphItem)
2230	2585	{
2231	2586	for (int i=0; i<group.selection.size(); i++)
2232	2587	{
..	..	@@ -2238,7 +2593,7 @@
2238	2593	ResetModel();
2239	2594	refreshContents();
2240	2595	} else
2241		- if (event.getSource() == scriptNodeItem)
	2596	+ if (source == scriptNodeItem)
2242	2597	{
2243	2598	boolean atleastone = false;
2244	2599
..	..	@@ -2277,195 +2632,239 @@
2277	2632	}
2278	2633	}
2279	2634	} else
2280		- if (event.getSource() == linkerItem)
	2635	+ if (source == linkerItem)
2281	2636	{
2282	2637	group(new cLinker());
2283	2638	} else
2284		- if (event.getSource() == textureItem)
	2639	+ if (source == textureItem)
2285	2640	{
2286	2641	group(new TextureNode());
2287	2642	} else
2288		- if (event.getSource() == shadowXItem)
	2643	+ if (source == billboardItem)
	2644	+ {
	2645	+ group(new BillboardNode());
	2646	+ } else
	2647	+ if (source == shadowXItem)
2289	2648	{
2290	2649	CastShadow(0);
2291	2650	} else
2292		- if (event.getSource() == shadowYItem)
	2651	+ if (source == shadowYItem)
2293	2652	{
2294	2653	CastShadow(1);
2295	2654	} else
2296		- if (event.getSource() == shadowZItem)
	2655	+ if (source == shadowZItem)
2297	2656	{
2298	2657	CastShadow(2);
2299	2658	} else
2300		- if (event.getSource() == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2301	2660	{
2302		- ungroup();
	2661	+ //ungroup();
	2662	+ for (int i=0; i<group.selection.size(); i++)
	2663	+ {
	2664	+ Ungroup(group.selection.get(i));
	2665	+ }
	2666	+
	2667	+ ClearSelection(false);
	2668	+
	2669	+ refreshContents();
2303	2670	} else
2304		- if (event.getSource() == genUVItem)
	2671	+ if (source == genUVItem)
2305	2672	{
2306	2673	GenUV();
2307	2674	} else
2308		- if (event.getSource() == genNormalsCADItem)
	2675	+ if (source == genNormalsCADItem)
2309	2676	{
2310	2677	GenNormals(true);
2311	2678	} else
2312		- if (event.getSource() == genNormalsORGANItem)
	2679	+ if (source == genNormalsMESHItem)
	2680	+ {
	2681	+ GenNormalsMESH();
	2682	+ } else
	2683	+ if (source == genNormalsORGANItem)
2313	2684	{
2314	2685	GenNormals(false);
2315	2686	} else
2316		- if (event.getSource() == stripifyItem)
	2687	+ if (source == genNormalsMINEItem)
	2688	+ {
	2689	+ GenNormalsMINE();
	2690	+ } else
	2691	+ if (source == stripifyItem)
2317	2692	{
2318	2693	Stripify();
2319	2694	} else
2320		- if (event.getSource() == unstripifyItem)
	2695	+ if (source == unstripifyItem)
2321	2696	{
2322	2697	Unstripify();
2323	2698	} else
2324		- if (event.getSource() == trimItem)
	2699	+ if (source == trimItem)
2325	2700	{
2326	2701	Trim();
2327	2702	} else
2328		- if (event.getSource() == untrimItem)
	2703	+ if (source == untrimItem)
2329	2704	{
2330	2705	Untrim();
2331	2706	} else
2332		- if (event.getSource() == clearColorsItem)
	2707	+ if (source == clearColorsItem)
2333	2708	{
2334	2709	ClearColors();
2335	2710	} else
2336		- if (event.getSource() == clearMaterialsItem)
	2711	+ if (source == clearMaterialsItem)
2337	2712	{
2338	2713	ClearMaterials();
2339	2714	} else
2340		- if (event.getSource() == liveleavesItem)
	2715	+ if (source == liveleavesItem)
2341	2716	{
2342	2717	LiveLeaves(true);
2343	2718	} else
2344		- if (event.getSource() == unliveleavesItem)
	2719	+ if (source == unliveleavesItem)
2345	2720	{
2346	2721	LiveLeaves(false);
2347	2722	} else
2348		- if (event.getSource() == supportleavesItem)
	2723	+ if (source == supportleavesItem)
2349	2724	{
2350	2725	SupportLeaves(true);
2351	2726	} else
2352		- if (event.getSource() == unsupportleavesItem)
	2727	+ if (source == unsupportleavesItem)
2353	2728	{
2354	2729	SupportLeaves(false);
2355	2730	} else
2356		- if (event.getSource() == hideleavesItem)
	2731	+ if (source == hideleavesItem)
2357	2732	{
2358	2733	HideLeaves(true);
2359	2734	} else
2360		- if (event.getSource() == showleavesItem)
	2735	+ if (source == showleavesItem)
2361	2736	{
2362	2737	HideLeaves(false);
2363	2738	} else
2364		- if (event.getSource() == markleavesItem)
	2739	+ if (source == markleavesItem)
2365	2740	{
2366	2741	MarkLeaves(true);
2367	2742	} else
2368		- if (event.getSource() == unmarkleavesItem)
	2743	+ if (source == unmarkleavesItem)
2369	2744	{
2370	2745	MarkLeaves(false);
2371	2746	} else
2372		- if (event.getSource() == flipVItem)
	2747	+ if (source == rewindleavesItem)
	2748	+ {
	2749	+ RewindLeaves(true);
	2750	+ } else
	2751	+ if (source == unrewindleavesItem)
	2752	+ {
	2753	+ RewindLeaves(false);
	2754	+ } else
	2755	+ if (source == randomleavesItem)
	2756	+ {
	2757	+ RandomLeaves(true);
	2758	+ } else
	2759	+ if (source == unrandomleavesItem)
	2760	+ {
	2761	+ RandomLeaves(false);
	2762	+ } else
	2763	+ if (source == flipVItem)
2373	2764	{
2374	2765	FlipV(true);
2375	2766	} else
2376		- if (event.getSource() == unflipVItem)
	2767	+ if (source == unflipVItem)
2377	2768	{
2378	2769	FlipV(false);
2379	2770	} else
2380		- if (event.getSource() == lowTexturesItem)
	2771	+ if (source == lowTexturesItem)
2381	2772	{
2382	2773	SetTexRes(0);
2383	2774	} else
2384		- if (event.getSource() == normalTexturesItem)
	2775	+ if (source == normalTexturesItem)
2385	2776	{
2386	2777	SetTexRes(1);
2387	2778	} else
2388		- if (event.getSource() == highTexturesItem)
	2779	+ if (source == highTexturesItem)
2389	2780	{
2390	2781	SetTexRes(2);
2391	2782	} else
2392		- if (event.getSource() == veryhighTexturesItem)
	2783	+ if (source == veryhighTexturesItem)
2393	2784	{
2394	2785	SetTexRes(3);
2395	2786	} else
2396		- if (event.getSource() == maxTexturesItem)
	2787	+ if (source == maxTexturesItem)
2397	2788	{
2398	2789	SetTexRes(4);
2399	2790	} else
2400		- if (event.getSource() == panoTexturesItem)
	2791	+ if (source == panoTexturesItem)
2401	2792	{
2402	2793	SetTexRes(5);
2403	2794	} else
2404		- if (event.getSource() == reverseNormalsItem)
	2795	+ if (source == reverseNormalsItem)
2405	2796	{
2406	2797	ReverseNormals();
2407	2798	} else
2408		- if (event.getSource() == parseverticesItem)
	2799	+ if (source == parseverticesItem)
2409	2800	{
2410	2801	ParseVertices();
2411	2802	} else
2412		- if (event.getSource() == textureFieldItem)
	2803	+ if (source == textureFieldItem)
2413	2804	{
2414	2805	TextureVertices();
2415	2806	} else
2416		- if (event.getSource() == alignItem)
	2807	+ if (source == alignItem)
2417	2808	{
2418	2809	Align();
2419	2810	} else
2420		- if (event.getSource() == mirrorItem)
	2811	+ if (source == mirrorItem)
2421	2812	{
2422	2813	MirrorPoses();
2423	2814	} else
2424		- if (event.getSource() == reduceMorphItem)
	2815	+ if (source == reduceMorphItem)
2425	2816	{
2426	2817	MeshReduction(false);
2427	2818	} else
2428		- if (event.getSource() == reduce34MorphItem)
	2819	+ if (source == reduce34MorphItem)
2429	2820	{
2430	2821	MeshReduction(true);
2431	2822	} else
2432		- if (event.getSource() == reverseTrianglesItem)
	2823	+ if (source == reverseTrianglesItem)
2433	2824	{
2434	2825	ReverseTriangles();
2435	2826	} else
2436		- if (event.getSource() == reduceMeshItem)
	2827	+ if (source == reduceMeshItem)
2437	2828	{
2438	2829	ReduceMesh(false);
2439	2830	} else
2440		- if (event.getSource() == reduce34MeshItem)
	2831	+ if (source == reduce34MeshItem)
2441	2832	{
2442	2833	ReduceMesh(true);
2443	2834	} else
2444		- if (event.getSource() == increaseMeshItem)
	2835	+ if (source == increaseMeshItem)
2445	2836	{
2446	2837	IncreaseMesh();
2447	2838	} else
2448		- if (event.getSource() == clipMeshItem)
	2839	+ if (source == clipMeshItem)
2449	2840	{
2450	2841	ClipMesh();
2451	2842	} else
2452		- if (event.getSource() == smoothMeshItem)
	2843	+ if (source == smoothMeshItem)
2453	2844	{
2454	2845	SmoothMesh();
2455	2846	} else
2456		- if (event.getSource() == transformgeometryItem)
	2847	+ if (source == transformGeometryItem)
2457	2848	{
2458	2849	TransformGeometry();
2459	2850	} else
2460		- if (event.getSource() == resetTransformItem)
	2851	+ if (source == transformChildrenItem)
	2852	+ {
	2853	+ TransformChildren();
	2854	+ } else
	2855	+ if (source == resetTransformItem)
2461	2856	{
2462	2857	ResetTransform();
2463	2858	} else
2464		- if (event.getSource() == resetCentroidItem)
	2859	+ if (source == resetCentroidItem)
2465	2860	{
2466		- ResetCentroid();
	2861	+ ResetCentroid(true);
2467	2862	} else
2468		- if (event.getSource() == resetParentItem)
	2863	+ if (source == resetCentroidXZItem)
	2864	+ {
	2865	+ ResetCentroid(false);
	2866	+ } else
	2867	+ if (source == resetParentItem)
2469	2868	{
2470	2869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2471	2870	{
..	..	@@ -2475,7 +2874,7 @@
2475	2874
2476	2875	refreshContents();
2477	2876	} else
2478		- if (event.getSource() == repairParentItem)
	2877	+ if (source == repairParentItem)
2479	2878	{
2480	2879	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2481	2880	{
..	..	@@ -2489,7 +2888,21 @@
2489	2888
2490	2889	refreshContents();
2491	2890	} else
2492		- if (event.getSource() == sortbysizeItem)
	2891	+ if (source == repairShadowItem)
	2892	+ {
	2893	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2894	+ {
	2895	+ Object3D obj = (Object3D)e.nextElement();
	2896	+ obj.RepairShadow();
	2897	+// for (int i=0; i<obj.size(); i++)
	2898	+// {
	2899	+// obj.get(i).parent = obj;
	2900	+// }
	2901	+ }
	2902	+
	2903	+ refreshContents();
	2904	+ } else
	2905	+ if (source == sortbysizeItem)
2493	2906	{
2494	2907	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2495	2908	{
..	..	@@ -2501,7 +2914,7 @@
2501	2914	ResetModel();
2502	2915	refreshContents();
2503	2916	} else
2504		- if (event.getSource() == sortbynameItem)
	2917	+ if (source == sortbynameItem)
2505	2918	{
2506	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2507	2920	{
..	..	@@ -2513,7 +2926,7 @@
2513	2926	ResetModel();
2514	2927	refreshContents();
2515	2928	} else
2516		- if (event.getSource() == attachPigmentItem)
	2929	+ if (source == attachPigmentItem)
2517	2930	{
2518	2931	String texture = GetFile("Attach pigment");
2519	2932	Object3D obj;
..	..	@@ -2525,7 +2938,7 @@
2525	2938
2526	2939	refreshContents();
2527	2940	} else
2528		- if (event.getSource() == detachPigmentItem)
	2941	+ if (source == detachPigmentItem)
2529	2942	{
2530	2943	Object3D obj;
2531	2944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2536,7 +2949,7 @@
2536	2949
2537	2950	refreshContents();
2538	2951	} else
2539		- if (event.getSource() == attachBumpItem)
	2952	+ if (source == attachBumpItem)
2540	2953	{
2541	2954	String texture = GetFile("Attach bump");
2542	2955	Object3D obj;
..	..	@@ -2548,7 +2961,7 @@
2548	2961
2549	2962	refreshContents();
2550	2963	} else
2551		- if (event.getSource() == detachBumpItem)
	2964	+ if (source == detachBumpItem)
2552	2965	{
2553	2966	Object3D obj;
2554	2967	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2559,7 +2972,7 @@
2559	2972
2560	2973	refreshContents();
2561	2974	} else
2562		- if (event.getSource() == pigmentBumpItem)
	2975	+ if (source == pigmentBumpItem)
2563	2976	{
2564	2977	Object3D obj;
2565	2978	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2570,158 +2983,237 @@
2570	2983
2571	2984	refreshContents();
2572	2985	} else
2573		- if (event.getSource() == flashSelectionButton)
	2986	+ if (source == flashSelectionButton)
2574	2987	{
2575	2988	CameraPane.flash = true;
2576	2989	refreshContents();
2577	2990	} else
2578		- if (event.getSource() == oneButton)
	2991	+ if (source == oneButton)
2579	2992	{
2580	2993	} else
2581		- if (event.getSource() == twoButton)
	2994	+ if (source == twoButton)
2582	2995	{
2583	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2584	3001	// bug
2585	3002	//gridPanel.setDividerLocation(1.0);
2586	3003	//bigPanel.setDividerLocation(0.0);
2587		- bigThree.remove(jtp);
2588		- bigThree.remove(cameraPanel);
2589		- bigThree.remove(XYZPanel);
2590		- aWindowConstraints.gridx = 0;
2591		- aWindowConstraints.gridy = 0;
2592		- aWindowConstraints.gridwidth = 1;
2593		- // aConstraints.gridheight = 3;
2594		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2595		- aWindowConstraints.weightx = 0;
2596		- aWindowConstraints.weighty = 1;
2597		- //bigThree.add(jtp, aWindowConstraints);
2598		- aWindowConstraints.weightx = 1;
2599		- aWindowConstraints.gridwidth = 3;
2600		- // aConstraints.gridheight = 3;
2601		- aWindowConstraints.gridx = 1;
2602		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2603		- bigThree.add(cameraPanel, aWindowConstraints);
2604		- aWindowConstraints.weightx = 0;
2605		- aWindowConstraints.gridx = 4;
2606		- aWindowConstraints.gridwidth = 1;
2607		- // aConstraints.gridheight = 3;
2608		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2609		- //bigThree.add(XYZPanel, aWindowConstraints);
2610		- bigThree.revalidate();
	3004	+// bigThree.remove(scenePanel);
	3005	+// bigThree.remove(centralPanel);
	3006	+// bigThree.remove(XYZPanel);
	3007	+// aWindowConstraints.gridx = 0;
	3008	+// aWindowConstraints.gridy = 0;
	3009	+// aWindowConstraints.gridwidth = 1;
	3010	+// // aConstraints.gridheight = 3;
	3011	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3012	+// aWindowConstraints.weightx = 0;
	3013	+// aWindowConstraints.weighty = 1;
	3014	+// //bigThree.add(jtp, aWindowConstraints);
	3015	+// aWindowConstraints.weightx = 1;
	3016	+// aWindowConstraints.gridwidth = 3;
	3017	+// // aConstraints.gridheight = 3;
	3018	+// aWindowConstraints.gridx = 1;
	3019	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3020	+// bigThree.add(centralPanel, aWindowConstraints);
	3021	+// aWindowConstraints.weightx = 0;
	3022	+// aWindowConstraints.gridx = 4;
	3023	+// aWindowConstraints.gridwidth = 1;
	3024	+// // aConstraints.gridheight = 3;
	3025	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3026	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3027	+// scenePanel.setVisible(false);
	3028	+// centralPanel.setVisible(true);
	3029	+// XYZPanel.setVisible(false);
	3030	+ bigThree.ClearUI();
	3031	+ bigThree.add(centralPanel);
	3032	+ bigThree.FlushUI();
	3033	+
	3034	+ cameraView.requestFocusInWindow();
	3035	+
	3036	+// refreshContents(true);
	3037	+//
	3038	+// try
	3039	+// {
	3040	+// java.awt.Robot bot = new java.awt.Robot();
	3041	+// int mask = InputEvent.BUTTON1_MASK;
	3042	+// bot.mouseMove(100, 100);
	3043	+// bot.mousePress(mask);
	3044	+// bot.mouseRelease(mask);
	3045	+// }
	3046	+// catch (Exception e)
	3047	+// {
	3048	+//
	3049	+// }
	3050	+
2611	3051	} else
2612		- if (event.getSource() == threeButton)
	3052	+ if (source == threeButton)
2613	3053	{
2614	3054	radio.layout = threeButton;
2615		- bigThree.remove(jtp);
2616		- bigThree.remove(cameraPanel);
2617		- bigThree.remove(XYZPanel);
2618		- aWindowConstraints.gridx = 0;
2619		- aWindowConstraints.gridy = 0;
2620		- aWindowConstraints.gridwidth = 1;
2621		- // aConstraints.gridheight = 3;
2622		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2623		- aWindowConstraints.weightx = 0;
2624		- aWindowConstraints.weighty = 1;
2625		- //bigThree.add(jtp, aWindowConstraints);
2626		- aWindowConstraints.weightx = 1;
2627		- aWindowConstraints.gridwidth = 3;
2628		- // aConstraints.gridheight = 3;
2629		- aWindowConstraints.gridx = 1;
2630		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2631		- bigThree.add(cameraPanel, aWindowConstraints);
2632		- aWindowConstraints.weightx = 0;
2633		- aWindowConstraints.gridx = 4;
2634		- aWindowConstraints.gridwidth = 1;
2635		- // aConstraints.gridheight = 3;
2636		- aConstraints.fill = GridBagConstraints.VERTICAL;
2637		- bigThree.add(XYZPanel, aWindowConstraints);
2638		- bigThree.revalidate();
	3055	+
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
	3058	+
	3059	+// bigThree.remove(scenePanel);
	3060	+// bigThree.remove(centralPanel);
	3061	+// bigThree.remove(XYZPanel);
	3062	+// aWindowConstraints.gridx = 0;
	3063	+// aWindowConstraints.gridy = 0;
	3064	+// aWindowConstraints.gridwidth = 1;
	3065	+// // aConstraints.gridheight = 3;
	3066	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3067	+// aWindowConstraints.weightx = 0;
	3068	+// aWindowConstraints.weighty = 1;
	3069	+// //bigThree.add(jtp, aWindowConstraints);
	3070	+// aWindowConstraints.weightx = 1;
	3071	+// aWindowConstraints.gridwidth = 3;
	3072	+// // aConstraints.gridheight = 3;
	3073	+// aWindowConstraints.gridx = 1;
	3074	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3075	+// bigThree.add(centralPanel, aWindowConstraints);
	3076	+// aWindowConstraints.weightx = 0;
	3077	+// aWindowConstraints.gridx = 4;
	3078	+// aWindowConstraints.gridwidth = 1;
	3079	+// // aConstraints.gridheight = 3;
	3080	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3081	+// bigThree.add(XYZPanel, aWindowConstraints);
	3082	+// bigThree.validate();
	3083	+// scenePanel.setVisible(false);
	3084	+// centralPanel.setVisible(true);
	3085	+// XYZPanel.setVisible(true);
	3086	+ bigThree.ClearUI();
	3087	+ bigThree.add(centralPanel);
	3088	+ bigThree.add(XYZPanel);
	3089	+ bigThree.FlushUI();
	3090	+
	3091	+ cameraView.requestFocusInWindow();
2639	3092	} else
2640		- if (event.getSource() == fourButton)
	3093	+ if (source == fourButton)
2641	3094	{
2642	3095	radio.layout = fourButton;
2643		- bigThree.remove(jtp);
2644		- bigThree.remove(cameraPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aWindowConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2651		- aWindowConstraints.weightx = 1;
2652		- aWindowConstraints.weighty = 1;
2653		- bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- //bigThree.add(cameraPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aWindowConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3096	+
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
	3099	+
	3100	+// bigThree.remove(scenePanel);
	3101	+// bigThree.remove(centralPanel);
	3102	+// bigThree.remove(XYZPanel);
	3103	+// aWindowConstraints.gridx = 0;
	3104	+// aWindowConstraints.gridy = 0;
	3105	+// aWindowConstraints.gridwidth = 1;
	3106	+// // aWindowConstraints.gridheight = 3;
	3107	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3108	+// aWindowConstraints.weightx = 1;
	3109	+// aWindowConstraints.weighty = 1;
	3110	+// bigThree.add(scenePanel, aWindowConstraints);
	3111	+// aWindowConstraints.weightx = 1;
	3112	+// aWindowConstraints.gridwidth = 3;
	3113	+// // aConstraints.gridheight = 3;
	3114	+// aWindowConstraints.gridx = 1;
	3115	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3116	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3117	+// aWindowConstraints.weightx = 0;
	3118	+// aWindowConstraints.gridx = 4;
	3119	+// aWindowConstraints.gridwidth = 1;
	3120	+// // aWindowConstraints.gridheight = 3;
	3121	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3122	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3123	+// bigThree.validate();
	3124	+// scenePanel.setVisible(true);
	3125	+// centralPanel.setVisible(false);
	3126	+// XYZPanel.setVisible(false);
	3127	+ bigThree.ClearUI();
	3128	+ bigThree.add(scenePanel);
	3129	+ bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
2667	3132	} else
2668		- if (event.getSource() == sixButton)
	3133	+ if (source == sixButton)
2669	3134	{
2670	3135	radio.layout = sixButton;
2671		- bigThree.remove(jtp);
2672		- bigThree.remove(cameraPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aWindowConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(cameraPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aWindowConstraints.gridheight = 3;
2692		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2693		- //bigThree.add(XYZPanel, aConstraints);
2694		- bigThree.revalidate();
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
	3139	+
	3140	+// bigThree.remove(scenePanel);
	3141	+// bigThree.remove(centralPanel);
	3142	+// bigThree.remove(XYZPanel);
	3143	+// aWindowConstraints.gridx = 0;
	3144	+// aWindowConstraints.gridy = 0;
	3145	+// aWindowConstraints.gridwidth = 1;
	3146	+// // aConstraints.gridheight = 3;
	3147	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3148	+// aWindowConstraints.weightx = 0;
	3149	+// aWindowConstraints.weighty = 1;
	3150	+// bigThree.add(scenePanel, aWindowConstraints);
	3151	+// aWindowConstraints.weightx = 1;
	3152	+// aWindowConstraints.gridwidth = 3;
	3153	+// // aWindowConstraints.gridheight = 3;
	3154	+// aWindowConstraints.gridx = 1;
	3155	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3156	+// bigThree.add(centralPanel, aWindowConstraints);
	3157	+// aWindowConstraints.weightx = 0;
	3158	+// aWindowConstraints.gridx = 4;
	3159	+// aWindowConstraints.gridwidth = 1;
	3160	+// // aWindowConstraints.gridheight = 3;
	3161	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3162	+// //bigThree.add(XYZPanel, aConstraints);
	3163	+// bigThree.validate();
	3164	+// scenePanel.setVisible(true);
	3165	+// centralPanel.setVisible(true);
	3166	+// XYZPanel.setVisible(false);
	3167	+ bigThree.ClearUI();
	3168	+ bigThree.add(scenePanel);
	3169	+ bigThree.add(centralPanel);
	3170	+ bigThree.FlushUI();
	3171	+
	3172	+ cameraView.requestFocusInWindow();
2695	3173	} else
2696		- if (event.getSource() == sevenButton)
	3174	+ if (source == sevenButton)
2697	3175	{
2698	3176	radio.layout = sevenButton;
2699		- bigThree.remove(jtp);
2700		- bigThree.remove(cameraPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2707		- aWindowConstraints.weightx = 0;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(jtp, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aWindowConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
	3180	+
	3181	+// bigThree.remove(scenePanel);
	3182	+// bigThree.remove(centralPanel);
	3183	+// bigThree.remove(XYZPanel);
	3184	+// aWindowConstraints.gridx = 0;
	3185	+// aWindowConstraints.gridy = 0;
	3186	+// aWindowConstraints.gridwidth = 1;
	3187	+// // aWindowConstraints.gridheight = 3;
	3188	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3189	+// aWindowConstraints.weightx = 0;
	3190	+// aWindowConstraints.weighty = 1;
	3191	+// bigThree.add(scenePanel, aWindowConstraints);
	3192	+// aWindowConstraints.weightx = 1;
	3193	+// aWindowConstraints.gridwidth = 3;
	3194	+// // aWindowConstraints.gridheight = 3;
	3195	+// aWindowConstraints.gridx = 1;
	3196	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3197	+// bigThree.add(centralPanel, aWindowConstraints);
	3198	+// aWindowConstraints.weightx = 0;
	3199	+// aWindowConstraints.gridx = 4;
	3200	+// aWindowConstraints.gridwidth = 1;
	3201	+// // aConstraints.gridheight = 3;
	3202	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3203	+// bigThree.add(XYZPanel, aWindowConstraints);
	3204	+// bigThree.validate();
	3205	+// scenePanel.setVisible(true);
	3206	+// centralPanel.setVisible(true);
	3207	+// XYZPanel.setVisible(true);
	3208	+ bigThree.ClearUI();
	3209	+ bigThree.add(scenePanel);
	3210	+ bigThree.add(centralPanel);
	3211	+ bigThree.add(XYZPanel);
	3212	+ bigThree.FlushUI();
	3213	+
	3214	+ cameraView.requestFocusInWindow();
2723	3215	} else
2724		- if (event.getSource() == rootButton)
	3216	+ if (source == rootButton)
2725	3217	{
2726	3218	Object3D obj;
2727	3219	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2731,34 +3223,44 @@
2731	3223	EditObject(obj);
2732	3224	}
2733	3225
	3226	+ cameraView.requestFocusInWindow();
2734	3227	refreshContents(true);
2735	3228	} else
2736		- if (event.getSource() == closeButton)
	3229	+ if (source == closeButton)
2737	3230	{
2738	3231	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2739	3232	cRadio ab;
2740	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2741	3234	{
2742	3235	ab = (cRadio)e.nextElement();
2743		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2744	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
2745	3244	buttonGroup.remove(ab);
2746	3245	radioPanel.remove(ab);
2747	3246
2748		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
2749	3249	// ab.GetObject().objectUI = null; // ?????????
2750	3250
2751	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2752	3252	break;
2753	3253	}
2754	3254	}
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2755	3257	refreshContents(true);
2756	3258	} else
2757		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3259	+ if (source == editItem \|\| source == editButton)
2758	3260	{
2759	3261	EditSelection(false);
2760	3262	} else
2761		- if (event.getSource() == uneditButton)
	3263	+ if (source == uneditButton)
2762	3264	{
2763	3265	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2764	3266	{
..	..	@@ -2768,14 +3270,14 @@
2768	3270	child.CloseUI();
2769	3271	listUI.remove(child);
2770	3272
2771		- child.editWindow = null; // ???????????
	3273	+ //child.editWindow = null; // ???????????
2772	3274	}
2773		- objEditor.ctrlPanel.revalidate();
	3275	+ objEditor.ctrlPanel.FlushUI();
2774	3276	//objEditor.jTree.clearSelection();
2775	3277	//objEditor.ResetSliders();
2776	3278	refreshContents(true);
2777	3279	} else
2778		- if (event.getSource() == clearPanelButton)
	3280	+ if (source == clearPanelButton)
2779	3281	{
2780	3282	assert(copy == group);
2781	3283	//copy.ClearUI();
..	..	@@ -2786,7 +3288,7 @@
2786	3288	listUI.clear();
2787	3289	refreshContents(true);
2788	3290	} else
2789		- if (event.getSource() == allParamsButton)
	3291	+ if (source == allParamsButton)
2790	3292	{
2791	3293	assert(copy == group);
2792	3294
..	..	@@ -2807,19 +3309,19 @@
2807	3309
2808	3310	refreshContents(true);
2809	3311	} else
2810		- if (event.getSource() == unselectButton)
	3312	+ if (source == unselectButton)
2811	3313	{
2812	3314	objEditor.jTree.clearSelection();
2813	3315	// ?? oct 2012 GrafreeD.clipboard.clear();
2814	3316	objEditor.ResetSliders();
2815	3317	refreshContents(true);
2816	3318	} else
2817		- if(event.getSource() instanceof cRadio)
	3319	+ if(source instanceof cRadio)
2818	3320	{
2819	3321	group.parent = keepparent;
2820	3322	group.attributes = 0;
2821	3323	//group.editWindow = null;
2822		- /cRadio/ radio = (cRadio)event.getSource();
	3324	+ /cRadio/ radio = (cRadio)source;
2823	3325	Object3D obj = radio.GetObject();
2824	3326	System.out.println("Edit " + obj);
2825	3327	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2839,7 +3341,7 @@
2839	3341	}
2840	3342
2841	3343	copy = group;
2842		- //CameraPane.theRenderer.object = group;
	3344	+ //Globals.theRenderer.object = group;
2843	3345	if(!useclient)
2844	3346	{
2845	3347	cameraView.renderCamera = radio.camera;
..	..	@@ -2848,12 +3350,17 @@
2848	3350	cameraView.cameras[cameraView.cameracount] = radio.camera;
2849	3351	cameraView.targetLookAt.set(radio.camera.lookAt);
2850	3352	cameraView.object = group;
2851		- cameraView.lighttouched = true;
	3353	+ //cameraView.lighttouched = true;
	3354	+ Globals.lighttouched = true;
2852	3355	topView.object = group;
2853	3356	frontView.object = group;
2854	3357	sideView.object = group;
2855	3358	}
2856		- group.editWindow = this;
	3359	+
	3360	+// fix "+" issue
	3361	+ //group.editWindow = this;
	3362	+ group.manipWindow = this;
	3363	+
2857	3364	/*
2858	3365	currentLayout = radio.layout;
2859	3366	if (currentLayout == null)
..	..	@@ -2865,8 +3372,23 @@
2865	3372	//group.parent = null; // ROOT
2866	3373	//group.attributes = -1;
2867	3374	ResetModel();
	3375	+
	3376	+ cameraView.requestFocusInWindow();
2868	3377	refreshContents(true);
2869		- }
	3378	+ } else if (event.getSource() == editCameraItem)
	3379	+ {
	3380	+ cameraView.ProtectCamera();
	3381	+ cameraView.repaint();
	3382	+ return;
	3383	+ } else if (event.getSource() == revertCameraItem)
	3384	+ {
	3385	+ cameraView.RevertCamera();
	3386	+ cameraView.repaint();
	3387	+ return;
	3388	+ // } else if (event.getSource() == textureButton)
	3389	+ // {
	3390	+ // return; // true;
	3391	+ }
2870	3392	else
2871	3393	{
2872	3394	//return super.action(event, arg);
..	..	@@ -2875,7 +3397,6 @@
2875	3397	}
2876	3398
2877	3399	boolean useclient = false;
2878		- cRadio radio;
2879	3400
2880	3401	void ToggleRoot()
2881	3402	{
..	..	@@ -2884,7 +3405,7 @@
2884	3405	if (useclient)
2885	3406	{
2886	3407	cameraView.object = client;
2887		- cameraView.lighttouched = true;
	3408	+ Globals.lighttouched = true;
2888	3409	//topView.object = client;
2889	3410	//frontView.object = client;
2890	3411	//sideView.object = client;
..	..	@@ -2892,7 +3413,7 @@
2892	3413	else
2893	3414	{
2894	3415	cameraView.object = group;
2895		- cameraView.lighttouched = true;
	3416	+ Globals.lighttouched = true;
2896	3417	//topView.object = group;
2897	3418	//frontView.object = group;
2898	3419	//sideView.object = group;
..	..	@@ -2927,6 +3448,28 @@
2927	3448	refreshContents();
2928	3449	}
2929	3450
	3451	+ void TransformChildren()
	3452	+ {
	3453	+ Object3D obj;
	3454	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3455	+ {
	3456	+ obj = (Object3D)e.nextElement();
	3457	+ obj.KeepTextureMatrices();
	3458	+ obj.TransformChildren();
	3459	+ obj.RestoreTextureMatrices();
	3460	+
	3461	+// if (obj.parent == null)
	3462	+// {
	3463	+// System.out.println("NULL PARENT!");
	3464	+// new Exception().printStackTrace();
	3465	+// }
	3466	+// else
	3467	+// TouchTransform(obj);
	3468	+// //obj.parent.Touch();
	3469	+ }
	3470	+
	3471	+ refreshContents();
	3472	+ }
2930	3473
2931	3474	void ResetTransform()
2932	3475	{
..	..	@@ -3039,7 +3582,7 @@
3039	3582	refreshContents();
3040	3583	}
3041	3584
3042		- void ResetCentroid()
	3585	+ void ResetCentroid(boolean full)
3043	3586	{
3044	3587	Object3D obj;
3045	3588	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3054,12 +3597,16 @@
3054	3597	LA.matIdentity(Object3D.mat);
3055	3598	obj.getBounds(minima, maxima, false);
3056	3599	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3600	+ if (full)
	3601	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3058	3602	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3059	3603	obj.TransformMesh(Object3D.mat);
	3604	+
3060	3605	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3061		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3606	+ if (full)
	3607	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3062	3608	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3609	+
3063	3610	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3064	3611	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3065	3612	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3088,7 +3635,8 @@
3088	3635
3089	3636	int size = obj.MemorySize();
3090	3637
3091		- System.err.println((size/1024) + " KB is the size of " + obj);
	3638	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3639	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3092	3640	}
3093	3641	}
3094	3642	catch (Exception e)
..	..	@@ -3125,9 +3673,9 @@
3125	3673	obj = (Object3D)e.nextElement();
3126	3674
3127	3675	System.out.println("Object is: " + obj);
3128		- GrafreeD.AnalyzeObject(obj);
	3676	+ Grafreed.AnalyzeObject(obj);
3129	3677	System.out.println("Boundary rep: " + obj.bRep);
3130		- GrafreeD.AnalyzeObject(obj.bRep);
	3678	+ Grafreed.AnalyzeObject(obj.bRep);
3131	3679
3132	3680	// System.err.println((size/1024) + " KB is the size of " + obj);
3133	3681	}
..	..	@@ -3169,6 +3717,20 @@
3169	3717	void GenNormals(boolean crease)
3170	3718	{
3171	3719	group.GenNormalsS(crease);
	3720	+
	3721	+ refreshContents();
	3722	+ }
	3723	+
	3724	+ void GenNormalsMESH()
	3725	+ {
	3726	+ group.GenNormalsMeshS();
	3727	+
	3728	+ refreshContents();
	3729	+ }
	3730	+
	3731	+ void GenNormalsMINE()
	3732	+ {
	3733	+ group.selection.GenNormalsMINE();
3172	3734
3173	3735	refreshContents();
3174	3736	}
..	..	@@ -3334,8 +3896,8 @@
3334	3896
3335	3897	void ParseVertices()
3336	3898	{
3337		- boolean epsequal = GrafreeD.epsequal;
3338		- GrafreeD.epsequal = true;
	3899	+ boolean epsequal = Grafreed.epsequal;
	3900	+ Grafreed.epsequal = true;
3339	3901
3340	3902	for (int i=0; i<group.selection.size(); i++)
3341	3903	{
..	..	@@ -3360,7 +3922,7 @@
3360	3922	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3361	3923	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3362	3924
3363		- g.add(GrafreeD.clipboard);
	3925	+ g.add(Grafreed.clipboard);
3364	3926
3365	3927	buffer.add(g);
3366	3928	}
..	..	@@ -3375,7 +3937,7 @@
3375	3937	makeSomething(buffer, i==group.selection.size()-1);
3376	3938	}
3377	3939
3378		- GrafreeD.epsequal = epsequal;
	3940	+ Grafreed.epsequal = epsequal;
3379	3941
3380	3942	refreshContents();
3381	3943	}
..	..	@@ -3393,7 +3955,16 @@
3393	3955	String pigment = Object3D.GetPigment(tex);
3394	3956	//String bump = Object3D.GetBump(tex);
3395	3957
3396		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3958	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3959	+
	3960	+ try
	3961	+ {
	3962	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3963	+ }
	3964	+ catch (Exception e)
	3965	+ {
	3966	+ System.err.println("FAIL: " + node);
	3967	+ }
3397	3968
3398	3969	double s = v.s;
3399	3970
..	..	@@ -3441,12 +4012,26 @@
3441	4012
3442	4013	void Align()
3443	4014	{
	4015	+ if (group.selection.size() == 0)
	4016	+ return;
	4017	+
	4018	+ cVector bbmin = new cVector();
	4019	+ cVector bbmax = new cVector();
	4020	+
	4021	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4022	+
	4023	+ double dx = bbmax.x - bbmin.x;
	4024	+ double dy = bbmax.y - bbmin.y;
	4025	+ double dz = bbmax.z - bbmin.z;
	4026	+
	4027	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4028	+
3444	4029	for (int i=0; i<group.selection.size(); i++)
3445	4030	{
3446	4031	Object3D obj = group.selection.get(i);
3447	4032
3448		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3449		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4033	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4034	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3450	4035	}
3451	4036
3452	4037	refreshContents();
..	..	@@ -3467,11 +4052,11 @@
3467	4052
3468	4053	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3469	4054
3470		- boolean random = CameraPane.RANDOM;
3471		- CameraPane.RANDOM = false; // parse all random nodes
	4055	+ boolean random = CameraPane.SWITCH;
	4056	+ CameraPane.SWITCH = false; // parse all random nodes
3472	4057	lowres.linkVerticesThis(null);
3473	4058	lowres.linkVerticesThis(sn);
3474		- CameraPane.RANDOM = random;
	4059	+ CameraPane.SWITCH = random;
3475	4060
3476	4061	System.err.flush();
3477	4062
..	..	@@ -3511,7 +4096,7 @@
3511	4096	return;
3512	4097
3513	4098	Object3D poses = group.selection.get(0);
3514		- Object3D ref = GrafreeD.clipboard.get(0);
	4099	+ Object3D ref = Grafreed.clipboard.get(0);
3515	4100
3516	4101	Object3D newgroup = new Object3D("Po:" + poses.name);
3517	4102
..	..	@@ -3680,7 +4265,7 @@
3680	4265	group.selection.RelinkToSupport(); // july 2014
3681	4266	System.out.println("DONE.");
3682	4267	refreshContents();
3683		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4268	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3684	4269	}
3685	4270
3686	4271	void ReduceMesh(boolean reduction34)
..	..	@@ -3705,9 +4290,9 @@
3705	4290
3706	4291	void ClipMesh()
3707	4292	{
3708		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4293	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3709	4294	{
3710		- Object3D content = GrafreeD.clipboard.get(0);
	4295	+ Object3D content = Grafreed.clipboard.get(0);
3711	4296
3712	4297	if (content instanceof cGroup && ((cGroup)content).transientlink )
3713	4298	content = ((cGroup)content).get(0);
..	..	@@ -3716,7 +4301,7 @@
3716	4301	// {
3717	4302	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3718	4303	// }
3719		- group.selection.ClipMesh(GrafreeD.clipboard);
	4304	+ group.selection.ClipMesh(Grafreed.clipboard);
3720	4305	}
3721	4306	// group.selection.ClipMesh(GrafreeD.clipboard);
3722	4307	System.out.println("DONE.");
..	..	@@ -3763,6 +4348,18 @@
3763	4348	void MarkLeaves(boolean hide)
3764	4349	{
3765	4350	group.selection.MarkLeaves(hide);
	4351	+ refreshContents();
	4352	+ }
	4353	+
	4354	+ void RewindLeaves(boolean hide)
	4355	+ {
	4356	+ group.selection.RewindLeaves(hide);
	4357	+ refreshContents();
	4358	+ }
	4359	+
	4360	+ void RandomLeaves(boolean hide)
	4361	+ {
	4362	+ group.selection.RandomLeaves(hide);
3766	4363	refreshContents();
3767	4364	}
3768	4365
..	..	@@ -3848,10 +4445,10 @@
3848	4445	{
3849	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3850	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3851		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3852	4449
3853	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
3854		- if(elem != group)
	4451	+ if(elem != group \|\| !newWindow)
3855	4452	{
3856	4453	// if (!(elem instanceof Composite))
3857	4454	// newWindow = false;
..	..	@@ -3941,7 +4538,6 @@
3941	4538	//case 702: // Event.LIST_DESELECT
3942	4539	group.deselectAll();
3943	4540	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3944		- objEditor.ClearInfo(); // .GetMaterial());
3945	4541	if (tps != null)
3946	4542	{
3947	4543	for (int i=0; i < tps.length; i++)
..	..	@@ -3950,31 +4546,30 @@
3950	4546
3951	4547	//if (child.parent != null)
3952	4548	//child.parent.addSelectee(child);
	4549	+ objEditor.SetMaterial(child);
3953	4550	group.addSelectee(child);
3954		- objEditor.SetMaterial(child); // .GetMaterial());
3955		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3956		- System.err.println("info : " + child.GetPath());
3957	4551	}
3958	4552	}
3959		- else
3960		- {
3961		- objEditor.SetMaterial(group); // .GetMaterial());
3962		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3963		- System.err.println("info : " + group.GetPath());
3964		- }
	4553	+// else
	4554	+// {
	4555	+// objEditor.SetMaterial(group); // .GetMaterial());
	4556	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4557	+// System.err.println("info : " + group.GetPath());
	4558	+// }
3965	4559
3966		- objEditor.SetText(); // jan 2014
3967		-
3968		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4560	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3969	4561	CameraPane.flash = true;
3970	4562
3971		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4563	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3972	4564	// a camera
3973	4565	{
3974		- CameraPane.camerachangeframe = 0; // don't refuse it
3975		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3976		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3977		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4566	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4567	+ {
	4568	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4569	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4570	+ }
	4571	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4572	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3978	4573	}
3979	4574
3980	4575	refreshContents();
..	..	@@ -3985,6 +4580,26 @@
3985	4580
3986	4581	freezemodel = false;
3987	4582	}
	4583	+
	4584	+ void refreshContents(boolean cp)
	4585	+ {
	4586	+ if (!Globals.MOUSEDRAGGED)
	4587	+ {
	4588	+ objEditor.ClearInfo(); // .GetMaterial());
	4589	+
	4590	+ for (int i=0; i < group.selection.Size(); i++)
	4591	+ {
	4592	+ Object3D child = (Object3D) group.selection.get(i);
	4593	+
	4594	+ objEditor.AddInfo(child, this, true);
	4595	+ System.err.println("info : " + child.GetPath());
	4596	+ }
	4597	+
	4598	+ objEditor.SetText(); // jan 2014
	4599	+ }
	4600	+
	4601	+ super.refreshContents(cp);
	4602	+ }
3988	4603
3989	4604	void linkSomething(Object3D thing)
3990	4605	{
..	..	@@ -4056,16 +4671,19 @@
4056	4671	{
4057	4672	if (group.selection.isEmpty())
4058	4673	return;
4059		- GrafreeD.clipboardIsTempGroup = false;
	4674	+
	4675	+ Grafreed.clipboardIsTempGroup = false;
4060	4676	Composite tGroup = null;
4061	4677	if (group.selection.size() > 0) // 1)
4062	4678	{
4063	4679	tGroup = new cGroup();
4064		- GrafreeD.clipboardIsTempGroup = true;
	4680	+ Grafreed.clipboardIsTempGroup = true;
4065	4681	}
4066	4682
4067	4683	if (cut)
4068	4684	{
	4685	+ if (Globals.SAVEONMAKE)
	4686	+ Save();
4069	4687	//int indices[] = jList.getSelectedIndices();
4070	4688	//for (int i = indices.length - 1; i >= 0; i--)
4071	4689	//jList.remove(indices[i]);
..	..	@@ -4101,16 +4719,16 @@
4101	4719	//System.out.println("cut " + child);
4102	4720	//System.out.println("parent = " + child.parent);
4103	4721	// tmp.addChild(child);
4104		- if (GrafreeD.clipboardIsTempGroup)
	4722	+ if (Grafreed.clipboardIsTempGroup)
4105	4723	tGroup.add/Child/(tmp);
4106	4724	else
4107		- GrafreeD.clipboard = tmp;
	4725	+ Grafreed.clipboard = tmp;
4108	4726	}
4109	4727	else
4110		- if (GrafreeD.clipboardIsTempGroup)
	4728	+ if (Grafreed.clipboardIsTempGroup)
4111	4729	tGroup.add/Child/(child);
4112	4730	else
4113		- GrafreeD.clipboard = child;
	4731	+ Grafreed.clipboard = child;
4114	4732	}
4115	4733
4116	4734	//ResetModel();
..	..	@@ -4142,21 +4760,23 @@
4142	4760	//System.out.println("cut " + elem);
4143	4761	//System.out.println("parent = " + elem.parent);
4144	4762	// tmp.addChild(elem);
4145		- if (GrafreeD.clipboardIsTempGroup)
	4763	+ if (Grafreed.clipboardIsTempGroup)
4146	4764	tGroup.add/Child/(tmp);
4147	4765	else
4148		- GrafreeD.clipboard = tmp;
	4766	+ Grafreed.clipboard = tmp;
4149	4767	}
4150	4768	else
4151		- if (GrafreeD.clipboardIsTempGroup)
	4769	+ if (Grafreed.clipboardIsTempGroup)
4152	4770	tGroup.add/Child/(child);
4153	4771	else
4154		- GrafreeD.clipboard = child;
	4772	+ Grafreed.clipboard = child;
4155	4773	}
4156	4774
4157	4775	}
4158		- if (GrafreeD.clipboardIsTempGroup)
4159		- GrafreeD.clipboard = tGroup;
	4776	+
	4777	+ if (Grafreed.clipboardIsTempGroup)
	4778	+ Grafreed.clipboard = tGroup;
	4779	+
4160	4780	if (cut)
4161	4781	{
4162	4782	ResetModel();
..	..	@@ -4170,7 +4790,7 @@
4170	4790	// return;
4171	4791	boolean first = true;
4172	4792
4173		- if (GrafreeD.clipboardIsTempGroup)
	4793	+ if (Grafreed.clipboardIsTempGroup)
4174	4794	{
4175	4795	Composite temp;
4176	4796
..	..	@@ -4181,7 +4801,7 @@
4181	4801	temp = (Composite)Applet3D.clipboard.deepCopy();
4182	4802	*/
4183	4803	Object3D elem;
4184		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4804	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4185	4805	{
4186	4806	Object3D child = (Object3D)e.nextElement();
4187	4807
..	..	@@ -4215,21 +4835,21 @@
4215	4835	//Object3D cb = Applet3D.clipboard;
4216	4836	//temp.addChild(cb);
4217	4837	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4218		- assert(GrafreeD.clipboard.parent == null);
4219		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4220		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4221		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4222		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4838	+ assert(Grafreed.clipboard.parent == null);
	4839	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4840	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4841	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4842	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4223	4843	else
4224		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4225		- GrafreeD.clipboard.get(0).parent = keepparent;
	4844	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4845	+ Grafreed.clipboard.get(0).parent = keepparent;
4226	4846	}
4227	4847
4228	4848	ResetModel();
4229	4849	refreshContents();
4230	4850	}
4231	4851
4232		- void pasteInto(boolean copyit)
	4852	+ void pasteInto(boolean copyit, boolean clone)
4233	4853	{
4234	4854	// if (GrafreeD.clipboard == null)
4235	4855	// return;
..	..	@@ -4258,15 +4878,22 @@
4258	4878	if (copyit)
4259	4879	{
4260	4880	// paste(false);
4261		- CloneClipboard(false); // sept 2014
	4881	+ if (clone)
	4882	+ {
	4883	+ CloneClipboard(false); // sept 2014
	4884	+ }
	4885	+ else
	4886	+ {
	4887	+ paste(false);
	4888	+ }
4262	4889	}
4263	4890	else
4264	4891	{
4265	4892	boolean first = true;
4266	4893
4267		- if (GrafreeD.clipboardIsTempGroup)
	4894	+ if (Grafreed.clipboardIsTempGroup)
4268	4895	{
4269		- Composite temp = (Composite)GrafreeD.clipboard;
	4896	+ Composite temp = (Composite)Grafreed.clipboard;
4270	4897	Object3D copy;
4271	4898	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4272	4899	{
..	..	@@ -4276,7 +4903,7 @@
4276	4903	}
4277	4904	} else
4278	4905	{
4279		- linkSomething(GrafreeD.clipboard); //.get(0));
	4906	+ linkSomething(Grafreed.clipboard); //.get(0));
4280	4907	}
4281	4908	}
4282	4909	}
..	..	@@ -4468,6 +5095,26 @@
4468	5095	makeSomething(csg);
4469	5096	}
4470	5097
	5098	+ void Ungroup(Object3D g)
	5099	+ {
	5100	+ if (g instanceof HiddenObject)
	5101	+ {
	5102	+ HiddenObject h = (HiddenObject) g;
	5103	+
	5104	+ for (int i=0; i<h.ActualSize(); i++)
	5105	+ {
	5106	+ objEditor.makeSomething(h.get(i), false);
	5107	+ }
	5108	+ }
	5109	+ else
	5110	+ {
	5111	+ for (int i=0; i<g.Size(); i++)
	5112	+ {
	5113	+ objEditor.makeSomething(g.get(i), false);
	5114	+ }
	5115	+ }
	5116	+ }
	5117	+
4471	5118	void ungroup()
4472	5119	{
4473	5120	/*
..	..	@@ -4661,21 +5308,6 @@
4661	5308	}
4662	5309	*/
4663	5310
4664		- void ImportGFD()
4665		- {
4666		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4667		- browser.show();
4668		- String filename = browser.getFile();
4669		- if (filename != null && filename.length() > 0)
4670		- {
4671		- String fullname = browser.getDirectory() + filename;
4672		-
4673		- //Object3D readobj =
4674		- objEditor.ReadGFD(fullname, objEditor);
4675		- //makeSomething(readobj);
4676		- }
4677		- }
4678		-
4679	5311	/*
4680	5312	public void Callback(Object obj)
4681	5313	{
..	..	@@ -4699,26 +5331,9 @@
4699	5331	}
4700	5332	*/
4701	5333
4702		- void ImportVRMLX3D()
4703		- {
4704		- if (GrafreeD.standAlone)
4705		- {
4706		- /**/
4707		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4708		- browser.show();
4709		- String filename = browser.getFile();
4710		- if (filename != null && filename.length() > 0)
4711		- {
4712		- String fullname = browser.getDirectory() + filename;
4713		- LoadVRMLX3D(fullname);
4714		- }
4715		- /**/
4716		- }
4717		- }
4718		-
4719	5334	String GetFile(String dialogName)
4720	5335	{
4721		- if (GrafreeD.standAlone)
	5336	+ if (Grafreed.standAlone)
4722	5337	{
4723	5338	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4724	5339	browser.show();
..	..	@@ -4782,10 +5397,33 @@
4782	5397	cButton flashSelectionButton;
4783	5398	cButton editButton;
4784	5399	cButton uneditButton;
	5400	+ JCheckBox allParamsButton;
4785	5401	cButton clearpanelButton;
4786		- cButton allParamsButton;
4787	5402	cButton unselectButton;
4788	5403
	5404	+ cButton minButton;
	5405	+ cButton maxButton;
	5406	+ cButton fullButton;
	5407	+ cButton undoButton;
	5408	+ cButton redoButton;
	5409	+ cButton saveButton;
	5410	+ cButton oneStepButton;
	5411	+
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
	5426	+
4789	5427	cButton screenfitButton;
4790	5428	cButton screenfitpointButton;
4791	5429	cButton snapobjectButton;
..	..	@@ -4796,14 +5434,6 @@
4796	5434	cButton closeButton;
4797	5435
4798	5436	cButton setsupportButton;
4799		-
4800		- cButton twoButton;
4801		- cButton sixButton;
4802		- cButton threeButton;
4803		- cButton sevenButton;
4804		- cButton fourButton; // full panel
4805		- cButton oneButton; // full XYZ
4806		- //cButton currentLayout;
4807	5437
4808	5438	//
4809	5439	//Composite
..	..	@@ -4816,7 +5446,9 @@
4816	5446	private MenuItem lookFromItem;
4817	5447	private MenuItem switchItem;
4818	5448	private MenuItem cutItem;
4819		- private MenuItem duplicateItem;
	5449	+ private MenuItem undoItem;
	5450	+ private MenuItem redoItem;
	5451	+ private JMenuItem duplicateItem;
4820	5452	private MenuItem cloneItem;
4821	5453	private MenuItem cloneSupportItem;
4822	5454	private MenuItem overwriteGeoItem;
..	..	@@ -4827,8 +5459,9 @@
4827	5459	private MenuItem resetsupportItem;
4828	5460	private MenuItem resetreferencesItem;
4829	5461	private MenuItem linkverticesItem;
	5462	+ private MenuItem relinkverticesItem;
4830	5463	private MenuItem setMasterItem;
4831		- private MenuItem resetMeshItem;
	5464	+ private MenuItem resetAllItem;
4832	5465	private MenuItem stepAllItem;
4833	5466	private MenuItem revertMeshItem;
4834	5467	private MenuItem poseMeshItem;
..	..	@@ -4839,14 +5472,17 @@
4839	5472	private MenuItem mergeGeometriesItem;
4840	5473	private MenuItem copyItem;
4841	5474	private MenuItem pasteItem;
	5475	+ private MenuItem pasteIntoItem;
4842	5476	private MenuItem pasteLinkItem;
4843	5477	private MenuItem pasteCloneItem;
4844	5478	private MenuItem pasteExpandItem;
4845	5479	private MenuItem clearItem;
4846	5480	private MenuItem clearAllItem;
4847	5481	private MenuItem genUVItem;
	5482	+ private MenuItem genNormalsMESHItem;
4848	5483	private MenuItem genNormalsCADItem;
4849	5484	private MenuItem genNormalsORGANItem;
	5485	+ private MenuItem genNormalsMINEItem;
4850	5486	private MenuItem stripifyItem;
4851	5487	private MenuItem unstripifyItem;
4852	5488	private MenuItem trimItem;
..	..	@@ -4875,6 +5511,10 @@
4875	5511	private MenuItem showleavesItem;
4876	5512	private MenuItem markleavesItem;
4877	5513	private MenuItem unmarkleavesItem;
	5514	+ private MenuItem rewindleavesItem;
	5515	+ private MenuItem unrewindleavesItem;
	5516	+ private MenuItem randomleavesItem;
	5517	+ private MenuItem unrandomleavesItem;
4878	5518
4879	5519	private MenuItem flipVItem;
4880	5520	private MenuItem unflipVItem;
..	..	@@ -4886,8 +5526,11 @@
4886	5526	private MenuItem panoTexturesItem;
4887	5527
4888	5528	private MenuItem resetCentroidItem;
4889		- private MenuItem transformgeometryItem;
	5529	+ private MenuItem resetCentroidXZItem;
4890	5530	private MenuItem resetTransformItem;
	5531	+ private MenuItem transformGeometryItem;
	5532	+ private MenuItem transformChildrenItem;
	5533	+ private MenuItem hideItem;
4891	5534	private MenuItem grabItem;
4892	5535	private MenuItem backItem;
4893	5536	private MenuItem frontItem;
..	..	@@ -4908,6 +5551,7 @@
4908	5551
4909	5552	private MenuItem resetParentItem;
4910	5553	private MenuItem repairParentItem;
	5554	+ private MenuItem repairShadowItem;
4911	5555	private MenuItem sortbysizeItem;
4912	5556	private MenuItem sortbynameItem;
4913	5557
..	..	@@ -4928,10 +5572,11 @@
4928	5572	private MenuItem coneItem;
4929	5573	private MenuItem torusItem;
4930	5574	private MenuItem superItem;
	5575	+ private MenuItem kleinItem;
4931	5576	private MenuItem blobItem;
4932	5577	private MenuItem latheItem;
4933	5578	private MenuItem bezierItem;
4934		- private MenuItem checkerItem;
	5579	+ private MenuItem overlayItem;
4935	5580	private MenuItem meshItem;
4936	5581	// private MenuItem meshGroupItem;
4937	5582	private MenuItem springItem;
..	..	@@ -4940,6 +5585,7 @@
4940	5585	private MenuItem csgItem;
4941	5586	private MenuItem templateItem;
4942	5587	private MenuItem textureItem;
	5588	+ private MenuItem billboardItem;
4943	5589	private MenuItem shadowXItem;
4944	5590	private MenuItem shadowYItem;
4945	5591	private MenuItem shadowZItem;
..	..	@@ -4952,11 +5598,6 @@
4952	5598	private MenuItem doubleItem;
4953	5599	private MenuItem tripleItem;
4954	5600
4955		- private MenuItem importGFDItem;
4956		- private MenuItem importVRMLX3DItem;
4957		- private MenuItem import3DSItem;
4958		- private MenuItem importOBJItem;
4959		-
4960	5601	private MenuItem computeAOItem;
4961	5602	private MenuItem recompileItem;
4962	5603	private MenuItem editScriptItem;
..	..	@@ -4966,4 +5607,8 @@
4966	5607	private MenuItem analyzeItem;
4967	5608	private MenuItem dumpItem;
4968	5609	//boolean freezemodel = false;
	5610	+
	5611	+ Menu cameraMenu;
	5612	+ MenuItem editCameraItem;
	5613	+ MenuItem revertCameraItem;
4969	5614	}