~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(Globals.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	286	+ }
	287	+
192	288	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);
	289	+ if (Globals.ADVANCED)
	290	+ {
197	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	292	revertMeshItem.addActionListener(this);
199	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	294	resetreferencesItem.addActionListener(this);
201	295	menu.add("-");
	296	+ }
202	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	298	overwriteGeoItem.addActionListener(this);
204	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,48 +305,68 @@
210	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	306	overwriteUVItem.addActionListener(this);
212	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
213	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	311	generateMeshItem.addActionListener(this);
215	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	313	poseMeshItem.addActionListener(this);
217	314	menu.add("-");
	315	+ }
218	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	317	resetsupportItem.addActionListener(this);
220	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
222	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	326	setMasterItem.addActionListener(this);
	327	+ }
224	328
225	329	oe.menuBar.add(menu = new Menu("Group"));
226	330	grabItem = menu.add(new MenuItem("Grab"));
227	331	grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.addActionListener(this);
230	332	backItem = menu.add(new MenuItem("Back"));
231	333	backItem.addActionListener(this);
	334	+ frontItem = menu.add(new MenuItem("Front"));
	335	+ frontItem.addActionListener(this);
232	336	compositeItem = menu.add(new MenuItem("Composite"));
233	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
234	342	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
236	344	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);
241	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	346	switchGeoItem.addActionListener(this);
243	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	348	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
247	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	360	scriptNodeItem.addActionListener(this);
249	361	cameraItem = menu.add(new MenuItem("Camera"));
250	362	cameraItem.addActionListener(this);
	363	+ }
251	364
252	365	oe.menuBar.add(menu = new Menu("Object"));
253	366	textureItem = menu.add(new MenuItem("Texture"));
254	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
255	370	csgItem = menu.add(new MenuItem("CSG"));
256	371	csgItem.addActionListener(this);
257	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -260,23 +375,29 @@
260	375	shadowYItem.addActionListener(this);
261	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
262	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
263	381	linkerItem = menu.add(new MenuItem("Linker"));
264	382	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	383	attributeItem = menu.add(new MenuItem("Attribute"));
268	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
269	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	388	pointflowItem.addActionListener(this);
	389	+ }
271	390	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	392	resetTransformItem.addActionListener(this);
276	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	394	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
280	401
281	402	oe.menuBar.add(menu = new Menu("Geometry"));
282	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +406,13 @@
285	406	genNormalsORGANItem.addActionListener(this);
286	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
288	416	stripifyItem = menu.add(new MenuItem("Stripify"));
289	417	stripifyItem.addActionListener(this);
290	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
313	445
314	446	oe.menuBar.add(menu = new Menu("Attributes"));
315	447	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	448	clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
317	453	menu.add("-");
318	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	455	liveleavesItem.addActionListener(this);
320	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
322	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	461	supportleavesItem.addActionListener(this);
324	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	463	unsupportleavesItem.addActionListener(this);
	464	+ }
326	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	466	hideleavesItem.addActionListener(this);
328	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +470,14 @@
331	470	markleavesItem.addActionListener(this);
332	471	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	472	unmarkleavesItem.addActionListener(this);
	473	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	474	+ rewindleavesItem.addActionListener(this);
	475	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	476	+ unrewindleavesItem.addActionListener(this);
	477	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	478	+ randomleavesItem.addActionListener(this);
	479	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	480	+ unrandomleavesItem.addActionListener(this);
334	481	menu.add("-");
335	482	flipVItem = menu.add(new MenuItem("Flip V"));
336	483	flipVItem.addActionListener(this);
..	..	@@ -366,35 +513,40 @@
366	513	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	514	sortbynameItem.addActionListener(this);
368	515	menu.add("-");
	516	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	517	+ shareGeometriesItem.addActionListener(this);
	518	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	519	+ mergeGeometriesItem.addActionListener(this);
	520	+ if (Globals.ADVANCED)
	521	+ {
	522	+ // Pretty much the same as duplicate and clone.
369	523	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	524	extractGeometriesItem.addActionListener(this);
371	525	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	526	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);
	527	+ }
377	528
378	529	oe.menuBar.add(menu = new Menu("Insert"));
379	530	buildCreateMenu(menu);
380	531
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	532	oe.menuBar.add(menu = new Menu("Tools"));
393	533	buildToolsMenu(menu);
394	534	}
395	535
396	536	void SetupUI2(ObjEditor oe)
397	537	{
	538	+ // June 2019
	539	+ if (oe == null)
	540	+ {
	541	+ //super.SetupUI2(this);
	542	+ //return;
	543	+ }
	544	+
	545	+ if (copy != group)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ }
	549	+
398	550	//new Exception().printStackTrace();
399	551
400	552	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +575,122 @@
423	575	oe.radioPanel.add(dummyButton);
424	576	oe.buttonGroup.add(dummyButton);
425	577	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	578	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
429	579
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	580	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	581	+ //minButton.setToolTipText("Minimize window");
	582	+ //minButton.addActionListener(this);
	583	+
	584	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ maxButton.setToolTipText("Maximize window");
	586	+ maxButton.addActionListener(this);
	587	+
	588	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ fullButton.setToolTipText("Full-screen window");
	590	+ fullButton.addActionListener(this);
	591	+
	592	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	593	+ undoButton.setToolTipText("Undo changes");
	594	+ undoButton.addActionListener(this);
	595	+
	596	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ redoButton.setToolTipText("Redo changes");
	598	+ redoButton.addActionListener(this);
	599	+
	600	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ saveButton.setToolTipText("Save changes");
	602	+ saveButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	605	+ liveCB.setToolTipText("Enable animation");
431	606	liveCB.addItemListener(this);
432	607
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);
	608	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ oneStepButton.setToolTipText("Animate one step forward");
	610	+ oneStepButton.addActionListener(this);
	611	+
	612	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	613	+ fastCB.setToolTipText("Fast mode");
451	614	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	617	+ trackCB.setToolTipText("Enable tracking");
493	618	trackCB.addItemListener(this);
494	619
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ screenfitButton.setToolTipText("Screen fit");
497	622	screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
	623	+
499	624	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	625	// 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	626
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);
	627	+ if (Globals.ADVANCED)
	628	+ {
	629	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ snapobjectButton.addActionListener(this);
	631	+ snapobjectButton.setToolTipText("Snap Object");
	632	+ }
	633	+
	634	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ flashSelectionButton.setToolTipText("Show selection");
512	636	flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	637
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	638	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	639	+
	640	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ twoButton.setToolTipText("Show center view only");
519	642	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	643	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	644	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ fourButton.setToolTipText("Show left panel only");
	646	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ sixButton.setToolTipText("2-column layout left");
523	648	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ threeButton.setToolTipText("2-column layout right");
525	651	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	652	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ sevenButton.setToolTipText("3-column layout");
527	654	sevenButton.addActionListener(this);
528	655	//
529	656
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	658	+ rootButton.setToolTipText("Edit selection in new tab");
531	659	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	660	+
	661	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ closeButton.setToolTipText("Close tab");
534	663	closeButton.addActionListener(this);
535	664	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	665	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538	666
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	667	+ cGridBag commandsPanel = new cGridBag();
	668	+
	669	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ editButton.setToolTipText("Edit selection");
541	671	editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	672
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	673	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ uneditButton.setToolTipText("Unedit selection");
547	675	uneditButton.addActionListener(this);
548	676
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);
	677	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	678	+ allParamsButton.setToolTipText("Edit all params");
561	679	allParamsButton.addActionListener(this);
562	680
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);
	681	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ clearPanelButton.setToolTipText("Clear edit panel");
	683	+ clearPanelButton.addActionListener(this);
	684	+
	685	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ unselectButton.setToolTipText("Unselect");
568	687	unselectButton.addActionListener(this);
569	688
	689	+ commandsPanel.preferredHeight = 1;
	690	+
	691	+ oe.treePanel.add(commandsPanel);
	692	+ oe.treePanel.Return();
	693	+
570	694	// oe.aConstraints.gridx += 1;
571	695	// oe.aConstraints.weighty = 0;
572	696	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +702,37 @@
578	702	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	703	// gcButton.addActionListener(this);
580	704
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;
	705	+ cGridBag jSPPanel = new cGridBag();
	706	+
	707	+ JScrollPane jSP;
592	708	//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);
	709	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
594	710	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
	711	+
	712	+ oe.treePanel.add(jSPPanel);
	713	+ oe.treePanel.Return();
599	714
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);
	715	+ cGridBag copyOptionsPanel = new cGridBag();
	716	+
	717	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	718	+ colorCB.setToolTipText("Copy color when dropped");
604	719	colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	720	+
	721	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	722	+ materialCB.setToolTipText("Copy material when dropped");
607	723	materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	724	+
	725	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	726	+ textureCB.setToolTipText("Copy texture when dropped");
610	727	textureCB.addItemListener(this);
611	728
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
	729	+ copyOptionsPanel.preferredHeight = 1;
	730	+ oe.treePanel.add(copyOptionsPanel);
	731	+ oe.treePanel.Return();
614	732
	733	+// mainPanel.setDividerLocation(0.5); //1.0);
	734	+// mainPanel.setResizeWeight(0.5);
	735	+
615	736	//jList.addListSelectionListener(this);
616	737	oe.jTree.addTreeSelectionListener(this);
617	738	//jTree.setRootVisible(false);
..	..	@@ -633,20 +754,95 @@
633	754	radio.layout = sevenButton;
634	755	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	756	}
	757	+
	758	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	759	+ {
	760	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	761	+ boxCB.setToolTipText("Display bounding boxes");
	762	+ boxCB.addItemListener(this);
	763	+
	764	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	765	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	766	+ zoomBoxCB.addItemListener(this);
	767	+
	768	+ if (true) // Globals.ADVANCED)
	769	+ {
	770	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	771	+ supportCB.setToolTipText("Enable rigging");
	772	+ supportCB.addItemListener(this);
	773	+
	774	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	775	+ // localCB.addItemListener(this);
	776	+
	777	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	778	+ crowdCB.setToolTipText("Used for crowds");
	779	+ crowdCB.addItemListener(this);
	780	+
	781	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	782	+ smoothCB.setToolTipText("Snapping delay");
	783	+ smoothCB.addItemListener(this);
	784	+
	785	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	786	+ slowCB.setToolTipText("Smooth interpolation");
	787	+ slowCB.addItemListener(this);
	788	+
	789	+// constraints.gridy += 1;
	790	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	791	+// speakerMocapCB.addItemListener(this);
	792	+
	793	+ if (false)
	794	+ {
	795	+ // handled in scripts
	796	+ //constraints.gridy += 1;
	797	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	798	+ speakerCameraCB.addItemListener(this);
	799	+
	800	+ //constraints.gridy += 1;
	801	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	802	+ speakerFocusCB.addItemListener(this);
	803	+
	804	+ //constraints.gridy += 1;
	805	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	806	+ smoothfocusCB.addItemListener(this);
	807	+ }
	808	+
	809	+//constraints.gridx += 1;
	810	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	811	+// debugCB.addItemListener(this);
	812	+
	813	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	814	+ oeilCB.addItemListener(this);
	815	+
	816	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	817	+ lookAtCB.setToolTipText("Look-at target");
	818	+ lookAtCB.addItemListener(this);
	819	+
	820	+ }
	821	+
	822	+ cGridBag fill = new cGridBag();
	823	+
	824	+ fill.preferredHeight = 200;
	825	+
	826	+ panel.add(fill);
	827	+
	828	+ }
