~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);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
	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		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- 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);
	335	+ frontItem = menu.add(new MenuItem("Front"));
	336	+ frontItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	343	+ hideItem.addActionListener(this);
	344	+ }
	345	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	346	+ ungroupItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.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		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	368	+ }
251	369
252	370	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
	373	+ billboardItem = menu.add(new MenuItem("Billboard"));
	374	+ billboardItem.addActionListener(this);
255	375	csgItem = menu.add(new MenuItem("CSG"));
256	376	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	378	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	380	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
263	386	linkerItem = menu.add(new MenuItem("Linker"));
264	387	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	388	attributeItem = menu.add(new MenuItem("Attribute"));
268	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
269	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	393	pointflowItem.addActionListener(this);
	394	+ }
271	395	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	397	resetTransformItem.addActionListener(this);
276	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	399	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
280	406
281	407	oe.menuBar.add(menu = new Menu("Geometry"));
282	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +411,13 @@
285	411	genNormalsORGANItem.addActionListener(this);
286	412	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	413	genNormalsCADItem.addActionListener(this);
	414	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	415	+ genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
	418	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	419	+ genNormalsMINEItem.addActionListener(this);
	420	+ }
288	421	stripifyItem = menu.add(new MenuItem("Stripify"));
289	422	stripifyItem.addActionListener(this);
290	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +439,34 @@
306	439	reduce34MeshItem.addActionListener(this);
307	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	441	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
313	450
314	451	oe.menuBar.add(menu = new Menu("Attributes"));
315	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
317	458	menu.add("-");
318	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	460	liveleavesItem.addActionListener(this);
320	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
322	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	466	supportleavesItem.addActionListener(this);
324	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	468	unsupportleavesItem.addActionListener(this);
	469	+ }
326	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	471	hideleavesItem.addActionListener(this);
328	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +475,14 @@
331	475	markleavesItem.addActionListener(this);
332	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
334	486	menu.add("-");
335	487	flipVItem = menu.add(new MenuItem("Flip V"));
336	488	flipVItem.addActionListener(this);
..	..	@@ -366,35 +518,40 @@
366	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	519	sortbynameItem.addActionListener(this);
368	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
369	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	529	extractGeometriesItem.addActionListener(this);
371	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	531	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);
	532	+ }
377	533
378	534	oe.menuBar.add(menu = new Menu("Insert"));
379	535	buildCreateMenu(menu);
380	536
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD 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	537	oe.menuBar.add(menu = new Menu("Tools"));
393	538	buildToolsMenu(menu);
394	539	}
395	540
396	541	void SetupUI2(ObjEditor oe)
397	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
398	555	//new Exception().printStackTrace();
399	556
400	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +580,199 @@
423	580	oe.radioPanel.add(dummyButton);
424	581	oe.buttonGroup.add(dummyButton);
425	582	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
429	586
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ redoButton.setToolTipText("Redo changes");
	611	+ redoButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ saveButton.setToolTipText("Save changes");
	615	+ saveButton.addActionListener(this);
	616	+
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	618	+ liveCB.setToolTipText("Enable animation");
431	619	liveCB.addItemListener(this);
432	620
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);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ oneStepButton.setToolTipText("Animate one step forward");
	623	+ oneStepButton.addActionListener(this);
	624	+
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	626	+ fastCB.setToolTipText("Fast mode");
451	627	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);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	628	+
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ screenfitButton.setToolTipText("Screen fit");
497	633	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
	638	+
499	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	640	// 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	641
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);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
	642	+ if (Globals.ADVANCED)
	643	+ {
	644	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	645	+ snapobjectButton.addActionListener(this);
	646	+ snapobjectButton.setToolTipText("Snap Object");
	647	+ }
	648	+
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
516	650
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ twoButton.setToolTipText("Show center view only");
519	653	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	657	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	658	+ fourButton.setToolTipText("Show left panel only");
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ sixButton.setToolTipText("2-column layout left");
523	661	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ threeButton.setToolTipText("2-column layout right");
525	664	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	666	+ sevenButton.setToolTipText("3-column layout");
527	667	sevenButton.addActionListener(this);
528	668	//
529	669
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ rootButton.setToolTipText("Edit selection in new tab");
531	672	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	673	+
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ closeButton.setToolTipText("Close tab");
534	676	closeButton.addActionListener(this);
535	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	678	//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	679
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ editButton.setToolTipText("Edit selection");
	749	+ editButton.addActionListener(this);
	750	+
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ uneditButton.setToolTipText("Unedit selection");
547	753	uneditButton.addActionListener(this);
548	754
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);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	756	+ allParamsButton.setToolTipText("Edit all params");
561	757	allParamsButton.addActionListener(this);
562	758
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);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ clearPanelButton.setToolTipText("Clear edit panel");
	761	+ clearPanelButton.addActionListener(this);
	762	+
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ unselectButton.setToolTipText("Unselect");
568	765	unselectButton.addActionListener(this);
569	766
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
	770	+
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
	775	+
570	776	// oe.aConstraints.gridx += 1;
571	777	// oe.aConstraints.weighty = 0;
572	778	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +784,22 @@
578	784	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	785	// gcButton.addActionListener(this);
580	786
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;
	787	+ cGridBag jSPPanel = new cGridBag();
	788	+
	789	+ JScrollPane jSP;
592	790	//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);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	792	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
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);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	793
	794	+ oe.treePanel.add(jSPPanel);
	795	+ oe.treePanel.Return();
	796	+
	797	+ oe.treePanel.add(copyOptionsPanel);
	798	+ oe.treePanel.Return();
	799	+
	800	+// mainPanel.setDividerLocation(0.5); //1.0);
	801	+// mainPanel.setResizeWeight(0.5);
	802	+
615	803	//jList.addListSelectionListener(this);
616	804	oe.jTree.addTreeSelectionListener(this);
617	805	//jTree.setRootVisible(false);
..	..	@@ -633,20 +821,153 @@
633	821	radio.layout = sevenButton;
634	822	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	823	}
	824	+
	825	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	826	+ {
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
	830	+
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
	834	+
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
	841	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	842	+ boxCB.setToolTipText("Display bounding boxes");
	843	+ boxCB.addItemListener(this);
	844	+
	845	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	846	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	847	+ zoomBoxCB.addItemListener(this);
	848	+
	849	+ if (true) // Globals.ADVANCED)
	850	+ {
	851	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	852	+ supportCB.setToolTipText("Enable rigging");
	853	+ supportCB.addItemListener(this);
	854	+
	855	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	856	+ // localCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
	860	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	861	+ crowdCB.setToolTipText("Used for crowds");
	862	+ crowdCB.addItemListener(this);
	863	+
	864	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	865	+ smoothCB.setToolTipText("Snapping delay");
	866	+ smoothCB.addItemListener(this);
	867	+
	868	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	869	+ slowCB.setToolTipText("Smooth interpolation");
	870	+ slowCB.addItemListener(this);
	871	+
	872	+// constraints.gridy += 1;
	873	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	874	+// speakerMocapCB.addItemListener(this);
	875	+
	876	+ panel.Return();
	877	+
	878	+ if (false)
	879	+ {
	880	+ // handled in scripts
	881	+ //constraints.gridy += 1;
	882	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	883	+ speakerCameraCB.addItemListener(this);
	884	+
	885	+ //constraints.gridy += 1;
	886	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	887	+ speakerFocusCB.addItemListener(this);
	888	+
	889	+ //constraints.gridy += 1;
	890	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	891	+ smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
	893	+ }
	894	+
	895	+//constraints.gridx += 1;
	896	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	897	+// debugCB.addItemListener(this);
	898	+
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
	903	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
	905	+ oeilCB.addItemListener(this);
	906	+
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
	927	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	928	+ lookAtCB.setToolTipText("Look-at target");
	929	+ lookAtCB.addItemListener(this);
	930	+ }
	931	+
	932	+ }
	933	+
	934	+ cGridBag fill = new cGridBag();
	935	+ fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
	940	+
	941	+ panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
	944	+
	945	+ }
636	946
637	947	void EditObject(Object3D obj)
638	948	{
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();
	949	+ cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
	958	+ radioButton.SetObject(obj);
	959	+ radioButton.layout = sevenButton;
	960	+ radioButton.SetCamera(cameraView.renderCamera, false);
	961	+ radioButton.addActionListener(this);
	962	+ radioPanel.add(radioButton);
	963	+ buttonGroup.add(radioButton);
	964	+ radioButton.doClick();
647	965	}
	966	+
648	967	void SetupViews(ObjEditor oe)
649	968	{
	969	+ theFrame = this;
	970	+
650	971	oe.SetupViews();
651	972
652	973	System.out.println("SetupViews");
..	..	@@ -655,22 +976,27 @@
655	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	977	}
657	978
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;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
668	991	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
674	1000
675	1001	// static int COLOR = 1;
676	1002	// static int MATERIAL = 2;
..	..	@@ -678,9 +1004,9 @@
678	1004
679	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1006
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
684	1010
685	1011	public void itemStateChanged(ItemEvent e)
686	1012	{
..	..	@@ -705,10 +1031,10 @@
705	1031	dropAttributes \|= Object3D.TEXTURE;
706	1032	else
707	1033	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1034	+ } else if(e.getSource() == liveCB)
710	1035	{
711	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
712	1038	}
713	1039	else if(e.getSource() == supportCB)
714	1040	{
..	..	@@ -744,6 +1070,10 @@
744	1070	cameraView.repaint();
745	1071	// refreshContents();
746	1072	}
	1073	+ else if(e.getSource() == zoomBoxCB)
	1074	+ {
	1075	+ cameraView.ToggleZoomBoxMode();
	1076	+ }
