~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,11 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ if (Globals.SAVEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.SAVEONMAKE;
	90	+ Globals.SAVEONMAKE = false;
	91	+ // Object3D keep = GrafreeD.clipboard;
87	92	//Object3D obj;
88	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	94	{
..	..	@@ -93,18 +98,19 @@
93	98
94	99	makeSomething(clone, i==group.selection.size()-1);
95	100	}
	101	+ Globals.SAVEONMAKE = keep;
96	102	}
97	103
98	104	void CloneClipboard(boolean supports)
99	105	{
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));
	106	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	111	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
108	114	}
109	115
110	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +124,7 @@
118	124	// obj.support = null;
119	125	if (!supports)
120	126	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	128	obj.parent = parent;
123	129	// obj.support = support;
124	130	// clone.support = support; // aout 2013
..	..	@@ -147,30 +153,29 @@
147	153
148	154	//JTextField nameField;
149	155
150		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
151	157	{
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);
	158	+ oe.jTree = new cTree();
	159	+
163	160	Menu menu;
164	161	oe.menuBar.add(menu = new Menu("Edit"));
165	162	//editItem = menu.add(new MenuItem("Edit"));
166	163	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	171	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	172	cloneItem = menu.add(new MenuItem("Clone"));
171	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
172	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	177	cloneSupportItem.addActionListener(this);
	178	+ }
174	179	menu.add("-");
175	180	cutItem = menu.add(new MenuItem("Cut"));
176	181	cutItem.addActionListener(this);
..	..	@@ -178,27 +183,123 @@
178	183	copyItem.addActionListener(this);
179	184	pasteItem = menu.add(new MenuItem("Paste"));
180	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
181	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	191	pasteLinkItem.addActionListener(this);
183	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	193	pasteCloneItem.addActionListener(this);
185	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
187	197	clearItem = menu.add(new MenuItem("Clear"));
188	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
189	203	clearAllItem = menu.add(new MenuItem("Clear All"));
190	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
191	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
192	294	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);
	295	+ if (Globals.ADVANCED)
	296	+ {
197	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	298	revertMeshItem.addActionListener(this);
199	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	300	resetreferencesItem.addActionListener(this);
201	301	menu.add("-");
	302	+ }
202	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	304	overwriteGeoItem.addActionListener(this);
204	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +311,104 @@
210	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	312	overwriteUVItem.addActionListener(this);
212	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
213	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	317	generateMeshItem.addActionListener(this);
215	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	319	poseMeshItem.addActionListener(this);
217	320	menu.add("-");
	321	+ }
218	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	323	resetsupportItem.addActionListener(this);
220	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	325	linkverticesItem.addActionListener(this);
	326	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	327	+ relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
222	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	332	setMasterItem.addActionListener(this);
	333	+ }
224	334
225	335	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);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
230	338	backItem = menu.add(new MenuItem("Back"));
231	339	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);
	340	+ frontItem = menu.add(new MenuItem("Front"));
	341	+ frontItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	348	+ hideItem.addActionListener(this);
	349	+ }
	350	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	351	+ ungroupItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
241	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	360	switchGeoItem.addActionListener(this);
243	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	362	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	364	morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
	367	+ physicsItem = menu.add(new MenuItem("Physics"));
	368	+ physicsItem.addActionListener(this);
	369	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	370	+ frameselectorItem.addActionListener(this);
247	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	372	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	373	+ }
251	374
252	375	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
	378	+ billboardItem = menu.add(new MenuItem("Billboard"));
	379	+ billboardItem.addActionListener(this);
255	380	csgItem = menu.add(new MenuItem("CSG"));
256	381	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	383	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	385	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
263	394	linkerItem = menu.add(new MenuItem("Linker"));
264	395	linkerItem.addActionListener(this);
265	396	templateItem = menu.add(new MenuItem("Template"));
266	397	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	399	pointflowItem.addActionListener(this);
	400	+ }
271	401	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	403	resetTransformItem.addActionListener(this);
276	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	405	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
280	412
281	413	oe.menuBar.add(menu = new Menu("Geometry"));
282	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +417,13 @@
285	417	genNormalsORGANItem.addActionListener(this);
286	418	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	419	genNormalsCADItem.addActionListener(this);
	420	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	421	+ genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
	424	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	425	+ genNormalsMINEItem.addActionListener(this);
	426	+ }
288	427	stripifyItem = menu.add(new MenuItem("Stripify"));
289	428	stripifyItem.addActionListener(this);
290	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +445,34 @@
306	445	reduce34MeshItem.addActionListener(this);
307	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	447	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
313	456
314	457	oe.menuBar.add(menu = new Menu("Attributes"));
315	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
317	464	menu.add("-");
318	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	466	liveleavesItem.addActionListener(this);
320	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
322	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	472	supportleavesItem.addActionListener(this);
324	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	474	unsupportleavesItem.addActionListener(this);
	475	+ }
326	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	477	hideleavesItem.addActionListener(this);
328	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +481,14 @@
331	481	markleavesItem.addActionListener(this);
332	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
334	492	menu.add("-");
335	493	flipVItem = menu.add(new MenuItem("Flip V"));
336	494	flipVItem.addActionListener(this);
..	..	@@ -366,35 +524,40 @@
366	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	525	sortbynameItem.addActionListener(this);
368	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
369	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	535	extractGeometriesItem.addActionListener(this);
371	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	537	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);
	538	+ }
377	539
378	540	oe.menuBar.add(menu = new Menu("Insert"));
379	541	buildCreateMenu(menu);
380	542
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	543	oe.menuBar.add(menu = new Menu("Tools"));
393	544	buildToolsMenu(menu);
394	545	}
395	546
396	547	void SetupUI2(ObjEditor oe)
397	548	{
	549	+ // June 2019
	550	+ if (oe == null)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ //return;
	554	+ }
	555	+
	556	+ if (copy != group)
	557	+ {
	558	+ //super.SetupUI2(this);
	559	+ }
	560	+
398	561	//new Exception().printStackTrace();
399	562
400	563	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +586,217 @@
423	586	oe.radioPanel.add(dummyButton);
424	587	oe.buttonGroup.add(dummyButton);
425	588	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	589	+ cGridBag copyOptionsPanel = new cGridBag();
	590	+
	591	+ copyOptionsPanel.preferredHeight = 1;
429	592
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	593	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	594	+
	595	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ //minButton.setToolTipText("Minimize window");
	597	+ //minButton.addActionListener(this);
	598	+
	599	+ if (Globals.ADVANCED)
	600	+ {
	601	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ maxButton.setToolTipText("Maximize window");
	603	+ maxButton.addActionListener(this);
	604	+ }
	605	+
	606	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	607	+ fullButton.setToolTipText("Full-screen window");
	608	+ fullButton.addActionListener(this);
	609	+
	610	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ screenfitButton.setToolTipText("Screen fit");
	612	+ screenfitButton.addActionListener(this);
	613	+
	614	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	616	+ restoreCameraButton.addActionListener(this);
	617	+
	618	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ undoButton.setToolTipText("Undo changes");
	620	+ undoButton.addActionListener(this);
	621	+ undoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ redoButton.setToolTipText("Redo changes");
	625	+ redoButton.addActionListener(this);
	626	+ redoButton.setEnabled(false);
	627	+
	628	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ saveButton.setToolTipText("Save changes");
	630	+ saveButton.addActionListener(this);
	631	+
	632	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	633	+ liveCB.setToolTipText("Enable animation");
431	634	liveCB.addItemListener(this);
432	635
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);
	636	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ oneStepButton.setToolTipText("Animate one step forward");
	638	+ oneStepButton.addActionListener(this);
	639	+
	640	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	641	+ fastCB.setToolTipText("Fast mode");
451	642	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);
	643	+
	644	+ //oe.toolboxPanel.Return();
	645	+
	646	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	647	+// trackCB.setToolTipText("Enable tracking");
	648	+// trackCB.addItemListener(this);
458	649
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);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	650	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	651	// 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	652
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;
	653	+ if (Globals.ADVANCED)
	654	+ {
	655	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ snapobjectButton.addActionListener(this);
	657	+ snapobjectButton.setToolTipText("Snap Object");
	658	+ }
	659	+
	660	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
516	661
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ twoButton.setToolTipText("Show center view only");
519	664	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	665	+ this.fullscreenLayout = twoButton;
	666	+
	667	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	668	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	669	+ fourButton.setToolTipText("Show left panel only");
	670	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ sixButton.setToolTipText("2-column layout left");
523	672	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	673	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ threeButton.setToolTipText("2-column layout right");
525	675	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ sevenButton.setToolTipText("3-column layout");
527	678	sevenButton.addActionListener(this);
528	679	//
529	680
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	681	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ rootButton.setToolTipText("Edit selection in new tab");
531	683	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	684	+
	685	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ closeButton.setToolTipText("Close tab");
534	687	closeButton.addActionListener(this);
535	688	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	689	//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	690
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	691	+ // INSERT
	692	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ gridButton.setToolTipText("Create grid");
	694	+ gridButton.addActionListener(this);
	695	+
	696	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ boxButton.setToolTipText("Create box");
	698	+ boxButton.addActionListener(this);
	699	+
	700	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+ sphereButton.setToolTipText("Create sphere");
	702	+ sphereButton.addActionListener(this);
	703	+
	704	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ coneButton.setToolTipText("Create cone");
	706	+ coneButton.addActionListener(this);
	707	+
	708	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ torusButton.setToolTipText("Create torus");
	710	+ torusButton.addActionListener(this);
	711	+
	712	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ superButton.setToolTipText("Create superellipsoid");
	714	+ superButton.addActionListener(this);
	715	+
	716	+ if (Globals.ADVANCED)
	717	+ {
	718	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ kleinButton.setToolTipText("Create Klein bottle");
	720	+ kleinButton.addActionListener(this);
	721	+ }
	722	+
	723	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ particlesButton.setToolTipText("Create particle system");
	725	+ particlesButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.Return();
	728	+
	729	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ groupButton.setToolTipText("Create group");
	731	+ groupButton.addActionListener(this);
	732	+
	733	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	734	+ compositeButton.setToolTipText("Create composite");
	735	+ compositeButton.addActionListener(this);
	736	+
	737	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ switchButton.setToolTipText("Create item switcher");
	739	+ switchButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ loopButton.setToolTipText("Create loop");
	743	+ loopButton.addActionListener(this);
	744	+
	745	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ textureButton.setToolTipText("Create texture");
	747	+ textureButton.addActionListener(this);
	748	+
	749	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ overlayButton.setToolTipText("Create overlay");
	751	+ overlayButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	754	+ lightButton.setToolTipText("Create light");
	755	+ lightButton.addActionListener(this);
	756	+
	757	+ for (int i=6; --i>=0;)
	758	+ {
	759	+ oe.toolboxPanel.Return();
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ oe.toolboxPanel.add(new cGridBag());
	763	+ oe.toolboxPanel.add(new cGridBag());
	764	+ oe.toolboxPanel.add(new cGridBag());
	765	+ oe.toolboxPanel.add(new cGridBag());
	766	+ oe.toolboxPanel.add(new cGridBag());
	767	+ }
	768	+
	769	+ // EDIT panel
	770	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	771	+ editButton.setToolTipText("Pin selection controls");
	772	+ editButton.addActionListener(this);
	773	+
	774	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	775	+ uneditButton.setToolTipText("Remove selection controls");
547	776	uneditButton.addActionListener(this);
548	777
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);
	778	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	779	+ allParamsButton.setToolTipText("Show all controle");
561	780	allParamsButton.addActionListener(this);
562	781
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);
	782	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	783	+ clearPanelButton.setToolTipText("Clear edit panel");
	784	+ clearPanelButton.addActionListener(this);
	785	+
	786	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	787	+ unselectButton.setToolTipText("Unselect");
568	788	unselectButton.addActionListener(this);
569	789
	790	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	791	+ flashSelectionButton.setToolTipText("Highlight selection");
	792	+ flashSelectionButton.addActionListener(this);
	793	+
	794	+ editCommandsPanel.preferredHeight = 1;
	795	+
	796	+ SetPinStates(false);
	797	+// oe.treePanel.add(commandsPanel);
	798	+// oe.treePanel.Return();
	799	+
570	800	// oe.aConstraints.gridx += 1;
571	801	// oe.aConstraints.weighty = 0;
572	802	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +808,22 @@
578	808	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	809	// gcButton.addActionListener(this);
580	810
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;
	811	+ cGridBag jSPPanel = new cGridBag();
	812	+
	813	+ JScrollPane jSP;
592	814	//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);
	815	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	816	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	817
	818	+ oe.treePanel.add(jSPPanel);
	819	+ oe.treePanel.Return();
	820	+
	821	+ oe.treePanel.add(copyOptionsPanel);
	822	+ oe.treePanel.Return();
	823	+
	824	+// mainPanel.setDividerLocation(0.5); //1.0);
	825	+// mainPanel.setResizeWeight(0.5);
	826	+