636	829
637	830	void EditObject(Object3D obj)
638	831	{
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();
	832	+ cRadio radioButton = new cRadio(obj.name);
	833	+ radioButton.SetObject(obj);
	834	+ radioButton.layout = sevenButton;
	835	+ radioButton.SetCamera(cameraView.renderCamera, false);
	836	+ radioButton.addActionListener(this);
	837	+ radioPanel.add(radioButton);
	838	+ buttonGroup.add(radioButton);
	839	+ radioButton.doClick();
647	840	}
	841	+
648	842	void SetupViews(ObjEditor oe)
649	843	{
	844	+ theFrame = this;
	845	+
650	846	oe.SetupViews();
651	847
652	848	System.out.println("SetupViews");
..	..	@@ -663,6 +859,7 @@
663	859	JCheckBox fastCB;
664	860	JCheckBox slowCB;
665	861	JCheckBox boxCB;
	862	+ JCheckBox zoomBoxCB;
666	863	JCheckBox trackCB;
667	864	JCheckBox smoothfocusCB;
668	865	// JCheckBox speakerMocapCB;
..	..	@@ -705,10 +902,10 @@
705	902	dropAttributes \|= Object3D.TEXTURE;
706	903	else
707	904	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	905	+ } else if(e.getSource() == liveCB)
710	906	{
711	907	cameraView.ToggleLive();
	908	+ refreshContents(false);
712	909	}
713	910	else if(e.getSource() == supportCB)
714	911	{
..	..	@@ -743,6 +940,10 @@
743	940	Recompile();
744	941	cameraView.repaint();
745	942	// refreshContents();
	943	+ }
	944	+ else if(e.getSource() == zoomBoxCB)
	945	+ {
	946	+ cameraView.ToggleZoomBoxMode();
746	947	}
747	948	else if(e.getSource() == smoothfocusCB)
748	949	{
..	..	@@ -857,7 +1058,9 @@
857	1058	// objEditor.DropFile((java.io.File[]) object, true);
858	1059	// return;
859	1060	// }
860		- if (string.charAt(0) == '/')
	1061	+
	1062	+ // File path for Mac and Windows
	1063	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1064	{
862	1065	// file(s)
863	1066	String[] names = string.split("\n");
..	..	@@ -884,7 +1087,7 @@
884	1087
885	1088	flashIt = false;
886	1089	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1090	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1091	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1092
890	1093	if (group.selection.size() == 1)
..	..	@@ -911,11 +1114,11 @@
911	1114	{
912	1115	loadClipboard(true);
913	1116	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1117	+ pasteInto(false, false);
915	1118	} else {
916	1119	loadClipboard(false);
917	1120	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1121	+ pasteInto(false, false); // true); // ???
919	1122	}
920	1123	}
921	1124	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1236,37 @@
1033	1236	torusItem.addActionListener(this);
1034	1237	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1238	superItem.addActionListener(this);
	1239	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1240	+ kleinItem.addActionListener(this);
1036	1241	particleItem = menu.add(new MenuItem("Particle system"));
1037	1242	particleItem.addActionListener(this);
	1243	+ if (Globals.ADVANCED)
	1244	+ {
1038	1245	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1246	ragdollItem.addActionListener(this);
1040	1247	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1248	ragdoll2Item.addActionListener(this);
	1249	+ }
1042	1250	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1251	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1252	meshItem.addActionListener(this);
1045	1253	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1254	// meshGroupItem.addActionListener(this);
	1255	+ if (Globals.ADVANCED)
	1256	+ {
1047	1257	springItem = menu.add(new MenuItem("Spring"));
1048	1258	springItem.addActionListener(this);
1049	1259	flagItem = menu.add(new MenuItem("Flag"));
1050	1260	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	1261	blobItem = menu.add(new MenuItem("Blob"));
1056	1262	blobItem.addActionListener(this);
1057	1263	latheItem = menu.add(new MenuItem("Lathe"));
1058	1264	latheItem.addActionListener(this);
	1265	+ }
	1266	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1267	+ bezierItem.addActionListener(this);
	1268	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1269	+ overlayItem.addActionListener(this);
1059	1270	lightItem = menu.add(new MenuItem("Light"));
1060	1271	lightItem.addActionListener(this);
1061	1272	menu.add("-");
..	..	@@ -1065,39 +1276,44 @@
1065	1276	loopItem.addActionListener(this);
1066	1277	doubleItem = menu.add(new MenuItem("Fork"));
1067	1278	doubleItem.addActionListener(this);
	1279	+ if (Globals.ADVANCED)
	1280	+ {
1068	1281	tripleItem = menu.add(new MenuItem("Trident"));
1069	1282	tripleItem.addActionListener(this);
	1283	+ }
1070	1284	}
1071	1285
1072	1286	void buildToolsMenu(Menu menu)
1073	1287	{
1074	1288	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1289	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1290	+ animationItem.setState(Globals.ANIMATION);
1077	1291
1078	1292	menu.add("-");
1079	1293	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1294	parseverticesItem.addActionListener(this);
1081	1295	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1296	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1297	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1298	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1299	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1300	reduceMorphItem.addActionListener(this);
1089	1301	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1302	reduce34MorphItem.addActionListener(this);
1091		-
	1303	+ menu.add("-");
1092	1304	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1305	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1306
	1307	+ if (Globals.ADVANCED)
	1308	+ {
	1309	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1310	+ mirrorItem.addActionListener(this);
	1311	+ menu.add("-");
1096	1312	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1313	memoryItem.addActionListener(this);
1098	1314	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1315	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1316	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1317	dumpItem.addActionListener(this);
1102	1318	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1319	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1322,8 @@
1106	1322	resetParentItem.addActionListener(this);
1107	1323	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1324	repairParentItem.addActionListener(this);
	1325	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1326	+ repairShadowItem.addActionListener(this);
1109	1327	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1328	invariantsItem.addActionListener(this);
1111	1329	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1331,7 @@
1113	1331	menu.add("-");
1114	1332	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1333	editScriptItem.addActionListener(this);
	1334	+ }
1116	1335	}
1117	1336
1118	1337	void ScreenFit()
..	..	@@ -1441,9 +1660,9 @@
1441	1660
1442	1661	void Overwrite(int mask)
1443	1662	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1663	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1664	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1665	+ Object3D content = Grafreed.clipboard.get(0);
1447	1666
1448	1667	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1668	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1685,7 @@
1466	1685	//
1467	1686	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1687	{
	1688	+ Object source = event.getSource();
1469	1689	/*
1470	1690	if (event.getSource() == nameField)
1471	1691	{
..	..	@@ -1477,11 +1697,11 @@
1477	1697	}
1478	1698	else
1479	1699	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1700	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1701	{
1482	1702	ScreenFit();
1483	1703	} else
1484		- if (event.getSource() == switchItem)
	1704	+ if (source == switchItem)
1485	1705	{
1486	1706	cVector v1 = new cVector();
1487	1707	cVector v2 = new cVector();
..	..	@@ -1490,11 +1710,11 @@
1490	1710	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1711	objEditor.cameraView.repaint();
1492	1712	} else
1493		- if (event.getSource() == rectoidItem)
	1713	+ if (source == rectoidItem)
1494	1714	{
1495	1715	makeSomething(new Box());
1496	1716	} else
1497		- if (event.getSource() == particleItem)
	1717	+ if (source == particleItem)
1498	1718	{
1499	1719	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1720	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1735,9 @@
1515	1735	applyExample(particleGeom, "SMOKE");
1516	1736	makeSomething(particleGeom);
1517	1737	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1738	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1739	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1740	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1741
1522	1742	ragdoll.toParent = LA.newMatrix();
1523	1743	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1755,7 @@
1535	1755	} else
1536	1756	/*
1537	1757	*/
1538		- if (event.getSource() == heightFieldItem)
	1758	+ if (source == heightFieldItem)
1539	1759	{
1540	1760	Object3D obj = new Object3D();
1541	1761
..	..	@@ -1573,27 +1793,31 @@
1573	1793
1574	1794	makeSomething(obj);
1575	1795	} else
1576		- if (event.getSource() == gridItem)
	1796	+ if (source == gridItem)
1577	1797	{
1578	1798	makeSomething(new Grid());
1579	1799	} else
1580		- if (event.getSource() == ellipsoidItem)
	1800	+ if (source == ellipsoidItem)
1581	1801	{
1582	1802	makeSomething(new Sphere());
1583	1803	} else
1584		- if (event.getSource() == coneItem)
	1804	+ if (source == coneItem)
1585	1805	{
1586	1806	makeSomething(new Cone());
1587	1807	} else
1588		- if (event.getSource() == torusItem)
	1808	+ if (source == torusItem)
1589	1809	{
1590	1810	makeSomething(new Torus());
1591	1811	} else
1592		- if (event.getSource() == superItem)
	1812	+ if (source == superItem)
1593	1813	{
1594	1814	makeSomething(new Superellipsoid());
1595	1815	} else
1596		- if (event.getSource() == blobItem)
	1816	+ if (source == kleinItem)
	1817	+ {
	1818	+ makeSomething(new Klein());
	1819	+ } else
	1820	+ if (source == blobItem)
1597	1821	{
1598	1822	Blob blob = new Blob();
1599	1823	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1825,15 @@
1601	1825	//blob.retile();
1602	1826	makeSomething(blob);
1603	1827	} else
1604		- if (event.getSource() == latheItem)
	1828	+ if (source == latheItem)
1605	1829	{
1606	1830	makeSomething(new Lathe());
1607	1831	} else
1608		- if (event.getSource() == bezierItem)
	1832	+ if (source == bezierItem)
1609	1833	{
1610	1834	makeSomething(new BezierSurface());
1611	1835	} else
1612		- if (event.getSource() == checkerItem)
	1836	+ if (source == overlayItem)
1613	1837	{
1614	1838	/*
1615	1839	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1848,7 @@
1624	1848	*/
1625	1849	makeSomething(new Checker());
1626	1850	} else
1627		- if (event.getSource() == meshItem)
	1851	+ if (source == meshItem)
1628	1852	{
1629	1853	Object3D itemtomake = new Object3D();
1630	1854	Object3D child;
..	..	@@ -1645,35 +1869,35 @@
1645	1869	makeSomething(child);
1646	1870	}
1647	1871	} else
1648		- if (event.getSource() == springItem)
	1872	+ if (source == springItem)
1649	1873	{
1650	1874	cSpring s = new cSpring();
1651	1875	s.setup();
1652	1876	makeSomething(s);
1653	1877	} else
1654		- if (event.getSource() == flagItem)
	1878	+ if (source == flagItem)
1655	1879	{
1656	1880	cSpring s = new cFlag();
1657	1881	s.setup();
1658	1882	makeSomething(s);
1659	1883	} else
1660		- if (event.getSource() == lightItem)
	1884	+ if (source == lightItem)
1661	1885	{
1662	1886	makeSomething(new Light());
1663	1887	} else
1664		- if (event.getSource() == csgItem)
	1888	+ if (source == csgItem)
1665	1889	{
1666	1890	group(new CSG());
1667	1891	} else
1668		- if (event.getSource() == templateItem)
	1892	+ if (source == templateItem)
1669	1893	{
1670	1894	group(new cTemplate());
1671	1895	} else
1672		- if (event.getSource() == attributeItem)
	1896	+ if (source == attributeItem)