747	1077	else if(e.getSource() == smoothfocusCB)
748	1078	{
749	1079	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1099,14 @@
769	1099	{
770	1100	cameraView.ToggleOeil();
771	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
772	1110	else if(e.getSource() == lookAtCB)
773	1111	{
774	1112	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1123,8 @@
785	1123
786	1124	/**/
787	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1129	// We can't move the root node or an empty selection
791	1130	return;
..	..	@@ -857,7 +1196,9 @@
857	1196	// objEditor.DropFile((java.io.File[]) object, true);
858	1197	// return;
859	1198	// }
860		- if (string.charAt(0) == '/')
	1199	+
	1200	+ // File path for Mac and Windows
	1201	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1202	{
862	1203	// file(s)
863	1204	String[] names = string.split("\n");
..	..	@@ -884,7 +1225,7 @@
884	1225
885	1226	flashIt = false;
886	1227	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1228	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1229	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1230
890	1231	if (group.selection.size() == 1)
..	..	@@ -900,23 +1241,33 @@
900	1241
901	1242	assert target == objEditor.jTree;
902	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
903	1245	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1247	} catch (Exception e) {
906	1248	System.out.println("destinationPath : " + destinationPath);
907	1249	return;
908	1250	}
909	1251
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
911	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
912	1263	loadClipboard(true);
913	1264	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1265	+ pasteInto(false, false);
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
920	1271	}
921	1272	public void dropActionChanged(DropTargetDragEvent dtde)
922	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1372,104 @@
1021	1372	{
1022	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1374	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
	1393	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1394	+ kleinItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
	1399	+ if (Globals.ADVANCED)
	1400	+ {
1038	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1402	ragdollItem.addActionListener(this);
1040	1403	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1404	ragdoll2Item.addActionListener(this);
	1405	+ }
1042	1406	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1407	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1408	meshItem.addActionListener(this);
1045	1409	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1410	// meshGroupItem.addActionListener(this);
	1411	+ if (Globals.ADVANCED)
	1412	+ {
1047	1413	springItem = menu.add(new MenuItem("Spring"));
1048	1414	springItem.addActionListener(this);
1049	1415	flagItem = menu.add(new MenuItem("Flag"));
1050	1416	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	1417	blobItem = menu.add(new MenuItem("Blob"));
1056	1418	blobItem.addActionListener(this);
1057	1419	latheItem = menu.add(new MenuItem("Lathe"));
1058	1420	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1421	+ }
	1422	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1423	+ bezierItem.addActionListener(this);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1061	1428	menu.add("-");
1062	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1430	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1066	1433	doubleItem = menu.add(new MenuItem("Fork"));
1067	1434	doubleItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1068	1437	tripleItem = menu.add(new MenuItem("Trident"));
1069	1438	tripleItem.addActionListener(this);
	1439	+ }
1070	1440	}
1071	1441
1072	1442	void buildToolsMenu(Menu menu)
1073	1443	{
1074	1444	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1445	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1446	+ animationItem.setState(Globals.ANIMATION);
1077	1447
1078	1448	menu.add("-");
1079	1449	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1450	parseverticesItem.addActionListener(this);
1081	1451	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1452	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1453	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1454	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1455	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1456	reduceMorphItem.addActionListener(this);
1089	1457	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1458	reduce34MorphItem.addActionListener(this);
1091		-
	1459	+ menu.add("-");
1092	1460	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1461	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1462
	1463	+ if (Globals.ADVANCED)
	1464	+ {
	1465	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1466	+ mirrorItem.addActionListener(this);
	1467	+ menu.add("-");
1096	1468	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1469	memoryItem.addActionListener(this);
1098	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1471	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1473	dumpItem.addActionListener(this);
1102	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1475	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1478,8 @@
1106	1478	resetParentItem.addActionListener(this);
1107	1479	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1480	repairParentItem.addActionListener(this);
	1481	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1482	+ repairShadowItem.addActionListener(this);
1109	1483	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1484	invariantsItem.addActionListener(this);
1111	1485	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1487,7 @@
1113	1487	menu.add("-");
1114	1488	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1489	editScriptItem.addActionListener(this);
	1490	+ }
1116	1491	}
1117	1492
1118	1493	void ScreenFit()
..	..	@@ -1235,6 +1610,7 @@
1235	1610	shadow.material = new cMaterial(obj.material);
1236	1611	shadow.material.diffuse = 0.0001f;
1237	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1238	1614
1239	1615	makeSomething(shadow);
1240	1616	}
..	..	@@ -1441,9 +1817,9 @@
1441	1817
1442	1818	void Overwrite(int mask)
1443	1819	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1820	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1821	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1822	+ Object3D content = Grafreed.clipboard.get(0);
1447	1823
1448	1824	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1825	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1842,7 @@
1466	1842	//
1467	1843	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1844	{
	1845	+ Object source = event.getSource();
1469	1846	/*
1470	1847	if (event.getSource() == nameField)
1471	1848	{
..	..	@@ -1477,11 +1854,11 @@
1477	1854	}
1478	1855	else
1479	1856	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1857	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1858	{
1482	1859	ScreenFit();
1483	1860	} else
1484		- if (event.getSource() == switchItem)
	1861	+ if (source == switchViewItem)
1485	1862	{
1486	1863	cVector v1 = new cVector();
1487	1864	cVector v2 = new cVector();
..	..	@@ -1490,11 +1867,11 @@
1490	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1868	objEditor.cameraView.repaint();
1492	1869	} else
1493		- if (event.getSource() == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1494	1871	{
1495	1872	makeSomething(new Box());
1496	1873	} else
1497		- if (event.getSource() == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1498	1875	{
1499	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1892,9 @@
1515	1892	applyExample(particleGeom, "SMOKE");
1516	1893	makeSomething(particleGeom);
1517	1894	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1895	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1896	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1897	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1898
1522	1899	ragdoll.toParent = LA.newMatrix();
1523	1900	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1912,7 @@
1535	1912	} else
1536	1913	/*
1537	1914	*/
1538		- if (event.getSource() == heightFieldItem)
	1915	+ if (source == heightFieldItem)
1539	1916	{
1540	1917	Object3D obj = new Object3D();
1541	1918
..	..	@@ -1573,27 +1950,31 @@
1573	1950
1574	1951	makeSomething(obj);
1575	1952	} else
1576		- if (event.getSource() == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1577	1954	{
1578	1955	makeSomething(new Grid());
1579	1956	} else
1580		- if (event.getSource() == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	1958	{
1582	1959	makeSomething(new Sphere());
1583	1960	} else
1584		- if (event.getSource() == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1585	1962	{
1586	1963	makeSomething(new Cone());
1587	1964	} else
1588		- if (event.getSource() == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1589	1966	{
1590	1967	makeSomething(new Torus());
1591	1968	} else
1592		- if (event.getSource() == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1593	1970	{
1594	1971	makeSomething(new Superellipsoid());
1595	1972	} else
1596		- if (event.getSource() == blobItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
	1974	+ {
	1975	+ makeSomething(new Klein());
	1976	+ } else
	1977	+ if (source == blobItem)
1597	1978	{
1598	1979	Blob blob = new Blob();
1599	1980	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1982,15 @@
1601	1982	//blob.retile();
1602	1983	makeSomething(blob);
1603	1984	} else
1604		- if (event.getSource() == latheItem)
	1985	+ if (source == latheItem)
1605	1986	{
1606	1987	makeSomething(new Lathe());
1607	1988	} else
1608		- if (event.getSource() == bezierItem)
	1989	+ if (source == bezierItem)
1609	1990	{
1610	1991	makeSomething(new BezierSurface());
1611	1992	} else
1612		- if (event.getSource() == checkerItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1613	1994	{
1614	1995	/*
1615	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2005,7 @@
1624	2005	*/
1625	2006	makeSomething(new Checker());
1626	2007	} else
1627		- if (event.getSource() == meshItem)
	2008	+ if (source == meshItem)
1628	2009	{
1629	2010	Object3D itemtomake = new Object3D();
1630	2011	Object3D child;
..	..	@@ -1645,35 +2026,35 @@
1645	2026	makeSomething(child);
1646	2027	}
1647	2028	} else
1648		- if (event.getSource() == springItem)
	2029	+ if (source == springItem)
1649	2030	{
1650	2031	cSpring s = new cSpring();
1651	2032	s.setup();
1652	2033	makeSomething(s);
1653	2034	} else
1654		- if (event.getSource() == flagItem)
	2035	+ if (source == flagItem)
1655	2036	{
1656	2037	cSpring s = new cFlag();
1657	2038	s.setup();
1658	2039	makeSomething(s);
1659	2040	} else
1660		- if (event.getSource() == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1661	2042	{
1662	2043	makeSomething(new Light());
1663	2044	} else
1664		- if (event.getSource() == csgItem)
	2045	+ if (source == csgItem)
1665	2046	{
1666	2047	group(new CSG());
1667	2048	} else
1668		- if (event.getSource() == templateItem)
	2049	+ if (source == templateItem)
1669	2050	{
1670	2051	group(new cTemplate());
1671	2052	} else
1672		- if (event.getSource() == attributeItem)
	2053	+ if (source == attributeItem)
1673	2054	{
1674	2055	makeSomething(new Attribute());
1675	2056	} else
1676		- if (event.getSource() == pointflowItem)
	2057	+ if (source == pointflowItem)
1677	2058	{
1678	2059	makeSomething(new PointFlow());
1679	2060	} else
..	..	@@ -1685,7 +2066,7 @@
1685	2066	} else
1686	2067	*/
1687	2068
1688		- if (event.getSource() == superLoopItem)
	2069	+ if (source == superLoopItem)
1689	2070	{
1690	2071	Composite g = new cGroup();
1691	2072	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +2088,7 @@
1707	2088
1708	2089	group(g);
1709	2090	} else
1710		- if (event.getSource() == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1711	2092	{
1712	2093	Composite csg = new GroupLeaf();
1713	2094	csg.count = 5;
..	..	@@ -1716,7 +2097,7 @@
1716	2097	csg.addChild(child);
1717	2098	child.addChild(csg);
1718	2099	} else
1719		- if (event.getSource() == doubleItem)
	2100	+ if (source == doubleItem)
1720	2101	{
1721	2102	Composite csg = new GroupLeaf();
1722	2103	csg.count = 5;
..	..	@@ -1728,7 +2109,7 @@
1728	2109	csg.addChild(child);
1729	2110	child.addChild(csg);
1730	2111	} else
1731		- if (event.getSource() == tripleItem)
	2112	+ if (source == tripleItem)
1732	2113	{
1733	2114	Composite csg = new GroupLeaf();
1734	2115	csg.count = 4;
..	..	@@ -1743,71 +2124,83 @@
1743	2124	csg.addChild(child);
1744	2125	child.addChild(csg);
1745	2126	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2127	+ if (source == computeAOItem)
1748	2128	{
1749		- ImportGFD();
	2129	+ Globals.drawMode = CameraPane.OCCLUSION;
	2130	+ Globals.theRenderer.repaint();
1750	2131	} 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)
	2132	+ if (source == recompileItem)
1769	2133	{
1770	2134	Recompile();
1771	2135	refreshContents();
1772	2136	} else
1773		- if (event.getSource() == editScriptItem)
	2137	+ if (source == editScriptItem)
1774	2138	{
1775	2139	OpenDialog();
1776	2140	refreshContents();
1777	2141	} else
1778		- if (event.getSource() == invariantsItem)
	2142	+ if (source == invariantsItem)
1779	2143	{
1780	2144	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2145	+ Grafreed.grafreeD.universe.invariants();
1782	2146	} else
1783		- if (event.getSource() == memoryItem)
	2147	+ if (source == memoryItem)
1784	2148	{
1785	2149	//System.out.println("Invariants:");
1786	2150	PrintMemory();
1787	2151	} else
1788		- if (event.getSource() == pathItem)
	2152	+ if (source == pathItem)
1789	2153	{
1790	2154	PrintPath();
1791	2155	} else
1792		- if (event.getSource() == analyzeItem)
	2156	+ if (source == analyzeItem)
1793	2157	{
1794	2158	AnalyzeObject();
1795	2159	} else
1796		- if (event.getSource() == dumpItem)
	2160	+ if (source == dumpItem)
1797	2161	{
1798	2162	DumpObject();
1799	2163	} else
1800		- if (event.getSource() == screenfitButton)
	2164	+ if (source == minButton)
	2165	+ {
	2166	+ Minimize();
	2167	+ } else
	2168	+ if (source == maxButton)
	2169	+ {
	2170	+ Maximize();
	2171	+ } else
	2172	+ if (source == fullButton)
	2173	+ {
	2174	+ ToggleFullScreen();
	2175	+ } else
	2176	+ if (source == undoButton)
	2177	+ {
	2178	+ Undo();
	2179	+ } else
	2180	+ if (source == redoButton)
	2181	+ {
	2182	+ Redo();
	2183	+ } else
	2184	+ if (source == saveButton)
	2185	+ {
	2186	+ Save();
	2187	+ } else
	2188	+ if (source == oneStepButton)
	2189	+ {
	2190	+ Globals.ONESTEP = true;
	2191	+ cameraView.repaint();
	2192	+ } else
	2193	+ if (source == screenfitButton)
1801	2194	{
1802	2195	//Reload(lastConverter, lastFilename, true);
1803	2196	ScreenFit();
1804	2197	} else
1805		- if (event.getSource() == screenfitpointButton)
	2198	+ if (source == screenfitpointButton)
1806	2199	{
1807	2200	//Reload(lastConverter, lastFilename, true);
1808	2201	ScreenFitPoint();
1809	2202	} else
1810		- if (event.getSource() == snapobjectButton)
	2203	+ if (source == snapobjectButton)
1811	2204	{
1812	2205	//Reload(lastConverter, lastFilename, true);
1813	2206	SnapObject();
..	..	@@ -1818,13 +2211,13 @@
1818	2211	// Recompile();
1819	2212	// refreshContents();
1820	2213	// } else
1821		- if (event.getSource() == gcButton)
	2214	+ if (source == gcButton)
1822	2215	{
1823	2216	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2217	System.gc();
1825	2218	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2219	} else
1827		- if (event.getSource() == editLeafItem)
	2220	+ if (source == editLeafItem)
1828	2221	{
1829	2222	Object3D obj;
1830	2223	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2231,78 @@
1838	2231	}
1839	2232	refreshContents(true);
1840	2233	} else
1841		- if (event.getSource() == openWindowItem)
	2234	+ if (source == openWindowItem)
1842	2235	{
1843	2236	EditSelection(true);
1844	2237	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2238	+ if (source == cutItem \|\| source == clearButton)
1846	2239	{
1847	2240	loadClipboard(true);
1848	2241	} else
1849		- if (event.getSource() == duplicateItem)
	2242	+ if (source == undoItem)
1850	2243	{
1851		- Object3D keep = GraphreeD.clipboard;
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
	2249	+ } else
	2250	+ if (source == duplicateItem)
	2251	+ {
	2252	+ Object3D keep = Grafreed.clipboard;
1852	2253	loadClipboard(false);
1853	2254	paste(false);
1854		- GraphreeD.clipboard = keep;
	2255	+ Grafreed.clipboard = keep;
1855	2256	} else
1856		- if (event.getSource() == cloneItem)
	2257	+ if (source == cloneItem)
1857	2258	{
1858	2259	CloneSelection(false);
1859	2260	} else
1860		- if (event.getSource() == cloneSupportItem)
	2261	+ if (source == cloneSupportItem)
1861	2262	{
1862	2263	CloneSelection(true);
1863	2264	} else
1864		- if (event.getSource() == copyItem)
	2265	+ if (source == copyItem)
1865	2266	{
1866	2267	loadClipboard(false);
1867	2268	} else
1868		- if (event.getSource() == pasteItem)
	2269	+ if (source == pasteItem)
1869	2270	{
1870	2271	paste(false);
1871	2272	} else
1872		- if (event.getSource() == pasteLinkItem)
	2273	+ if (source == pasteIntoItem)
1873	2274	{
1874		- pasteInto(false);
	2275	+ pasteInto(true, false);
1875	2276	} else
1876		- if (event.getSource() == pasteCloneItem)
	2277	+ if (source == pasteLinkItem)
1877	2278	{
1878		- pasteInto(true);
	2279	+ pasteInto(false, false);
1879	2280	} else
1880		- if (event.getSource() == pasteExpandItem)
	2281	+ if (source == pasteCloneItem)
	2282	+ {
	2283	+ pasteInto(true, true);
	2284	+ } else
	2285	+ if (source == pasteExpandItem)
1881	2286	{
1882	2287	paste(true);
1883	2288	} else
1884		- if (event.getSource() == synchronizeItem)
	2289	+ if (source == synchronizeItem)
1885	2290	{
1886	2291	Overwrite(Object3D.TRANSFORM);
1887	2292	} else
1888		- if (event.getSource() == overwriteNameItem)
	2293	+ if (source == overwriteNameItem)
1889	2294	{
1890	2295	Overwrite(Object3D.NAME);
1891	2296	} else
1892		- if (event.getSource() == overwriteUVItem)
	2297	+ if (source == overwriteUVItem)
1893	2298	{
1894	2299	Overwrite(Object3D.UV);
1895	2300	} else
1896		- if (event.getSource() == overwriteMatItem)
	2301	+ if (source == overwriteMatItem)
1897	2302	{
	2303	+ /* july 2015
1898	2304	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2305	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2306	else
1901	2307	{
1902	2308	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2314,16 @@
1908	2314	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2315	}
1910	2316	}
	2317	+ */
	2318	+
	2319	+ Overwrite(dropAttributes);
1911	2320	}
1912		- if (event.getSource() == overwriteGeoItem)
	2321	+ if (source == overwriteGeoItem)
1913	2322	{
1914	2323	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2324	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2325	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2326	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2327	//
1919	2328	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2329	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2335,7 @@
1926	2335	// refreshContents();
1927	2336	// }
1928	2337	} else
1929		- if (event.getSource() == generateMeshItem)
	2338	+ if (source == generateMeshItem)
1930	2339	{
1931	2340	//if (group.selection.size() == 1)
1932	2341	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2346,7 @@
1937	2346	ResetModel();
1938	2347	refreshContents();
1939	2348	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2349	+ if (source == extractGeometriesItem)
1941	2350	{
1942	2351	boolean one = false;
1943	2352
..	..	@@ -1964,7 +2373,7 @@
1964	2373	ResetModel();
1965	2374	refreshContents();
1966	2375	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2376	+ if (source == cloneGeometriesItem)
1968	2377	{
1969	2378	boolean one = false;
1970	2379
..	..	@@ -1990,32 +2399,37 @@
1990	2399	ResetModel();
1991	2400	refreshContents();
1992	2401	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2402	+ if (source == shareGeometriesItem)
1994	2403	{
1995	2404	boolean one = false;
1996	2405
1997	2406	if (group.selection.size() == 1)
1998	2407	one = true;
1999	2408
	2409	+ Object3D merge = null;
	2410	+
2000	2411	Object3D content = new cGroup();
2001	2412
2002	2413	for (int i=0; i<group.selection.size(); i++)
2003	2414	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2415	+ merge = new Merge(group.selection.get(i));
2005	2416
2006	2417	if (one)
2007		- makeSomething(sel, false);
	2418	+ makeSomething(merge, false);
2008	2419	else
2009		- content.addChild(sel);
	2420	+ content.addChild(merge);
2010	2421	}
2011	2422
2012	2423	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2424	+ makeSomething(content, true);
	2425	+ else
	2426	+ {
	2427	+ ResetModel();
	2428	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2429	+ refreshContents();
	2430	+ }
2017	2431	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2432	+ if (source == mergeGeometriesItem)
2019	2433	{
2020	2434	boolean one = false;
2021	2435
..	..	@@ -2045,11 +2459,11 @@
2045	2459	ResetModel();
2046	2460	refreshContents();
2047	2461	} else
2048		- if (event.getSource() == linkverticesItem)
	2462	+ if (source == linkverticesItem)
2049	2463	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2464	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2465	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2466	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2467	//
2054	2468	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2469	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2472,48 @@
2058	2472	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2473	// refreshContents();
2060	2474	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2475	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2476	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2477	+ Object3D content = Grafreed.clipboard.get(0);
2064	2478
2065	2479	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2480	content = ((cGroup)content).get(0);
2067	2481
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2482	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2483	for (int i=0; i<group.selection.size(); i++)
2070	2484	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2485	+ boolean random = CameraPane.SWITCH;
	2486	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2487	group.selection.get(i).linkVerticesThis(content);
2074	2488	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2489	+ CameraPane.SWITCH = random;
2076	2490	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2491	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2492	refreshContents();
2079	2493	}
2080	2494	} else
2081		- if (event.getSource() == resetsupportItem)
	2495	+ if (source == resetsupportItem)
2082	2496	{
2083	2497	for (int i=0; i<group.selection.size(); i++)
2084	2498	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2501	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2502	+ CameraPane.SWITCH = random;
2089	2503	}
2090	2504
2091	2505	refreshContents();
2092	2506	} else
2093		- if (event.getSource() == resetreferencesItem)
	2507	+ if (source == relinkverticesItem)
	2508	+ {
	2509	+ boolean random = CameraPane.SWITCH;
	2510	+ CameraPane.SWITCH = false; // parse all random nodes
	2511	+ group.selection.RelinkToSupport();
	2512	+ CameraPane.SWITCH = random;
	2513	+
	2514	+ refreshContents();
	2515	+ } else
	2516	+ if (source == resetreferencesItem)
2094	2517	{
2095	2518	for (int i=0; i<group.selection.size(); i++)
2096	2519	{
..	..	@@ -2099,11 +2522,11 @@
2099	2522
2100	2523	refreshContents();
2101	2524	} else
2102		- if (event.getSource() == setMasterItem)
	2525	+ if (source == setMasterItem)
2103	2526	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2527	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2528	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2529	+ Object3D content = Grafreed.clipboard.get(0);
2107	2530
2108	2531	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2532	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2535,13 @@
2112	2535	refreshContents();
2113	2536	}
2114	2537	} else
2115		- if (event.getSource() == poseMeshItem)
	2538	+ if (source == poseMeshItem)
2116	2539	{
2117	2540	if (group.selection.size() == 1)
2118	2541	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2542	+ if (Grafreed.clipboard.size() == 1)
2120	2543	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2544	+ Object3D content = Grafreed.clipboard.get(0);
2122	2545
2123	2546	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2547	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2554,19 @@
2131	2554	}
2132	2555
2133	2556	} else
2134		- if (event.getSource() == revertMeshItem)
	2557	+ if (source == revertMeshItem)
2135	2558	{
2136	2559	RevertMeshes();
2137	2560	} else
2138		- if (event.getSource() == resetMeshItem)
	2561	+ if (source == resetAllItem)
2139	2562	{
2140	2563	ResetAll();
2141	2564	} else
2142		- if (event.getSource() == stepAllItem)
	2565	+ if (source == stepAllItem)
2143	2566	{
2144	2567	StepAll();
2145	2568	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2569	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2570	{
2148	2571	//int indices[] = jList.getSelectedIndices();
2149	2572	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2574,46 @@
2151	2574
2152	2575	ClearSelection(false);
2153	2576	} else
2154		- if (event.getSource() == clearAllItem)
	2577	+ if (source == clearAllItem)
2155	2578	{
2156	2579	ClearSelection(true);
2157	2580	} else
2158		- if (event.getSource() == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2159	2582	{
2160		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2161	2584	} else
2162		- if (event.getSource() == frontItem)
	2585	+ if (source == hideItem)
	2586	+ {
	2587	+ group(new HiddenObject());
	2588	+ } else
	2589	+ if (source == frontItem)
2163	2590	{
2164	2591	front();
2165	2592	} else
2166		- if (event.getSource() == backItem)
	2593	+ if (source == backItem)
2167	2594	{
2168	2595	back();
2169	2596	} else
2170		- if (event.getSource() == cameraItem)
	2597	+ if (source == cameraItem)
2171	2598	{
2172	2599	makeSomething(new Camera());
2173	2600	} else
2174		- if (event.getSource() == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2175	2602	{
2176	2603	group(new Composite());
2177	2604	} else
2178		- if (event.getSource() == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2179	2606	{
2180	2607	RandomNode random = new RandomNode();
2181	2608	group(random);
2182	2609	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2610	+ random.name = random.get(0).name + "Switch";
2184	2611	} else
2185		- if (event.getSource() == physicsItem)
	2612	+ if (source == physicsItem)
2186	2613	{
2187	2614	group(new PhysicsNode());
2188	2615	} else
2189		- if (event.getSource() == frameselectorItem)
	2616	+ if (source == frameselectorItem)
2190	2617	{
2191	2618	for (int i=0; i<group.selection.size(); i++)
2192	2619	{
..	..	@@ -2198,7 +2625,7 @@
2198	2625	ResetModel();
2199	2626	refreshContents();
2200	2627	} else
2201		- if (event.getSource() == switchGeoItem)
	2628	+ if (source == switchGeoItem)
2202	2629	{
2203	2630	for (int i=0; i<group.selection.size(); i++)
2204	2631	{
..	..	@@ -2210,7 +2637,7 @@
2210	2637	ResetModel();
2211	2638	refreshContents();
2212	2639	} else
2213		- if (event.getSource() == switchTransfoItem)
	2640	+ if (source == switchTransfoItem)
2214	2641	{
2215	2642	for (int i=0; i<group.selection.size(); i++)
2216	2643	{
..	..	@@ -2222,7 +2649,7 @@
2222	2649	ResetModel();
2223	2650	refreshContents();
2224	2651	} else
2225		- if (event.getSource() == morphItem)
	2652	+ if (source == morphItem)
2226	2653	{
2227	2654	for (int i=0; i<group.selection.size(); i++)
2228	2655	{
..	..	@@ -2234,7 +2661,7 @@
2234	2661	ResetModel();
2235	2662	refreshContents();
2236	2663	} else
2237		- if (event.getSource() == scriptNodeItem)
	2664	+ if (source == scriptNodeItem)
2238	2665	{
2239	2666	boolean atleastone = false;
2240	2667
..	..	@@ -2273,195 +2700,239 @@
2273	2700	}
2274	2701	}
2275	2702	} else
2276		- if (event.getSource() == linkerItem)
	2703	+ if (source == linkerItem)
2277	2704	{
2278	2705	group(new cLinker());
2279	2706	} else
2280		- if (event.getSource() == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2281	2708	{
2282	2709	group(new TextureNode());
2283	2710	} else
2284		- if (event.getSource() == shadowXItem)
	2711	+ if (source == billboardItem)
	2712	+ {
	2713	+ group(new BillboardNode());
	2714	+ } else
	2715	+ if (source == shadowXItem)
2285	2716	{
2286	2717	CastShadow(0);
2287	2718	} else
2288		- if (event.getSource() == shadowYItem)
	2719	+ if (source == shadowYItem)
2289	2720	{
2290	2721	CastShadow(1);
2291	2722	} else
2292		- if (event.getSource() == shadowZItem)
	2723	+ if (source == shadowZItem)
2293	2724	{
2294	2725	CastShadow(2);
2295	2726	} else
2296		- if (event.getSource() == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	2728	{
2298		- ungroup();
	2729	+ //ungroup();
	2730	+ for (int i=0; i<group.selection.size(); i++)
	2731	+ {
	2732	+ Ungroup(group.selection.get(i));
	2733	+ }
	2734	+
	2735	+ ClearSelection(false);
	2736	+
	2737	+ refreshContents();
2299	2738	} else
2300		- if (event.getSource() == genUVItem)
	2739	+ if (source == genUVItem)
2301	2740	{
2302	2741	GenUV();
2303	2742	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2743	+ if (source == genNormalsCADItem)
2305	2744	{
2306	2745	GenNormals(true);
2307	2746	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2747	+ if (source == genNormalsMESHItem)
	2748	+ {
	2749	+ GenNormalsMESH();
	2750	+ } else
	2751	+ if (source == genNormalsORGANItem)
2309	2752	{
2310	2753	GenNormals(false);
2311	2754	} else
2312		- if (event.getSource() == stripifyItem)
	2755	+ if (source == genNormalsMINEItem)
	2756	+ {
	2757	+ GenNormalsMINE();
	2758	+ } else
	2759	+ if (source == stripifyItem)
2313	2760	{
2314	2761	Stripify();
2315	2762	} else
2316		- if (event.getSource() == unstripifyItem)
	2763	+ if (source == unstripifyItem)
2317	2764	{
2318	2765	Unstripify();
2319	2766	} else
2320		- if (event.getSource() == trimItem)
	2767	+ if (source == trimItem)
2321	2768	{
2322	2769	Trim();
2323	2770	} else
2324		- if (event.getSource() == untrimItem)
	2771	+ if (source == untrimItem)
2325	2772	{
2326	2773	Untrim();
2327	2774	} else
2328		- if (event.getSource() == clearColorsItem)
	2775	+ if (source == clearColorsItem)
2329	2776	{
2330	2777	ClearColors();
2331	2778	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2779	+ if (source == clearMaterialsItem)
2333	2780	{
2334	2781	ClearMaterials();
2335	2782	} else
2336		- if (event.getSource() == liveleavesItem)
	2783	+ if (source == liveleavesItem)
2337	2784	{
2338	2785	LiveLeaves(true);
2339	2786	} else
2340		- if (event.getSource() == unliveleavesItem)
	2787	+ if (source == unliveleavesItem)
2341	2788	{
2342	2789	LiveLeaves(false);
2343	2790	} else
2344		- if (event.getSource() == supportleavesItem)
	2791	+ if (source == supportleavesItem)
2345	2792	{
2346	2793	SupportLeaves(true);
2347	2794	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2795	+ if (source == unsupportleavesItem)
2349	2796	{
2350	2797	SupportLeaves(false);
2351	2798	} else
2352		- if (event.getSource() == hideleavesItem)
	2799	+ if (source == hideleavesItem)
2353	2800	{
2354	2801	HideLeaves(true);
2355	2802	} else
2356		- if (event.getSource() == showleavesItem)
	2803	+ if (source == showleavesItem)
2357	2804	{
2358	2805	HideLeaves(false);
2359	2806	} else
2360		- if (event.getSource() == markleavesItem)
	2807	+ if (source == markleavesItem)
2361	2808	{
2362	2809	MarkLeaves(true);
2363	2810	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2811	+ if (source == unmarkleavesItem)
2365	2812	{
2366	2813	MarkLeaves(false);
2367	2814	} else
2368		- if (event.getSource() == flipVItem)
	2815	+ if (source == rewindleavesItem)
	2816	+ {
	2817	+ RewindLeaves(true);
	2818	+ } else
	2819	+ if (source == unrewindleavesItem)
	2820	+ {
	2821	+ RewindLeaves(false);
	2822	+ } else
	2823	+ if (source == randomleavesItem)
	2824	+ {
	2825	+ RandomLeaves(true);
	2826	+ } else
	2827	+ if (source == unrandomleavesItem)
	2828	+ {
	2829	+ RandomLeaves(false);
	2830	+ } else
	2831	+ if (source == flipVItem)
2369	2832	{
2370	2833	FlipV(true);
2371	2834	} else
2372		- if (event.getSource() == unflipVItem)
	2835	+ if (source == unflipVItem)
2373	2836	{
2374	2837	FlipV(false);
2375	2838	} else
2376		- if (event.getSource() == lowTexturesItem)
	2839	+ if (source == lowTexturesItem)
2377	2840	{
2378	2841	SetTexRes(0);
2379	2842	} else
2380		- if (event.getSource() == normalTexturesItem)
	2843	+ if (source == normalTexturesItem)
2381	2844	{
2382	2845	SetTexRes(1);
2383	2846	} else
2384		- if (event.getSource() == highTexturesItem)
	2847	+ if (source == highTexturesItem)
2385	2848	{
2386	2849	SetTexRes(2);
2387	2850	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2851	+ if (source == veryhighTexturesItem)
2389	2852	{
2390	2853	SetTexRes(3);
2391	2854	} else
2392		- if (event.getSource() == maxTexturesItem)
	2855	+ if (source == maxTexturesItem)
2393	2856	{
2394	2857	SetTexRes(4);
2395	2858	} else
2396		- if (event.getSource() == panoTexturesItem)
	2859	+ if (source == panoTexturesItem)
2397	2860	{
2398	2861	SetTexRes(5);
2399	2862	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2863	+ if (source == reverseNormalsItem)
2401	2864	{
2402	2865	ReverseNormals();
2403	2866	} else
2404		- if (event.getSource() == parseverticesItem)
	2867	+ if (source == parseverticesItem)
2405	2868	{
2406	2869	ParseVertices();
2407	2870	} else
2408		- if (event.getSource() == textureFieldItem)
	2871	+ if (source == textureFieldItem)
2409	2872	{
2410	2873	TextureVertices();
2411	2874	} else
2412		- if (event.getSource() == alignItem)
	2875	+ if (source == alignItem)
2413	2876	{
2414	2877	Align();
2415	2878	} else
2416		- if (event.getSource() == mirrorItem)
	2879	+ if (source == mirrorItem)
2417	2880	{
2418	2881	MirrorPoses();
2419	2882	} else
2420		- if (event.getSource() == reduceMorphItem)
	2883	+ if (source == reduceMorphItem)
2421	2884	{
2422	2885	MeshReduction(false);
2423	2886	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2887	+ if (source == reduce34MorphItem)
2425	2888	{
2426	2889	MeshReduction(true);
2427	2890	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2891	+ if (source == reverseTrianglesItem)
2429	2892	{
2430	2893	ReverseTriangles();
2431	2894	} else
2432		- if (event.getSource() == reduceMeshItem)
	2895	+ if (source == reduceMeshItem)
2433	2896	{
2434	2897	ReduceMesh(false);
2435	2898	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2899	+ if (source == reduce34MeshItem)
2437	2900	{
2438	2901	ReduceMesh(true);
2439	2902	} else
2440		- if (event.getSource() == increaseMeshItem)
	2903	+ if (source == increaseMeshItem)
2441	2904	{
2442	2905	IncreaseMesh();
2443	2906	} else
2444		- if (event.getSource() == clipMeshItem)
	2907	+ if (source == clipMeshItem)
2445	2908	{
2446	2909	ClipMesh();
2447	2910	} else
2448		- if (event.getSource() == smoothMeshItem)
	2911	+ if (source == smoothMeshItem)
2449	2912	{
2450	2913	SmoothMesh();
2451	2914	} else
2452		- if (event.getSource() == transformgeometryItem)
	2915	+ if (source == transformGeometryItem)
2453	2916	{
2454	2917	TransformGeometry();
2455	2918	} else
2456		- if (event.getSource() == resetTransformItem)
	2919	+ if (source == transformChildrenItem)
	2920	+ {
	2921	+ TransformChildren();
	2922	+ } else
	2923	+ if (source == resetTransformItem)
2457	2924	{
2458	2925	ResetTransform();
2459	2926	} else
2460		- if (event.getSource() == resetCentroidItem)
	2927	+ if (source == resetCentroidItem)
2461	2928	{
2462		- ResetCentroid();
	2929	+ ResetCentroid(true);
2463	2930	} else
2464		- if (event.getSource() == resetParentItem)
	2931	+ if (source == resetCentroidXZItem)
	2932	+ {
	2933	+ ResetCentroid(false);
	2934	+ } else
	2935	+ if (source == resetParentItem)
2465	2936	{
2466	2937	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2938	{
..	..	@@ -2471,7 +2942,7 @@
2471	2942
2472	2943	refreshContents();
2473	2944	} else
2474		- if (event.getSource() == repairParentItem)
	2945	+ if (source == repairParentItem)
2475	2946	{
2476	2947	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2948	{
..	..	@@ -2485,7 +2956,21 @@
2485	2956
2486	2957	refreshContents();
2487	2958	} else
2488		- if (event.getSource() == sortbysizeItem)
	2959	+ if (source == repairShadowItem)
	2960	+ {
	2961	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2962	+ {
	2963	+ Object3D obj = (Object3D)e.nextElement();
	2964	+ obj.RepairShadow();
	2965	+// for (int i=0; i<obj.size(); i++)
	2966	+// {
	2967	+// obj.get(i).parent = obj;
	2968	+// }
	2969	+ }
	2970	+
	2971	+ refreshContents();
	2972	+ } else
	2973	+ if (source == sortbysizeItem)
2489	2974	{
2490	2975	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2976	{
..	..	@@ -2497,7 +2982,7 @@
2497	2982	ResetModel();
2498	2983	refreshContents();
2499	2984	} else
2500		- if (event.getSource() == sortbynameItem)
	2985	+ if (source == sortbynameItem)
2501	2986	{
2502	2987	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2988	{
..	..	@@ -2509,7 +2994,7 @@
2509	2994	ResetModel();
2510	2995	refreshContents();
2511	2996	} else
2512		- if (event.getSource() == attachPigmentItem)
	2997	+ if (source == attachPigmentItem)
2513	2998	{
2514	2999	String texture = GetFile("Attach pigment");
2515	3000	Object3D obj;
..	..	@@ -2521,7 +3006,7 @@
2521	3006
2522	3007	refreshContents();
2523	3008	} else
2524		- if (event.getSource() == detachPigmentItem)
	3009	+ if (source == detachPigmentItem)
2525	3010	{
2526	3011	Object3D obj;
2527	3012	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3017,7 @@
2532	3017
2533	3018	refreshContents();
2534	3019	} else
2535		- if (event.getSource() == attachBumpItem)
	3020	+ if (source == attachBumpItem)
2536	3021	{
2537	3022	String texture = GetFile("Attach bump");
2538	3023	Object3D obj;
..	..	@@ -2544,7 +3029,7 @@
2544	3029
2545	3030	refreshContents();
2546	3031	} else
2547		- if (event.getSource() == detachBumpItem)
	3032	+ if (source == detachBumpItem)
2548	3033	{
2549	3034	Object3D obj;
2550	3035	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +3040,7 @@
2555	3040
2556	3041	refreshContents();
2557	3042	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3043	+ if (source == pigmentBumpItem)
2559	3044	{
2560	3045	Object3D obj;
2561	3046	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3051,237 @@
2566	3051
2567	3052	refreshContents();
2568	3053	} else
2569		- if (event.getSource() == flashSelectionButton)
	3054	+ if (source == flashSelectionButton)
2570	3055	{
2571	3056	CameraPane.flash = true;
2572	3057	refreshContents();
2573	3058	} else
2574		- if (event.getSource() == oneButton)
	3059	+ if (source == oneButton)
2575	3060	{
2576	3061	} else
2577		- if (event.getSource() == twoButton)
	3062	+ if (source == twoButton)
2578	3063	{
2579	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2580	3069	// bug
2581	3070	//gridPanel.setDividerLocation(1.0);
2582	3071	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3072	+// bigThree.remove(scenePanel);
	3073	+// bigThree.remove(centralPanel);
	3074	+// bigThree.remove(XYZPanel);
	3075	+// aWindowConstraints.gridx = 0;
	3076	+// aWindowConstraints.gridy = 0;
	3077	+// aWindowConstraints.gridwidth = 1;
	3078	+// // aConstraints.gridheight = 3;
	3079	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3080	+// aWindowConstraints.weightx = 0;
	3081	+// aWindowConstraints.weighty = 1;
	3082	+// //bigThree.add(jtp, aWindowConstraints);
	3083	+// aWindowConstraints.weightx = 1;
	3084	+// aWindowConstraints.gridwidth = 3;
	3085	+// // aConstraints.gridheight = 3;
	3086	+// aWindowConstraints.gridx = 1;
	3087	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3088	+// bigThree.add(centralPanel, aWindowConstraints);
	3089	+// aWindowConstraints.weightx = 0;
	3090	+// aWindowConstraints.gridx = 4;
	3091	+// aWindowConstraints.gridwidth = 1;
	3092	+// // aConstraints.gridheight = 3;
	3093	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3094	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3095	+// scenePanel.setVisible(false);
	3096	+// centralPanel.setVisible(true);
	3097	+// XYZPanel.setVisible(false);
	3098	+ bigThree.ClearUI();
	3099	+ bigThree.add(centralPanel);
	3100	+ bigThree.FlushUI();
	3101	+
	3102	+ cameraView.requestFocusInWindow();
	3103	+
	3104	+// refreshContents(true);
	3105	+//
	3106	+// try
	3107	+// {
	3108	+// java.awt.Robot bot = new java.awt.Robot();
	3109	+// int mask = InputEvent.BUTTON1_MASK;
	3110	+// bot.mouseMove(100, 100);
	3111	+// bot.mousePress(mask);
	3112	+// bot.mouseRelease(mask);
	3113	+// }
	3114	+// catch (Exception e)
	3115	+// {
	3116	+//
	3117	+// }
	3118	+
2607	3119	} else
2608		- if (event.getSource() == threeButton)
	3120	+ if (source == threeButton)
2609	3121	{
2610	3122	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
	3126	+
	3127	+// bigThree.remove(scenePanel);
	3128	+// bigThree.remove(centralPanel);
	3129	+// bigThree.remove(XYZPanel);
	3130	+// aWindowConstraints.gridx = 0;
	3131	+// aWindowConstraints.gridy = 0;
	3132	+// aWindowConstraints.gridwidth = 1;
	3133	+// // aConstraints.gridheight = 3;
	3134	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3135	+// aWindowConstraints.weightx = 0;
	3136	+// aWindowConstraints.weighty = 1;
	3137	+// //bigThree.add(jtp, aWindowConstraints);
	3138	+// aWindowConstraints.weightx = 1;
	3139	+// aWindowConstraints.gridwidth = 3;
	3140	+// // aConstraints.gridheight = 3;
	3141	+// aWindowConstraints.gridx = 1;
	3142	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3143	+// bigThree.add(centralPanel, aWindowConstraints);
	3144	+// aWindowConstraints.weightx = 0;
	3145	+// aWindowConstraints.gridx = 4;
	3146	+// aWindowConstraints.gridwidth = 1;
	3147	+// // aConstraints.gridheight = 3;
	3148	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3149	+// bigThree.add(XYZPanel, aWindowConstraints);
	3150	+// bigThree.validate();
	3151	+// scenePanel.setVisible(false);
	3152	+// centralPanel.setVisible(true);
	3153	+// XYZPanel.setVisible(true);
	3154	+ bigThree.ClearUI();
	3155	+ bigThree.add(centralPanel);
	3156	+ bigThree.add(XYZPanel);
	3157	+ bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2635	3160	} else
2636		- if (event.getSource() == fourButton)
	3161	+ if (source == fourButton)
2637	3162	{
2638	3163	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
	3167	+
	3168	+// bigThree.remove(scenePanel);
	3169	+// bigThree.remove(centralPanel);
	3170	+// bigThree.remove(XYZPanel);
	3171	+// aWindowConstraints.gridx = 0;
	3172	+// aWindowConstraints.gridy = 0;
	3173	+// aWindowConstraints.gridwidth = 1;
	3174	+// // aWindowConstraints.gridheight = 3;
	3175	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3176	+// aWindowConstraints.weightx = 1;
	3177	+// aWindowConstraints.weighty = 1;
	3178	+// bigThree.add(scenePanel, aWindowConstraints);
	3179	+// aWindowConstraints.weightx = 1;
	3180	+// aWindowConstraints.gridwidth = 3;
	3181	+// // aConstraints.gridheight = 3;
	3182	+// aWindowConstraints.gridx = 1;
	3183	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3184	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.gridx = 4;
	3187	+// aWindowConstraints.gridwidth = 1;
	3188	+// // aWindowConstraints.gridheight = 3;
	3189	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3190	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3191	+// bigThree.validate();
	3192	+// scenePanel.setVisible(true);
	3193	+// centralPanel.setVisible(false);
	3194	+// XYZPanel.setVisible(false);
	3195	+ bigThree.ClearUI();
	3196	+ bigThree.add(scenePanel);
	3197	+ bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2663	3200	} else
2664		- if (event.getSource() == sixButton)
	3201	+ if (source == sixButton)
2665	3202	{
2666	3203	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
	3207	+
	3208	+// bigThree.remove(scenePanel);
	3209	+// bigThree.remove(centralPanel);
	3210	+// bigThree.remove(XYZPanel);
	3211	+// aWindowConstraints.gridx = 0;
	3212	+// aWindowConstraints.gridy = 0;
	3213	+// aWindowConstraints.gridwidth = 1;
	3214	+// // aConstraints.gridheight = 3;
	3215	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3216	+// aWindowConstraints.weightx = 0;
	3217	+// aWindowConstraints.weighty = 1;
	3218	+// bigThree.add(scenePanel, aWindowConstraints);
	3219	+// aWindowConstraints.weightx = 1;
	3220	+// aWindowConstraints.gridwidth = 3;
	3221	+// // aWindowConstraints.gridheight = 3;
	3222	+// aWindowConstraints.gridx = 1;
	3223	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3224	+// bigThree.add(centralPanel, aWindowConstraints);
	3225	+// aWindowConstraints.weightx = 0;
	3226	+// aWindowConstraints.gridx = 4;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aWindowConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3230	+// //bigThree.add(XYZPanel, aConstraints);
	3231	+// bigThree.validate();
	3232	+// scenePanel.setVisible(true);
	3233	+// centralPanel.setVisible(true);
	3234	+// XYZPanel.setVisible(false);
	3235	+ bigThree.ClearUI();
	3236	+ bigThree.add(scenePanel);
	3237	+ bigThree.add(centralPanel);
	3238	+ bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2691	3241	} else
2692		- if (event.getSource() == sevenButton)
	3242	+ if (source == sevenButton)
2693	3243	{
2694	3244	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
	3248	+
	3249	+// bigThree.remove(scenePanel);
	3250	+// bigThree.remove(centralPanel);
	3251	+// bigThree.remove(XYZPanel);
	3252	+// aWindowConstraints.gridx = 0;
	3253	+// aWindowConstraints.gridy = 0;
	3254	+// aWindowConstraints.gridwidth = 1;
	3255	+// // aWindowConstraints.gridheight = 3;
	3256	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3257	+// aWindowConstraints.weightx = 0;
	3258	+// aWindowConstraints.weighty = 1;
	3259	+// bigThree.add(scenePanel, aWindowConstraints);
	3260	+// aWindowConstraints.weightx = 1;
	3261	+// aWindowConstraints.gridwidth = 3;
	3262	+// // aWindowConstraints.gridheight = 3;
	3263	+// aWindowConstraints.gridx = 1;
	3264	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3265	+// bigThree.add(centralPanel, aWindowConstraints);
	3266	+// aWindowConstraints.weightx = 0;
	3267	+// aWindowConstraints.gridx = 4;
	3268	+// aWindowConstraints.gridwidth = 1;
	3269	+// // aConstraints.gridheight = 3;
	3270	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3271	+// bigThree.add(XYZPanel, aWindowConstraints);
	3272	+// bigThree.validate();
	3273	+// scenePanel.setVisible(true);
	3274	+// centralPanel.setVisible(true);
	3275	+// XYZPanel.setVisible(true);
	3276	+ bigThree.ClearUI();
	3277	+ bigThree.add(scenePanel);
	3278	+ bigThree.add(centralPanel);
	3279	+ bigThree.add(XYZPanel);
	3280	+ bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2719	3283	} else
2720		- if (event.getSource() == rootButton)
	3284	+ if (source == rootButton)
2721	3285	{
2722	3286	Object3D obj;
2723	3287	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,34 +3291,44 @@
2727	3291	EditObject(obj);
2728	3292	}
2729	3293
	3294	+ cameraView.requestFocusInWindow();
2730	3295	refreshContents(true);
2731	3296	} else
2732		- if (event.getSource() == closeButton)
	3297	+ if (source == closeButton)
2733	3298	{
2734	3299	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3300	cRadio ab;
2736	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3302	{
2738	3303	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
2741	3312	buttonGroup.remove(ab);
2742	3313	radioPanel.remove(ab);
2743	3314
2744		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
2745	3317	// ab.GetObject().objectUI = null; // ?????????
2746	3318
2747	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3320	break;
2749	3321	}
2750	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
2751	3325	refreshContents(true);
2752	3326	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3327	+ if (source == editItem \|\| source == editButton)
2754	3328	{
2755	3329	EditSelection(false);
2756	3330	} else
2757		- if (event.getSource() == uneditButton)
	3331	+ if (source == uneditButton)
2758	3332	{
2759	3333	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3334	{
..	..	@@ -2764,14 +3338,14 @@
2764	3338	child.CloseUI();
2765	3339	listUI.remove(child);
2766	3340
2767		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
2768	3342	}
2769		- objEditor.ctrlPanel.revalidate();
	3343	+ objEditor.ctrlPanel.FlushUI();
2770	3344	//objEditor.jTree.clearSelection();
2771	3345	//objEditor.ResetSliders();
2772	3346	refreshContents(true);
2773	3347	} else
2774		- if (event.getSource() == clearPanelButton)
	3348	+ if (source == clearPanelButton)
2775	3349	{
2776	3350	assert(copy == group);
2777	3351	//copy.ClearUI();
..	..	@@ -2782,7 +3356,7 @@
2782	3356	listUI.clear();
2783	3357	refreshContents(true);
2784	3358	} else
2785		- if (event.getSource() == allParamsButton)
	3359	+ if (source == allParamsButton)
2786	3360	{
2787	3361	assert(copy == group);
2788	3362
..	..	@@ -2803,19 +3377,19 @@
2803	3377
2804	3378	refreshContents(true);
2805	3379	} else
2806		- if (event.getSource() == unselectButton)
	3380	+ if (source == unselectButton)
2807	3381	{
2808	3382	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3383	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3384	objEditor.ResetSliders();
2811	3385	refreshContents(true);
2812	3386	} else
2813		- if(event.getSource() instanceof cRadio)
	3387	+ if(source instanceof cRadio)
2814	3388	{
2815	3389	group.parent = keepparent;
2816	3390	group.attributes = 0;
2817	3391	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3392	+ /cRadio/ radio = (cRadio)source;
2819	3393	Object3D obj = radio.GetObject();
2820	3394	System.out.println("Edit " + obj);
2821	3395	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3409,7 @@
2835	3409	}
2836	3410
2837	3411	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3412	+ //Globals.theRenderer.object = group;
2839	3413	if(!useclient)
2840	3414	{
2841	3415	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3418,17 @@
2844	3418	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3419	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3420	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3421	+ //cameraView.lighttouched = true;
	3422	+ Globals.lighttouched = true;
2848	3423	topView.object = group;
2849	3424	frontView.object = group;
2850	3425	sideView.object = group;
2851	3426	}
2852		- group.editWindow = this;
	3427	+
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
	3431	+
2853	3432	/*
2854	3433	currentLayout = radio.layout;
2855	3434	if (currentLayout == null)
..	..	@@ -2861,8 +3440,23 @@
2861	3440	//group.parent = null; // ROOT
2862	3441	//group.attributes = -1;
2863	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
2864	3445	refreshContents(true);
2865		- }
	3446	+ } else if (event.getSource() == editCameraItem)
	3447	+ {
	3448	+ cameraView.ProtectCamera();
	3449	+ cameraView.repaint();
	3450	+ return;
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3452	+ {
	3453	+ cameraView.RevertCamera();
	3454	+ cameraView.repaint();
	3455	+ return;
	3456	+ // } else if (event.getSource() == textureButton)
	3457	+ // {
	3458	+ // return; // true;
	3459	+ }
2866	3460	else
2867	3461	{
2868	3462	//return super.action(event, arg);
..	..	@@ -2871,7 +3465,6 @@
2871	3465	}
2872	3466
2873	3467	boolean useclient = false;
2874		- cRadio radio;
2875	3468
2876	3469	void ToggleRoot()
2877	3470	{
..	..	@@ -2880,7 +3473,7 @@
2880	3473	if (useclient)
2881	3474	{
2882	3475	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3476	+ Globals.lighttouched = true;
2884	3477	//topView.object = client;
2885	3478	//frontView.object = client;
2886	3479	//sideView.object = client;
..	..	@@ -2888,7 +3481,7 @@
2888	3481	else
2889	3482	{
2890	3483	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3484	+ Globals.lighttouched = true;
2892	3485	//topView.object = group;
2893	3486	//frontView.object = group;
2894	3487	//sideView.object = group;
..	..	@@ -2923,6 +3516,28 @@
2923	3516	refreshContents();
2924	3517	}
2925	3518
	3519	+ void TransformChildren()
	3520	+ {
	3521	+ Object3D obj;
	3522	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3523	+ {
	3524	+ obj = (Object3D)e.nextElement();
	3525	+ obj.KeepTextureMatrices();
	3526	+ obj.TransformChildren();
	3527	+ obj.RestoreTextureMatrices();
	3528	+
	3529	+// if (obj.parent == null)
	3530	+// {
	3531	+// System.out.println("NULL PARENT!");
	3532	+// new Exception().printStackTrace();
	3533	+// }
	3534	+// else
	3535	+// TouchTransform(obj);
	3536	+// //obj.parent.Touch();
	3537	+ }
	3538	+
	3539	+ refreshContents();
	3540	+ }
2926	3541
2927	3542	void ResetTransform()
2928	3543	{
..	..	@@ -3035,7 +3650,7 @@
3035	3650	refreshContents();
3036	3651	}
3037	3652
3038		- void ResetCentroid()
	3653	+ void ResetCentroid(boolean full)
3039	3654	{
3040	3655	Object3D obj;
3041	3656	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3665,16 @@
3050	3665	LA.matIdentity(Object3D.mat);
3051	3666	obj.getBounds(minima, maxima, false);
3052	3667	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3668	+ if (full)
	3669	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3670	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3671	obj.TransformMesh(Object3D.mat);
	3672	+
3056	3673	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3674	+ if (full)
	3675	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3676	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3677	+
3059	3678	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3679	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3680	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3703,8 @@
3084	3703
3085	3704	int size = obj.MemorySize();
3086	3705
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3706	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3707	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3708	}
3089	3709	}
3090	3710	catch (Exception e)
..	..	@@ -3121,9 +3741,9 @@
3121	3741	obj = (Object3D)e.nextElement();
3122	3742
3123	3743	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3744	+ Grafreed.AnalyzeObject(obj);
3125	3745	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3746	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3747
3128	3748	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3749	}
..	..	@@ -3165,6 +3785,20 @@
3165	3785	void GenNormals(boolean crease)
3166	3786	{
3167	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
	3795	+
	3796	+ refreshContents();
	3797	+ }
	3798	+
	3799	+ void GenNormalsMINE()
	3800	+ {
	3801	+ group.selection.GenNormalsMINE();
3168	3802
3169	3803	refreshContents();
3170	3804	}
..	..	@@ -3250,7 +3884,7 @@
3250	3884	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3885	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3886	//
3253		-// g.add(GraphreeD.clipboard);
	3887	+// g.add(GrafreeD.clipboard);
3254	3888	//
3255	3889	// buffer.add(g);
3256	3890	// }
..	..	@@ -3269,8 +3903,8 @@
3269	3903	// nodes = new Object3D();
3270	3904	// vertices = new Vector<Vertex>();
3271	3905	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3906	+// boolean epsequal = GrafreeD.epsequal;
	3907	+// GrafreeD.epsequal = true;
3274	3908	//
3275	3909	// for (int i=0; i<group.selection.size(); i++)
3276	3910	// {
..	..	@@ -3311,7 +3945,7 @@
3311	3945	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3946	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3947	//
3314		-// g.add(GraphreeD.clipboard);
	3948	+// g.add(GrafreeD.clipboard);
3315	3949	//
3316	3950	// buffer.add(g);
3317	3951	// }
..	..	@@ -3319,7 +3953,7 @@
3319	3953	// makeSomething(buffer, i==group.selection.size()-1);
3320	3954	// }
3321	3955	//
3322		-// GraphreeD.epsequal = epsequal;
	3956	+// GrafreeD.epsequal = epsequal;
3323	3957	//
3324	3958	// //buffer = null;
3325	3959	// temprep = null;
..	..	@@ -3330,8 +3964,8 @@
3330	3964
3331	3965	void ParseVertices()
3332	3966	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3967	+ boolean epsequal = Grafreed.epsequal;
	3968	+ Grafreed.epsequal = true;
3335	3969
3336	3970	for (int i=0; i<group.selection.size(); i++)
3337	3971	{
..	..	@@ -3356,7 +3990,7 @@
3356	3990	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3991	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3992
3359		- g.add(GraphreeD.clipboard);
	3993	+ g.add(Grafreed.clipboard);
3360	3994
3361	3995	buffer.add(g);
3362	3996	}
..	..	@@ -3371,7 +4005,7 @@
3371	4005	makeSomething(buffer, i==group.selection.size()-1);
3372	4006	}
3373	4007
3374		- GraphreeD.epsequal = epsequal;
	4008	+ Grafreed.epsequal = epsequal;
3375	4009
3376	4010	refreshContents();
3377	4011	}
..	..	@@ -3389,7 +4023,16 @@
3389	4023	String pigment = Object3D.GetPigment(tex);
3390	4024	//String bump = Object3D.GetBump(tex);
3391	4025
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4026	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4027	+
	4028	+ try
	4029	+ {
	4030	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4031	+ }
	4032	+ catch (Exception e)
	4033	+ {
	4034	+ System.err.println("FAIL: " + node);
	4035	+ }
3393	4036
3394	4037	double s = v.s;
3395	4038
..	..	@@ -3416,7 +4059,7 @@
3416	4059	scale /= 3;
3417	4060
3418	4061	scale /= 0xFF;
3419		- scale /= 4;
	4062	+ // c'est quoi ca? scale /= 4;
3420	4063
3421	4064	//v.AO = scale;
3422	4065
..	..	@@ -3437,12 +4080,26 @@
3437	4080
3438	4081	void Align()
3439	4082	{
	4083	+ if (group.selection.size() == 0)
	4084	+ return;
	4085	+
	4086	+ cVector bbmin = new cVector();
	4087	+ cVector bbmax = new cVector();
	4088	+
	4089	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4090	+
	4091	+ double dx = bbmax.x - bbmin.x;
	4092	+ double dy = bbmax.y - bbmin.y;
	4093	+ double dz = bbmax.z - bbmin.z;
	4094	+
	4095	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4096	+
3440	4097	for (int i=0; i<group.selection.size(); i++)
3441	4098	{
3442	4099	Object3D obj = group.selection.get(i);
3443	4100
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4101	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4102	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4103	}
3447	4104
3448	4105	refreshContents();
..	..	@@ -3455,7 +4112,7 @@
3455	4112	// ref.SaveSupports();
3456	4113	// Object3D par = ref.parent;
3457	4114	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4115	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4116	// ref.parent = par;
3460	4117	// ref.RestoreSupports();
3461	4118
..	..	@@ -3463,11 +4120,11 @@
3463	4120
3464	4121	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4122
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4123	+ boolean random = CameraPane.SWITCH;
	4124	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4125	lowres.linkVerticesThis(null);
3469	4126	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4127	+ CameraPane.SWITCH = random;
3471	4128
3472	4129	System.err.flush();
3473	4130
..	..	@@ -3485,7 +4142,7 @@
3485	4142	// lowres.SaveSupports();
3486	4143	// par = lowres.parent;
3487	4144	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4145	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4146	Object3D newlow = CloneObject(lowres, false);
3490	4147	newlow.name = sn.switchobject.get(i).name;
3491	4148	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4164,7 @@
3507	4164	return;
3508	4165
3509	4166	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4167	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4168
3512	4169	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4170
..	..	@@ -3676,7 +4333,7 @@
3676	4333	group.selection.RelinkToSupport(); // july 2014
3677	4334	System.out.println("DONE.");
3678	4335	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4336	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4337	}
3681	4338
3682	4339	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4358,20 @@
3701	4358
3702	4359	void ClipMesh()
3703	4360	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4361	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4362	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4363	+ Object3D content = Grafreed.clipboard.get(0);
3707	4364
3708	4365	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4366	content = ((cGroup)content).get(0);
3710	4367
3711	4368	// for (int i=0; i<group.selection.size(); i++)
3712	4369	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4370	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4371	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4372	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4373	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4374	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4375	System.out.println("DONE.");
3719	4376	refreshContents();
3720	4377	}
..	..	@@ -3759,6 +4416,18 @@
3759	4416	void MarkLeaves(boolean hide)
3760	4417	{
3761	4418	group.selection.MarkLeaves(hide);
	4419	+ refreshContents();
	4420	+ }
	4421	+
	4422	+ void RewindLeaves(boolean hide)
	4423	+ {
	4424	+ group.selection.RewindLeaves(hide);
	4425	+ refreshContents();
	4426	+ }
	4427	+
	4428	+ void RandomLeaves(boolean hide)
	4429	+ {
	4430	+ group.selection.RandomLeaves(hide);
3762	4431	refreshContents();
3763	4432	}
3764	4433
..	..	@@ -3844,10 +4513,10 @@
3844	4513	{
3845	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4517
3849	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4519	+ if(elem != group \|\| !newWindow)
3851	4520	{
3852	4521	// if (!(elem instanceof Composite))
3853	4522	// newWindow = false;
..	..	@@ -3937,7 +4606,6 @@
3937	4606	//case 702: // Event.LIST_DESELECT
3938	4607	group.deselectAll();
3939	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4609	if (tps != null)
3942	4610	{
3943	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,31 +4614,30 @@
3946	4614
3947	4615	//if (child.parent != null)
3948	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
3949	4618	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4619	}
3954	4620	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4621	+// else
	4622	+// {
	4623	+// objEditor.SetMaterial(group); // .GetMaterial());
	4624	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4625	+// System.err.println("info : " + group.GetPath());
	4626	+// }
3961	4627
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4629	CameraPane.flash = true;
3966	4630
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4632	// a camera
3969	4633	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4635	+ {
	4636	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4637	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4638	+ }
	4639	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4640	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4641	}
3975	4642
3976	4643	refreshContents();
..	..	@@ -3981,6 +4648,27 @@
3981	4648
3982	4649	freezemodel = false;
3983	4650	}
	4651	+
	4652	+ void refreshContents(boolean cp)
	4653	+ {
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4656	+ {
	4657	+ objEditor.ClearInfo(); // .GetMaterial());
	4658	+
	4659	+ for (int i=0; i < group.selection.Size(); i++)
	4660	+ {
	4661	+ Object3D child = (Object3D) group.selection.get(i);
	4662	+
	4663	+ objEditor.AddInfo(child, this, true);
	4664	+ System.err.println("info : " + child.GetPath());
	4665	+ }
	4666	+
	4667	+ objEditor.SetText(); // jan 2014
	4668	+ }
	4669	+
	4670	+ super.refreshContents(cp);
	4671	+ }
3984	4672
3985	4673	void linkSomething(Object3D thing)
3986	4674	{
..	..	@@ -4052,16 +4740,19 @@
4052	4740	{
4053	4741	if (group.selection.isEmpty())
4054	4742	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4743	+
	4744	+ Grafreed.clipboardIsTempGroup = false;
4056	4745	Composite tGroup = null;
4057	4746	if (group.selection.size() > 0) // 1)
4058	4747	{
4059	4748	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4749	+ Grafreed.clipboardIsTempGroup = true;
4061	4750	}
4062	4751
4063	4752	if (cut)
4064	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4065	4756	//int indices[] = jList.getSelectedIndices();
4066	4757	//for (int i = indices.length - 1; i >= 0; i--)
4067	4758	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4788,16 @@
4097	4788	//System.out.println("cut " + child);
4098	4789	//System.out.println("parent = " + child.parent);
4099	4790	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4791	+ if (Grafreed.clipboardIsTempGroup)
4101	4792	tGroup.add/Child/(tmp);
4102	4793	else
4103		- GraphreeD.clipboard = tmp;
	4794	+ Grafreed.clipboard = tmp;
4104	4795	}
4105	4796	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4797	+ if (Grafreed.clipboardIsTempGroup)
4107	4798	tGroup.add/Child/(child);
4108	4799	else
4109		- GraphreeD.clipboard = child;
	4800	+ Grafreed.clipboard = child;
4110	4801	}
4111	4802
4112	4803	//ResetModel();
..	..	@@ -4138,21 +4829,23 @@
4138	4829	//System.out.println("cut " + elem);
4139	4830	//System.out.println("parent = " + elem.parent);
4140	4831	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4832	+ if (Grafreed.clipboardIsTempGroup)
4142	4833	tGroup.add/Child/(tmp);
4143	4834	else
4144		- GraphreeD.clipboard = tmp;
	4835	+ Grafreed.clipboard = tmp;
4145	4836	}
4146	4837	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4838	+ if (Grafreed.clipboardIsTempGroup)
4148	4839	tGroup.add/Child/(child);
4149	4840	else
4150		- GraphreeD.clipboard = child;
	4841	+ Grafreed.clipboard = child;
4151	4842	}
4152	4843
4153	4844	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4845	+
	4846	+ if (Grafreed.clipboardIsTempGroup)
	4847	+ Grafreed.clipboard = tGroup;
	4848	+
4156	4849	if (cut)
4157	4850	{
4158	4851	ResetModel();
..	..	@@ -4162,11 +4855,11 @@
4162	4855
4163	4856	void paste(boolean expand)
4164	4857	{
4165		- // if (GraphreeD.clipboard == null)
	4858	+ // if (GrafreeD.clipboard == null)
4166	4859	// return;
4167	4860	boolean first = true;
4168	4861
4169		- if (GraphreeD.clipboardIsTempGroup)
	4862	+ if (Grafreed.clipboardIsTempGroup)
4170	4863	{
4171	4864	Composite temp;
4172	4865
..	..	@@ -4177,7 +4870,7 @@
4177	4870	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4871	*/
4179	4872	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4873	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4874	{
4182	4875	Object3D child = (Object3D)e.nextElement();
4183	4876
..	..	@@ -4191,7 +4884,7 @@
4191	4884	else
4192	4885	elem = child.deepCopy(); // ?
4193	4886	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4887	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4888	// elem = elem.get(0);
4196	4889	makeSomething(elem, true); // ?? first);
4197	4890	//group.addChild(elem);
..	..	@@ -4211,23 +4904,23 @@
4211	4904	//Object3D cb = Applet3D.clipboard;
4212	4905	//temp.addChild(cb);
4213	4906	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4907	+ assert(Grafreed.clipboard.parent == null);
	4908	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4909	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4910	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4911	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4912	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4913	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4914	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4915	}
4223	4916
4224	4917	ResetModel();
4225	4918	refreshContents();
4226	4919	}
4227	4920
4228		- void pasteInto(boolean copyit)
	4921	+ void pasteInto(boolean copyit, boolean clone)
4229	4922	{
4230		-// if (GraphreeD.clipboard == null)
	4923	+// if (GrafreeD.clipboard == null)
4231	4924	// return;
4232	4925
4233	4926	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4947,22 @@
4254	4947	if (copyit)
4255	4948	{
4256	4949	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4950	+ if (clone)
	4951	+ {
	4952	+ CloneClipboard(false); // sept 2014
	4953	+ }
	4954	+ else
	4955	+ {
	4956	+ paste(false);
	4957	+ }
4258	4958	}
4259	4959	else
4260	4960	{
4261	4961	boolean first = true;
4262	4962
4263		- if (GraphreeD.clipboardIsTempGroup)
	4963	+ if (Grafreed.clipboardIsTempGroup)
4264	4964	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4965	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4966	Object3D copy;
4267	4967	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4968	{
..	..	@@ -4272,7 +4972,7 @@
4272	4972	}
4273	4973	} else
4274	4974	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4975	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4976	}
4277	4977	}
4278	4978	}
..	..	@@ -4464,6 +5164,26 @@
4464	5164	makeSomething(csg);
4465	5165	}
4466	5166
	5167	+ void Ungroup(Object3D g)
	5168	+ {
	5169	+ if (g instanceof HiddenObject)
	5170	+ {
	5171	+ HiddenObject h = (HiddenObject) g;
	5172	+
	5173	+ for (int i=0; i<h.ActualSize(); i++)
	5174	+ {
	5175	+ objEditor.makeSomething(h.get(i), false);
	5176	+ }
	5177	+ }
	5178	+ else
	5179	+ {
	5180	+ for (int i=0; i<g.Size(); i++)
	5181	+ {
	5182	+ objEditor.makeSomething(g.get(i), false);
	5183	+ }
	5184	+ }
	5185	+ }
	5186	+
4467	5187	void ungroup()
4468	5188	{
4469	5189	/*
..	..	@@ -4657,21 +5377,6 @@
4657	5377	}
4658	5378	*/
4659	5379
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	5380	/*
4676	5381	public void Callback(Object obj)
4677	5382	{
..	..	@@ -4695,26 +5400,9 @@
4695	5400	}
4696	5401	*/
4697	5402
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	5403	String GetFile(String dialogName)
4716	5404	{
4717		- if (GraphreeD.standAlone)
	5405	+ if (Grafreed.standAlone)
4718	5406	{
4719	5407	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5408	browser.show();
..	..	@@ -4778,10 +5466,38 @@
4778	5466	cButton flashSelectionButton;
4779	5467	cButton editButton;
4780	5468	cButton uneditButton;
	5469	+ JCheckBox allParamsButton;
4781	5470	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5471	cButton unselectButton;
4784	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
	5481	+ cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
	5500	+
4785	5501	cButton screenfitButton;
4786	5502	cButton screenfitpointButton;
4787	5503	cButton snapobjectButton;
..	..	@@ -4793,14 +5509,6 @@
4793	5509
4794	5510	cButton setsupportButton;
4795	5511
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	5512	//
4805	5513	//Composite
4806	5514	Object3D // to do !!
..	..	@@ -4810,9 +5518,11 @@
4810	5518	//JTree jTree;
4811	5519	private MenuItem lookAtItem;
4812	5520	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
4814	5522	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
4816	5526	private MenuItem cloneItem;
4817	5527	private MenuItem cloneSupportItem;
4818	5528	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5533,9 @@
4823	5533	private MenuItem resetsupportItem;
4824	5534	private MenuItem resetreferencesItem;
4825	5535	private MenuItem linkverticesItem;
	5536	+ private MenuItem relinkverticesItem;
4826	5537	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5538	+ private MenuItem resetAllItem;
4828	5539	private MenuItem stepAllItem;
4829	5540	private MenuItem revertMeshItem;
4830	5541	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5546,17 @@
4835	5546	private MenuItem mergeGeometriesItem;
4836	5547	private MenuItem copyItem;
4837	5548	private MenuItem pasteItem;
	5549	+ private MenuItem pasteIntoItem;
4838	5550	private MenuItem pasteLinkItem;
4839	5551	private MenuItem pasteCloneItem;
4840	5552	private MenuItem pasteExpandItem;
4841	5553	private MenuItem clearItem;
4842	5554	private MenuItem clearAllItem;
4843	5555	private MenuItem genUVItem;
	5556	+ private MenuItem genNormalsMESHItem;
4844	5557	private MenuItem genNormalsCADItem;
4845	5558	private MenuItem genNormalsORGANItem;
	5559	+ private MenuItem genNormalsMINEItem;
4846	5560	private MenuItem stripifyItem;
4847	5561	private MenuItem unstripifyItem;
4848	5562	private MenuItem trimItem;
..	..	@@ -4871,6 +5585,10 @@
4871	5585	private MenuItem showleavesItem;
4872	5586	private MenuItem markleavesItem;
4873	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
4874	5592
4875	5593	private MenuItem flipVItem;
4876	5594	private MenuItem unflipVItem;
..	..	@@ -4882,14 +5600,17 @@
4882	5600	private MenuItem panoTexturesItem;
4883	5601
4884	5602	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5603	+ private MenuItem resetCentroidXZItem;
4886	5604	private MenuItem resetTransformItem;
	5605	+ private MenuItem transformGeometryItem;
	5606	+ private MenuItem transformChildrenItem;
	5607	+ private MenuItem hideItem;
4887	5608	private MenuItem grabItem;
4888	5609	private MenuItem backItem;
4889	5610	private MenuItem frontItem;
4890	5611	private MenuItem cameraItem;
4891	5612	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
4893	5614	private MenuItem physicsItem;
4894	5615	private MenuItem frameselectorItem;
4895	5616	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +5625,7 @@
4904	5625
4905	5626	private MenuItem resetParentItem;
4906	5627	private MenuItem repairParentItem;
	5628	+ private MenuItem repairShadowItem;
4907	5629	private MenuItem sortbysizeItem;
4908	5630	private MenuItem sortbynameItem;
4909	5631
..	..	@@ -4924,10 +5646,11 @@
4924	5646	private MenuItem coneItem;
4925	5647	private MenuItem torusItem;
4926	5648	private MenuItem superItem;
	5649	+ private MenuItem kleinItem;
4927	5650	private MenuItem blobItem;
4928	5651	private MenuItem latheItem;
4929	5652	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5653	+ private MenuItem overlayItem;
4931	5654	private MenuItem meshItem;
4932	5655	// private MenuItem meshGroupItem;
4933	5656	private MenuItem springItem;
..	..	@@ -4936,6 +5659,7 @@
4936	5659	private MenuItem csgItem;
4937	5660	private MenuItem templateItem;
4938	5661	private MenuItem textureItem;
	5662	+ private MenuItem billboardItem;
4939	5663	private MenuItem shadowXItem;
4940	5664	private MenuItem shadowYItem;
4941	5665	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5672,6 @@
4948	5672	private MenuItem doubleItem;
4949	5673	private MenuItem tripleItem;
4950	5674
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5675	private MenuItem computeAOItem;
4957	5676	private MenuItem recompileItem;
4958	5677	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5681,8 @@
4962	5681	private MenuItem analyzeItem;
4963	5682	private MenuItem dumpItem;
4964	5683	//boolean freezemodel = false;
	5684	+
	5685	+ Menu cameraMenu;
	5686	+ MenuItem editCameraItem;
	5687	+ MenuItem restoreCameraItem;
4965	5688	}