615	827	//jList.addListSelectionListener(this);
616	828	oe.jTree.addTreeSelectionListener(this);
617	829	//jTree.setRootVisible(false);
..	..	@@ -633,20 +845,157 @@
633	845	radio.layout = sevenButton;
634	846	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	847	}
	848	+
	849	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	850	+ {
	851	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	852	+ colorCB.setToolTipText("Copy color when dropped");
	853	+ colorCB.addItemListener(this);
	854	+
	855	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	856	+ materialCB.setToolTipText("Copy material when dropped");
	857	+ materialCB.addItemListener(this);
	858	+
	859	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	860	+ textureCB.setToolTipText("Copy texture when dropped");
	861	+ textureCB.addItemListener(this);
	862	+
	863	+ panel.Return();
	864	+
	865	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	866	+ boxCB.setToolTipText("Display bounding boxes");
	867	+ boxCB.addItemListener(this);
	868	+
	869	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	870	+ zoomBoxCB.setToolTipText("Display only for wheel");
	871	+ zoomBoxCB.addItemListener(this);
	872	+
	873	+ if (true) // Globals.ADVANCED)
	874	+ {
	875	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	876	+// supportCB.setToolTipText("Enable rigging");
	877	+// supportCB.addItemListener(this);
	878	+
	879	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	880	+ freezeCB.setToolTipText("Fast moving camera");
	881	+ freezeCB.addItemListener(this);
	882	+
	883	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	884	+ // localCB.addItemListener(this);
	885	+
	886	+ panel.Return();
	887	+
	888	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	889	+ crowdCB.setToolTipText("Used for crowds");
	890	+ crowdCB.addItemListener(this);
	891	+
	892	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	893	+ smoothCB.setToolTipText("Snapping delay");
	894	+ smoothCB.addItemListener(this);
	895	+
	896	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	897	+ slowCB.setToolTipText("Smooth interpolation");
	898	+ slowCB.addItemListener(this);
	899	+
	900	+// constraints.gridy += 1;
	901	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	902	+// speakerMocapCB.addItemListener(this);
	903	+
	904	+ panel.Return();
	905	+
	906	+ if (false)
	907	+ {
	908	+ // handled in scripts
	909	+ //constraints.gridy += 1;
	910	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	911	+ speakerCameraCB.addItemListener(this);
	912	+
	913	+ //constraints.gridy += 1;
	914	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	915	+ speakerFocusCB.addItemListener(this);
	916	+
	917	+ //constraints.gridy += 1;
	918	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	919	+ smoothfocusCB.addItemListener(this);
	920	+ panel.Return();
	921	+ }
	922	+
	923	+//constraints.gridx += 1;
	924	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	925	+// debugCB.addItemListener(this);
	926	+
	927	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	928	+ trackCB.setToolTipText("Enable tracking target");
	929	+ trackCB.addItemListener(this);
	930	+
	931	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	932	+ oeilCB.setToolTipText("Move camera when tracking");
	933	+ oeilCB.addItemListener(this);
	934	+
	935	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	936	+ shadowCB.setToolTipText("When live compute shadows");
	937	+ shadowCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	941	+ toggleTextureCB.setToolTipText("Load textures");
	942	+ toggleTextureCB.addItemListener(this);
	943	+
	944	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	945	+ toggleSwitchCB.setToolTipText("Choose a single item");
	946	+ toggleSwitchCB.addItemListener(this);
	947	+
	948	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	949	+ autosaveCB.setToolTipText("On structure change");
	950	+ autosaveCB.addItemListener(this);
	951	+
	952	+ panel.Return();
	953	+ if (Globals.ADVANCED)
	954	+ {
	955	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	956	+ lookAtCB.setToolTipText("Look-at target");
	957	+ lookAtCB.addItemListener(this);
	958	+ }
	959	+
	960	+ }
	961	+
	962	+ cGridBag fill = new cGridBag();
	963	+ fill.preferredHeight = 200;
	964	+ cGridBag fill2 = new cGridBag();
	965	+ fill2.preferredHeight = 200;
	966	+ cGridBag fill3 = new cGridBag();
	967	+ fill3.preferredHeight = 200;
	968	+
	969	+ panel.add(fill);
	970	+ panel.add(fill2);
	971	+ panel.add(fill3);
	972	+
	973	+ }
636	974
637	975	void EditObject(Object3D obj)
638	976	{
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();
	977	+ cRadio radioButton = new cRadio(obj.name);
	978	+
	979	+ // June 2019. Patch to avoid bug with transparency.
	980	+ radioButton.hadMaterial = obj.material != null;
	981	+ if (!radioButton.hadMaterial)
	982	+ {
	983	+ obj.material = new cMaterial();
	984	+ }
	985	+
	986	+ radioButton.SetObject(obj);
	987	+ radioButton.layout = sevenButton;
	988	+ radioButton.SetCamera(cameraView.renderCamera, false);
	989	+ radioButton.addActionListener(this);
	990	+ radioPanel.add(radioButton);
	991	+ buttonGroup.add(radioButton);
	992	+ radioButton.doClick();
647	993	}
	994	+
648	995	void SetupViews(ObjEditor oe)
649	996	{
	997	+ theFrame = this;
	998	+
650	999	oe.SetupViews();
651	1000
652	1001	System.out.println("SetupViews");
..	..	@@ -655,22 +1004,28 @@
655	1004	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1005	}
657	1006
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;
	1007	+ cToggleButton liveCB;
	1008	+ cCheckBox supportCB;
	1009	+ cCheckBox localCB;
	1010	+ cCheckBox crowdCB;
	1011	+ cCheckBox smoothCB;
	1012	+ cToggleButton fastCB;
	1013	+ cCheckBox slowCB;
	1014	+ cCheckBox boxCB;
	1015	+ cCheckBox zoomBoxCB;
	1016	+ cCheckBox freezeCB;
	1017	+ //cToggleButton trackCB;
	1018	+ cCheckBox trackCB;
	1019	+ cCheckBox smoothfocusCB;
668	1020	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1021	+ cCheckBox speakerCameraCB;
	1022	+ cCheckBox speakerFocusCB;
	1023	+ cCheckBox debugCB;
	1024	+
	1025	+ cCheckBox oeilCB;
	1026	+ cCheckBox shadowCB;
	1027	+ cCheckBox autosaveCB;
	1028	+ cCheckBox lookAtCB;
674	1029
675	1030	// static int COLOR = 1;
676	1031	// static int MATERIAL = 2;
..	..	@@ -678,9 +1033,9 @@
678	1033
679	1034	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1035
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1036	+ cCheckBox colorCB;
	1037	+ cCheckBox materialCB;
	1038	+ cCheckBox textureCB;
684	1039
685	1040	public void itemStateChanged(ItemEvent e)
686	1041	{
..	..	@@ -705,10 +1060,10 @@
705	1060	dropAttributes \|= Object3D.TEXTURE;
706	1061	else
707	1062	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1063	+ } else if(e.getSource() == liveCB)
710	1064	{
711	1065	cameraView.ToggleLive();
	1066	+ refreshContents(false);
712	1067	}
713	1068	else if(e.getSource() == supportCB)
714	1069	{
..	..	@@ -744,6 +1099,10 @@
744	1099	cameraView.repaint();
745	1100	// refreshContents();
746	1101	}
	1102	+ else if(e.getSource() == zoomBoxCB)
	1103	+ {
	1104	+ cameraView.ToggleZoomBoxMode();
	1105	+ }
747	1106	else if(e.getSource() == smoothfocusCB)
748	1107	{
749	1108	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1128,18 @@
769	1128	{
770	1129	cameraView.ToggleOeil();
771	1130	}
	1131	+ else if(e.getSource() == shadowCB)
	1132	+ {
	1133	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1134	+ }
	1135	+ else if(e.getSource() == freezeCB)
	1136	+ {
	1137	+ Globals.FREEZEONMOVE ^= true;
	1138	+ }
	1139	+ else if(e.getSource() == autosaveCB)
	1140	+ {
	1141	+ Globals.SAVEONMAKE ^= true;
	1142	+ }
772	1143	else if(e.getSource() == lookAtCB)
773	1144	{
774	1145	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1156,8 @@
785	1156
786	1157	/**/
787	1158	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1159	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1160	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1161	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1162	// We can't move the root node or an empty selection
791	1163	return;
..	..	@@ -848,8 +1220,6 @@
848	1220	}
849	1221	}
850	1222
851		- String string = (String) object;
852		-
853	1223	System.out.println("Transfer = " + object + "; drop : " + target);
854	1224	// if( object instanceof java.io.File[])
855	1225	// {
..	..	@@ -857,7 +1227,11 @@
857	1227	// objEditor.DropFile((java.io.File[]) object, true);
858	1228	// return;
859	1229	// }
860		- if (string.charAt(0) == '/')
	1230	+
	1231	+ String string = object.toString();
	1232	+
	1233	+ // File path for Mac and Windows
	1234	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1235	{
862	1236	// file(s)
863	1237	String[] names = string.split("\n");
..	..	@@ -884,7 +1258,7 @@
884	1258
885	1259	flashIt = false;
886	1260	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1261	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1262	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1263
890	1264	if (group.selection.size() == 1)
..	..	@@ -900,23 +1274,33 @@
900	1274
901	1275	assert target == objEditor.jTree;
902	1276	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1277	+ Object3D destinationLeaf;
903	1278	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1279	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1280	} catch (Exception e) {
906	1281	System.out.println("destinationPath : " + destinationPath);
907	1282	return;
908	1283	}
909	1284
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1285	+ for (int i=group.selection.size(); --i>=0;)
911	1286	{
	1287	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1288	+
	1289	+ // Cannot move into itself
	1290	+ if (child == destinationLeaf)
	1291	+ return;
	1292	+ }
	1293	+
	1294	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1295	+// {
912	1296	loadClipboard(true);
913	1297	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1298	+ pasteInto(false, false);
	1299	+// } else {
	1300	+// loadClipboard(false);
	1301	+// objEditor.jTree.setSelectionPath(destinationPath);
	1302	+// pasteInto(false, false); // true); // ???
	1303	+// }
920	1304	}
921	1305	public void dropActionChanged(DropTargetDragEvent dtde)
922	1306	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1405,107 @@
1021	1405	{
1022	1406	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1407	//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);
	1408	+// gridItem = menu.add(new MenuItem("Grid"));
	1409	+// gridItem.addActionListener(this);
	1410	+// rectoidItem = menu.add(new MenuItem("Box"));
	1411	+// rectoidItem.addActionListener(this);
	1412	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1413	+// ellipsoidItem.addActionListener(this);
	1414	+// coneItem = menu.add(new MenuItem("Cone"));
	1415	+// coneItem.addActionListener(this);
	1416	+// torusItem = menu.add(new MenuItem("Torus"));
	1417	+// torusItem.addActionListener(this);
	1418	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1419	+// superItem.addActionListener(this);
	1420	+
	1421	+ cameraItem = menu.add(new MenuItem("Camera"));
	1422	+ cameraItem.addActionListener(this);
	1423	+
	1424	+ if (!Globals.ADVANCED)
	1425	+ {
	1426	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1427	+ kleinItem.addActionListener(this);
	1428	+ }
	1429	+
	1430	+// particleItem = menu.add(new MenuItem("Particle system"));
	1431	+// particleItem.addActionListener(this);
	1432	+ if (Globals.ADVANCED)
	1433	+ {
1038	1434	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1435	ragdollItem.addActionListener(this);
1040	1436	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1437	ragdoll2Item.addActionListener(this);
	1438	+ }
1042	1439	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1440	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1441	meshItem.addActionListener(this);
1045	1442	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1443	// meshGroupItem.addActionListener(this);
	1444	+ if (Globals.ADVANCED)
	1445	+ {
1047	1446	springItem = menu.add(new MenuItem("Spring"));
1048	1447	springItem.addActionListener(this);
1049	1448	flagItem = menu.add(new MenuItem("Flag"));
1050	1449	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	1450	blobItem = menu.add(new MenuItem("Blob"));
1056	1451	blobItem.addActionListener(this);
1057	1452	latheItem = menu.add(new MenuItem("Lathe"));
1058	1453	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1454	+ }
	1455	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1456	+ bezierItem.addActionListener(this);
	1457	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1458	+// overlayItem.addActionListener(this);
	1459	+// lightItem = menu.add(new MenuItem("Light"));
	1460	+// lightItem.addActionListener(this);
1061	1461	menu.add("-");
1062	1462	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1463	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1464	+// loopItem = menu.add(new MenuItem("Loop"));
	1465	+// loopItem.addActionListener(this);
1066	1466	doubleItem = menu.add(new MenuItem("Fork"));
1067	1467	doubleItem.addActionListener(this);
	1468	+ if (Globals.ADVANCED)
	1469	+ {
1068	1470	tripleItem = menu.add(new MenuItem("Trident"));
1069	1471	tripleItem.addActionListener(this);
	1472	+ }
1070	1473	}
1071	1474
1072	1475	void buildToolsMenu(Menu menu)
1073	1476	{
1074	1477	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1478	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1479	+ animationItem.setState(Globals.ANIMATION);
	1480	+
	1481	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1482	+ archiveItem.addActionListener(this);
1077	1483
1078	1484	menu.add("-");
1079	1485	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1486	parseverticesItem.addActionListener(this);
1081	1487	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1488	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1489	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1490	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1491	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1492	reduceMorphItem.addActionListener(this);
1089	1493	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1494	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1495	menu.add("-");
1095		-
1096	1496	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1497	memoryItem.addActionListener(this);
	1498	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1499	+ computeAOItem.addActionListener(this);
	1500	+
	1501	+ if (Globals.ADVANCED)
	1502	+ {
	1503	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1504	+ mirrorItem.addActionListener(this);
	1505	+ menu.add("-");
1098	1506	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1507	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1508	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1509	dumpItem.addActionListener(this);
1102	1510	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1511	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1514,8 @@
1106	1514	resetParentItem.addActionListener(this);
1107	1515	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1516	repairParentItem.addActionListener(this);
	1517	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1518	+ repairShadowItem.addActionListener(this);
1109	1519	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1520	invariantsItem.addActionListener(this);
1111	1521	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1523,7 @@
1113	1523	menu.add("-");
1114	1524	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1525	editScriptItem.addActionListener(this);
	1526	+ }
1116	1527	}
1117	1528
1118	1529	void ScreenFit()
..	..	@@ -1235,9 +1646,24 @@
1235	1646	shadow.material = new cMaterial(obj.material);
1236	1647	shadow.material.diffuse = 0.0001f;
1237	1648	shadow.material.specular = 0.0001f;
	1649	+ //shadow.projectedVertices[1].x = 300;