1673	1897	{
1674	1898	makeSomething(new Attribute());
1675	1899	} else
1676		- if (event.getSource() == pointflowItem)
	1900	+ if (source == pointflowItem)
1677	1901	{
1678	1902	makeSomething(new PointFlow());
1679	1903	} else
..	..	@@ -1685,7 +1909,7 @@
1685	1909	} else
1686	1910	*/
1687	1911
1688		- if (event.getSource() == superLoopItem)
	1912	+ if (source == superLoopItem)
1689	1913	{
1690	1914	Composite g = new cGroup();
1691	1915	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1931,7 @@
1707	1931
1708	1932	group(g);
1709	1933	} else
1710		- if (event.getSource() == loopItem)
	1934	+ if (source == loopItem)
1711	1935	{
1712	1936	Composite csg = new GroupLeaf();
1713	1937	csg.count = 5;
..	..	@@ -1716,7 +1940,7 @@
1716	1940	csg.addChild(child);
1717	1941	child.addChild(csg);
1718	1942	} else
1719		- if (event.getSource() == doubleItem)
	1943	+ if (source == doubleItem)
1720	1944	{
1721	1945	Composite csg = new GroupLeaf();
1722	1946	csg.count = 5;
..	..	@@ -1728,7 +1952,7 @@
1728	1952	csg.addChild(child);
1729	1953	child.addChild(csg);
1730	1954	} else
1731		- if (event.getSource() == tripleItem)
	1955	+ if (source == tripleItem)
1732	1956	{
1733	1957	Composite csg = new GroupLeaf();
1734	1958	csg.count = 4;
..	..	@@ -1743,71 +1967,83 @@
1743	1967	csg.addChild(child);
1744	1968	child.addChild(csg);
1745	1969	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1970	+ if (source == computeAOItem)
1748	1971	{
1749		- ImportGFD();
	1972	+ Globals.drawMode = CameraPane.OCCLUSION;
	1973	+ Globals.theRenderer.repaint();
1750	1974	} 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)
	1975	+ if (source == recompileItem)
1769	1976	{
1770	1977	Recompile();
1771	1978	refreshContents();
1772	1979	} else
1773		- if (event.getSource() == editScriptItem)
	1980	+ if (source == editScriptItem)
1774	1981	{
1775	1982	OpenDialog();
1776	1983	refreshContents();
1777	1984	} else
1778		- if (event.getSource() == invariantsItem)
	1985	+ if (source == invariantsItem)
1779	1986	{
1780	1987	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	1988	+ Grafreed.grafreeD.universe.invariants();
1782	1989	} else
1783		- if (event.getSource() == memoryItem)
	1990	+ if (source == memoryItem)
1784	1991	{
1785	1992	//System.out.println("Invariants:");
1786	1993	PrintMemory();
1787	1994	} else
1788		- if (event.getSource() == pathItem)
	1995	+ if (source == pathItem)
1789	1996	{
1790	1997	PrintPath();
1791	1998	} else
1792		- if (event.getSource() == analyzeItem)
	1999	+ if (source == analyzeItem)
1793	2000	{
1794	2001	AnalyzeObject();
1795	2002	} else
1796		- if (event.getSource() == dumpItem)
	2003	+ if (source == dumpItem)
1797	2004	{
1798	2005	DumpObject();
1799	2006	} else
1800		- if (event.getSource() == screenfitButton)
	2007	+ if (source == minButton)
	2008	+ {
	2009	+ Minimize();
	2010	+ } else
	2011	+ if (source == maxButton)
	2012	+ {
	2013	+ Maximize();
	2014	+ } else
	2015	+ if (source == fullButton)
	2016	+ {
	2017	+ ToggleFullScreen();
	2018	+ } else
	2019	+ if (source == undoButton)
	2020	+ {
	2021	+ Undo();
	2022	+ } else
	2023	+ if (source == redoButton)
	2024	+ {
	2025	+ Redo();
	2026	+ } else
	2027	+ if (source == saveButton)
	2028	+ {
	2029	+ Save();
	2030	+ } else
	2031	+ if (source == oneStepButton)
	2032	+ {
	2033	+ Globals.ONESTEP = true;
	2034	+ cameraView.repaint();
	2035	+ } else
	2036	+ if (source == screenfitButton)
1801	2037	{
1802	2038	//Reload(lastConverter, lastFilename, true);
1803	2039	ScreenFit();
1804	2040	} else
1805		- if (event.getSource() == screenfitpointButton)
	2041	+ if (source == screenfitpointButton)
1806	2042	{
1807	2043	//Reload(lastConverter, lastFilename, true);
1808	2044	ScreenFitPoint();
1809	2045	} else
1810		- if (event.getSource() == snapobjectButton)
	2046	+ if (source == snapobjectButton)
1811	2047	{
1812	2048	//Reload(lastConverter, lastFilename, true);
1813	2049	SnapObject();
..	..	@@ -1818,13 +2054,13 @@
1818	2054	// Recompile();
1819	2055	// refreshContents();
1820	2056	// } else
1821		- if (event.getSource() == gcButton)
	2057	+ if (source == gcButton)
1822	2058	{
1823	2059	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2060	System.gc();
1825	2061	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2062	} else
1827		- if (event.getSource() == editLeafItem)
	2063	+ if (source == editLeafItem)
1828	2064	{
1829	2065	Object3D obj;
1830	2066	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2074,78 @@
1838	2074	}
1839	2075	refreshContents(true);
1840	2076	} else
1841		- if (event.getSource() == openWindowItem)
	2077	+ if (source == openWindowItem)
1842	2078	{
1843	2079	EditSelection(true);
1844	2080	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2081	+ if (source == cutItem \|\| source == clearButton)
1846	2082	{
1847	2083	loadClipboard(true);
1848	2084	} else
1849		- if (event.getSource() == duplicateItem)
	2085	+ if (source == undoItem)
1850	2086	{
1851		- Object3D keep = GraphreeD.clipboard;
	2087	+ Undo();
	2088	+ } else
	2089	+ if (source == redoItem)
	2090	+ {
	2091	+ Redo();
	2092	+ } else
	2093	+ if (source == duplicateItem)
	2094	+ {
	2095	+ Object3D keep = Grafreed.clipboard;
1852	2096	loadClipboard(false);
1853	2097	paste(false);
1854		- GraphreeD.clipboard = keep;
	2098	+ Grafreed.clipboard = keep;
1855	2099	} else
1856		- if (event.getSource() == cloneItem)
	2100	+ if (source == cloneItem)
1857	2101	{
1858	2102	CloneSelection(false);
1859	2103	} else
1860		- if (event.getSource() == cloneSupportItem)
	2104	+ if (source == cloneSupportItem)
1861	2105	{
1862	2106	CloneSelection(true);
1863	2107	} else
1864		- if (event.getSource() == copyItem)
	2108	+ if (source == copyItem)
1865	2109	{
1866	2110	loadClipboard(false);
1867	2111	} else
1868		- if (event.getSource() == pasteItem)
	2112	+ if (source == pasteItem)
1869	2113	{
1870	2114	paste(false);
1871	2115	} else
1872		- if (event.getSource() == pasteLinkItem)
	2116	+ if (source == pasteIntoItem)
1873	2117	{
1874		- pasteInto(false);
	2118	+ pasteInto(true, false);
1875	2119	} else
1876		- if (event.getSource() == pasteCloneItem)
	2120	+ if (source == pasteLinkItem)
1877	2121	{
1878		- pasteInto(true);
	2122	+ pasteInto(false, false);
1879	2123	} else
1880		- if (event.getSource() == pasteExpandItem)
	2124	+ if (source == pasteCloneItem)
	2125	+ {
	2126	+ pasteInto(true, true);
	2127	+ } else
	2128	+ if (source == pasteExpandItem)
1881	2129	{
1882	2130	paste(true);
1883	2131	} else
1884		- if (event.getSource() == synchronizeItem)
	2132	+ if (source == synchronizeItem)
1885	2133	{
1886	2134	Overwrite(Object3D.TRANSFORM);
1887	2135	} else
1888		- if (event.getSource() == overwriteNameItem)
	2136	+ if (source == overwriteNameItem)
1889	2137	{
1890	2138	Overwrite(Object3D.NAME);
1891	2139	} else
1892		- if (event.getSource() == overwriteUVItem)
	2140	+ if (source == overwriteUVItem)
1893	2141	{
1894	2142	Overwrite(Object3D.UV);
1895	2143	} else
1896		- if (event.getSource() == overwriteMatItem)
	2144	+ if (source == overwriteMatItem)
1897	2145	{
	2146	+ /* july 2015
1898	2147	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2148	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2149	else
1901	2150	{
1902	2151	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2157,16 @@
1908	2157	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2158	}
1910	2159	}
	2160	+ */
	2161	+
	2162	+ Overwrite(dropAttributes);
1911	2163	}
1912		- if (event.getSource() == overwriteGeoItem)
	2164	+ if (source == overwriteGeoItem)
1913	2165	{
1914	2166	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2167	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2168	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2169	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2170	//
1919	2171	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2172	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2178,7 @@
1926	2178	// refreshContents();
1927	2179	// }
1928	2180	} else
1929		- if (event.getSource() == generateMeshItem)
	2181	+ if (source == generateMeshItem)
1930	2182	{
1931	2183	//if (group.selection.size() == 1)
1932	2184	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2189,7 @@
1937	2189	ResetModel();
1938	2190	refreshContents();
1939	2191	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2192	+ if (source == extractGeometriesItem)
1941	2193	{
1942	2194	boolean one = false;
1943	2195
..	..	@@ -1964,7 +2216,7 @@
1964	2216	ResetModel();
1965	2217	refreshContents();
1966	2218	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2219	+ if (source == cloneGeometriesItem)
1968	2220	{
1969	2221	boolean one = false;
1970	2222
..	..	@@ -1990,32 +2242,37 @@
1990	2242	ResetModel();
1991	2243	refreshContents();
1992	2244	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2245	+ if (source == shareGeometriesItem)
1994	2246	{
1995	2247	boolean one = false;
1996	2248
1997	2249	if (group.selection.size() == 1)
1998	2250	one = true;
1999	2251
	2252	+ Object3D merge = null;
	2253	+
2000	2254	Object3D content = new cGroup();
2001	2255
2002	2256	for (int i=0; i<group.selection.size(); i++)
2003	2257	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2258	+ merge = new Merge(group.selection.get(i));
2005	2259
2006	2260	if (one)
2007		- makeSomething(sel, false);
	2261	+ makeSomething(merge, false);
2008	2262	else
2009		- content.addChild(sel);
	2263	+ content.addChild(merge);
2010	2264	}
2011	2265
2012	2266	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2267	+ makeSomething(content, true);
	2268	+ else
	2269	+ {
	2270	+ ResetModel();
	2271	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2272	+ refreshContents();
	2273	+ }
2017	2274	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2275	+ if (source == mergeGeometriesItem)
2019	2276	{
2020	2277	boolean one = false;
2021	2278
..	..	@@ -2045,11 +2302,11 @@
2045	2302	ResetModel();
2046	2303	refreshContents();
2047	2304	} else
2048		- if (event.getSource() == linkverticesItem)
	2305	+ if (source == linkverticesItem)
2049	2306	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2307	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2308	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2309	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2310	//
2054	2311	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2312	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2315,48 @@
2058	2315	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2316	// refreshContents();
2060	2317	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2318	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2319	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2320	+ Object3D content = Grafreed.clipboard.get(0);
2064	2321
2065	2322	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2323	content = ((cGroup)content).get(0);
2067	2324
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2325	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2326	for (int i=0; i<group.selection.size(); i++)
2070	2327	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2328	+ boolean random = CameraPane.SWITCH;
	2329	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2330	group.selection.get(i).linkVerticesThis(content);
2074	2331	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2332	+ CameraPane.SWITCH = random;
2076	2333	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2334	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2335	refreshContents();
2079	2336	}
2080	2337	} else
2081		- if (event.getSource() == resetsupportItem)
	2338	+ if (source == resetsupportItem)
2082	2339	{
2083	2340	for (int i=0; i<group.selection.size(); i++)
2084	2341	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2342	+ boolean random = CameraPane.SWITCH;
	2343	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2344	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2345	+ CameraPane.SWITCH = random;
2089	2346	}
2090	2347
2091	2348	refreshContents();
2092	2349	} else
2093		- if (event.getSource() == resetreferencesItem)
	2350	+ if (source == relinkverticesItem)
	2351	+ {
	2352	+ boolean random = CameraPane.SWITCH;
	2353	+ CameraPane.SWITCH = false; // parse all random nodes
	2354	+ group.selection.RelinkToSupport();
	2355	+ CameraPane.SWITCH = random;
	2356	+
	2357	+ refreshContents();
	2358	+ } else
	2359	+ if (source == resetreferencesItem)
2094	2360	{
2095	2361	for (int i=0; i<group.selection.size(); i++)
2096	2362	{
..	..	@@ -2099,11 +2365,11 @@
2099	2365
2100	2366	refreshContents();
2101	2367	} else
2102		- if (event.getSource() == setMasterItem)
	2368	+ if (source == setMasterItem)
2103	2369	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2370	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2371	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2372	+ Object3D content = Grafreed.clipboard.get(0);
2107	2373
2108	2374	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2375	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2378,13 @@
2112	2378	refreshContents();
2113	2379	}
2114	2380	} else
2115		- if (event.getSource() == poseMeshItem)
	2381	+ if (source == poseMeshItem)