1238	1650
1239	1651	makeSomething(shadow);
1240	1652	}
	1653	+
	1654	+ private void ClearUnpinned()
	1655	+ {
	1656	+ //for (Object3D obj : listUI)
	1657	+ for (int i=listUI.size(); --i>=0;)
	1658	+ {
	1659	+ Object3D obj = listUI.elementAt(i);
	1660	+ if (!obj.pinned)
	1661	+ {
	1662	+ obj.CloseUI();
	1663	+ listUI.remove(i);
	1664	+ }
	1665	+ }
	1666	+ }
1241	1667
1242	1668	/**
1243	1669	* applyExample
..	..	@@ -1441,9 +1867,9 @@
1441	1867
1442	1868	void Overwrite(int mask)
1443	1869	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1870	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1871	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1872	+ Object3D content = Grafreed.clipboard.get(0);
1447	1873
1448	1874	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1875	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1892,7 @@
1466	1892	//
1467	1893	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1894	{
	1895	+ Object source = event.getSource();
1469	1896	/*
1470	1897	if (event.getSource() == nameField)
1471	1898	{
..	..	@@ -1477,11 +1904,11 @@
1477	1904	}
1478	1905	else
1479	1906	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1907	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1908	{
1482	1909	ScreenFit();
1483	1910	} else
1484		- if (event.getSource() == switchItem)
	1911	+ if (source == switchViewItem)
1485	1912	{
1486	1913	cVector v1 = new cVector();
1487	1914	cVector v2 = new cVector();
..	..	@@ -1490,11 +1917,11 @@
1490	1917	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1918	objEditor.cameraView.repaint();
1492	1919	} else
1493		- if (event.getSource() == rectoidItem)
	1920	+ if (source == rectoidItem \|\| source == boxButton)
1494	1921	{
1495	1922	makeSomething(new Box());
1496	1923	} else
1497		- if (event.getSource() == particleItem)
	1924	+ if (source == particleItem \|\| source == particlesButton)
1498	1925	{
1499	1926	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1927	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1942,9 @@
1515	1942	applyExample(particleGeom, "SMOKE");
1516	1943	makeSomething(particleGeom);
1517	1944	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1945	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1946	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1947	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1948
1522	1949	ragdoll.toParent = LA.newMatrix();
1523	1950	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1962,7 @@
1535	1962	} else
1536	1963	/*
1537	1964	*/
1538		- if (event.getSource() == heightFieldItem)
	1965	+ if (source == heightFieldItem)
1539	1966	{
1540	1967	Object3D obj = new Object3D();
1541	1968
..	..	@@ -1573,27 +2000,31 @@
1573	2000
1574	2001	makeSomething(obj);
1575	2002	} else
1576		- if (event.getSource() == gridItem)
	2003	+ if (source == gridItem \|\| source == gridButton)
1577	2004	{
1578	2005	makeSomething(new Grid());
1579	2006	} else
1580		- if (event.getSource() == ellipsoidItem)
	2007	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2008	{
1582	2009	makeSomething(new Sphere());
1583	2010	} else
1584		- if (event.getSource() == coneItem)
	2011	+ if (source == coneItem \|\| source == coneButton)
1585	2012	{
1586	2013	makeSomething(new Cone());
1587	2014	} else
1588		- if (event.getSource() == torusItem)
	2015	+ if (source == torusItem \|\| source == torusButton)
1589	2016	{
1590	2017	makeSomething(new Torus());
1591	2018	} else
1592		- if (event.getSource() == superItem)
	2019	+ if (source == superItem \|\| source == superButton)
1593	2020	{
1594	2021	makeSomething(new Superellipsoid());
1595	2022	} else
1596		- if (event.getSource() == blobItem)
	2023	+ if (source == kleinItem \|\| source == kleinButton)
	2024	+ {
	2025	+ makeSomething(new Klein());
	2026	+ } else
	2027	+ if (source == blobItem)
1597	2028	{
1598	2029	Blob blob = new Blob();
1599	2030	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2032,15 @@
1601	2032	//blob.retile();
1602	2033	makeSomething(blob);
1603	2034	} else
1604		- if (event.getSource() == latheItem)
	2035	+ if (source == latheItem)
1605	2036	{
1606	2037	makeSomething(new Lathe());
1607	2038	} else
1608		- if (event.getSource() == bezierItem)
	2039	+ if (source == bezierItem)
1609	2040	{
1610	2041	makeSomething(new BezierSurface());
1611	2042	} else
1612		- if (event.getSource() == checkerItem)
	2043	+ if (source == overlayItem \|\| source == overlayButton)
1613	2044	{
1614	2045	/*
1615	2046	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2055,7 @@
1624	2055	*/
1625	2056	makeSomething(new Checker());
1626	2057	} else
1627		- if (event.getSource() == meshItem)
	2058	+ if (source == meshItem)
1628	2059	{
1629	2060	Object3D itemtomake = new Object3D();
1630	2061	Object3D child;
..	..	@@ -1645,35 +2076,35 @@
1645	2076	makeSomething(child);
1646	2077	}
1647	2078	} else
1648		- if (event.getSource() == springItem)
	2079	+ if (source == springItem)
1649	2080	{
1650	2081	cSpring s = new cSpring();
1651	2082	s.setup();
1652	2083	makeSomething(s);
1653	2084	} else
1654		- if (event.getSource() == flagItem)
	2085	+ if (source == flagItem)
1655	2086	{
1656	2087	cSpring s = new cFlag();
1657	2088	s.setup();
1658	2089	makeSomething(s);
1659	2090	} else
1660		- if (event.getSource() == lightItem)
	2091	+ if (source == lightItem \|\| source == lightButton)
1661	2092	{
1662	2093	makeSomething(new Light());
1663	2094	} else
1664		- if (event.getSource() == csgItem)
	2095	+ if (source == csgItem)
1665	2096	{
1666	2097	group(new CSG());
1667	2098	} else
1668		- if (event.getSource() == templateItem)
	2099	+ if (source == templateItem)
1669	2100	{
1670	2101	group(new cTemplate());
1671	2102	} else
1672		- if (event.getSource() == attributeItem)
	2103	+ if (source == attributeItem)
1673	2104	{
1674	2105	makeSomething(new Attribute());
1675	2106	} else
1676		- if (event.getSource() == pointflowItem)
	2107	+ if (source == pointflowItem)
1677	2108	{
1678	2109	makeSomething(new PointFlow());
1679	2110	} else
..	..	@@ -1685,7 +2116,7 @@
1685	2116	} else
1686	2117	*/
1687	2118
1688		- if (event.getSource() == superLoopItem)
	2119	+ if (source == superLoopItem)
1689	2120	{
1690	2121	Composite g = new cGroup();
1691	2122	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2138,30 @@
1707	2138
1708	2139	group(g);
1709	2140	} else
1710		- if (event.getSource() == loopItem)
	2141	+ if (source == loopItem \|\| source == loopButton)
1711	2142	{
1712	2143	Composite csg = new GroupLeaf();
1713	2144	csg.count = 5;
1714	2145	group(csg);
1715		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch");
1716	2147	csg.addChild(child);
1717	2148	child.addChild(csg);
1718	2149	} else
1719		- if (event.getSource() == doubleItem)
	2150	+ if (source == doubleItem)
1720	2151	{
1721		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Fork");
1722	2153	csg.count = 5;
1723	2154	group(csg);
1724		- Composite child = new cGroup();
	2155	+ Composite child = new cGroup("Branch A");
1725	2156	csg.addChild(child);
1726	2157	child.addChild(csg);
1727		- child = new cGroup();
	2158	+ child = new cGroup("Branch B");
1728	2159	csg.addChild(child);
1729	2160	child.addChild(csg);
1730	2161	} else
1731		- if (event.getSource() == tripleItem)
	2162	+ if (source == tripleItem)
1732	2163	{
1733		- Composite csg = new GroupLeaf();
	2164	+ Composite csg = new GroupLeaf("Trident");
1734	2165	csg.count = 4;
1735	2166	group(csg);
1736	2167	Composite child = new cGroup();
..	..	@@ -1743,73 +2174,84 @@
1743	2174	csg.addChild(child);
1744	2175	child.addChild(csg);
1745	2176	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2177	+ if (source == computeAOItem)
1748	2178	{
1749		- ImportGFD();
	2179	+ Globals.drawMode = CameraPane.OCCLUSION;
	2180	+ Globals.theRenderer.repaint();
1750	2181	} 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)
	2182	+ if (source == recompileItem)
1769	2183	{
1770	2184	Recompile();
1771	2185	refreshContents();
1772	2186	} else
1773		- if (event.getSource() == editScriptItem)
	2187	+ if (source == editScriptItem)
1774	2188	{
1775	2189	OpenDialog();
1776	2190	refreshContents();
1777	2191	} else
1778		- if (event.getSource() == invariantsItem)
	2192	+ if (source == invariantsItem)
1779	2193	{
1780	2194	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2195	+ Grafreed.grafreeD.universe.invariants();
1782	2196	} else
1783		- if (event.getSource() == memoryItem)
	2197	+ if (source == memoryItem)
1784	2198	{
1785	2199	//System.out.println("Invariants:");
1786	2200	PrintMemory();
1787	2201	} else
1788		- if (event.getSource() == pathItem)
	2202	+ if (source == pathItem)
1789	2203	{
1790	2204	PrintPath();
1791	2205	} else
1792		- if (event.getSource() == analyzeItem)
	2206	+ if (source == analyzeItem)
1793	2207	{
1794	2208	AnalyzeObject();
1795	2209	} else
1796		- if (event.getSource() == dumpItem)
	2210	+ if (source == dumpItem)
1797	2211	{
1798	2212	DumpObject();
1799	2213	} else
1800		- if (event.getSource() == screenfitButton)
	2214	+ if (source == minButton)
1801	2215	{
1802		- //Reload(lastConverter, lastFilename, true);
	2216	+ Minimize();
	2217	+ } else
	2218	+ if (source == maxButton)
	2219	+ {
	2220	+ Maximize();
	2221	+ } else
	2222	+ if (source == fullButton)
	2223	+ {
	2224	+ ToggleFullScreen();
	2225	+ } else
	2226	+ if (source == undoButton)
	2227	+ {
	2228	+ if (!Undo())
	2229	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2230	+ } else
	2231	+ if (source == redoButton)
	2232	+ {
	2233	+ Redo();
	2234	+ } else
	2235	+ if (source == saveButton)
	2236	+ {
	2237	+ if (!Save(true))
	2238	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2239	+ } else
	2240	+ if (source == oneStepButton)
	2241	+ {
	2242	+ Globals.ONESTEP = true;
	2243	+ cameraView.repaint();
	2244	+ } else
	2245	+ if (source == screenfitButton)
	2246	+ {
1803	2247	ScreenFit();
1804	2248	} else
1805		- if (event.getSource() == screenfitpointButton)
	2249	+ if (source == screenfitpointButton)
1806	2250	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2251	ScreenFitPoint();
1809	2252	} else
1810		- if (event.getSource() == snapobjectButton)
	2253	+ if (source == snapobjectButton)
1811	2254	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2255	SnapObject();
1814	2256	} else
1815	2257	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2260,13 @@
1818	2260	// Recompile();
1819	2261	// refreshContents();
1820	2262	// } else
1821		- if (event.getSource() == gcButton)
	2263	+ if (source == gcButton)
1822	2264	{
1823	2265	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2266	System.gc();
1825	2267	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2268	} else
1827		- if (event.getSource() == editLeafItem)
	2269	+ if (source == editLeafItem)
1828	2270	{
1829	2271	Object3D obj;
1830	2272	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2280,78 @@
1838	2280	}
1839	2281	refreshContents(true);
1840	2282	} else
1841		- if (event.getSource() == openWindowItem)
	2283	+ if (source == openWindowItem)
1842	2284	{
1843	2285	EditSelection(true);
1844	2286	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2287	+ if (source == cutItem \|\| source == clearButton)
1846	2288	{
1847	2289	loadClipboard(true);
1848	2290	} else
1849		- if (event.getSource() == duplicateItem)
	2291	+ if (source == undoItem)
1850	2292	{
1851		- Object3D keep = GraphreeD.clipboard;
	2293	+ Undo();
	2294	+ } else
	2295	+ if (source == redoItem)
	2296	+ {
	2297	+ Redo();
	2298	+ } else
	2299	+ if (source == duplicateItem)
	2300	+ {
	2301	+ Object3D keep = Grafreed.clipboard;
1852	2302	loadClipboard(false);
1853	2303	paste(false);
1854		- GraphreeD.clipboard = keep;
	2304	+ Grafreed.clipboard = keep;
1855	2305	} else
1856		- if (event.getSource() == cloneItem)
	2306	+ if (source == cloneItem)
1857	2307	{
1858	2308	CloneSelection(false);
1859	2309	} else
1860		- if (event.getSource() == cloneSupportItem)
	2310	+ if (source == cloneSupportItem)
1861	2311	{
1862	2312	CloneSelection(true);
1863	2313	} else
1864		- if (event.getSource() == copyItem)
	2314	+ if (source == copyItem)
1865	2315	{
1866	2316	loadClipboard(false);
1867	2317	} else
1868		- if (event.getSource() == pasteItem)
	2318	+ if (source == pasteItem)
1869	2319	{
1870	2320	paste(false);
1871	2321	} else
1872		- if (event.getSource() == pasteLinkItem)
	2322	+ if (source == pasteIntoItem)
1873	2323	{
1874		- pasteInto(false);
	2324	+ pasteInto(true, false);
1875	2325	} else
1876		- if (event.getSource() == pasteCloneItem)
	2326	+ if (source == pasteLinkItem)
1877	2327	{
1878		- pasteInto(true);
	2328	+ pasteInto(false, false);
1879	2329	} else
1880		- if (event.getSource() == pasteExpandItem)
	2330	+ if (source == pasteCloneItem)
	2331	+ {
	2332	+ pasteInto(true, true);
	2333	+ } else
	2334	+ if (source == pasteExpandItem)
1881	2335	{
1882	2336	paste(true);
1883	2337	} else
1884		- if (event.getSource() == synchronizeItem)
	2338	+ if (source == synchronizeItem)
1885	2339	{
1886	2340	Overwrite(Object3D.TRANSFORM);
1887	2341	} else
1888		- if (event.getSource() == overwriteNameItem)
	2342	+ if (source == overwriteNameItem)
1889	2343	{
1890	2344	Overwrite(Object3D.NAME);
1891	2345	} else
1892		- if (event.getSource() == overwriteUVItem)
	2346	+ if (source == overwriteUVItem)
1893	2347	{
1894	2348	Overwrite(Object3D.UV);
1895	2349	} else
1896		- if (event.getSource() == overwriteMatItem)
	2350	+ if (source == overwriteMatItem)
1897	2351	{
	2352	+ /* july 2015
1898	2353	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2354	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2355	else
1901	2356	{
1902	2357	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2363,16 @@
1908	2363	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2364	}
1910	2365	}
	2366	+ */
	2367	+
	2368	+ Overwrite(dropAttributes);
1911	2369	}
1912		- if (event.getSource() == overwriteGeoItem)
	2370	+ if (source == overwriteGeoItem)
1913	2371	{
1914	2372	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2373	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2374	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2375	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2376	//
1919	2377	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2378	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2384,7 @@
1926	2384	// refreshContents();
1927	2385	// }
1928	2386	} else
1929		- if (event.getSource() == generateMeshItem)
	2387	+ if (source == generateMeshItem)
1930	2388	{
1931	2389	//if (group.selection.size() == 1)
1932	2390	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2395,7 @@
1937	2395	ResetModel();
1938	2396	refreshContents();
1939	2397	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2398	+ if (source == extractGeometriesItem)
1941	2399	{
1942	2400	boolean one = false;
1943	2401
..	..	@@ -1964,7 +2422,7 @@
1964	2422	ResetModel();
1965	2423	refreshContents();
1966	2424	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2425	+ if (source == cloneGeometriesItem)
1968	2426	{
1969	2427	boolean one = false;
1970	2428
..	..	@@ -1990,32 +2448,37 @@
1990	2448	ResetModel();
1991	2449	refreshContents();
1992	2450	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2451	+ if (source == shareGeometriesItem)
1994	2452	{
1995	2453	boolean one = false;
1996	2454
1997	2455	if (group.selection.size() == 1)
1998	2456	one = true;
1999	2457
	2458	+ Object3D merge = null;
	2459	+
2000	2460	Object3D content = new cGroup();
2001	2461
2002	2462	for (int i=0; i<group.selection.size(); i++)
2003	2463	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2464	+ merge = new Merge(group.selection.get(i));
2005	2465
2006	2466	if (one)
2007		- makeSomething(sel, false);
	2467	+ makeSomething(merge, false);
2008	2468	else
2009		- content.addChild(sel);
	2469	+ content.addChild(merge);
2010	2470	}
2011	2471
2012	2472	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2473	+ makeSomething(content, true);
	2474	+ else
	2475	+ {
	2476	+ ResetModel();
	2477	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2478	+ refreshContents();
	2479	+ }
2017	2480	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2481	+ if (source == mergeGeometriesItem)
2019	2482	{
2020	2483	boolean one = false;
2021	2484
..	..	@@ -2045,11 +2508,11 @@
2045	2508	ResetModel();
2046	2509	refreshContents();
2047	2510	} else
2048		- if (event.getSource() == linkverticesItem)
	2511	+ if (source == linkverticesItem)
2049	2512	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2513	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2514	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2515	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2516	//
2054	2517	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2518	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2521,48 @@
2058	2521	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2522	// refreshContents();
2060	2523	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2524	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2525	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2526	+ Object3D content = Grafreed.clipboard.get(0);
2064	2527
2065	2528	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2529	content = ((cGroup)content).get(0);
2067	2530
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2531	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2532	for (int i=0; i<group.selection.size(); i++)
2070	2533	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2534	+ boolean random = CameraPane.SWITCH;
	2535	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2536	group.selection.get(i).linkVerticesThis(content);
2074	2537	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2538	+ CameraPane.SWITCH = random;
2076	2539	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2540	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2541	refreshContents();
2079	2542	}
2080	2543	} else
2081		- if (event.getSource() == resetsupportItem)
	2544	+ if (source == resetsupportItem)
2082	2545	{
2083	2546	for (int i=0; i<group.selection.size(); i++)
2084	2547	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2548	+ boolean random = CameraPane.SWITCH;
	2549	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2550	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2551	+ CameraPane.SWITCH = random;
2089	2552	}
2090	2553
2091	2554	refreshContents();
2092	2555	} else
2093		- if (event.getSource() == resetreferencesItem)
	2556	+ if (source == relinkverticesItem)
	2557	+ {
	2558	+ boolean random = CameraPane.SWITCH;
	2559	+ CameraPane.SWITCH = false; // parse all random nodes
	2560	+ group.selection.RelinkToSupport();
	2561	+ CameraPane.SWITCH = random;
	2562	+
	2563	+ refreshContents();
	2564	+ } else
	2565	+ if (source == resetreferencesItem)
2094	2566	{
2095	2567	for (int i=0; i<group.selection.size(); i++)
2096	2568	{
..	..	@@ -2099,11 +2571,11 @@
2099	2571
2100	2572	refreshContents();
2101	2573	} else
2102		- if (event.getSource() == setMasterItem)
	2574	+ if (source == setMasterItem)
2103	2575	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2576	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2577	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2578	+ Object3D content = Grafreed.clipboard.get(0);
2107	2579
2108	2580	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2581	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2584,13 @@
2112	2584	refreshContents();
2113	2585	}
2114	2586	} else
2115		- if (event.getSource() == poseMeshItem)
	2587	+ if (source == poseMeshItem)
2116	2588	{
2117	2589	if (group.selection.size() == 1)
2118	2590	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2591	+ if (Grafreed.clipboard.size() == 1)
2120	2592	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2593	+ Object3D content = Grafreed.clipboard.get(0);
2122	2594
2123	2595	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2596	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2603,19 @@
2131	2603	}
2132	2604
2133	2605	} else
2134		- if (event.getSource() == revertMeshItem)
	2606	+ if (source == revertMeshItem)
2135	2607	{
2136	2608	RevertMeshes();
2137	2609	} else
2138		- if (event.getSource() == resetMeshItem)
	2610	+ if (source == resetAllItem)
2139	2611	{
2140	2612	ResetAll();
2141	2613	} else
2142		- if (event.getSource() == stepAllItem)
	2614	+ if (source == stepAllItem)