2116	2382	{
2117	2383	if (group.selection.size() == 1)
2118	2384	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2385	+ if (Grafreed.clipboard.size() == 1)
2120	2386	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2387	+ Object3D content = Grafreed.clipboard.get(0);
2122	2388
2123	2389	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2390	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2397,19 @@
2131	2397	}
2132	2398
2133	2399	} else
2134		- if (event.getSource() == revertMeshItem)
	2400	+ if (source == revertMeshItem)
2135	2401	{
2136	2402	RevertMeshes();
2137	2403	} else
2138		- if (event.getSource() == resetMeshItem)
	2404	+ if (source == resetAllItem)
2139	2405	{
2140	2406	ResetAll();
2141	2407	} else
2142		- if (event.getSource() == stepAllItem)
	2408	+ if (source == stepAllItem)
2143	2409	{
2144	2410	StepAll();
2145	2411	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2412	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2413	{
2148	2414	//int indices[] = jList.getSelectedIndices();
2149	2415	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2417,46 @@
2151	2417
2152	2418	ClearSelection(false);
2153	2419	} else
2154		- if (event.getSource() == clearAllItem)
	2420	+ if (source == clearAllItem)
2155	2421	{
2156	2422	ClearSelection(true);
2157	2423	} else
2158		- if (event.getSource() == grabItem)
	2424	+ if (source == grabItem)
2159	2425	{
2160	2426	group(new cGroup(), true);
2161	2427	} else
2162		- if (event.getSource() == frontItem)
	2428	+ if (source == hideItem)
	2429	+ {
	2430	+ group(new HiddenObject());
	2431	+ } else
	2432	+ if (source == frontItem)
2163	2433	{
2164	2434	front();
2165	2435	} else
2166		- if (event.getSource() == backItem)
	2436	+ if (source == backItem)
2167	2437	{
2168	2438	back();
2169	2439	} else
2170		- if (event.getSource() == cameraItem)
	2440	+ if (source == cameraItem)
2171	2441	{
2172	2442	makeSomething(new Camera());
2173	2443	} else
2174		- if (event.getSource() == compositeItem)
	2444	+ if (source == compositeItem)
2175	2445	{
2176	2446	group(new Composite());
2177	2447	} else
2178		- if (event.getSource() == randomItem)
	2448	+ if (source == randomItem)
2179	2449	{
2180	2450	RandomNode random = new RandomNode();
2181	2451	group(random);
2182	2452	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2453	+ random.name = random.get(0).name + "Switch";
2184	2454	} else
2185		- if (event.getSource() == physicsItem)
	2455	+ if (source == physicsItem)
2186	2456	{
2187	2457	group(new PhysicsNode());
2188	2458	} else
2189		- if (event.getSource() == frameselectorItem)
	2459	+ if (source == frameselectorItem)
2190	2460	{
2191	2461	for (int i=0; i<group.selection.size(); i++)
2192	2462	{
..	..	@@ -2198,7 +2468,7 @@
2198	2468	ResetModel();
2199	2469	refreshContents();
2200	2470	} else
2201		- if (event.getSource() == switchGeoItem)
	2471	+ if (source == switchGeoItem)
2202	2472	{
2203	2473	for (int i=0; i<group.selection.size(); i++)
2204	2474	{
..	..	@@ -2210,7 +2480,7 @@
2210	2480	ResetModel();
2211	2481	refreshContents();
2212	2482	} else
2213		- if (event.getSource() == switchTransfoItem)
	2483	+ if (source == switchTransfoItem)
2214	2484	{
2215	2485	for (int i=0; i<group.selection.size(); i++)
2216	2486	{
..	..	@@ -2222,7 +2492,7 @@
2222	2492	ResetModel();
2223	2493	refreshContents();
2224	2494	} else
2225		- if (event.getSource() == morphItem)
	2495	+ if (source == morphItem)
2226	2496	{
2227	2497	for (int i=0; i<group.selection.size(); i++)
2228	2498	{
..	..	@@ -2234,7 +2504,7 @@
2234	2504	ResetModel();
2235	2505	refreshContents();
2236	2506	} else
2237		- if (event.getSource() == scriptNodeItem)
	2507	+ if (source == scriptNodeItem)
2238	2508	{
2239	2509	boolean atleastone = false;
2240	2510
..	..	@@ -2273,195 +2543,239 @@
2273	2543	}
2274	2544	}
2275	2545	} else
2276		- if (event.getSource() == linkerItem)
	2546	+ if (source == linkerItem)
2277	2547	{
2278	2548	group(new cLinker());
2279	2549	} else
2280		- if (event.getSource() == textureItem)
	2550	+ if (source == textureItem)
2281	2551	{
2282	2552	group(new TextureNode());
2283	2553	} else
2284		- if (event.getSource() == shadowXItem)
	2554	+ if (source == billboardItem)
	2555	+ {
	2556	+ group(new BillboardNode());
	2557	+ } else
	2558	+ if (source == shadowXItem)
2285	2559	{
2286	2560	CastShadow(0);
2287	2561	} else
2288		- if (event.getSource() == shadowYItem)
	2562	+ if (source == shadowYItem)
2289	2563	{
2290	2564	CastShadow(1);
2291	2565	} else
2292		- if (event.getSource() == shadowZItem)
	2566	+ if (source == shadowZItem)
2293	2567	{
2294	2568	CastShadow(2);
2295	2569	} else
2296		- if (event.getSource() == ungroupItem)
	2570	+ if (source == ungroupItem)
2297	2571	{
2298		- ungroup();
	2572	+ //ungroup();
	2573	+ for (int i=0; i<group.selection.size(); i++)
	2574	+ {
	2575	+ Ungroup(group.selection.get(i));
	2576	+ }
	2577	+
	2578	+ ClearSelection(false);
	2579	+
	2580	+ refreshContents();
2299	2581	} else
2300		- if (event.getSource() == genUVItem)
	2582	+ if (source == genUVItem)
2301	2583	{
2302	2584	GenUV();
2303	2585	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2586	+ if (source == genNormalsCADItem)
2305	2587	{
2306	2588	GenNormals(true);
2307	2589	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2590	+ if (source == genNormalsMESHItem)
	2591	+ {
	2592	+ GenNormalsMESH();
	2593	+ } else
	2594	+ if (source == genNormalsORGANItem)
2309	2595	{
2310	2596	GenNormals(false);
2311	2597	} else
2312		- if (event.getSource() == stripifyItem)
	2598	+ if (source == genNormalsMINEItem)
	2599	+ {
	2600	+ GenNormalsMINE();
	2601	+ } else
	2602	+ if (source == stripifyItem)
2313	2603	{
2314	2604	Stripify();
2315	2605	} else
2316		- if (event.getSource() == unstripifyItem)
	2606	+ if (source == unstripifyItem)
2317	2607	{
2318	2608	Unstripify();
2319	2609	} else
2320		- if (event.getSource() == trimItem)
	2610	+ if (source == trimItem)
2321	2611	{
2322	2612	Trim();
2323	2613	} else
2324		- if (event.getSource() == untrimItem)
	2614	+ if (source == untrimItem)
2325	2615	{
2326	2616	Untrim();
2327	2617	} else
2328		- if (event.getSource() == clearColorsItem)
	2618	+ if (source == clearColorsItem)
2329	2619	{
2330	2620	ClearColors();
2331	2621	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2622	+ if (source == clearMaterialsItem)
2333	2623	{
2334	2624	ClearMaterials();
2335	2625	} else
2336		- if (event.getSource() == liveleavesItem)
	2626	+ if (source == liveleavesItem)
2337	2627	{
2338	2628	LiveLeaves(true);
2339	2629	} else
2340		- if (event.getSource() == unliveleavesItem)
	2630	+ if (source == unliveleavesItem)
2341	2631	{
2342	2632	LiveLeaves(false);
2343	2633	} else
2344		- if (event.getSource() == supportleavesItem)
	2634	+ if (source == supportleavesItem)
2345	2635	{
2346	2636	SupportLeaves(true);
2347	2637	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2638	+ if (source == unsupportleavesItem)
2349	2639	{
2350	2640	SupportLeaves(false);
2351	2641	} else
2352		- if (event.getSource() == hideleavesItem)
	2642	+ if (source == hideleavesItem)
2353	2643	{
2354	2644	HideLeaves(true);
2355	2645	} else
2356		- if (event.getSource() == showleavesItem)
	2646	+ if (source == showleavesItem)
2357	2647	{
2358	2648	HideLeaves(false);
2359	2649	} else
2360		- if (event.getSource() == markleavesItem)
	2650	+ if (source == markleavesItem)
2361	2651	{
2362	2652	MarkLeaves(true);
2363	2653	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2654	+ if (source == unmarkleavesItem)
2365	2655	{
2366	2656	MarkLeaves(false);
2367	2657	} else
2368		- if (event.getSource() == flipVItem)
	2658	+ if (source == rewindleavesItem)
	2659	+ {
	2660	+ RewindLeaves(true);
	2661	+ } else
	2662	+ if (source == unrewindleavesItem)
	2663	+ {
	2664	+ RewindLeaves(false);
	2665	+ } else
	2666	+ if (source == randomleavesItem)
	2667	+ {
	2668	+ RandomLeaves(true);
	2669	+ } else
	2670	+ if (source == unrandomleavesItem)
	2671	+ {
	2672	+ RandomLeaves(false);
	2673	+ } else
	2674	+ if (source == flipVItem)
2369	2675	{
2370	2676	FlipV(true);
2371	2677	} else
2372		- if (event.getSource() == unflipVItem)
	2678	+ if (source == unflipVItem)
2373	2679	{
2374	2680	FlipV(false);
2375	2681	} else
2376		- if (event.getSource() == lowTexturesItem)
	2682	+ if (source == lowTexturesItem)
2377	2683	{
2378	2684	SetTexRes(0);
2379	2685	} else
2380		- if (event.getSource() == normalTexturesItem)
	2686	+ if (source == normalTexturesItem)
2381	2687	{
2382	2688	SetTexRes(1);
2383	2689	} else
2384		- if (event.getSource() == highTexturesItem)
	2690	+ if (source == highTexturesItem)
2385	2691	{
2386	2692	SetTexRes(2);
2387	2693	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2694	+ if (source == veryhighTexturesItem)
2389	2695	{
2390	2696	SetTexRes(3);
2391	2697	} else
2392		- if (event.getSource() == maxTexturesItem)
	2698	+ if (source == maxTexturesItem)
2393	2699	{
2394	2700	SetTexRes(4);
2395	2701	} else
2396		- if (event.getSource() == panoTexturesItem)
	2702	+ if (source == panoTexturesItem)
2397	2703	{
2398	2704	SetTexRes(5);
2399	2705	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2706	+ if (source == reverseNormalsItem)
2401	2707	{
2402	2708	ReverseNormals();
2403	2709	} else
2404		- if (event.getSource() == parseverticesItem)
	2710	+ if (source == parseverticesItem)
2405	2711	{
2406	2712	ParseVertices();
2407	2713	} else
2408		- if (event.getSource() == textureFieldItem)
	2714	+ if (source == textureFieldItem)
2409	2715	{
2410	2716	TextureVertices();
2411	2717	} else
2412		- if (event.getSource() == alignItem)
	2718	+ if (source == alignItem)
2413	2719	{
2414	2720	Align();
2415	2721	} else
2416		- if (event.getSource() == mirrorItem)
	2722	+ if (source == mirrorItem)
2417	2723	{
2418	2724	MirrorPoses();
2419	2725	} else
2420		- if (event.getSource() == reduceMorphItem)
	2726	+ if (source == reduceMorphItem)
2421	2727	{
2422	2728	MeshReduction(false);
2423	2729	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2730	+ if (source == reduce34MorphItem)
2425	2731	{
2426	2732	MeshReduction(true);
2427	2733	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2734	+ if (source == reverseTrianglesItem)
2429	2735	{
2430	2736	ReverseTriangles();
2431	2737	} else
2432		- if (event.getSource() == reduceMeshItem)
	2738	+ if (source == reduceMeshItem)
2433	2739	{
2434	2740	ReduceMesh(false);
2435	2741	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2742	+ if (source == reduce34MeshItem)
2437	2743	{
2438	2744	ReduceMesh(true);
2439	2745	} else
2440		- if (event.getSource() == increaseMeshItem)
	2746	+ if (source == increaseMeshItem)
2441	2747	{
2442	2748	IncreaseMesh();
2443	2749	} else
2444		- if (event.getSource() == clipMeshItem)
	2750	+ if (source == clipMeshItem)
2445	2751	{
2446	2752	ClipMesh();
2447	2753	} else
2448		- if (event.getSource() == smoothMeshItem)
	2754	+ if (source == smoothMeshItem)
2449	2755	{
2450	2756	SmoothMesh();
2451	2757	} else
2452		- if (event.getSource() == transformgeometryItem)
	2758	+ if (source == transformGeometryItem)
2453	2759	{
2454	2760	TransformGeometry();
2455	2761	} else
2456		- if (event.getSource() == resetTransformItem)
	2762	+ if (source == transformChildrenItem)
	2763	+ {
	2764	+ TransformChildren();
	2765	+ } else
	2766	+ if (source == resetTransformItem)
2457	2767	{
2458	2768	ResetTransform();
2459	2769	} else
2460		- if (event.getSource() == resetCentroidItem)
	2770	+ if (source == resetCentroidItem)
2461	2771	{
2462		- ResetCentroid();
	2772	+ ResetCentroid(true);
2463	2773	} else
2464		- if (event.getSource() == resetParentItem)
	2774	+ if (source == resetCentroidXZItem)
	2775	+ {
	2776	+ ResetCentroid(false);
	2777	+ } else
	2778	+ if (source == resetParentItem)
2465	2779	{
2466	2780	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2781	{
..	..	@@ -2471,7 +2785,7 @@
2471	2785
2472	2786	refreshContents();
2473	2787	} else
2474		- if (event.getSource() == repairParentItem)
	2788	+ if (source == repairParentItem)
2475	2789	{
2476	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2791	{
..	..	@@ -2485,7 +2799,21 @@
2485	2799
2486	2800	refreshContents();
2487	2801	} else
2488		- if (event.getSource() == sortbysizeItem)
	2802	+ if (source == repairShadowItem)
	2803	+ {
	2804	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2805	+ {
	2806	+ Object3D obj = (Object3D)e.nextElement();
	2807	+ obj.RepairShadow();
	2808	+// for (int i=0; i<obj.size(); i++)
	2809	+// {
	2810	+// obj.get(i).parent = obj;
	2811	+// }
	2812	+ }
	2813	+
	2814	+ refreshContents();
	2815	+ } else
	2816	+ if (source == sortbysizeItem)
2489	2817	{
2490	2818	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2819	{
..	..	@@ -2497,7 +2825,7 @@
2497	2825	ResetModel();
2498	2826	refreshContents();
2499	2827	} else
2500		- if (event.getSource() == sortbynameItem)
	2828	+ if (source == sortbynameItem)
2501	2829	{
2502	2830	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2831	{
..	..	@@ -2509,7 +2837,7 @@
2509	2837	ResetModel();
2510	2838	refreshContents();
2511	2839	} else
2512		- if (event.getSource() == attachPigmentItem)
	2840	+ if (source == attachPigmentItem)
2513	2841	{
2514	2842	String texture = GetFile("Attach pigment");
2515	2843	Object3D obj;
..	..	@@ -2521,7 +2849,7 @@
2521	2849
2522	2850	refreshContents();
2523	2851	} else
2524		- if (event.getSource() == detachPigmentItem)
	2852	+ if (source == detachPigmentItem)
2525	2853	{
2526	2854	Object3D obj;
2527	2855	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2860,7 @@
2532	2860
2533	2861	refreshContents();
2534	2862	} else
2535		- if (event.getSource() == attachBumpItem)
	2863	+ if (source == attachBumpItem)
2536	2864	{
2537	2865	String texture = GetFile("Attach bump");
2538	2866	Object3D obj;
..	..	@@ -2544,7 +2872,7 @@
2544	2872
2545	2873	refreshContents();
2546	2874	} else
2547		- if (event.getSource() == detachBumpItem)
	2875	+ if (source == detachBumpItem)
2548	2876	{
2549	2877	Object3D obj;
2550	2878	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2883,7 @@
2555	2883
2556	2884	refreshContents();
2557	2885	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2886	+ if (source == pigmentBumpItem)
2559	2887	{
2560	2888	Object3D obj;
2561	2889	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2894,221 @@
2566	2894
2567	2895	refreshContents();
2568	2896	} else
2569		- if (event.getSource() == flashSelectionButton)
	2897	+ if (source == flashSelectionButton)
2570	2898	{
2571	2899	CameraPane.flash = true;
2572	2900	refreshContents();
2573	2901	} else
2574		- if (event.getSource() == oneButton)
	2902	+ if (source == oneButton)
2575	2903	{
2576	2904	} else
2577		- if (event.getSource() == twoButton)
	2905	+ if (source == twoButton)
2578	2906	{
2579	2907	radio.layout = twoButton;
2580	2908	// bug
2581	2909	//gridPanel.setDividerLocation(1.0);
2582	2910	//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();
	2911	+// bigThree.remove(scenePanel);
	2912	+// bigThree.remove(centralPanel);
	2913	+// bigThree.remove(XYZPanel);
	2914	+// aWindowConstraints.gridx = 0;
	2915	+// aWindowConstraints.gridy = 0;
	2916	+// aWindowConstraints.gridwidth = 1;
	2917	+// // aConstraints.gridheight = 3;
	2918	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2919	+// aWindowConstraints.weightx = 0;
	2920	+// aWindowConstraints.weighty = 1;
	2921	+// //bigThree.add(jtp, aWindowConstraints);
	2922	+// aWindowConstraints.weightx = 1;
	2923	+// aWindowConstraints.gridwidth = 3;
	2924	+// // aConstraints.gridheight = 3;
	2925	+// aWindowConstraints.gridx = 1;
	2926	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2927	+// bigThree.add(centralPanel, aWindowConstraints);
	2928	+// aWindowConstraints.weightx = 0;
	2929	+// aWindowConstraints.gridx = 4;
	2930	+// aWindowConstraints.gridwidth = 1;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2933	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2934	+// scenePanel.setVisible(false);
	2935	+// centralPanel.setVisible(true);
	2936	+// XYZPanel.setVisible(false);
	2937	+ bigThree.ClearUI();
	2938	+ bigThree.add(centralPanel);
	2939	+ bigThree.FlushUI();
	2940	+
	2941	+ cameraView.requestFocusInWindow();
	2942	+
	2943	+// refreshContents(true);
	2944	+//
	2945	+// try
	2946	+// {
	2947	+// java.awt.Robot bot = new java.awt.Robot();
	2948	+// int mask = InputEvent.BUTTON1_MASK;
	2949	+// bot.mouseMove(100, 100);
	2950	+// bot.mousePress(mask);
	2951	+// bot.mouseRelease(mask);
	2952	+// }
	2953	+// catch (Exception e)
	2954	+// {
	2955	+//
	2956	+// }
	2957	+
2607	2958	} else
2608		- if (event.getSource() == threeButton)
	2959	+ if (source == threeButton)
2609	2960	{
2610	2961	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();
	2962	+
	2963	+// bigThree.remove(scenePanel);
	2964	+// bigThree.remove(centralPanel);
	2965	+// bigThree.remove(XYZPanel);
	2966	+// aWindowConstraints.gridx = 0;
	2967	+// aWindowConstraints.gridy = 0;
	2968	+// aWindowConstraints.gridwidth = 1;
	2969	+// // aConstraints.gridheight = 3;
	2970	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2971	+// aWindowConstraints.weightx = 0;
	2972	+// aWindowConstraints.weighty = 1;
	2973	+// //bigThree.add(jtp, aWindowConstraints);
	2974	+// aWindowConstraints.weightx = 1;
	2975	+// aWindowConstraints.gridwidth = 3;
	2976	+// // aConstraints.gridheight = 3;
	2977	+// aWindowConstraints.gridx = 1;
	2978	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2979	+// bigThree.add(centralPanel, aWindowConstraints);
	2980	+// aWindowConstraints.weightx = 0;
	2981	+// aWindowConstraints.gridx = 4;
	2982	+// aWindowConstraints.gridwidth = 1;
	2983	+// // aConstraints.gridheight = 3;
	2984	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2985	+// bigThree.add(XYZPanel, aWindowConstraints);
	2986	+// bigThree.validate();
	2987	+// scenePanel.setVisible(false);
	2988	+// centralPanel.setVisible(true);
	2989	+// XYZPanel.setVisible(true);
	2990	+ bigThree.ClearUI();
	2991	+ bigThree.add(centralPanel);
	2992	+ bigThree.add(XYZPanel);
	2993	+ bigThree.FlushUI();
	2994	+
	2995	+ cameraView.requestFocusInWindow();
2635	2996	} else
2636		- if (event.getSource() == fourButton)
	2997	+ if (source == fourButton)
2637	2998	{
2638	2999	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();
	3000	+
	3001	+// bigThree.remove(scenePanel);
	3002	+// bigThree.remove(centralPanel);
	3003	+// bigThree.remove(XYZPanel);
	3004	+// aWindowConstraints.gridx = 0;
	3005	+// aWindowConstraints.gridy = 0;
	3006	+// aWindowConstraints.gridwidth = 1;
	3007	+// // aWindowConstraints.gridheight = 3;
	3008	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3009	+// aWindowConstraints.weightx = 1;
	3010	+// aWindowConstraints.weighty = 1;
	3011	+// bigThree.add(scenePanel, aWindowConstraints);
	3012	+// aWindowConstraints.weightx = 1;
	3013	+// aWindowConstraints.gridwidth = 3;
	3014	+// // aConstraints.gridheight = 3;
	3015	+// aWindowConstraints.gridx = 1;
	3016	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3017	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3018	+// aWindowConstraints.weightx = 0;
	3019	+// aWindowConstraints.gridx = 4;
	3020	+// aWindowConstraints.gridwidth = 1;
	3021	+// // aWindowConstraints.gridheight = 3;
	3022	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3023	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3024	+// bigThree.validate();
	3025	+// scenePanel.setVisible(true);
	3026	+// centralPanel.setVisible(false);
	3027	+// XYZPanel.setVisible(false);
	3028	+ bigThree.ClearUI();
	3029	+ bigThree.add(scenePanel);
	3030	+ bigThree.FlushUI();
	3031	+
	3032	+ cameraView.requestFocusInWindow();
2663	3033	} else
2664		- if (event.getSource() == sixButton)
	3034	+ if (source == sixButton)
2665	3035	{
2666	3036	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();
	3037	+
	3038	+// bigThree.remove(scenePanel);
	3039	+// bigThree.remove(centralPanel);
	3040	+// bigThree.remove(XYZPanel);
	3041	+// aWindowConstraints.gridx = 0;
	3042	+// aWindowConstraints.gridy = 0;
	3043	+// aWindowConstraints.gridwidth = 1;
	3044	+// // aConstraints.gridheight = 3;
	3045	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3046	+// aWindowConstraints.weightx = 0;
	3047	+// aWindowConstraints.weighty = 1;
	3048	+// bigThree.add(scenePanel, aWindowConstraints);
	3049	+// aWindowConstraints.weightx = 1;
	3050	+// aWindowConstraints.gridwidth = 3;
	3051	+// // aWindowConstraints.gridheight = 3;
	3052	+// aWindowConstraints.gridx = 1;
	3053	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3054	+// bigThree.add(centralPanel, aWindowConstraints);
	3055	+// aWindowConstraints.weightx = 0;
	3056	+// aWindowConstraints.gridx = 4;
	3057	+// aWindowConstraints.gridwidth = 1;
	3058	+// // aWindowConstraints.gridheight = 3;
	3059	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3060	+// //bigThree.add(XYZPanel, aConstraints);
	3061	+// bigThree.validate();
	3062	+// scenePanel.setVisible(true);
	3063	+// centralPanel.setVisible(true);
	3064	+// XYZPanel.setVisible(false);
	3065	+ bigThree.ClearUI();
	3066	+ bigThree.add(scenePanel);
	3067	+ bigThree.add(centralPanel);
	3068	+ bigThree.FlushUI();
	3069	+
	3070	+ cameraView.requestFocusInWindow();
2691	3071	} else
2692		- if (event.getSource() == sevenButton)
	3072	+ if (source == sevenButton)
2693	3073	{
2694	3074	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();
	3075	+
	3076	+// bigThree.remove(scenePanel);
	3077	+// bigThree.remove(centralPanel);
	3078	+// bigThree.remove(XYZPanel);
	3079	+// aWindowConstraints.gridx = 0;
	3080	+// aWindowConstraints.gridy = 0;
	3081	+// aWindowConstraints.gridwidth = 1;
	3082	+// // aWindowConstraints.gridheight = 3;
	3083	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3084	+// aWindowConstraints.weightx = 0;
	3085	+// aWindowConstraints.weighty = 1;
	3086	+// bigThree.add(scenePanel, aWindowConstraints);
	3087	+// aWindowConstraints.weightx = 1;
	3088	+// aWindowConstraints.gridwidth = 3;
	3089	+// // aWindowConstraints.gridheight = 3;
	3090	+// aWindowConstraints.gridx = 1;
	3091	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3092	+// bigThree.add(centralPanel, aWindowConstraints);
	3093	+// aWindowConstraints.weightx = 0;
	3094	+// aWindowConstraints.gridx = 4;
	3095	+// aWindowConstraints.gridwidth = 1;
	3096	+// // aConstraints.gridheight = 3;
	3097	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3098	+// bigThree.add(XYZPanel, aWindowConstraints);
	3099	+// bigThree.validate();
	3100	+// scenePanel.setVisible(true);
	3101	+// centralPanel.setVisible(true);
	3102	+// XYZPanel.setVisible(true);
	3103	+ bigThree.ClearUI();
	3104	+ bigThree.add(scenePanel);
	3105	+ bigThree.add(centralPanel);
	3106	+ bigThree.add(XYZPanel);
	3107	+ bigThree.FlushUI();
	3108	+
	3109	+ cameraView.requestFocusInWindow();
2719	3110	} else
2720		- if (event.getSource() == rootButton)
	3111	+ if (source == rootButton)
2721	3112	{
2722	3113	Object3D obj;
2723	3114	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,9 +3118,10 @@
2727	3118	EditObject(obj);
2728	3119	}
2729	3120
	3121	+ cameraView.requestFocusInWindow();
2730	3122	refreshContents(true);
2731	3123	} else
2732		- if (event.getSource() == closeButton)
	3124	+ if (source == closeButton)
2733	3125	{
2734	3126	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3127	cRadio ab;
..	..	@@ -2748,13 +3140,15 @@
2748	3140	break;
2749	3141	}
2750	3142	}
	3143	+
	3144	+ cameraView.requestFocusInWindow();
2751	3145	refreshContents(true);
2752	3146	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3147	+ if (source == editItem \|\| source == editButton)
2754	3148	{
2755	3149	EditSelection(false);
2756	3150	} else
2757		- if (event.getSource() == uneditButton)
	3151	+ if (source == uneditButton)
2758	3152	{
2759	3153	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3154	{
..	..	@@ -2764,14 +3158,14 @@
2764	3158	child.CloseUI();
2765	3159	listUI.remove(child);
2766	3160
2767		- child.editWindow = null; // ???????????
	3161	+ //child.editWindow = null; // ???????????
2768	3162	}
2769		- objEditor.ctrlPanel.revalidate();
	3163	+ objEditor.ctrlPanel.FlushUI();
2770	3164	//objEditor.jTree.clearSelection();
2771	3165	//objEditor.ResetSliders();
2772	3166	refreshContents(true);
2773	3167	} else
2774		- if (event.getSource() == clearPanelButton)
	3168	+ if (source == clearPanelButton)
2775	3169	{
2776	3170	assert(copy == group);
2777	3171	//copy.ClearUI();
..	..	@@ -2782,7 +3176,7 @@
2782	3176	listUI.clear();
2783	3177	refreshContents(true);
2784	3178	} else
2785		- if (event.getSource() == allParamsButton)
	3179	+ if (source == allParamsButton)
2786	3180	{
2787	3181	assert(copy == group);
2788	3182
..	..	@@ -2803,19 +3197,19 @@
2803	3197
2804	3198	refreshContents(true);
2805	3199	} else
2806		- if (event.getSource() == unselectButton)
	3200	+ if (source == unselectButton)
2807	3201	{
2808	3202	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3203	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3204	objEditor.ResetSliders();
2811	3205	refreshContents(true);
2812	3206	} else
2813		- if(event.getSource() instanceof cRadio)
	3207	+ if(source instanceof cRadio)
2814	3208	{
2815	3209	group.parent = keepparent;
2816	3210	group.attributes = 0;
2817	3211	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3212	+ /cRadio/ radio = (cRadio)source;
2819	3213	Object3D obj = radio.GetObject();
2820	3214	System.out.println("Edit " + obj);
2821	3215	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3229,7 @@
2835	3229	}
2836	3230
2837	3231	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3232	+ //Globals.theRenderer.object = group;
2839	3233	if(!useclient)
2840	3234	{
2841	3235	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3238,16 @@
2844	3238	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3239	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3240	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3241	+ //cameraView.lighttouched = true;
	3242	+ Globals.lighttouched = true;
2848	3243	topView.object = group;
2849	3244	frontView.object = group;
2850	3245	sideView.object = group;
2851	3246	}
2852		- group.editWindow = this;
	3247	+
	3248	+// fix "+" issue
	3249	+ //group.editWindow = this;
	3250	+
2853	3251	/*
2854	3252	currentLayout = radio.layout;
2855	3253	if (currentLayout == null)
..	..	@@ -2861,8 +3259,23 @@
2861	3259	//group.parent = null; // ROOT
2862	3260	//group.attributes = -1;
2863	3261	ResetModel();
	3262	+
	3263	+ cameraView.requestFocusInWindow();
2864	3264	refreshContents(true);
2865		- }
	3265	+ } else if (event.getSource() == editCameraItem)
	3266	+ {
	3267	+ cameraView.ProtectCamera();
	3268	+ cameraView.repaint();
	3269	+ return;
	3270	+ } else if (event.getSource() == revertCameraItem)
	3271	+ {
	3272	+ cameraView.RevertCamera();
	3273	+ cameraView.repaint();
	3274	+ return;
	3275	+ // } else if (event.getSource() == textureButton)
	3276	+ // {
	3277	+ // return; // true;
	3278	+ }
2866	3279	else
2867	3280	{
2868	3281	//return super.action(event, arg);
..	..	@@ -2871,7 +3284,6 @@
2871	3284	}
2872	3285
2873	3286	boolean useclient = false;
2874		- cRadio radio;
2875	3287
2876	3288	void ToggleRoot()
2877	3289	{
..	..	@@ -2880,7 +3292,7 @@
2880	3292	if (useclient)
2881	3293	{
2882	3294	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3295	+ Globals.lighttouched = true;
2884	3296	//topView.object = client;
2885	3297	//frontView.object = client;
2886	3298	//sideView.object = client;
..	..	@@ -2888,7 +3300,7 @@
2888	3300	else
2889	3301	{
2890	3302	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3303	+ Globals.lighttouched = true;
2892	3304	//topView.object = group;
2893	3305	//frontView.object = group;
2894	3306	//sideView.object = group;
..	..	@@ -2923,6 +3335,28 @@
2923	3335	refreshContents();
2924	3336	}
2925	3337
	3338	+ void TransformChildren()
	3339	+ {
	3340	+ Object3D obj;
	3341	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3342	+ {
	3343	+ obj = (Object3D)e.nextElement();
	3344	+ obj.KeepTextureMatrices();
	3345	+ obj.TransformChildren();
	3346	+ obj.RestoreTextureMatrices();
	3347	+
	3348	+// if (obj.parent == null)
	3349	+// {
	3350	+// System.out.println("NULL PARENT!");
	3351	+// new Exception().printStackTrace();
	3352	+// }
	3353	+// else
	3354	+// TouchTransform(obj);
	3355	+// //obj.parent.Touch();
	3356	+ }
	3357	+
	3358	+ refreshContents();
	3359	+ }
2926	3360
2927	3361	void ResetTransform()
2928	3362	{
..	..	@@ -3035,7 +3469,7 @@
3035	3469	refreshContents();
3036	3470	}
3037	3471
3038		- void ResetCentroid()
	3472	+ void ResetCentroid(boolean full)
3039	3473	{
3040	3474	Object3D obj;
3041	3475	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3484,16 @@
3050	3484	LA.matIdentity(Object3D.mat);
3051	3485	obj.getBounds(minima, maxima, false);
3052	3486	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3487	+ if (full)
	3488	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3489	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3490	obj.TransformMesh(Object3D.mat);
	3491	+
3056	3492	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3493	+ if (full)
	3494	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3495	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3496	+
3059	3497	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3498	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3499	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3522,8 @@
3084	3522
3085	3523	int size = obj.MemorySize();
3086	3524
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3525	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3526	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3527	}
3089	3528	}
3090	3529	catch (Exception e)
..	..	@@ -3121,9 +3560,9 @@
3121	3560	obj = (Object3D)e.nextElement();
3122	3561
3123	3562	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3563	+ Grafreed.AnalyzeObject(obj);
3125	3564	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3565	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3566
3128	3567	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3568	}
..	..	@@ -3165,6 +3604,20 @@
3165	3604	void GenNormals(boolean crease)
3166	3605	{
3167	3606	group.GenNormalsS(crease);
	3607	+
	3608	+ refreshContents();
	3609	+ }
	3610	+
	3611	+ void GenNormalsMESH()
	3612	+ {
	3613	+ group.GenNormalsMeshS();
	3614	+
	3615	+ refreshContents();
	3616	+ }
	3617	+
	3618	+ void GenNormalsMINE()
	3619	+ {
	3620	+ group.selection.GenNormalsMINE();
3168	3621
3169	3622	refreshContents();
3170	3623	}
..	..	@@ -3250,7 +3703,7 @@
3250	3703	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3704	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3705	//
3253		-// g.add(GraphreeD.clipboard);
	3706	+// g.add(GrafreeD.clipboard);
3254	3707	//
3255	3708	// buffer.add(g);
3256	3709	// }
..	..	@@ -3269,8 +3722,8 @@
3269	3722	// nodes = new Object3D();
3270	3723	// vertices = new Vector<Vertex>();
3271	3724	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3725	+// boolean epsequal = GrafreeD.epsequal;
	3726	+// GrafreeD.epsequal = true;
3274	3727	//
3275	3728	// for (int i=0; i<group.selection.size(); i++)
3276	3729	// {
..	..	@@ -3311,7 +3764,7 @@
3311	3764	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3765	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3766	//
3314		-// g.add(GraphreeD.clipboard);
	3767	+// g.add(GrafreeD.clipboard);
3315	3768	//
3316	3769	// buffer.add(g);
3317	3770	// }
..	..	@@ -3319,7 +3772,7 @@
3319	3772	// makeSomething(buffer, i==group.selection.size()-1);
3320	3773	// }
3321	3774	//
3322		-// GraphreeD.epsequal = epsequal;
	3775	+// GrafreeD.epsequal = epsequal;
3323	3776	//
3324	3777	// //buffer = null;
3325	3778	// temprep = null;
..	..	@@ -3330,8 +3783,8 @@
3330	3783
3331	3784	void ParseVertices()
3332	3785	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3786	+ boolean epsequal = Grafreed.epsequal;
	3787	+ Grafreed.epsequal = true;
3335	3788
3336	3789	for (int i=0; i<group.selection.size(); i++)
3337	3790	{
..	..	@@ -3356,7 +3809,7 @@
3356	3809	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3810	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3811
3359		- g.add(GraphreeD.clipboard);
	3812	+ g.add(Grafreed.clipboard);
3360	3813
3361	3814	buffer.add(g);
3362	3815	}
..	..	@@ -3371,7 +3824,7 @@
3371	3824	makeSomething(buffer, i==group.selection.size()-1);
3372	3825	}
3373	3826
3374		- GraphreeD.epsequal = epsequal;
	3827	+ Grafreed.epsequal = epsequal;
3375	3828
3376	3829	refreshContents();
3377	3830	}
..	..	@@ -3389,7 +3842,16 @@
3389	3842	String pigment = Object3D.GetPigment(tex);
3390	3843	//String bump = Object3D.GetBump(tex);
3391	3844
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3845	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3846	+
	3847	+ try
	3848	+ {
	3849	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3850	+ }
	3851	+ catch (Exception e)
	3852	+ {
	3853	+ System.err.println("FAIL: " + node);
	3854	+ }
3393	3855
3394	3856	double s = v.s;
3395	3857
..	..	@@ -3416,7 +3878,7 @@
3416	3878	scale /= 3;
3417	3879
3418	3880	scale /= 0xFF;
3419		- scale /= 4;
	3881	+ // c'est quoi ca? scale /= 4;
3420	3882
3421	3883	//v.AO = scale;
3422	3884
..	..	@@ -3437,12 +3899,26 @@
3437	3899
3438	3900	void Align()
3439	3901	{
	3902	+ if (group.selection.size() == 0)
	3903	+ return;
	3904	+
	3905	+ cVector bbmin = new cVector();
	3906	+ cVector bbmax = new cVector();
	3907	+
	3908	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3909	+
	3910	+ double dx = bbmax.x - bbmin.x;
	3911	+ double dy = bbmax.y - bbmin.y;
	3912	+ double dz = bbmax.z - bbmin.z;
	3913	+
	3914	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3915	+
3440	3916	for (int i=0; i<group.selection.size(); i++)
3441	3917	{
3442	3918	Object3D obj = group.selection.get(i);
3443	3919
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3920	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3921	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3922	}
3447	3923
3448	3924	refreshContents();
..	..	@@ -3455,7 +3931,7 @@
3455	3931	// ref.SaveSupports();
3456	3932	// Object3D par = ref.parent;
3457	3933	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3934	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3935	// ref.parent = par;
3460	3936	// ref.RestoreSupports();
3461	3937
..	..	@@ -3463,11 +3939,11 @@
3463	3939
3464	3940	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3941
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3942	+ boolean random = CameraPane.SWITCH;
	3943	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3944	lowres.linkVerticesThis(null);
3469	3945	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3946	+ CameraPane.SWITCH = random;
3471	3947
3472	3948	System.err.flush();
3473	3949
..	..	@@ -3485,7 +3961,7 @@
3485	3961	// lowres.SaveSupports();
3486	3962	// par = lowres.parent;
3487	3963	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3964	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	3965	Object3D newlow = CloneObject(lowres, false);
3490	3966	newlow.name = sn.switchobject.get(i).name;
3491	3967	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +3983,7 @@
3507	3983	return;
3508	3984
3509	3985	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	3986	+ Object3D ref = Grafreed.clipboard.get(0);
3511	3987
3512	3988	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	3989
..	..	@@ -3676,7 +4152,7 @@
3676	4152	group.selection.RelinkToSupport(); // july 2014
3677	4153	System.out.println("DONE.");
3678	4154	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4155	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4156	}
3681	4157
3682	4158	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4177,20 @@
3701	4177
3702	4178	void ClipMesh()
3703	4179	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4180	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4181	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4182	+ Object3D content = Grafreed.clipboard.get(0);
3707	4183
3708	4184	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4185	content = ((cGroup)content).get(0);
3710	4186
3711	4187	// for (int i=0; i<group.selection.size(); i++)
3712	4188	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4189	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4190	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4191	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4192	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4193	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4194	System.out.println("DONE.");
3719	4195	refreshContents();
3720	4196	}
..	..	@@ -3759,6 +4235,18 @@
3759	4235	void MarkLeaves(boolean hide)
3760	4236	{
3761	4237	group.selection.MarkLeaves(hide);
	4238	+ refreshContents();
	4239	+ }
	4240	+
	4241	+ void RewindLeaves(boolean hide)
	4242	+ {
	4243	+ group.selection.RewindLeaves(hide);
	4244	+ refreshContents();
	4245	+ }
	4246	+
	4247	+ void RandomLeaves(boolean hide)
	4248	+ {
	4249	+ group.selection.RandomLeaves(hide);
3762	4250	refreshContents();
3763	4251	}
3764	4252
..	..	@@ -3847,7 +4335,7 @@
3847	4335	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4336
3849	4337	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4338	+ if(elem != group \|\| !newWindow)
3851	4339	{
3852	4340	// if (!(elem instanceof Composite))
3853	4341	// newWindow = false;
..	..	@@ -3937,7 +4425,6 @@
3937	4425	//case 702: // Event.LIST_DESELECT
3938	4426	group.deselectAll();
3939	4427	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4428	if (tps != null)
3942	4429	{
3943	4430	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,31 +4433,30 @@
3946	4433
3947	4434	//if (child.parent != null)
3948	4435	//child.parent.addSelectee(child);
	4436	+ objEditor.SetMaterial(child);
3949	4437	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4438	}
3954	4439	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4440	+// else
	4441	+// {
	4442	+// objEditor.SetMaterial(group); // .GetMaterial());
	4443	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4444	+// System.err.println("info : " + group.GetPath());
	4445	+// }
3961	4446
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4447	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4448	CameraPane.flash = true;
3966	4449
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4450	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4451	// a camera
3969	4452	{
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;
	4453	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4454	+ {
	4455	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4456	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4457	+ }
	4458	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4459	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4460	}
3975	4461
3976	4462	refreshContents();
..	..	@@ -3981,6 +4467,26 @@
3981	4467
3982	4468	freezemodel = false;
3983	4469	}
	4470	+
	4471	+ void refreshContents(boolean cp)
	4472	+ {
	4473	+ if (!Globals.MOUSEDRAGGED)
	4474	+ {
	4475	+ objEditor.ClearInfo(); // .GetMaterial());
	4476	+
	4477	+ for (int i=0; i < group.selection.Size(); i++)
	4478	+ {
	4479	+ Object3D child = (Object3D) group.selection.get(i);
	4480	+
	4481	+ objEditor.AddInfo(child, this, true);
	4482	+ System.err.println("info : " + child.GetPath());
	4483	+ }
	4484	+
	4485	+ objEditor.SetText(); // jan 2014
	4486	+ }
	4487	+
	4488	+ super.refreshContents(cp);
	4489	+ }
3984	4490
3985	4491	void linkSomething(Object3D thing)
3986	4492	{
..	..	@@ -4052,16 +4558,18 @@
4052	4558	{
4053	4559	if (group.selection.isEmpty())
4054	4560	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4561	+
	4562	+ Grafreed.clipboardIsTempGroup = false;
4056	4563	Composite tGroup = null;
4057	4564	if (group.selection.size() > 0) // 1)
4058	4565	{
4059	4566	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4567	+ Grafreed.clipboardIsTempGroup = true;
4061	4568	}
4062	4569
4063	4570	if (cut)
4064	4571	{
	4572	+ Save();
4065	4573	//int indices[] = jList.getSelectedIndices();
4066	4574	//for (int i = indices.length - 1; i >= 0; i--)
4067	4575	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4605,16 @@
4097	4605	//System.out.println("cut " + child);
4098	4606	//System.out.println("parent = " + child.parent);
4099	4607	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4608	+ if (Grafreed.clipboardIsTempGroup)
4101	4609	tGroup.add/Child/(tmp);
4102	4610	else
4103		- GraphreeD.clipboard = tmp;
	4611	+ Grafreed.clipboard = tmp;
4104	4612	}
4105	4613	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4614	+ if (Grafreed.clipboardIsTempGroup)
4107	4615	tGroup.add/Child/(child);
4108	4616	else
4109		- GraphreeD.clipboard = child;
	4617	+ Grafreed.clipboard = child;
4110	4618	}
4111	4619
4112	4620	//ResetModel();
..	..	@@ -4138,21 +4646,23 @@
4138	4646	//System.out.println("cut " + elem);
4139	4647	//System.out.println("parent = " + elem.parent);
4140	4648	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4649	+ if (Grafreed.clipboardIsTempGroup)
4142	4650	tGroup.add/Child/(tmp);
4143	4651	else
4144		- GraphreeD.clipboard = tmp;
	4652	+ Grafreed.clipboard = tmp;
4145	4653	}
4146	4654	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4655	+ if (Grafreed.clipboardIsTempGroup)
4148	4656	tGroup.add/Child/(child);
4149	4657	else
4150		- GraphreeD.clipboard = child;
	4658	+ Grafreed.clipboard = child;
4151	4659	}
4152	4660
4153	4661	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4662	+
	4663	+ if (Grafreed.clipboardIsTempGroup)
	4664	+ Grafreed.clipboard = tGroup;
	4665	+
4156	4666	if (cut)
4157	4667	{
4158	4668	ResetModel();
..	..	@@ -4162,11 +4672,11 @@
4162	4672
4163	4673	void paste(boolean expand)
4164	4674	{
4165		- // if (GraphreeD.clipboard == null)
	4675	+ // if (GrafreeD.clipboard == null)
4166	4676	// return;
4167	4677	boolean first = true;
4168	4678
4169		- if (GraphreeD.clipboardIsTempGroup)
	4679	+ if (Grafreed.clipboardIsTempGroup)
4170	4680	{
4171	4681	Composite temp;
4172	4682
..	..	@@ -4177,7 +4687,7 @@
4177	4687	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4688	*/
4179	4689	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4690	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4691	{
4182	4692	Object3D child = (Object3D)e.nextElement();
4183	4693
..	..	@@ -4191,7 +4701,7 @@
4191	4701	else
4192	4702	elem = child.deepCopy(); // ?
4193	4703	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4704	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4705	// elem = elem.get(0);
4196	4706	makeSomething(elem, true); // ?? first);
4197	4707	//group.addChild(elem);
..	..	@@ -4211,23 +4721,23 @@
4211	4721	//Object3D cb = Applet3D.clipboard;
4212	4722	//temp.addChild(cb);
4213	4723	//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());
	4724	+ assert(Grafreed.clipboard.parent == null);
	4725	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4726	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4727	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4728	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4729	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4730	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4731	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4732	}
4223	4733
4224	4734	ResetModel();
4225	4735	refreshContents();
4226	4736	}
4227	4737
4228		- void pasteInto(boolean copyit)
	4738	+ void pasteInto(boolean copyit, boolean clone)
4229	4739	{
4230		-// if (GraphreeD.clipboard == null)
	4740	+// if (GrafreeD.clipboard == null)
4231	4741	// return;
4232	4742
4233	4743	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4764,22 @@
4254	4764	if (copyit)
4255	4765	{
4256	4766	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4767	+ if (clone)
	4768	+ {
	4769	+ CloneClipboard(false); // sept 2014
	4770	+ }
	4771	+ else
	4772	+ {
	4773	+ paste(false);
	4774	+ }
4258	4775	}
4259	4776	else
4260	4777	{
4261	4778	boolean first = true;
4262	4779
4263		- if (GraphreeD.clipboardIsTempGroup)
	4780	+ if (Grafreed.clipboardIsTempGroup)
4264	4781	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4782	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4783	Object3D copy;
4267	4784	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4785	{
..	..	@@ -4272,7 +4789,7 @@
4272	4789	}
4273	4790	} else
4274	4791	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4792	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4793	}
4277	4794	}
4278	4795	}
..	..	@@ -4464,6 +4981,26 @@
4464	4981	makeSomething(csg);
4465	4982	}
4466	4983
	4984	+ void Ungroup(Object3D g)
	4985	+ {
	4986	+ if (g instanceof HiddenObject)
	4987	+ {
	4988	+ HiddenObject h = (HiddenObject) g;
	4989	+
	4990	+ for (int i=0; i<h.ActualSize(); i++)
	4991	+ {
	4992	+ objEditor.makeSomething(h.get(i), false);
	4993	+ }
	4994	+ }
	4995	+ else
	4996	+ {
	4997	+ for (int i=0; i<g.Size(); i++)
	4998	+ {
	4999	+ objEditor.makeSomething(g.get(i), false);
	5000	+ }
	5001	+ }
	5002	+ }
	5003	+
4467	5004	void ungroup()
4468	5005	{
4469	5006	/*
..	..	@@ -4657,21 +5194,6 @@
4657	5194	}
4658	5195	*/
4659	5196
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	5197	/*
4676	5198	public void Callback(Object obj)
4677	5199	{
..	..	@@ -4695,26 +5217,9 @@
4695	5217	}
4696	5218	*/
4697	5219
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	5220	String GetFile(String dialogName)
4716	5221	{
4717		- if (GraphreeD.standAlone)
	5222	+ if (Grafreed.standAlone)
4718	5223	{
4719	5224	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5225	browser.show();
..	..	@@ -4778,10 +5283,18 @@
4778	5283	cButton flashSelectionButton;
4779	5284	cButton editButton;
4780	5285	cButton uneditButton;
	5286	+ JCheckBox allParamsButton;
4781	5287	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5288	cButton unselectButton;
4784	5289
	5290	+ cButton minButton;
	5291	+ cButton maxButton;
	5292	+ cButton fullButton;
	5293	+ cButton undoButton;
	5294	+ cButton redoButton;
	5295	+ cButton saveButton;
	5296	+ cButton oneStepButton;
	5297	+
4785	5298	cButton screenfitButton;
4786	5299	cButton screenfitpointButton;
4787	5300	cButton snapobjectButton;
..	..	@@ -4792,14 +5305,6 @@
4792	5305	cButton closeButton;
4793	5306
4794	5307	cButton setsupportButton;
4795		-
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	5308
4804	5309	//
4805	5310	//Composite
..	..	@@ -4812,6 +5317,8 @@
4812	5317	private MenuItem lookFromItem;
4813	5318	private MenuItem switchItem;
4814	5319	private MenuItem cutItem;
	5320	+ private MenuItem undoItem;
	5321	+ private MenuItem redoItem;
4815	5322	private MenuItem duplicateItem;
4816	5323	private MenuItem cloneItem;
4817	5324	private MenuItem cloneSupportItem;
..	..	@@ -4823,8 +5330,9 @@
4823	5330	private MenuItem resetsupportItem;
4824	5331	private MenuItem resetreferencesItem;
4825	5332	private MenuItem linkverticesItem;
	5333	+ private MenuItem relinkverticesItem;
4826	5334	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5335	+ private MenuItem resetAllItem;
4828	5336	private MenuItem stepAllItem;
4829	5337	private MenuItem revertMeshItem;
4830	5338	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5343,17 @@
4835	5343	private MenuItem mergeGeometriesItem;
4836	5344	private MenuItem copyItem;
4837	5345	private MenuItem pasteItem;
	5346	+ private MenuItem pasteIntoItem;
4838	5347	private MenuItem pasteLinkItem;
4839	5348	private MenuItem pasteCloneItem;
4840	5349	private MenuItem pasteExpandItem;
4841	5350	private MenuItem clearItem;
4842	5351	private MenuItem clearAllItem;
4843	5352	private MenuItem genUVItem;
	5353	+ private MenuItem genNormalsMESHItem;
4844	5354	private MenuItem genNormalsCADItem;
4845	5355	private MenuItem genNormalsORGANItem;
	5356	+ private MenuItem genNormalsMINEItem;
4846	5357	private MenuItem stripifyItem;
4847	5358	private MenuItem unstripifyItem;
4848	5359	private MenuItem trimItem;
..	..	@@ -4871,6 +5382,10 @@
4871	5382	private MenuItem showleavesItem;
4872	5383	private MenuItem markleavesItem;
4873	5384	private MenuItem unmarkleavesItem;
	5385	+ private MenuItem rewindleavesItem;
	5386	+ private MenuItem unrewindleavesItem;
	5387	+ private MenuItem randomleavesItem;
	5388	+ private MenuItem unrandomleavesItem;
4874	5389
4875	5390	private MenuItem flipVItem;
4876	5391	private MenuItem unflipVItem;
..	..	@@ -4882,8 +5397,11 @@
4882	5397	private MenuItem panoTexturesItem;
4883	5398
4884	5399	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5400	+ private MenuItem resetCentroidXZItem;
4886	5401	private MenuItem resetTransformItem;
	5402	+ private MenuItem transformGeometryItem;
	5403	+ private MenuItem transformChildrenItem;
	5404	+ private MenuItem hideItem;
4887	5405	private MenuItem grabItem;
4888	5406	private MenuItem backItem;
4889	5407	private MenuItem frontItem;
..	..	@@ -4904,6 +5422,7 @@
4904	5422
4905	5423	private MenuItem resetParentItem;
4906	5424	private MenuItem repairParentItem;
	5425	+ private MenuItem repairShadowItem;
4907	5426	private MenuItem sortbysizeItem;
4908	5427	private MenuItem sortbynameItem;
4909	5428
..	..	@@ -4924,10 +5443,11 @@
4924	5443	private MenuItem coneItem;
4925	5444	private MenuItem torusItem;
4926	5445	private MenuItem superItem;
	5446	+ private MenuItem kleinItem;
4927	5447	private MenuItem blobItem;
4928	5448	private MenuItem latheItem;
4929	5449	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5450	+ private MenuItem overlayItem;
4931	5451	private MenuItem meshItem;
4932	5452	// private MenuItem meshGroupItem;
4933	5453	private MenuItem springItem;
..	..	@@ -4936,6 +5456,7 @@
4936	5456	private MenuItem csgItem;
4937	5457	private MenuItem templateItem;
4938	5458	private MenuItem textureItem;
	5459	+ private MenuItem billboardItem;
4939	5460	private MenuItem shadowXItem;
4940	5461	private MenuItem shadowYItem;
4941	5462	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5469,6 @@
4948	5469	private MenuItem doubleItem;
4949	5470	private MenuItem tripleItem;
4950	5471
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5472	private MenuItem computeAOItem;
4957	5473	private MenuItem recompileItem;
4958	5474	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5478,8 @@
4962	5478	private MenuItem analyzeItem;
4963	5479	private MenuItem dumpItem;
4964	5480	//boolean freezemodel = false;
	5481	+
	5482	+ Menu cameraMenu;
	5483	+ MenuItem editCameraItem;
	5484	+ MenuItem revertCameraItem;
4965	5485	}