2143	2615	{
2144	2616	StepAll();
2145	2617	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2618	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2619	{
2148	2620	//int indices[] = jList.getSelectedIndices();
2149	2621	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2623,46 @@
2151	2623
2152	2624	ClearSelection(false);
2153	2625	} else
2154		- if (event.getSource() == clearAllItem)
	2626	+ if (source == clearAllItem)
2155	2627	{
2156	2628	ClearSelection(true);
2157	2629	} else
2158		- if (event.getSource() == grabItem)
	2630	+ if (source == grabItem \|\| source == groupButton)
2159	2631	{
2160		- group(new cGroup(), true);
	2632	+ group(new cGroup(), false); // true);
2161	2633	} else
2162		- if (event.getSource() == frontItem)
	2634	+ if (source == hideItem)
	2635	+ {
	2636	+ group(new HiddenObject());
	2637	+ } else
	2638	+ if (source == frontItem)
2163	2639	{
2164	2640	front();
2165	2641	} else
2166		- if (event.getSource() == backItem)
	2642	+ if (source == backItem)
2167	2643	{
2168	2644	back();
2169	2645	} else
2170		- if (event.getSource() == cameraItem)
	2646	+ if (source == cameraItem)
2171	2647	{
2172	2648	makeSomething(new Camera());
2173	2649	} else
2174		- if (event.getSource() == compositeItem)
	2650	+ if (source == compositeItem \|\| source == compositeButton)
2175	2651	{
2176	2652	group(new Composite());
2177	2653	} else
2178		- if (event.getSource() == randomItem)
	2654	+ if (source == switchItem \|\| source == switchButton)
2179	2655	{
2180	2656	RandomNode random = new RandomNode();
2181	2657	group(random);
2182	2658	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2659	+ random.name = random.get(0).name + "Switch";
2184	2660	} else
2185		- if (event.getSource() == physicsItem)
	2661	+ if (source == physicsItem)
2186	2662	{
2187	2663	group(new PhysicsNode());
2188	2664	} else
2189		- if (event.getSource() == frameselectorItem)
	2665	+ if (source == frameselectorItem)
2190	2666	{
2191	2667	for (int i=0; i<group.selection.size(); i++)
2192	2668	{
..	..	@@ -2198,7 +2674,7 @@
2198	2674	ResetModel();
2199	2675	refreshContents();
2200	2676	} else
2201		- if (event.getSource() == switchGeoItem)
	2677	+ if (source == switchGeoItem)
2202	2678	{
2203	2679	for (int i=0; i<group.selection.size(); i++)
2204	2680	{
..	..	@@ -2210,7 +2686,7 @@
2210	2686	ResetModel();
2211	2687	refreshContents();
2212	2688	} else
2213		- if (event.getSource() == switchTransfoItem)
	2689	+ if (source == switchTransfoItem)
2214	2690	{
2215	2691	for (int i=0; i<group.selection.size(); i++)
2216	2692	{
..	..	@@ -2222,7 +2698,7 @@
2222	2698	ResetModel();
2223	2699	refreshContents();
2224	2700	} else
2225		- if (event.getSource() == morphItem)
	2701	+ if (source == morphItem)
2226	2702	{
2227	2703	for (int i=0; i<group.selection.size(); i++)
2228	2704	{
..	..	@@ -2234,7 +2710,7 @@
2234	2710	ResetModel();
2235	2711	refreshContents();
2236	2712	} else
2237		- if (event.getSource() == scriptNodeItem)
	2713	+ if (source == scriptNodeItem)
2238	2714	{
2239	2715	boolean atleastone = false;
2240	2716
..	..	@@ -2273,195 +2749,252 @@
2273	2749	}
2274	2750	}
2275	2751	} else
2276		- if (event.getSource() == linkerItem)
	2752	+ if (source == linkerItem)
2277	2753	{
2278	2754	group(new cLinker());
2279	2755	} else
2280		- if (event.getSource() == textureItem)
	2756	+ if (source == textureItem \|\| source == textureButton)
2281	2757	{
2282	2758	group(new TextureNode());
2283	2759	} else
2284		- if (event.getSource() == shadowXItem)
	2760	+ if (source == billboardItem)
	2761	+ {
	2762	+ group(new BillboardNode());
	2763	+ } else
	2764	+ if (source == shadowXItem)
2285	2765	{
2286	2766	CastShadow(0);
2287	2767	} else
2288		- if (event.getSource() == shadowYItem)
	2768	+ if (source == shadowYItem)
2289	2769	{
2290	2770	CastShadow(1);
2291	2771	} else
2292		- if (event.getSource() == shadowZItem)
	2772	+ if (source == shadowZItem)
2293	2773	{
2294	2774	CastShadow(2);
2295	2775	} else
2296		- if (event.getSource() == ungroupItem)
	2776	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	2777	{
2298		- ungroup();
	2778	+ boolean hasRoot = false;
	2779	+
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ if (group.selection.get(i) == group)
	2783	+ {
	2784	+ hasRoot = true;
	2785	+ break;
	2786	+ }
	2787	+ }
	2788	+
	2789	+ if (!hasRoot)
	2790	+ {
	2791	+ for (int i=0; i<group.selection.size(); i++)
	2792	+ {
	2793	+ Ungroup(group.selection.get(i));
	2794	+ }
	2795	+
	2796	+ ClearSelection(false);
	2797	+
	2798	+ refreshContents();
	2799	+ }
2299	2800	} else
2300		- if (event.getSource() == genUVItem)
	2801	+ if (source == genUVItem)
2301	2802	{
2302	2803	GenUV();
2303	2804	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2805	+ if (source == genNormalsCADItem)
2305	2806	{
2306	2807	GenNormals(true);
2307	2808	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2809	+ if (source == genNormalsMESHItem)
	2810	+ {
	2811	+ GenNormalsMESH();
	2812	+ } else
	2813	+ if (source == genNormalsORGANItem)
2309	2814	{
2310	2815	GenNormals(false);
2311	2816	} else
2312		- if (event.getSource() == stripifyItem)
	2817	+ if (source == genNormalsMINEItem)
	2818	+ {
	2819	+ GenNormalsMINE();
	2820	+ } else
	2821	+ if (source == stripifyItem)
2313	2822	{
2314	2823	Stripify();
2315	2824	} else
2316		- if (event.getSource() == unstripifyItem)
	2825	+ if (source == unstripifyItem)
2317	2826	{
2318	2827	Unstripify();
2319	2828	} else
2320		- if (event.getSource() == trimItem)
	2829	+ if (source == trimItem)
2321	2830	{
2322	2831	Trim();
2323	2832	} else
2324		- if (event.getSource() == untrimItem)
	2833	+ if (source == untrimItem)
2325	2834	{
2326	2835	Untrim();
2327	2836	} else
2328		- if (event.getSource() == clearColorsItem)
	2837	+ if (source == clearColorsItem)
2329	2838	{
2330	2839	ClearColors();
2331	2840	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2841	+ if (source == clearMaterialsItem)
2333	2842	{
2334	2843	ClearMaterials();
2335	2844	} else
2336		- if (event.getSource() == liveleavesItem)
	2845	+ if (source == liveleavesItem)
2337	2846	{
2338	2847	LiveLeaves(true);
2339	2848	} else
2340		- if (event.getSource() == unliveleavesItem)
	2849	+ if (source == unliveleavesItem)
2341	2850	{
2342	2851	LiveLeaves(false);
2343	2852	} else
2344		- if (event.getSource() == supportleavesItem)
	2853	+ if (source == supportleavesItem)
2345	2854	{
2346	2855	SupportLeaves(true);
2347	2856	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2857	+ if (source == unsupportleavesItem)
2349	2858	{
2350	2859	SupportLeaves(false);
2351	2860	} else
2352		- if (event.getSource() == hideleavesItem)
	2861	+ if (source == hideleavesItem)
2353	2862	{
2354	2863	HideLeaves(true);
2355	2864	} else
2356		- if (event.getSource() == showleavesItem)
	2865	+ if (source == showleavesItem)
2357	2866	{
2358	2867	HideLeaves(false);
2359	2868	} else
2360		- if (event.getSource() == markleavesItem)
	2869	+ if (source == markleavesItem)
2361	2870	{
2362	2871	MarkLeaves(true);
2363	2872	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2873	+ if (source == unmarkleavesItem)
2365	2874	{
2366	2875	MarkLeaves(false);
2367	2876	} else
2368		- if (event.getSource() == flipVItem)
	2877	+ if (source == rewindleavesItem)
	2878	+ {
	2879	+ RewindLeaves(true);
	2880	+ } else
	2881	+ if (source == unrewindleavesItem)
	2882	+ {
	2883	+ RewindLeaves(false);
	2884	+ } else
	2885	+ if (source == randomleavesItem)
	2886	+ {
	2887	+ RandomLeaves(true);
	2888	+ } else
	2889	+ if (source == unrandomleavesItem)
	2890	+ {
	2891	+ RandomLeaves(false);
	2892	+ } else
	2893	+ if (source == flipVItem)
2369	2894	{
2370	2895	FlipV(true);
2371	2896	} else
2372		- if (event.getSource() == unflipVItem)
	2897	+ if (source == unflipVItem)
2373	2898	{
2374	2899	FlipV(false);
2375	2900	} else
2376		- if (event.getSource() == lowTexturesItem)
	2901	+ if (source == lowTexturesItem)
2377	2902	{
2378	2903	SetTexRes(0);
2379	2904	} else
2380		- if (event.getSource() == normalTexturesItem)
	2905	+ if (source == normalTexturesItem)
2381	2906	{
2382	2907	SetTexRes(1);
2383	2908	} else
2384		- if (event.getSource() == highTexturesItem)
	2909	+ if (source == highTexturesItem)
2385	2910	{
2386	2911	SetTexRes(2);
2387	2912	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2913	+ if (source == veryhighTexturesItem)
2389	2914	{
2390	2915	SetTexRes(3);
2391	2916	} else
2392		- if (event.getSource() == maxTexturesItem)
	2917	+ if (source == maxTexturesItem)
2393	2918	{
2394	2919	SetTexRes(4);
2395	2920	} else
2396		- if (event.getSource() == panoTexturesItem)
	2921	+ if (source == panoTexturesItem)
2397	2922	{
2398	2923	SetTexRes(5);
2399	2924	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2925	+ if (source == reverseNormalsItem)
2401	2926	{
2402	2927	ReverseNormals();
2403	2928	} else
2404		- if (event.getSource() == parseverticesItem)
	2929	+ if (source == parseverticesItem)
2405	2930	{
2406	2931	ParseVertices();
2407	2932	} else
2408		- if (event.getSource() == textureFieldItem)
	2933	+ if (source == textureFieldItem)
2409	2934	{
2410	2935	TextureVertices();
2411	2936	} else
2412		- if (event.getSource() == alignItem)
	2937	+ if (source == alignItem)
2413	2938	{
2414	2939	Align();
2415	2940	} else
2416		- if (event.getSource() == mirrorItem)
	2941	+ if (source == mirrorItem)
2417	2942	{
2418	2943	MirrorPoses();
2419	2944	} else
2420		- if (event.getSource() == reduceMorphItem)
	2945	+ if (source == reduceMorphItem)
2421	2946	{
2422	2947	MeshReduction(false);
2423	2948	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2949	+ if (source == reduce34MorphItem)
2425	2950	{
2426	2951	MeshReduction(true);
2427	2952	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2953	+ if (source == reverseTrianglesItem)
2429	2954	{
2430	2955	ReverseTriangles();
2431	2956	} else
2432		- if (event.getSource() == reduceMeshItem)
	2957	+ if (source == reduceMeshItem)
2433	2958	{
2434	2959	ReduceMesh(false);
2435	2960	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2961	+ if (source == reduce34MeshItem)
2437	2962	{
2438	2963	ReduceMesh(true);
2439	2964	} else
2440		- if (event.getSource() == increaseMeshItem)
	2965	+ if (source == increaseMeshItem)
2441	2966	{
2442	2967	IncreaseMesh();
2443	2968	} else
2444		- if (event.getSource() == clipMeshItem)
	2969	+ if (source == clipMeshItem)
2445	2970	{
2446	2971	ClipMesh();
2447	2972	} else
2448		- if (event.getSource() == smoothMeshItem)
	2973	+ if (source == smoothMeshItem)
2449	2974	{
2450	2975	SmoothMesh();
2451	2976	} else
2452		- if (event.getSource() == transformgeometryItem)
	2977	+ if (source == transformGeometryItem)
2453	2978	{
2454	2979	TransformGeometry();
2455	2980	} else
2456		- if (event.getSource() == resetTransformItem)
	2981	+ if (source == transformChildrenItem)
	2982	+ {
	2983	+ TransformChildren();
	2984	+ } else
	2985	+ if (source == resetTransformItem)
2457	2986	{
2458	2987	ResetTransform();
2459	2988	} else
2460		- if (event.getSource() == resetCentroidItem)
	2989	+ if (source == resetCentroidItem)
2461	2990	{
2462		- ResetCentroid();
	2991	+ ResetCentroid(true);
2463	2992	} else
2464		- if (event.getSource() == resetParentItem)
	2993	+ if (source == resetCentroidXZItem)
	2994	+ {
	2995	+ ResetCentroid(false);
	2996	+ } else
	2997	+ if (source == resetParentItem)
2465	2998	{
2466	2999	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3000	{
..	..	@@ -2471,7 +3004,7 @@
2471	3004
2472	3005	refreshContents();
2473	3006	} else
2474		- if (event.getSource() == repairParentItem)
	3007	+ if (source == repairParentItem)
2475	3008	{
2476	3009	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3010	{
..	..	@@ -2485,7 +3018,21 @@
2485	3018
2486	3019	refreshContents();
2487	3020	} else
2488		- if (event.getSource() == sortbysizeItem)
	3021	+ if (source == repairShadowItem)
	3022	+ {
	3023	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3024	+ {
	3025	+ Object3D obj = (Object3D)e.nextElement();
	3026	+ obj.RepairShadow();
	3027	+// for (int i=0; i<obj.size(); i++)
	3028	+// {
	3029	+// obj.get(i).parent = obj;
	3030	+// }
	3031	+ }
	3032	+
	3033	+ refreshContents();
	3034	+ } else
	3035	+ if (source == sortbysizeItem)
2489	3036	{
2490	3037	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3038	{
..	..	@@ -2497,7 +3044,7 @@
2497	3044	ResetModel();
2498	3045	refreshContents();
2499	3046	} else
2500		- if (event.getSource() == sortbynameItem)
	3047	+ if (source == sortbynameItem)
2501	3048	{
2502	3049	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3050	{
..	..	@@ -2509,7 +3056,7 @@
2509	3056	ResetModel();
2510	3057	refreshContents();
2511	3058	} else
2512		- if (event.getSource() == attachPigmentItem)
	3059	+ if (source == attachPigmentItem)
2513	3060	{
2514	3061	String texture = GetFile("Attach pigment");
2515	3062	Object3D obj;
..	..	@@ -2521,7 +3068,7 @@
2521	3068
2522	3069	refreshContents();
2523	3070	} else
2524		- if (event.getSource() == detachPigmentItem)
	3071	+ if (source == detachPigmentItem)
2525	3072	{
2526	3073	Object3D obj;
2527	3074	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3079,7 @@
2532	3079
2533	3080	refreshContents();
2534	3081	} else
2535		- if (event.getSource() == attachBumpItem)
	3082	+ if (source == attachBumpItem)
2536	3083	{
2537	3084	String texture = GetFile("Attach bump");
2538	3085	Object3D obj;
..	..	@@ -2544,7 +3091,7 @@
2544	3091
2545	3092	refreshContents();
2546	3093	} else
2547		- if (event.getSource() == detachBumpItem)
	3094	+ if (source == detachBumpItem)
2548	3095	{
2549	3096	Object3D obj;
2550	3097	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +3102,7 @@
2555	3102
2556	3103	refreshContents();
2557	3104	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3105	+ if (source == pigmentBumpItem)
2559	3106	{
2560	3107	Object3D obj;
2561	3108	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3113,237 @@
2566	3113
2567	3114	refreshContents();
2568	3115	} else
2569		- if (event.getSource() == flashSelectionButton)
	3116	+ if (source == flashSelectionButton)
2570	3117	{
2571	3118	CameraPane.flash = true;
2572	3119	refreshContents();
2573	3120	} else
2574		- if (event.getSource() == oneButton)
	3121	+ if (source == oneButton)
2575	3122	{
2576	3123	} else
2577		- if (event.getSource() == twoButton)
	3124	+ if (source == twoButton)
2578	3125	{
2579	3126	radio.layout = twoButton;
	3127	+
	3128	+ if (CameraPane.FULLSCREEN)
	3129	+ fullscreenLayout = radio.layout;
	3130	+
2580	3131	// bug
2581	3132	//gridPanel.setDividerLocation(1.0);
2582	3133	//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();
	3134	+// bigThree.remove(scenePanel);
	3135	+// bigThree.remove(centralPanel);
	3136	+// bigThree.remove(XYZPanel);
	3137	+// aWindowConstraints.gridx = 0;
	3138	+// aWindowConstraints.gridy = 0;
	3139	+// aWindowConstraints.gridwidth = 1;
	3140	+// // aConstraints.gridheight = 3;
	3141	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3142	+// aWindowConstraints.weightx = 0;
	3143	+// aWindowConstraints.weighty = 1;
	3144	+// //bigThree.add(jtp, aWindowConstraints);
	3145	+// aWindowConstraints.weightx = 1;
	3146	+// aWindowConstraints.gridwidth = 3;
	3147	+// // aConstraints.gridheight = 3;
	3148	+// aWindowConstraints.gridx = 1;
	3149	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3150	+// bigThree.add(centralPanel, aWindowConstraints);
	3151	+// aWindowConstraints.weightx = 0;
	3152	+// aWindowConstraints.gridx = 4;
	3153	+// aWindowConstraints.gridwidth = 1;
	3154	+// // aConstraints.gridheight = 3;
	3155	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3156	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3157	+// scenePanel.setVisible(false);
	3158	+// centralPanel.setVisible(true);
	3159	+// XYZPanel.setVisible(false);
	3160	+ bigThree.ClearUI();
	3161	+ bigThree.add(centralPanel);
	3162	+ bigThree.FlushUI();
	3163	+
	3164	+ cameraView.requestFocusInWindow();
	3165	+
	3166	+// refreshContents(true);
	3167	+//
	3168	+// try
	3169	+// {
	3170	+// java.awt.Robot bot = new java.awt.Robot();
	3171	+// int mask = InputEvent.BUTTON1_MASK;
	3172	+// bot.mouseMove(100, 100);
	3173	+// bot.mousePress(mask);
	3174	+// bot.mouseRelease(mask);
	3175	+// }
	3176	+// catch (Exception e)
	3177	+// {
	3178	+//
	3179	+// }
	3180	+
2607	3181	} else
2608		- if (event.getSource() == threeButton)
	3182	+ if (source == threeButton)
2609	3183	{
2610	3184	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();
	3185	+
	3186	+ if (CameraPane.FULLSCREEN)
	3187	+ fullscreenLayout = radio.layout;
	3188	+
	3189	+// bigThree.remove(scenePanel);
	3190	+// bigThree.remove(centralPanel);
	3191	+// bigThree.remove(XYZPanel);
	3192	+// aWindowConstraints.gridx = 0;
	3193	+// aWindowConstraints.gridy = 0;
	3194	+// aWindowConstraints.gridwidth = 1;
	3195	+// // aConstraints.gridheight = 3;
	3196	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3197	+// aWindowConstraints.weightx = 0;
	3198	+// aWindowConstraints.weighty = 1;
	3199	+// //bigThree.add(jtp, aWindowConstraints);
	3200	+// aWindowConstraints.weightx = 1;
	3201	+// aWindowConstraints.gridwidth = 3;
	3202	+// // aConstraints.gridheight = 3;
	3203	+// aWindowConstraints.gridx = 1;
	3204	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3205	+// bigThree.add(centralPanel, aWindowConstraints);
	3206	+// aWindowConstraints.weightx = 0;
	3207	+// aWindowConstraints.gridx = 4;
	3208	+// aWindowConstraints.gridwidth = 1;
	3209	+// // aConstraints.gridheight = 3;
	3210	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3211	+// bigThree.add(XYZPanel, aWindowConstraints);
	3212	+// bigThree.validate();
	3213	+// scenePanel.setVisible(false);
	3214	+// centralPanel.setVisible(true);
	3215	+// XYZPanel.setVisible(true);
	3216	+ bigThree.ClearUI();
	3217	+ bigThree.add(centralPanel);
	3218	+ bigThree.add(XYZPanel);
	3219	+ bigThree.FlushUI();
	3220	+
	3221	+ cameraView.requestFocusInWindow();
2635	3222	} else
2636		- if (event.getSource() == fourButton)
	3223	+ if (source == fourButton)
2637	3224	{
2638	3225	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();
	3226	+
	3227	+ if (CameraPane.FULLSCREEN)
	3228	+ fullscreenLayout = radio.layout;
	3229	+
	3230	+// bigThree.remove(scenePanel);
	3231	+// bigThree.remove(centralPanel);
	3232	+// bigThree.remove(XYZPanel);
	3233	+// aWindowConstraints.gridx = 0;
	3234	+// aWindowConstraints.gridy = 0;
	3235	+// aWindowConstraints.gridwidth = 1;
	3236	+// // aWindowConstraints.gridheight = 3;
	3237	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3238	+// aWindowConstraints.weightx = 1;
	3239	+// aWindowConstraints.weighty = 1;
	3240	+// bigThree.add(scenePanel, aWindowConstraints);
	3241	+// aWindowConstraints.weightx = 1;
	3242	+// aWindowConstraints.gridwidth = 3;
	3243	+// // aConstraints.gridheight = 3;
	3244	+// aWindowConstraints.gridx = 1;
	3245	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3246	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3247	+// aWindowConstraints.weightx = 0;
	3248	+// aWindowConstraints.gridx = 4;
	3249	+// aWindowConstraints.gridwidth = 1;
	3250	+// // aWindowConstraints.gridheight = 3;
	3251	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3252	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3253	+// bigThree.validate();
	3254	+// scenePanel.setVisible(true);
	3255	+// centralPanel.setVisible(false);
	3256	+// XYZPanel.setVisible(false);
	3257	+ bigThree.ClearUI();
	3258	+ bigThree.add(scenePanel);
	3259	+ bigThree.FlushUI();
	3260	+
	3261	+ cameraView.requestFocusInWindow();
2663	3262	} else
2664		- if (event.getSource() == sixButton)
	3263	+ if (source == sixButton)
2665	3264	{
2666	3265	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();
	3266	+
	3267	+ if (CameraPane.FULLSCREEN)
	3268	+ fullscreenLayout = radio.layout;
	3269	+
	3270	+// bigThree.remove(scenePanel);
	3271	+// bigThree.remove(centralPanel);
	3272	+// bigThree.remove(XYZPanel);
	3273	+// aWindowConstraints.gridx = 0;
	3274	+// aWindowConstraints.gridy = 0;
	3275	+// aWindowConstraints.gridwidth = 1;
	3276	+// // aConstraints.gridheight = 3;
	3277	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3278	+// aWindowConstraints.weightx = 0;
	3279	+// aWindowConstraints.weighty = 1;
	3280	+// bigThree.add(scenePanel, aWindowConstraints);
	3281	+// aWindowConstraints.weightx = 1;
	3282	+// aWindowConstraints.gridwidth = 3;
	3283	+// // aWindowConstraints.gridheight = 3;
	3284	+// aWindowConstraints.gridx = 1;
	3285	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3286	+// bigThree.add(centralPanel, aWindowConstraints);
	3287	+// aWindowConstraints.weightx = 0;
	3288	+// aWindowConstraints.gridx = 4;
	3289	+// aWindowConstraints.gridwidth = 1;
	3290	+// // aWindowConstraints.gridheight = 3;
	3291	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3292	+// //bigThree.add(XYZPanel, aConstraints);
	3293	+// bigThree.validate();
	3294	+// scenePanel.setVisible(true);
	3295	+// centralPanel.setVisible(true);
	3296	+// XYZPanel.setVisible(false);
	3297	+ bigThree.ClearUI();
	3298	+ bigThree.add(scenePanel);
	3299	+ bigThree.add(centralPanel);
	3300	+ bigThree.FlushUI();
	3301	+
	3302	+ cameraView.requestFocusInWindow();
2691	3303	} else
2692		- if (event.getSource() == sevenButton)
	3304	+ if (source == sevenButton)
2693	3305	{
2694	3306	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();
	3307	+
	3308	+ if (CameraPane.FULLSCREEN)
	3309	+ fullscreenLayout = radio.layout;
	3310	+
	3311	+// bigThree.remove(scenePanel);
	3312	+// bigThree.remove(centralPanel);
	3313	+// bigThree.remove(XYZPanel);
	3314	+// aWindowConstraints.gridx = 0;
	3315	+// aWindowConstraints.gridy = 0;
	3316	+// aWindowConstraints.gridwidth = 1;
	3317	+// // aWindowConstraints.gridheight = 3;
	3318	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3319	+// aWindowConstraints.weightx = 0;
	3320	+// aWindowConstraints.weighty = 1;
	3321	+// bigThree.add(scenePanel, aWindowConstraints);
	3322	+// aWindowConstraints.weightx = 1;
	3323	+// aWindowConstraints.gridwidth = 3;
	3324	+// // aWindowConstraints.gridheight = 3;
	3325	+// aWindowConstraints.gridx = 1;
	3326	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3327	+// bigThree.add(centralPanel, aWindowConstraints);
	3328	+// aWindowConstraints.weightx = 0;
	3329	+// aWindowConstraints.gridx = 4;
	3330	+// aWindowConstraints.gridwidth = 1;
	3331	+// // aConstraints.gridheight = 3;
	3332	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3333	+// bigThree.add(XYZPanel, aWindowConstraints);
	3334	+// bigThree.validate();
	3335	+// scenePanel.setVisible(true);
	3336	+// centralPanel.setVisible(true);
	3337	+// XYZPanel.setVisible(true);
	3338	+ bigThree.ClearUI();
	3339	+ bigThree.add(scenePanel);
	3340	+ bigThree.add(centralPanel);
	3341	+ bigThree.add(XYZPanel);
	3342	+ bigThree.FlushUI();
	3343	+
	3344	+ cameraView.requestFocusInWindow();
2719	3345	} else
2720		- if (event.getSource() == rootButton)
	3346	+ if (source == rootButton)
2721	3347	{
2722	3348	Object3D obj;
2723	3349	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3353,84 @@
2727	3353	EditObject(obj);
2728	3354	}
2729	3355
	3356	+ cameraView.requestFocusInWindow();
2730	3357	refreshContents(true);
2731	3358	} else
2732		- if (event.getSource() == closeButton)
	3359	+ if (source == closeButton)
2733	3360	{
2734	3361	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3362	cRadio ab;
2736	3363	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3364	{
2738	3365	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3366	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3367	{
	3368	+ // Patch to avoid bug with transparency.
	3369	+ if (!ab.hadMaterial)
	3370	+ {
	3371	+ ab.object.material = null;
	3372	+ }
	3373	+
2741	3374	buttonGroup.remove(ab);
2742	3375	radioPanel.remove(ab);
2743	3376
2744		- ab.GetObject().editWindow = null;
	3377	+ //ab.GetObject().editWindow = null;
	3378	+ ab.GetObject().manipWindow = null;
2745	3379	// ab.GetObject().objectUI = null; // ?????????
2746	3380
2747	3381	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3382	break;
2749	3383	}
2750	3384	}
	3385	+
	3386	+ cameraView.requestFocusInWindow();
2751	3387	refreshContents(true);
2752	3388	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3389	+ if (source == editItem \|\| source == editButton)
2754	3390	{
	3391	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3392	+ {
	3393	+ Object3D child = (Object3D)e.nextElement();
	3394	+ child.pinned = true;
	3395	+ }
	3396	+
2755	3397	EditSelection(false);
2756	3398	} else
2757		- if (event.getSource() == uneditButton)
	3399	+ if (source == uneditButton)
2758	3400	{
2759	3401	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3402	{
2761	3403	Object3D child = (Object3D)e.nextElement();
2762	3404	if(child.editWindow != null)
2763	3405	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3406	+ child.pinned = false;
2764	3407	child.CloseUI();
2765	3408	listUI.remove(child);
2766	3409
2767		- child.editWindow = null; // ???????????
	3410	+ //child.editWindow = null; // ???????????
2768	3411	}
2769		- objEditor.ctrlPanel.revalidate();
	3412	+ objEditor.ctrlPanel.FlushUI();
2770	3413	//objEditor.jTree.clearSelection();
2771	3414	//objEditor.ResetSliders();
2772	3415	refreshContents(true);
2773	3416	} else
2774		- if (event.getSource() == clearPanelButton)
	3417	+ if (source == clearPanelButton)
2775	3418	{
2776	3419	assert(copy == group);
2777	3420	//copy.ClearUI();
2778	3421	for (Object3D obj : listUI)
2779	3422	{
	3423	+ obj.pinned = false;
2780	3424	obj.CloseUI();
2781	3425	}
2782	3426	listUI.clear();
2783	3427	refreshContents(true);
2784	3428	} else
2785		- if (event.getSource() == allParamsButton)
	3429	+ if (source == allParamsButton)
2786	3430	{
2787	3431	assert(copy == group);
2788	3432
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3433	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3434
2791	3435	for (Object3D obj : listUI)
2792	3436	{
..	..	@@ -2803,19 +3447,19 @@
2803	3447
2804	3448	refreshContents(true);
2805	3449	} else
2806		- if (event.getSource() == unselectButton)
	3450	+ if (source == unselectButton)
2807	3451	{
2808	3452	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3453	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3454	objEditor.ResetSliders();
2811	3455	refreshContents(true);
2812	3456	} else
2813		- if(event.getSource() instanceof cRadio)
	3457	+ if(source instanceof cRadio)
2814	3458	{
2815	3459	group.parent = keepparent;
2816	3460	group.attributes = 0;
2817	3461	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3462	+ /cRadio/ radio = (cRadio)source;
2819	3463	Object3D obj = radio.GetObject();
2820	3464	System.out.println("Edit " + obj);
2821	3465	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3479,7 @@
2835	3479	}
2836	3480
2837	3481	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3482	+ //Globals.theRenderer.object = group;
2839	3483	if(!useclient)
2840	3484	{
2841	3485	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +3488,50 @@
2844	3488	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3489	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3490	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3491	+ //cameraView.lighttouched = true;
	3492	+ Globals.lighttouched = true;
2848	3493	topView.object = group;
2849	3494	frontView.object = group;
2850	3495	sideView.object = group;
2851	3496	}
2852		- group.editWindow = this;
	3497	+
	3498	+// fix "+" issue
	3499	+ //group.editWindow = this;
	3500	+ group.manipWindow = this;
	3501	+
2853	3502	/*
2854	3503	currentLayout = radio.layout;
2855	3504	if (currentLayout == null)
2856	3505	currentLayout = sevenButton;
2857	3506	*/
2858	3507	radio.layout.doClick();
	3508	+
	3509	+ ClearUnpinned();
	3510	+ SetPinStates(group.selection.size() > 0);
	3511	+ if (group.selection.size() == 1)
	3512	+ EditSelection(false);
2859	3513	keepparent = group.parent;
2860	3514	// PARENT = NULL or not???
2861	3515	//group.parent = null; // ROOT
2862	3516	//group.attributes = -1;
2863	3517	ResetModel();
	3518	+
	3519	+ cameraView.requestFocusInWindow();
2864	3520	refreshContents(true);
2865		- }
	3521	+ } else if (event.getSource() == editCameraItem)
	3522	+ {
	3523	+ cameraView.ProtectCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3527	+ {
	3528	+ cameraView.RevertCamera();
	3529	+ cameraView.repaint();
	3530	+ return;
	3531	+ // } else if (event.getSource() == textureButton)
	3532	+ // {
	3533	+ // return; // true;
	3534	+ }
2866	3535	else
2867	3536	{
2868	3537	//return super.action(event, arg);
..	..	@@ -2871,7 +3540,6 @@
2871	3540	}
2872	3541
2873	3542	boolean useclient = false;
2874		- cRadio radio;
2875	3543
2876	3544	void ToggleRoot()
2877	3545	{
..	..	@@ -2880,7 +3548,7 @@
2880	3548	if (useclient)
2881	3549	{
2882	3550	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3551	+ Globals.lighttouched = true;
2884	3552	//topView.object = client;
2885	3553	//frontView.object = client;
2886	3554	//sideView.object = client;
..	..	@@ -2888,7 +3556,7 @@
2888	3556	else
2889	3557	{
2890	3558	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3559	+ Globals.lighttouched = true;
2892	3560	//topView.object = group;
2893	3561	//frontView.object = group;
2894	3562	//sideView.object = group;
..	..	@@ -2923,6 +3591,28 @@
2923	3591	refreshContents();
2924	3592	}
2925	3593
	3594	+ void TransformChildren()
	3595	+ {
	3596	+ Object3D obj;
	3597	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3598	+ {
	3599	+ obj = (Object3D)e.nextElement();
	3600	+ obj.KeepTextureMatrices();
	3601	+ obj.TransformChildren();
	3602	+ obj.RestoreTextureMatrices();
	3603	+
	3604	+// if (obj.parent == null)
	3605	+// {
	3606	+// System.out.println("NULL PARENT!");
	3607	+// new Exception().printStackTrace();
	3608	+// }
	3609	+// else
	3610	+// TouchTransform(obj);
	3611	+// //obj.parent.Touch();
	3612	+ }
	3613	+
	3614	+ refreshContents();
	3615	+ }
2926	3616
2927	3617	void ResetTransform()
2928	3618	{
..	..	@@ -3035,7 +3725,7 @@
3035	3725	refreshContents();
3036	3726	}
3037	3727
3038		- void ResetCentroid()
	3728	+ void ResetCentroid(boolean full)
3039	3729	{
3040	3730	Object3D obj;
3041	3731	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3740,16 @@
3050	3740	LA.matIdentity(Object3D.mat);
3051	3741	obj.getBounds(minima, maxima, false);
3052	3742	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3743	+ if (full)
	3744	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3745	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3746	obj.TransformMesh(Object3D.mat);
	3747	+
3056	3748	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3749	+ if (full)
	3750	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3751	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3752	+
3059	3753	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3754	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3755	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3778,8 @@
3084	3778
3085	3779	int size = obj.MemorySize();
3086	3780
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3781	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3782	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3783	}
3089	3784	}
3090	3785	catch (Exception e)
..	..	@@ -3121,9 +3816,9 @@
3121	3816	obj = (Object3D)e.nextElement();
3122	3817
3123	3818	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3819	+ Grafreed.AnalyzeObject(obj);
3125	3820	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3821	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3822
3128	3823	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3824	}
..	..	@@ -3165,6 +3860,20 @@
3165	3860	void GenNormals(boolean crease)
3166	3861	{
3167	3862	group.GenNormalsS(crease);
	3863	+
	3864	+ refreshContents();
	3865	+ }
	3866	+
	3867	+ void GenNormalsMESH()
	3868	+ {
	3869	+ group.GenNormalsMeshS();
	3870	+
	3871	+ refreshContents();
	3872	+ }
	3873	+
	3874	+ void GenNormalsMINE()
	3875	+ {
	3876	+ group.selection.GenNormalsMINE();
3168	3877
3169	3878	refreshContents();
3170	3879	}
..	..	@@ -3250,7 +3959,7 @@
3250	3959	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3960	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3961	//
3253		-// g.add(GraphreeD.clipboard);
	3962	+// g.add(GrafreeD.clipboard);
3254	3963	//
3255	3964	// buffer.add(g);
3256	3965	// }
..	..	@@ -3269,8 +3978,8 @@
3269	3978	// nodes = new Object3D();
3270	3979	// vertices = new Vector<Vertex>();
3271	3980	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3981	+// boolean epsequal = GrafreeD.epsequal;
	3982	+// GrafreeD.epsequal = true;
3274	3983	//
3275	3984	// for (int i=0; i<group.selection.size(); i++)
3276	3985	// {
..	..	@@ -3311,7 +4020,7 @@
3311	4020	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4021	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4022	//
3314		-// g.add(GraphreeD.clipboard);
	4023	+// g.add(GrafreeD.clipboard);
3315	4024	//
3316	4025	// buffer.add(g);
3317	4026	// }
..	..	@@ -3319,7 +4028,7 @@
3319	4028	// makeSomething(buffer, i==group.selection.size()-1);
3320	4029	// }
3321	4030	//
3322		-// GraphreeD.epsequal = epsequal;
	4031	+// GrafreeD.epsequal = epsequal;
3323	4032	//
3324	4033	// //buffer = null;
3325	4034	// temprep = null;
..	..	@@ -3330,8 +4039,8 @@
3330	4039
3331	4040	void ParseVertices()
3332	4041	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4042	+ boolean epsequal = Grafreed.epsequal;
	4043	+ Grafreed.epsequal = true;
3335	4044
3336	4045	for (int i=0; i<group.selection.size(); i++)
3337	4046	{
..	..	@@ -3356,7 +4065,7 @@
3356	4065	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4066	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4067
3359		- g.add(GraphreeD.clipboard);
	4068	+ g.add(Grafreed.clipboard);
3360	4069
3361	4070	buffer.add(g);
3362	4071	}
..	..	@@ -3371,7 +4080,7 @@
3371	4080	makeSomething(buffer, i==group.selection.size()-1);
3372	4081	}
3373	4082
3374		- GraphreeD.epsequal = epsequal;
	4083	+ Grafreed.epsequal = epsequal;
3375	4084
3376	4085	refreshContents();
3377	4086	}
..	..	@@ -3389,7 +4098,16 @@
3389	4098	String pigment = Object3D.GetPigment(tex);
3390	4099	//String bump = Object3D.GetBump(tex);
3391	4100
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4102	+
	4103	+ try
	4104	+ {
	4105	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4106	+ }
	4107	+ catch (Exception e)
	4108	+ {
	4109	+ System.err.println("FAIL: " + node);
	4110	+ }
3393	4111
3394	4112	double s = v.s;
3395	4113
..	..	@@ -3416,7 +4134,7 @@
3416	4134	scale /= 3;
3417	4135
3418	4136	scale /= 0xFF;
3419		- scale /= 4;
	4137	+ // c'est quoi ca? scale /= 4;
3420	4138
3421	4139	//v.AO = scale;
3422	4140
..	..	@@ -3437,12 +4155,26 @@
3437	4155
3438	4156	void Align()
3439	4157	{
	4158	+ if (group.selection.size() == 0)
	4159	+ return;
	4160	+
	4161	+ cVector bbmin = new cVector();
	4162	+ cVector bbmax = new cVector();
	4163	+
	4164	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4165	+
	4166	+ double dx = bbmax.x - bbmin.x;
	4167	+ double dy = bbmax.y - bbmin.y;
	4168	+ double dz = bbmax.z - bbmin.z;
	4169	+
	4170	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4171	+
3440	4172	for (int i=0; i<group.selection.size(); i++)
3441	4173	{
3442	4174	Object3D obj = group.selection.get(i);
3443	4175
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4176	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4177	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4178	}
3447	4179
3448	4180	refreshContents();
..	..	@@ -3455,7 +4187,7 @@
3455	4187	// ref.SaveSupports();
3456	4188	// Object3D par = ref.parent;
3457	4189	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4190	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4191	// ref.parent = par;
3460	4192	// ref.RestoreSupports();
3461	4193
..	..	@@ -3463,11 +4195,11 @@
3463	4195
3464	4196	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4197
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4198	+ boolean random = CameraPane.SWITCH;
	4199	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4200	lowres.linkVerticesThis(null);
3469	4201	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4202	+ CameraPane.SWITCH = random;
3471	4203
3472	4204	System.err.flush();
3473	4205
..	..	@@ -3485,7 +4217,7 @@
3485	4217	// lowres.SaveSupports();
3486	4218	// par = lowres.parent;
3487	4219	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4220	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4221	Object3D newlow = CloneObject(lowres, false);
3490	4222	newlow.name = sn.switchobject.get(i).name;
3491	4223	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4239,7 @@
3507	4239	return;
3508	4240
3509	4241	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4242	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4243
3512	4244	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4245
..	..	@@ -3676,7 +4408,7 @@
3676	4408	group.selection.RelinkToSupport(); // july 2014
3677	4409	System.out.println("DONE.");
3678	4410	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4411	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4412	}
3681	4413
3682	4414	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4433,20 @@
3701	4433
3702	4434	void ClipMesh()
3703	4435	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4436	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4437	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4438	+ Object3D content = Grafreed.clipboard.get(0);
3707	4439
3708	4440	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4441	content = ((cGroup)content).get(0);
3710	4442
3711	4443	// for (int i=0; i<group.selection.size(); i++)
3712	4444	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4445	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4446	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4447	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4448	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4449	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4450	System.out.println("DONE.");
3719	4451	refreshContents();
3720	4452	}
..	..	@@ -3759,6 +4491,18 @@
3759	4491	void MarkLeaves(boolean hide)
3760	4492	{
3761	4493	group.selection.MarkLeaves(hide);
	4494	+ refreshContents();
	4495	+ }
	4496	+
	4497	+ void RewindLeaves(boolean hide)
	4498	+ {
	4499	+ group.selection.RewindLeaves(hide);
	4500	+ refreshContents();
	4501	+ }
	4502	+
	4503	+ void RandomLeaves(boolean hide)
	4504	+ {
	4505	+ group.selection.RandomLeaves(hide);
3762	4506	refreshContents();
3763	4507	}
3764	4508
..	..	@@ -3833,10 +4577,6 @@
3833	4577	// }
3834	4578	// }
3835	4579
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	4580	void EditSelection(boolean newWindow)
3841	4581	{
3842	4582	// aConstraints.gridy = 0;
..	..	@@ -3844,10 +4584,10 @@
3844	4584	{
3845	4585	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4586	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4587	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4588
3849	4589	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4590	+ if(elem != group \|\| !newWindow)
3851	4591	{
3852	4592	// if (!(elem instanceof Composite))
3853	4593	// newWindow = false;
..	..	@@ -3929,7 +4669,8 @@
3929	4669	//new Exception().printStackTrace();
3930	4670
3931	4671	freezemodel = true;
3932		-
	4672	+ ClearUnpinned();
	4673	+
3933	4674	/**/
3934	4675	//switch (event.id)
3935	4676	{
..	..	@@ -3937,7 +4678,6 @@
3937	4678	//case 702: // Event.LIST_DESELECT
3938	4679	group.deselectAll();
3939	4680	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4681	if (tps != null)
3942	4682	{
3943	4683	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +4686,39 @@
3946	4686
3947	4687	//if (child.parent != null)
3948	4688	//child.parent.addSelectee(child);
	4689	+ objEditor.SetMaterial(child);
3949	4690	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4691	}
3954	4692	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4693	+// else
	4694	+// {
	4695	+// objEditor.SetMaterial(group); // .GetMaterial());
	4696	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4697	+// System.err.println("info : " + group.GetPath());
	4698	+// }
3961	4699
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4700	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4701	CameraPane.flash = true;
3966	4702
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4703	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4704	// a camera
3969	4705	{
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;
	4706	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4707	+ {
	4708	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4709	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4710	+ }
	4711	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4712	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4713	}
3975	4714
	4715	+ if (tps != null && tps.length == 1)
	4716	+ {
	4717	+ EditSelection(false);
	4718	+ }
	4719	+
	4720	+ SetPinStates(tps != null && tps.length > 0);
	4721	+
3976	4722	refreshContents();
3977	4723	//return true;
3978	4724	}
..	..	@@ -3981,6 +4727,35 @@
3981	4727
3982	4728	freezemodel = false;
3983	4729	}
	4730	+
	4731	+ void SetPinStates(boolean enabled)
	4732	+ {
	4733	+ editButton.setEnabled(enabled);
	4734	+ uneditButton.setEnabled(enabled);
	4735	+ unselectButton.setEnabled(enabled);
	4736	+ flashSelectionButton.setEnabled(enabled);
	4737	+ }
	4738	+
	4739	+ void refreshContents(boolean cp)
	4740	+ {
	4741	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4742	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4743	+ {
	4744	+ objEditor.ClearInfo(); // .GetMaterial());
	4745	+
	4746	+ for (int i=0; i < group.selection.Size(); i++)
	4747	+ {
	4748	+ Object3D child = (Object3D) group.selection.get(i);
	4749	+
	4750	+ objEditor.AddInfo(child, this, true);
	4751	+ System.err.println("info : " + child.GetPath());
	4752	+ }
	4753	+
	4754	+ objEditor.SetText(); // jan 2014
	4755	+ }
	4756	+
	4757	+ super.refreshContents(cp);
	4758	+ }
3984	4759
3985	4760	void linkSomething(Object3D thing)
3986	4761	{
..	..	@@ -4052,16 +4827,19 @@
4052	4827	{
4053	4828	if (group.selection.isEmpty())
4054	4829	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4830	+
	4831	+ Grafreed.clipboardIsTempGroup = false;
4056	4832	Composite tGroup = null;
4057	4833	if (group.selection.size() > 0) // 1)
4058	4834	{
4059	4835	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4836	+ Grafreed.clipboardIsTempGroup = true;
4061	4837	}
4062	4838
4063	4839	if (cut)
4064	4840	{
	4841	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4842	+// Save();
4065	4843	//int indices[] = jList.getSelectedIndices();
4066	4844	//for (int i = indices.length - 1; i >= 0; i--)
4067	4845	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4875,16 @@
4097	4875	//System.out.println("cut " + child);
4098	4876	//System.out.println("parent = " + child.parent);
4099	4877	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4878	+ if (Grafreed.clipboardIsTempGroup)
4101	4879	tGroup.add/Child/(tmp);
4102	4880	else
4103		- GraphreeD.clipboard = tmp;
	4881	+ Grafreed.clipboard = tmp;
4104	4882	}
4105	4883	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4884	+ if (Grafreed.clipboardIsTempGroup)
4107	4885	tGroup.add/Child/(child);
4108	4886	else
4109		- GraphreeD.clipboard = child;
	4887	+ Grafreed.clipboard = child;
4110	4888	}
4111	4889
4112	4890	//ResetModel();
..	..	@@ -4138,21 +4916,23 @@
4138	4916	//System.out.println("cut " + elem);
4139	4917	//System.out.println("parent = " + elem.parent);
4140	4918	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4919	+ if (Grafreed.clipboardIsTempGroup)
4142	4920	tGroup.add/Child/(tmp);
4143	4921	else
4144		- GraphreeD.clipboard = tmp;
	4922	+ Grafreed.clipboard = tmp;
4145	4923	}
4146	4924	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4925	+ if (Grafreed.clipboardIsTempGroup)
4148	4926	tGroup.add/Child/(child);
4149	4927	else
4150		- GraphreeD.clipboard = child;
	4928	+ Grafreed.clipboard = child;
4151	4929	}
4152	4930
4153	4931	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4932	+
	4933	+ if (Grafreed.clipboardIsTempGroup)
	4934	+ Grafreed.clipboard = tGroup;
	4935	+
4156	4936	if (cut)
4157	4937	{
4158	4938	ResetModel();
..	..	@@ -4162,11 +4942,15 @@
4162	4942
4163	4943	void paste(boolean expand)
4164	4944	{
4165		- // if (GraphreeD.clipboard == null)
	4945	+ if (Globals.SAVEONMAKE)
	4946	+ Save();
	4947	+ boolean keep = Globals.SAVEONMAKE;
	4948	+ Globals.SAVEONMAKE = false;
	4949	+ // if (GrafreeD.clipboard == null)
4166	4950	// return;
4167	4951	boolean first = true;
4168	4952
4169		- if (GraphreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4170	4954	{
4171	4955	Composite temp;
4172	4956
..	..	@@ -4177,7 +4961,7 @@
4177	4961	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4962	*/
4179	4963	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4964	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4965	{
4182	4966	Object3D child = (Object3D)e.nextElement();
4183	4967
..	..	@@ -4191,7 +4975,7 @@
4191	4975	else
4192	4976	elem = child.deepCopy(); // ?
4193	4977	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4978	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4979	// elem = elem.get(0);
4196	4980	makeSomething(elem, true); // ?? first);
4197	4981	//group.addChild(elem);
..	..	@@ -4211,23 +4995,24 @@
4211	4995	//Object3D cb = Applet3D.clipboard;
4212	4996	//temp.addChild(cb);
4213	4997	//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());
	4998	+ assert(Grafreed.clipboard.parent == null);
	4999	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5000	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5001	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5002	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5003	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5004	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5005	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5006	}
4223	5007
	5008	+ Globals.SAVEONMAKE = keep;
4224	5009	ResetModel();
4225	5010	refreshContents();
4226	5011	}
4227	5012
4228		- void pasteInto(boolean copyit)
	5013	+ void pasteInto(boolean copyit, boolean clone)
4229	5014	{
4230		-// if (GraphreeD.clipboard == null)
	5015	+// if (GrafreeD.clipboard == null)
4231	5016	// return;
4232	5017
4233	5018	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5039,22 @@
4254	5039	if (copyit)
4255	5040	{
4256	5041	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5042	+ if (clone)
	5043	+ {
	5044	+ CloneClipboard(false); // sept 2014
	5045	+ }
	5046	+ else
	5047	+ {
	5048	+ paste(false);
	5049	+ }
4258	5050	}
4259	5051	else
4260	5052	{
4261	5053	boolean first = true;
4262	5054
4263		- if (GraphreeD.clipboardIsTempGroup)
	5055	+ if (Grafreed.clipboardIsTempGroup)
4264	5056	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5057	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5058	Object3D copy;
4267	5059	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5060	{
..	..	@@ -4272,7 +5064,7 @@
4272	5064	}
4273	5065	} else
4274	5066	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5067	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5068	}
4277	5069	}
4278	5070	}
..	..	@@ -4349,6 +5141,10 @@
4349	5141
4350	5142	void group(Object3D csg, boolean grab)
4351	5143	{
	5144	+ if (Globals.SAVEONMAKE)
	5145	+ Save();
	5146	+ boolean keep = Globals.SAVEONMAKE;
	5147	+ Globals.SAVEONMAKE = false;
4352	5148	if (//false) // why??
4353	5149	!group.selection.isEmpty())
4354	5150	{
..	..	@@ -4462,8 +5258,34 @@
4462	5258	//node.add(csg);
4463	5259	//makeSomething(node);
4464	5260	makeSomething(csg);
	5261	+ Globals.SAVEONMAKE = keep;
4465	5262	}
4466	5263
	5264	+ void Ungroup(Object3D g)
	5265	+ {
	5266	+ if (Globals.SAVEONMAKE)
	5267	+ Save();
	5268	+ boolean keep = Globals.SAVEONMAKE;
	5269	+ Globals.SAVEONMAKE = false;
	5270	+ if (g instanceof HiddenObject)
	5271	+ {
	5272	+ HiddenObject h = (HiddenObject) g;
	5273	+
	5274	+ for (int i=0; i<h.ActualSize(); i++)
	5275	+ {
	5276	+ objEditor.makeSomething(h.get(i), false);
	5277	+ }
	5278	+ }
	5279	+ else
	5280	+ {
	5281	+ for (int i=0; i<g.Size(); i++)
	5282	+ {
	5283	+ objEditor.makeSomething(g.get(i), false);
	5284	+ }
	5285	+ }
	5286	+ Globals.SAVEONMAKE = keep;
	5287	+ }
	5288	+
4467	5289	void ungroup()
4468	5290	{
4469	5291	/*
..	..	@@ -4657,21 +5479,6 @@
4657	5479	}
4658	5480	*/
4659	5481
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	5482	/*
4676	5483	public void Callback(Object obj)
4677	5484	{
..	..	@@ -4695,26 +5502,9 @@
4695	5502	}
4696	5503	*/
4697	5504
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	5505	String GetFile(String dialogName)
4716	5506	{
4717		- if (GraphreeD.standAlone)
	5507	+ if (Grafreed.standAlone)
4718	5508	{
4719	5509	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5510	browser.show();
..	..	@@ -4778,10 +5568,33 @@
4778	5568	cButton flashSelectionButton;
4779	5569	cButton editButton;
4780	5570	cButton uneditButton;
	5571	+ JCheckBox allParamsButton;
4781	5572	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5573	cButton unselectButton;
4784	5574
	5575	+ cButton restoreCameraButton;
	5576	+
	5577	+ cButton saveButton;
	5578	+ cButton oneStepButton;
	5579	+
	5580	+ cButton groupButton;
	5581	+ cButton ungroupButton;
	5582	+ cButton compositeButton;
	5583	+ cButton switchButton;
	5584	+ cButton loopButton;
	5585	+ cButton textureButton;
	5586	+
	5587	+ cButton gridButton;
	5588	+ cButton boxButton;
	5589	+ cButton sphereButton;
	5590	+ cButton coneButton;
	5591	+ cButton torusButton;
	5592	+ cButton superButton;
	5593	+ cButton kleinButton;
	5594	+ cButton particlesButton;
	5595	+ cButton overlayButton;
	5596	+ cButton lightButton;
	5597	+
4785	5598	cButton screenfitButton;
4786	5599	cButton screenfitpointButton;
4787	5600	cButton snapobjectButton;
..	..	@@ -4793,14 +5606,6 @@
4793	5606
4794	5607	cButton setsupportButton;
4795	5608
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	5609	//
4805	5610	//Composite
4806	5611	Object3D // to do !!
..	..	@@ -4810,9 +5615,11 @@
4810	5615	//JTree jTree;
4811	5616	private MenuItem lookAtItem;
4812	5617	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5618	+ private MenuItem switchViewItem;
4814	5619	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5620	+ private MenuItem undoItem;
	5621	+ private MenuItem redoItem;
	5622	+ private JMenuItem duplicateItem;
4816	5623	private MenuItem cloneItem;
4817	5624	private MenuItem cloneSupportItem;
4818	5625	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5630,9 @@
4823	5630	private MenuItem resetsupportItem;
4824	5631	private MenuItem resetreferencesItem;
4825	5632	private MenuItem linkverticesItem;
	5633	+ private MenuItem relinkverticesItem;
4826	5634	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5635	+ private MenuItem resetAllItem;
4828	5636	private MenuItem stepAllItem;
4829	5637	private MenuItem revertMeshItem;
4830	5638	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5643,17 @@
4835	5643	private MenuItem mergeGeometriesItem;
4836	5644	private MenuItem copyItem;
4837	5645	private MenuItem pasteItem;
	5646	+ private MenuItem pasteIntoItem;
4838	5647	private MenuItem pasteLinkItem;
4839	5648	private MenuItem pasteCloneItem;
4840	5649	private MenuItem pasteExpandItem;
4841	5650	private MenuItem clearItem;
4842	5651	private MenuItem clearAllItem;
4843	5652	private MenuItem genUVItem;
	5653	+ private MenuItem genNormalsMESHItem;
4844	5654	private MenuItem genNormalsCADItem;
4845	5655	private MenuItem genNormalsORGANItem;
	5656	+ private MenuItem genNormalsMINEItem;
4846	5657	private MenuItem stripifyItem;
4847	5658	private MenuItem unstripifyItem;
4848	5659	private MenuItem trimItem;
..	..	@@ -4871,6 +5682,10 @@
4871	5682	private MenuItem showleavesItem;
4872	5683	private MenuItem markleavesItem;
4873	5684	private MenuItem unmarkleavesItem;
	5685	+ private MenuItem rewindleavesItem;
	5686	+ private MenuItem unrewindleavesItem;
	5687	+ private MenuItem randomleavesItem;
	5688	+ private MenuItem unrandomleavesItem;
4874	5689
4875	5690	private MenuItem flipVItem;
4876	5691	private MenuItem unflipVItem;
..	..	@@ -4882,14 +5697,17 @@
4882	5697	private MenuItem panoTexturesItem;
4883	5698
4884	5699	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5700	+ private MenuItem resetCentroidXZItem;
4886	5701	private MenuItem resetTransformItem;
	5702	+ private MenuItem transformGeometryItem;
	5703	+ private MenuItem transformChildrenItem;
	5704	+ private MenuItem hideItem;
4887	5705	private MenuItem grabItem;
4888	5706	private MenuItem backItem;
4889	5707	private MenuItem frontItem;
4890	5708	private MenuItem cameraItem;
4891	5709	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	5710	+ private MenuItem switchItem;
4893	5711	private MenuItem physicsItem;
4894	5712	private MenuItem frameselectorItem;
4895	5713	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +5722,7 @@
4904	5722
4905	5723	private MenuItem resetParentItem;
4906	5724	private MenuItem repairParentItem;
	5725	+ private MenuItem repairShadowItem;
4907	5726	private MenuItem sortbysizeItem;
4908	5727	private MenuItem sortbynameItem;
4909	5728
..	..	@@ -4924,10 +5743,11 @@
4924	5743	private MenuItem coneItem;
4925	5744	private MenuItem torusItem;
4926	5745	private MenuItem superItem;
	5746	+ private MenuItem kleinItem;
4927	5747	private MenuItem blobItem;
4928	5748	private MenuItem latheItem;
4929	5749	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5750	+ private MenuItem overlayItem;
4931	5751	private MenuItem meshItem;
4932	5752	// private MenuItem meshGroupItem;
4933	5753	private MenuItem springItem;
..	..	@@ -4936,6 +5756,7 @@
4936	5756	private MenuItem csgItem;
4937	5757	private MenuItem templateItem;
4938	5758	private MenuItem textureItem;
	5759	+ private MenuItem billboardItem;
4939	5760	private MenuItem shadowXItem;
4940	5761	private MenuItem shadowYItem;
4941	5762	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5769,6 @@
4948	5769	private MenuItem doubleItem;
4949	5770	private MenuItem tripleItem;
4950	5771
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5772	private MenuItem computeAOItem;
4957	5773	private MenuItem recompileItem;
4958	5774	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5778,8 @@
4962	5778	private MenuItem analyzeItem;
4963	5779	private MenuItem dumpItem;
4964	5780	//boolean freezemodel = false;
	5781	+
	5782	+ Menu cameraMenu;
	5783	+ MenuItem editCameraItem;
	5784	+ MenuItem restoreCameraItem;
4965	5785	}