~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,129 @@
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	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//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		-
	285	+ }
	286	+
192	287	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);
	288	+ if (Globals.ADVANCED)
	289	+ {
197	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	291	revertMeshItem.addActionListener(this);
199	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	293	resetreferencesItem.addActionListener(this);
201	294	menu.add("-");
	295	+ }
202	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	297	overwriteGeoItem.addActionListener(this);
204	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,17 +304,26 @@
210	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	305	overwriteUVItem.addActionListener(this);
212	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
213	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	310	generateMeshItem.addActionListener(this);
215	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	312	poseMeshItem.addActionListener(this);
217	313	menu.add("-");
	314	+ }
218	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	316	resetsupportItem.addActionListener(this);
220	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	318	linkverticesItem.addActionListener(this);
	319	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	320	+ relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
222	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	325	setMasterItem.addActionListener(this);
	326	+ }
224	327
225	328	oe.menuBar.add(menu = new Menu("Group"));
226	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -231,52 +334,69 @@
231	334	frontItem.addActionListener(this);
232	335	compositeItem = menu.add(new MenuItem("Composite"));
233	336	compositeItem.addActionListener(this);
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	338	+ hideItem.addActionListener(this);
	339	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	340	+ ungroupItem.addActionListener(this);
234	341	menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
236	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	345	switchGeoItem.addActionListener(this);
243	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	347	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
247	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	359	scriptNodeItem.addActionListener(this);
249	360	cameraItem = menu.add(new MenuItem("Camera"));
250	361	cameraItem.addActionListener(this);
	362	+ }
251	363
252	364	oe.menuBar.add(menu = new Menu("Object"));
253	365	textureItem = menu.add(new MenuItem("Texture"));
254	366	textureItem.addActionListener(this);
	367	+ billboardItem = menu.add(new MenuItem("Billboard"));
	368	+ billboardItem.addActionListener(this);
255	369	csgItem = menu.add(new MenuItem("CSG"));
256	370	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	372	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	374	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
263	380	linkerItem = menu.add(new MenuItem("Linker"));
264	381	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	382	attributeItem = menu.add(new MenuItem("Attribute"));
268	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
269	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	387	pointflowItem.addActionListener(this);
	388	+ }
271	389	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	391	resetTransformItem.addActionListener(this);
276	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	393	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
280	400
281	401	oe.menuBar.add(menu = new Menu("Geometry"));
282	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +407,11 @@
287	407	genNormalsCADItem.addActionListener(this);
288	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
290	415	stripifyItem = menu.add(new MenuItem("Stripify"));
291	416	stripifyItem.addActionListener(this);
292	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +433,34 @@
308	433	reduce34MeshItem.addActionListener(this);
309	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	435	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
315	444
316	445	oe.menuBar.add(menu = new Menu("Attributes"));
317	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	447	clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
319	452	menu.add("-");
320	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	454	liveleavesItem.addActionListener(this);
322	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
324	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	460	supportleavesItem.addActionListener(this);
326	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	462	unsupportleavesItem.addActionListener(this);
	463	+ }
328	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	465	hideleavesItem.addActionListener(this);
330	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +469,14 @@
333	469	markleavesItem.addActionListener(this);
334	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	471	unmarkleavesItem.addActionListener(this);
	472	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	473	+ rewindleavesItem.addActionListener(this);
	474	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	475	+ unrewindleavesItem.addActionListener(this);
	476	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	477	+ randomleavesItem.addActionListener(this);
	478	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	479	+ unrandomleavesItem.addActionListener(this);
336	480	menu.add("-");
337	481	flipVItem = menu.add(new MenuItem("Flip V"));
338	482	flipVItem.addActionListener(this);
..	..	@@ -368,35 +512,40 @@
368	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	513	sortbynameItem.addActionListener(this);
370	514	menu.add("-");
	515	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	516	+ shareGeometriesItem.addActionListener(this);
	517	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	518	+ mergeGeometriesItem.addActionListener(this);
	519	+ if (Globals.ADVANCED)
	520	+ {
	521	+ // Pretty much the same as duplicate and clone.
371	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	523	extractGeometriesItem.addActionListener(this);
373	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	525	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	526	+ }
379	527
380	528	oe.menuBar.add(menu = new Menu("Insert"));
381	529	buildCreateMenu(menu);
382	530
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	531	oe.menuBar.add(menu = new Menu("Tools"));
395	532	buildToolsMenu(menu);
396	533	}
397	534
398	535	void SetupUI2(ObjEditor oe)
399	536	{
	537	+ // June 2019
	538	+ if (oe == null)
	539	+ {
	540	+ //super.SetupUI2(this);
	541	+ //return;
	542	+ }
	543	+
	544	+ if (copy != group)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ }
	548	+
400	549	//new Exception().printStackTrace();
401	550
402	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -425,150 +574,120 @@
425	574	oe.radioPanel.add(dummyButton);
426	575	oe.buttonGroup.add(dummyButton);
427	576	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
431	578
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
433	605	liveCB.addItemListener(this);
434	606
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
453	613	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
460		-
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ trackCB.setToolTipText("Enable tracking");
495	617	trackCB.addItemListener(this);
496	618
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ screenfitButton.setToolTipText("Screen fit");
499	621	screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
	622	+
501	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	624	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	625
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Show selection");
514	635	flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518	636
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	638	+
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	640	+ twoButton.setToolTipText("Show center view only");
521	641	twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	643	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	644	+ fourButton.setToolTipText("Show left panel only");
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ sixButton.setToolTipText("2-column layout left");
525	647	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ threeButton.setToolTipText("2-column layout right");
527	650	threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ sevenButton.setToolTipText("3-column layout");
529	653	sevenButton.addActionListener(this);
530	654	//
531	655
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
533	658	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ closeButton.setToolTipText("Close tab");
536	662	closeButton.addActionListener(this);
537	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	664	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540	665
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
543	668	editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	669
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
549	672	uneditButton.addActionListener(this);
550	673
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	674	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	675	+ allParamsButton.setToolTipText("Edit all params");
563	676	allParamsButton.addActionListener(this);
564	677
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	678	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ clearPanelButton.setToolTipText("Clear edit panel");
	680	+ clearPanelButton.addActionListener(this);
	681	+
	682	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	683	+ unselectButton.setToolTipText("Unselect");
570	684	unselectButton.addActionListener(this);
571	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
572	691	// oe.aConstraints.gridx += 1;
573	692	// oe.aConstraints.weighty = 0;
574	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +699,37 @@
580	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	700	// gcButton.addActionListener(this);
582	701
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
594	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	706	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
596	707	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
601	711
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	712	+ cGridBag copyOptionsPanel = new cGridBag();
	713	+
	714	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	715	+ colorCB.setToolTipText("Copy color when dropped");
606	716	colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	717	+
	718	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	719	+ materialCB.setToolTipText("Copy material when dropped");
609	720	materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	721	+
	722	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	723	+ textureCB.setToolTipText("Copy texture when dropped");
612	724	textureCB.addItemListener(this);
613	725
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
616	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
617	733	//jList.addListSelectionListener(this);
618	734	oe.jTree.addTreeSelectionListener(this);
619	735	//jTree.setRootVisible(false);
..	..	@@ -635,20 +751,111 @@
635	751	radio.layout = sevenButton;
636	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	753	}
	754	+
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	756	+ {
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	758	+ boxCB.setToolTipText("Display bounding boxes");
	759	+ boxCB.addItemListener(this);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	762	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	763	+ zoomBoxCB.addItemListener(this);
	764	+
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
	767	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	768	+ supportCB.setToolTipText("Enable rigging");
	769	+ supportCB.addItemListener(this);
	770	+
	771	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	772	+ // localCB.addItemListener(this);
	773	+
	774	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	775	+ crowdCB.setToolTipText("Used for crowds");
	776	+ crowdCB.addItemListener(this);
	777	+
	778	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	779	+ smoothCB.setToolTipText("Snapping delay");
	780	+ smoothCB.addItemListener(this);
	781	+
	782	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	783	+ slowCB.setToolTipText("Smooth interpolation");
	784	+ slowCB.addItemListener(this);
	785	+
	786	+// constraints.gridy += 1;
	787	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	788	+// speakerMocapCB.addItemListener(this);
	789	+
	790	+ if (false)
	791	+ {
	792	+ // handled in scripts
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	795	+ speakerCameraCB.addItemListener(this);
	796	+
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	799	+ speakerFocusCB.addItemListener(this);
	800	+
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	803	+ smoothfocusCB.addItemListener(this);
	804	+ }
	805	+
	806	+//constraints.gridx += 1;
	807	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	808	+// debugCB.addItemListener(this);
	809	+
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
	812	+ oeilCB.addItemListener(this);
	813	+
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
	820	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	821	+ lookAtCB.setToolTipText("Look-at target");
	822	+ lookAtCB.addItemListener(this);
	823	+ }
	824	+
	825	+ }
	826	+
	827	+ cGridBag fill = new cGridBag();
	828	+
	829	+ fill.preferredHeight = 200;
	830	+
	831	+ panel.add(fill);
	832	+
	833	+ }
638	834
639	835	void EditObject(Object3D obj)
640	836	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	837	+ cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
	846	+ radioButton.SetObject(obj);
	847	+ radioButton.layout = sevenButton;
	848	+ radioButton.SetCamera(cameraView.renderCamera, false);
	849	+ radioButton.addActionListener(this);
	850	+ radioPanel.add(radioButton);
	851	+ buttonGroup.add(radioButton);
	852	+ radioButton.doClick();
649	853	}
	854	+
650	855	void SetupViews(ObjEditor oe)
651	856	{
	857	+ theFrame = this;
	858	+
652	859	oe.SetupViews();
653	860
654	861	System.out.println("SetupViews");
..	..	@@ -665,13 +872,16 @@
665	872	JCheckBox fastCB;
666	873	JCheckBox slowCB;
667	874	JCheckBox boxCB;
	875	+ JCheckBox zoomBoxCB;
668	876	JCheckBox trackCB;
669	877	JCheckBox smoothfocusCB;
670	878	// JCheckBox speakerMocapCB;
671	879	JCheckBox speakerCameraCB;
672	880	JCheckBox speakerFocusCB;
673	881	JCheckBox debugCB;
	882	+
674	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
675	885	JCheckBox lookAtCB;
676	886
677	887	// static int COLOR = 1;
..	..	@@ -707,10 +917,10 @@
707	917	dropAttributes \|= Object3D.TEXTURE;
708	918	else
709	919	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	920	+ } else if(e.getSource() == liveCB)
712	921	{
713	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
714	924	}
715	925	else if(e.getSource() == supportCB)
716	926	{
..	..	@@ -746,6 +956,10 @@
746	956	cameraView.repaint();
747	957	// refreshContents();
748	958	}
	959	+ else if(e.getSource() == zoomBoxCB)
	960	+ {
	961	+ cameraView.ToggleZoomBoxMode();
	962	+ }
749	963	else if(e.getSource() == smoothfocusCB)
750	964	{
751	965	cameraView.ToggleSmoothFocus();
..	..	@@ -770,6 +984,10 @@
770	984	else if(e.getSource() == oeilCB)
771	985	{
772	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
773	991	}
774	992	else if(e.getSource() == lookAtCB)
775	993	{
..	..	@@ -859,7 +1077,9 @@
859	1077	// objEditor.DropFile((java.io.File[]) object, true);
860	1078	// return;
861	1079	// }
862		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
863	1083	{
864	1084	// file(s)
865	1085	String[] names = string.split("\n");
..	..	@@ -886,7 +1106,7 @@
886	1106
887	1107	flashIt = false;
888	1108	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1111
892	1112	if (group.selection.size() == 1)
..	..	@@ -913,11 +1133,11 @@
913	1133	{
914	1134	loadClipboard(true);
915	1135	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
	1136	+ pasteInto(false, false);
917	1137	} else {
918	1138	loadClipboard(false);
919	1139	objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
	1140	+ pasteInto(false, false); // true); // ???
921	1141	}
922	1142	}
923	1143	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1035,29 +1255,37 @@
1035	1255	torusItem.addActionListener(this);
1036	1256	superItem = menu.add(new MenuItem("Superellipsoid"));
1037	1257	superItem.addActionListener(this);
	1258	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1259	+ kleinItem.addActionListener(this);
1038	1260	particleItem = menu.add(new MenuItem("Particle system"));
1039	1261	particleItem.addActionListener(this);
	1262	+ if (Globals.ADVANCED)
	1263	+ {
1040	1264	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1265	ragdollItem.addActionListener(this);
1042	1266	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1267	ragdoll2Item.addActionListener(this);
	1268	+ }
1044	1269	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1270	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1271	meshItem.addActionListener(this);
1047	1272	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1273	// meshGroupItem.addActionListener(this);
	1274	+ if (Globals.ADVANCED)
	1275	+ {
1049	1276	springItem = menu.add(new MenuItem("Spring"));
1050	1277	springItem.addActionListener(this);
1051	1278	flagItem = menu.add(new MenuItem("Flag"));
1052	1279	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1280	blobItem = menu.add(new MenuItem("Blob"));
1058	1281	blobItem.addActionListener(this);
1059	1282	latheItem = menu.add(new MenuItem("Lathe"));
1060	1283	latheItem.addActionListener(this);
	1284	+ }
	1285	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1286	+ bezierItem.addActionListener(this);
	1287	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1288	+ overlayItem.addActionListener(this);
1061	1289	lightItem = menu.add(new MenuItem("Light"));
1062	1290	lightItem.addActionListener(this);
1063	1291	menu.add("-");
..	..	@@ -1067,39 +1295,44 @@
1067	1295	loopItem.addActionListener(this);
1068	1296	doubleItem = menu.add(new MenuItem("Fork"));
1069	1297	doubleItem.addActionListener(this);
	1298	+ if (Globals.ADVANCED)
	1299	+ {
1070	1300	tripleItem = menu.add(new MenuItem("Trident"));
1071	1301	tripleItem.addActionListener(this);
	1302	+ }
1072	1303	}
1073	1304
1074	1305	void buildToolsMenu(Menu menu)
1075	1306	{
1076	1307	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1308	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1309	+ animationItem.setState(Globals.ANIMATION);
1079	1310
1080	1311	menu.add("-");
1081	1312	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1313	parseverticesItem.addActionListener(this);
1083	1314	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1315	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1316	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1317	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1318	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1319	reduceMorphItem.addActionListener(this);
1091	1320	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1321	reduce34MorphItem.addActionListener(this);
1093		-
	1322	+ menu.add("-");
1094	1323	menu.add(computeAOItem = new MenuItem("Compute AO"));
1095	1324	computeAOItem.addActionListener(this);
1096		- menu.add("-");
1097	1325
	1326	+ if (Globals.ADVANCED)
	1327	+ {
	1328	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1329	+ mirrorItem.addActionListener(this);
	1330	+ menu.add("-");
1098	1331	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	1332	memoryItem.addActionListener(this);
1100	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	1334	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1103	1336	dumpItem.addActionListener(this);
1104	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1105	1338	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +1341,8 @@
1108	1341	resetParentItem.addActionListener(this);
1109	1342	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1343	repairParentItem.addActionListener(this);
	1344	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1345	+ repairShadowItem.addActionListener(this);
1111	1346	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1347	invariantsItem.addActionListener(this);
1113	1348	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1350,7 @@
1115	1350	menu.add("-");
1116	1351	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1352	editScriptItem.addActionListener(this);
	1353	+ }
1118	1354	}
1119	1355
1120	1356	void ScreenFit()
..	..	@@ -1237,6 +1473,7 @@
1237	1473	shadow.material = new cMaterial(obj.material);
1238	1474	shadow.material.diffuse = 0.0001f;
1239	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1240	1477
1241	1478	makeSomething(shadow);
1242	1479	}
..	..	@@ -1443,9 +1680,9 @@
1443	1680
1444	1681	void Overwrite(int mask)
1445	1682	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1684	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1449	1686
1450	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1688	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1705,7 @@
1468	1705	//
1469	1706	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1707	{
	1708	+ Object source = event.getSource();
1471	1709	/*
1472	1710	if (event.getSource() == nameField)
1473	1711	{
..	..	@@ -1479,11 +1717,11 @@
1479	1717	}
1480	1718	else
1481	1719	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1720	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1721	{
1484	1722	ScreenFit();
1485	1723	} else
1486		- if (event.getSource() == switchItem)
	1724	+ if (source == switchItem)
1487	1725	{
1488	1726	cVector v1 = new cVector();
1489	1727	cVector v2 = new cVector();
..	..	@@ -1492,11 +1730,11 @@
1492	1730	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1731	objEditor.cameraView.repaint();
1494	1732	} else
1495		- if (event.getSource() == rectoidItem)
	1733	+ if (source == rectoidItem)
1496	1734	{
1497	1735	makeSomething(new Box());
1498	1736	} else
1499		- if (event.getSource() == particleItem)
	1737	+ if (source == particleItem)
1500	1738	{
1501	1739	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1740	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1755,9 @@
1517	1755	applyExample(particleGeom, "SMOKE");
1518	1756	makeSomething(particleGeom);
1519	1757	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1758	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1759	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1760	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1761
1524	1762	ragdoll.toParent = LA.newMatrix();
1525	1763	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +1775,7 @@
1537	1775	} else
1538	1776	/*
1539	1777	*/
1540		- if (event.getSource() == heightFieldItem)
	1778	+ if (source == heightFieldItem)
1541	1779	{
1542	1780	Object3D obj = new Object3D();
1543	1781
..	..	@@ -1575,27 +1813,31 @@
1575	1813
1576	1814	makeSomething(obj);
1577	1815	} else
1578		- if (event.getSource() == gridItem)
	1816	+ if (source == gridItem)
1579	1817	{
1580	1818	makeSomething(new Grid());
1581	1819	} else
1582		- if (event.getSource() == ellipsoidItem)
	1820	+ if (source == ellipsoidItem)
1583	1821	{
1584	1822	makeSomething(new Sphere());
1585	1823	} else
1586		- if (event.getSource() == coneItem)
	1824	+ if (source == coneItem)
1587	1825	{
1588	1826	makeSomething(new Cone());
1589	1827	} else
1590		- if (event.getSource() == torusItem)
	1828	+ if (source == torusItem)
1591	1829	{
1592	1830	makeSomething(new Torus());
1593	1831	} else
1594		- if (event.getSource() == superItem)
	1832	+ if (source == superItem)
1595	1833	{
1596	1834	makeSomething(new Superellipsoid());
1597	1835	} else
1598		- if (event.getSource() == blobItem)
	1836	+ if (source == kleinItem)
	1837	+ {
	1838	+ makeSomething(new Klein());
	1839	+ } else
	1840	+ if (source == blobItem)
1599	1841	{
1600	1842	Blob blob = new Blob();
1601	1843	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +1845,15 @@
1603	1845	//blob.retile();
1604	1846	makeSomething(blob);
1605	1847	} else
1606		- if (event.getSource() == latheItem)
	1848	+ if (source == latheItem)
1607	1849	{
1608	1850	makeSomething(new Lathe());
1609	1851	} else
1610		- if (event.getSource() == bezierItem)
	1852	+ if (source == bezierItem)
1611	1853	{
1612	1854	makeSomething(new BezierSurface());
1613	1855	} else
1614		- if (event.getSource() == checkerItem)
	1856	+ if (source == overlayItem)
1615	1857	{
1616	1858	/*
1617	1859	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +1868,7 @@
1626	1868	*/
1627	1869	makeSomething(new Checker());
1628	1870	} else
1629		- if (event.getSource() == meshItem)
	1871	+ if (source == meshItem)
1630	1872	{
1631	1873	Object3D itemtomake = new Object3D();
1632	1874	Object3D child;
..	..	@@ -1647,35 +1889,35 @@
1647	1889	makeSomething(child);
1648	1890	}
1649	1891	} else
1650		- if (event.getSource() == springItem)
	1892	+ if (source == springItem)
1651	1893	{
1652	1894	cSpring s = new cSpring();
1653	1895	s.setup();
1654	1896	makeSomething(s);
1655	1897	} else
1656		- if (event.getSource() == flagItem)
	1898	+ if (source == flagItem)
1657	1899	{
1658	1900	cSpring s = new cFlag();
1659	1901	s.setup();
1660	1902	makeSomething(s);
1661	1903	} else
1662		- if (event.getSource() == lightItem)
	1904	+ if (source == lightItem)
1663	1905	{
1664	1906	makeSomething(new Light());
1665	1907	} else
1666		- if (event.getSource() == csgItem)
	1908	+ if (source == csgItem)
1667	1909	{
1668	1910	group(new CSG());
1669	1911	} else
1670		- if (event.getSource() == templateItem)
	1912	+ if (source == templateItem)
1671	1913	{
1672	1914	group(new cTemplate());
1673	1915	} else
1674		- if (event.getSource() == attributeItem)
	1916	+ if (source == attributeItem)
1675	1917	{
1676	1918	makeSomething(new Attribute());
1677	1919	} else
1678		- if (event.getSource() == pointflowItem)
	1920	+ if (source == pointflowItem)
1679	1921	{
1680	1922	makeSomething(new PointFlow());
1681	1923	} else
..	..	@@ -1687,7 +1929,7 @@
1687	1929	} else
1688	1930	*/
1689	1931
1690		- if (event.getSource() == superLoopItem)
	1932	+ if (source == superLoopItem)
1691	1933	{
1692	1934	Composite g = new cGroup();
1693	1935	for (int i=0; i<15; i++)
..	..	@@ -1709,7 +1951,7 @@
1709	1951
1710	1952	group(g);
1711	1953	} else
1712		- if (event.getSource() == loopItem)
	1954	+ if (source == loopItem)
1713	1955	{
1714	1956	Composite csg = new GroupLeaf();
1715	1957	csg.count = 5;
..	..	@@ -1718,7 +1960,7 @@
1718	1960	csg.addChild(child);
1719	1961	child.addChild(csg);
1720	1962	} else
1721		- if (event.getSource() == doubleItem)
	1963	+ if (source == doubleItem)
1722	1964	{
1723	1965	Composite csg = new GroupLeaf();
1724	1966	csg.count = 5;
..	..	@@ -1730,7 +1972,7 @@
1730	1972	csg.addChild(child);
1731	1973	child.addChild(csg);
1732	1974	} else
1733		- if (event.getSource() == tripleItem)
	1975	+ if (source == tripleItem)
1734	1976	{
1735	1977	Composite csg = new GroupLeaf();
1736	1978	csg.count = 4;
..	..	@@ -1745,71 +1987,83 @@
1745	1987	csg.addChild(child);
1746	1988	child.addChild(csg);
1747	1989	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	1990	+ if (source == computeAOItem)
1750	1991	{
1751		- ImportGFD();
	1992	+ Globals.drawMode = CameraPane.OCCLUSION;
	1993	+ Globals.theRenderer.repaint();
1752	1994	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	1995	+ if (source == recompileItem)
1771	1996	{
1772	1997	Recompile();
1773	1998	refreshContents();
1774	1999	} else
1775		- if (event.getSource() == editScriptItem)
	2000	+ if (source == editScriptItem)
1776	2001	{
1777	2002	OpenDialog();
1778	2003	refreshContents();
1779	2004	} else
1780		- if (event.getSource() == invariantsItem)
	2005	+ if (source == invariantsItem)
1781	2006	{
1782	2007	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1784	2009	} else
1785		- if (event.getSource() == memoryItem)
	2010	+ if (source == memoryItem)
1786	2011	{
1787	2012	//System.out.println("Invariants:");
1788	2013	PrintMemory();
1789	2014	} else
1790		- if (event.getSource() == pathItem)
	2015	+ if (source == pathItem)
1791	2016	{
1792	2017	PrintPath();
1793	2018	} else
1794		- if (event.getSource() == analyzeItem)
	2019	+ if (source == analyzeItem)
1795	2020	{
1796	2021	AnalyzeObject();
1797	2022	} else
1798		- if (event.getSource() == dumpItem)
	2023	+ if (source == dumpItem)
1799	2024	{
1800	2025	DumpObject();
1801	2026	} else
1802		- if (event.getSource() == screenfitButton)
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
	2050	+ } else
	2051	+ if (source == oneStepButton)
	2052	+ {
	2053	+ Globals.ONESTEP = true;
	2054	+ cameraView.repaint();
	2055	+ } else
	2056	+ if (source == screenfitButton)
1803	2057	{
1804	2058	//Reload(lastConverter, lastFilename, true);
1805	2059	ScreenFit();
1806	2060	} else
1807		- if (event.getSource() == screenfitpointButton)
	2061	+ if (source == screenfitpointButton)
1808	2062	{
1809	2063	//Reload(lastConverter, lastFilename, true);
1810	2064	ScreenFitPoint();
1811	2065	} else
1812		- if (event.getSource() == snapobjectButton)
	2066	+ if (source == snapobjectButton)
1813	2067	{
1814	2068	//Reload(lastConverter, lastFilename, true);
1815	2069	SnapObject();
..	..	@@ -1820,13 +2074,13 @@
1820	2074	// Recompile();
1821	2075	// refreshContents();
1822	2076	// } else
1823		- if (event.getSource() == gcButton)
	2077	+ if (source == gcButton)
1824	2078	{
1825	2079	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2080	System.gc();
1827	2081	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2082	} else
1829		- if (event.getSource() == editLeafItem)
	2083	+ if (source == editLeafItem)
1830	2084	{
1831	2085	Object3D obj;
1832	2086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2094,74 @@
1840	2094	}
1841	2095	refreshContents(true);
1842	2096	} else
1843		- if (event.getSource() == openWindowItem)
	2097	+ if (source == openWindowItem)
1844	2098	{
1845	2099	EditSelection(true);
1846	2100	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2101	+ if (source == cutItem \|\| source == clearButton)
1848	2102	{
1849	2103	loadClipboard(true);
1850	2104	} else
1851		- if (event.getSource() == duplicateItem)
	2105	+ if (source == undoItem)
1852	2106	{
1853		- Object3D keep = GrafreeD.clipboard;
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
	2113	+ if (source == duplicateItem)
	2114	+ {
	2115	+ Object3D keep = Grafreed.clipboard;
1854	2116	loadClipboard(false);
1855	2117	paste(false);
1856		- GrafreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1857	2119	} else
1858		- if (event.getSource() == cloneItem)
	2120	+ if (source == cloneItem)
1859	2121	{
1860	2122	CloneSelection(false);
1861	2123	} else
1862		- if (event.getSource() == cloneSupportItem)
	2124	+ if (source == cloneSupportItem)
1863	2125	{
1864	2126	CloneSelection(true);
1865	2127	} else
1866		- if (event.getSource() == copyItem)
	2128	+ if (source == copyItem)
1867	2129	{
1868	2130	loadClipboard(false);
1869	2131	} else
1870		- if (event.getSource() == pasteItem)
	2132	+ if (source == pasteItem)
1871	2133	{
1872	2134	paste(false);
1873	2135	} else
1874		- if (event.getSource() == pasteLinkItem)
	2136	+ if (source == pasteIntoItem)
1875	2137	{
1876		- pasteInto(false);
	2138	+ pasteInto(true, false);
1877	2139	} else
1878		- if (event.getSource() == pasteCloneItem)
	2140	+ if (source == pasteLinkItem)
1879	2141	{
1880		- pasteInto(true);
	2142	+ pasteInto(false, false);
1881	2143	} else
1882		- if (event.getSource() == pasteExpandItem)
	2144	+ if (source == pasteCloneItem)
	2145	+ {
	2146	+ pasteInto(true, true);
	2147	+ } else
	2148	+ if (source == pasteExpandItem)
1883	2149	{
1884	2150	paste(true);
1885	2151	} else
1886		- if (event.getSource() == synchronizeItem)
	2152	+ if (source == synchronizeItem)
1887	2153	{
1888	2154	Overwrite(Object3D.TRANSFORM);
1889	2155	} else
1890		- if (event.getSource() == overwriteNameItem)
	2156	+ if (source == overwriteNameItem)
1891	2157	{
1892	2158	Overwrite(Object3D.NAME);
1893	2159	} else
1894		- if (event.getSource() == overwriteUVItem)
	2160	+ if (source == overwriteUVItem)
1895	2161	{
1896	2162	Overwrite(Object3D.UV);
1897	2163	} else
1898		- if (event.getSource() == overwriteMatItem)
	2164	+ if (source == overwriteMatItem)
1899	2165	{
1900	2166	/* july 2015
1901	2167	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2181,7 @@
1915	2181
1916	2182	Overwrite(dropAttributes);
1917	2183	}
1918		- if (event.getSource() == overwriteGeoItem)
	2184	+ if (source == overwriteGeoItem)
1919	2185	{
1920	2186	Overwrite(Object3D.GEOMETRY);
1921	2187	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2198,7 @@
1932	2198	// refreshContents();
1933	2199	// }
1934	2200	} else
1935		- if (event.getSource() == generateMeshItem)
	2201	+ if (source == generateMeshItem)
1936	2202	{
1937	2203	//if (group.selection.size() == 1)
1938	2204	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2209,7 @@
1943	2209	ResetModel();
1944	2210	refreshContents();
1945	2211	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2212	+ if (source == extractGeometriesItem)
1947	2213	{
1948	2214	boolean one = false;
1949	2215
..	..	@@ -1970,7 +2236,7 @@
1970	2236	ResetModel();
1971	2237	refreshContents();
1972	2238	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2239	+ if (source == cloneGeometriesItem)
1974	2240	{
1975	2241	boolean one = false;
1976	2242
..	..	@@ -1996,32 +2262,37 @@
1996	2262	ResetModel();
1997	2263	refreshContents();
1998	2264	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2265	+ if (source == shareGeometriesItem)
2000	2266	{
2001	2267	boolean one = false;
2002	2268
2003	2269	if (group.selection.size() == 1)
2004	2270	one = true;
2005	2271
	2272	+ Object3D merge = null;
	2273	+
2006	2274	Object3D content = new cGroup();
2007	2275
2008	2276	for (int i=0; i<group.selection.size(); i++)
2009	2277	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2278	+ merge = new Merge(group.selection.get(i));
2011	2279
2012	2280	if (one)
2013		- makeSomething(sel, false);
	2281	+ makeSomething(merge, false);
2014	2282	else
2015		- content.addChild(sel);
	2283	+ content.addChild(merge);
2016	2284	}
2017	2285
2018	2286	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2287	+ makeSomething(content, true);
	2288	+ else
	2289	+ {
	2290	+ ResetModel();
	2291	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2292	+ refreshContents();
	2293	+ }
2023	2294	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2295	+ if (source == mergeGeometriesItem)
2025	2296	{
2026	2297	boolean one = false;
2027	2298
..	..	@@ -2051,7 +2322,7 @@
2051	2322	ResetModel();
2052	2323	refreshContents();
2053	2324	} else
2054		- if (event.getSource() == linkverticesItem)
	2325	+ if (source == linkverticesItem)
2055	2326	{
2056	2327	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2328	// {
..	..	@@ -2064,39 +2335,48 @@
2064	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2336	// refreshContents();
2066	2337	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2339	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2070	2341
2071	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2343	content = ((cGroup)content).get(0);
2073	2344
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2345	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2346	for (int i=0; i<group.selection.size(); i++)
2076	2347	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2348	+ boolean random = CameraPane.SWITCH;
	2349	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2350	group.selection.get(i).linkVerticesThis(content);
2080	2351	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2352	+ CameraPane.SWITCH = random;
2082	2353	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2354	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2355	refreshContents();
2085	2356	}
2086	2357	} else
2087		- if (event.getSource() == resetsupportItem)
	2358	+ if (source == resetsupportItem)
2088	2359	{
2089	2360	for (int i=0; i<group.selection.size(); i++)
2090	2361	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2362	+ boolean random = CameraPane.SWITCH;
	2363	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2364	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2365	+ CameraPane.SWITCH = random;
2095	2366	}
2096	2367
2097	2368	refreshContents();
2098	2369	} else
2099		- if (event.getSource() == resetreferencesItem)
	2370	+ if (source == relinkverticesItem)
	2371	+ {
	2372	+ boolean random = CameraPane.SWITCH;
	2373	+ CameraPane.SWITCH = false; // parse all random nodes
	2374	+ group.selection.RelinkToSupport();
	2375	+ CameraPane.SWITCH = random;
	2376	+
	2377	+ refreshContents();
	2378	+ } else
	2379	+ if (source == resetreferencesItem)
2100	2380	{
2101	2381	for (int i=0; i<group.selection.size(); i++)
2102	2382	{
..	..	@@ -2105,11 +2385,11 @@
2105	2385
2106	2386	refreshContents();
2107	2387	} else
2108		- if (event.getSource() == setMasterItem)
	2388	+ if (source == setMasterItem)
2109	2389	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2391	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2113	2393
2114	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2395	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2398,13 @@
2118	2398	refreshContents();
2119	2399	}
2120	2400	} else
2121		- if (event.getSource() == poseMeshItem)
	2401	+ if (source == poseMeshItem)
2122	2402	{
2123	2403	if (group.selection.size() == 1)
2124	2404	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2126	2406	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2128	2408
2129	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2410	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2417,19 @@
2137	2417	}
2138	2418
2139	2419	} else
2140		- if (event.getSource() == revertMeshItem)
	2420	+ if (source == revertMeshItem)
2141	2421	{
2142	2422	RevertMeshes();
2143	2423	} else
2144		- if (event.getSource() == resetMeshItem)
	2424	+ if (source == resetAllItem)
2145	2425	{
2146	2426	ResetAll();
2147	2427	} else
2148		- if (event.getSource() == stepAllItem)
	2428	+ if (source == stepAllItem)
2149	2429	{
2150	2430	StepAll();
2151	2431	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2432	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2153	2433	{
2154	2434	//int indices[] = jList.getSelectedIndices();
2155	2435	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2437,46 @@
2157	2437
2158	2438	ClearSelection(false);
2159	2439	} else
2160		- if (event.getSource() == clearAllItem)
	2440	+ if (source == clearAllItem)
2161	2441	{
2162	2442	ClearSelection(true);
2163	2443	} else
2164		- if (event.getSource() == grabItem)
	2444	+ if (source == grabItem)
2165	2445	{
2166	2446	group(new cGroup(), true);
2167	2447	} else
2168		- if (event.getSource() == frontItem)
	2448	+ if (source == hideItem)
	2449	+ {
	2450	+ group(new HiddenObject());
	2451	+ } else
	2452	+ if (source == frontItem)
2169	2453	{
2170	2454	front();
2171	2455	} else
2172		- if (event.getSource() == backItem)
	2456	+ if (source == backItem)
2173	2457	{
2174	2458	back();
2175	2459	} else
2176		- if (event.getSource() == cameraItem)
	2460	+ if (source == cameraItem)
2177	2461	{
2178	2462	makeSomething(new Camera());
2179	2463	} else
2180		- if (event.getSource() == compositeItem)
	2464	+ if (source == compositeItem)
2181	2465	{
2182	2466	group(new Composite());
2183	2467	} else
2184		- if (event.getSource() == randomItem)
	2468	+ if (source == randomItem)
2185	2469	{
2186	2470	RandomNode random = new RandomNode();
2187	2471	group(random);
2188	2472	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2473	+ random.name = random.get(0).name + "Switch";
2190	2474	} else
2191		- if (event.getSource() == physicsItem)
	2475	+ if (source == physicsItem)
2192	2476	{
2193	2477	group(new PhysicsNode());
2194	2478	} else
2195		- if (event.getSource() == frameselectorItem)
	2479	+ if (source == frameselectorItem)
2196	2480	{
2197	2481	for (int i=0; i<group.selection.size(); i++)
2198	2482	{
..	..	@@ -2204,7 +2488,7 @@
2204	2488	ResetModel();
2205	2489	refreshContents();
2206	2490	} else
2207		- if (event.getSource() == switchGeoItem)
	2491	+ if (source == switchGeoItem)
2208	2492	{
2209	2493	for (int i=0; i<group.selection.size(); i++)
2210	2494	{
..	..	@@ -2216,7 +2500,7 @@
2216	2500	ResetModel();
2217	2501	refreshContents();
2218	2502	} else
2219		- if (event.getSource() == switchTransfoItem)
	2503	+ if (source == switchTransfoItem)
2220	2504	{
2221	2505	for (int i=0; i<group.selection.size(); i++)
2222	2506	{
..	..	@@ -2228,7 +2512,7 @@
2228	2512	ResetModel();
2229	2513	refreshContents();
2230	2514	} else
2231		- if (event.getSource() == morphItem)
	2515	+ if (source == morphItem)
2232	2516	{
2233	2517	for (int i=0; i<group.selection.size(); i++)
2234	2518	{
..	..	@@ -2240,7 +2524,7 @@
2240	2524	ResetModel();
2241	2525	refreshContents();
2242	2526	} else
2243		- if (event.getSource() == scriptNodeItem)
	2527	+ if (source == scriptNodeItem)
2244	2528	{
2245	2529	boolean atleastone = false;
2246	2530
..	..	@@ -2279,199 +2563,239 @@
2279	2563	}
2280	2564	}
2281	2565	} else
2282		- if (event.getSource() == linkerItem)
	2566	+ if (source == linkerItem)
2283	2567	{
2284	2568	group(new cLinker());
2285	2569	} else
2286		- if (event.getSource() == textureItem)
	2570	+ if (source == textureItem)
2287	2571	{
2288	2572	group(new TextureNode());
2289	2573	} else
2290		- if (event.getSource() == shadowXItem)
	2574	+ if (source == billboardItem)
	2575	+ {
	2576	+ group(new BillboardNode());
	2577	+ } else
	2578	+ if (source == shadowXItem)
2291	2579	{
2292	2580	CastShadow(0);
2293	2581	} else
2294		- if (event.getSource() == shadowYItem)
	2582	+ if (source == shadowYItem)
2295	2583	{
2296	2584	CastShadow(1);
2297	2585	} else
2298		- if (event.getSource() == shadowZItem)
	2586	+ if (source == shadowZItem)
2299	2587	{
2300	2588	CastShadow(2);
2301	2589	} else
2302		- if (event.getSource() == ungroupItem)
	2590	+ if (source == ungroupItem)
2303	2591	{
2304		- ungroup();
	2592	+ //ungroup();
	2593	+ for (int i=0; i<group.selection.size(); i++)
	2594	+ {
	2595	+ Ungroup(group.selection.get(i));
	2596	+ }
	2597	+
	2598	+ ClearSelection(false);
	2599	+
	2600	+ refreshContents();
2305	2601	} else
2306		- if (event.getSource() == genUVItem)
	2602	+ if (source == genUVItem)
2307	2603	{
2308	2604	GenUV();
2309	2605	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2606	+ if (source == genNormalsCADItem)
2311	2607	{
2312	2608	GenNormals(true);
2313	2609	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2610	+ if (source == genNormalsMESHItem)
2315	2611	{
2316		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2317	2613	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2614	+ if (source == genNormalsORGANItem)
2319	2615	{
2320	2616	GenNormals(false);
2321	2617	} else
2322		- if (event.getSource() == stripifyItem)
	2618	+ if (source == genNormalsMINEItem)
	2619	+ {
	2620	+ GenNormalsMINE();
	2621	+ } else
	2622	+ if (source == stripifyItem)
2323	2623	{
2324	2624	Stripify();
2325	2625	} else
2326		- if (event.getSource() == unstripifyItem)
	2626	+ if (source == unstripifyItem)
2327	2627	{
2328	2628	Unstripify();
2329	2629	} else
2330		- if (event.getSource() == trimItem)
	2630	+ if (source == trimItem)
2331	2631	{
2332	2632	Trim();
2333	2633	} else
2334		- if (event.getSource() == untrimItem)
	2634	+ if (source == untrimItem)
2335	2635	{
2336	2636	Untrim();
2337	2637	} else
2338		- if (event.getSource() == clearColorsItem)
	2638	+ if (source == clearColorsItem)
2339	2639	{
2340	2640	ClearColors();
2341	2641	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2642	+ if (source == clearMaterialsItem)
2343	2643	{
2344	2644	ClearMaterials();
2345	2645	} else
2346		- if (event.getSource() == liveleavesItem)
	2646	+ if (source == liveleavesItem)
2347	2647	{
2348	2648	LiveLeaves(true);
2349	2649	} else
2350		- if (event.getSource() == unliveleavesItem)
	2650	+ if (source == unliveleavesItem)
2351	2651	{
2352	2652	LiveLeaves(false);
2353	2653	} else
2354		- if (event.getSource() == supportleavesItem)
	2654	+ if (source == supportleavesItem)
2355	2655	{
2356	2656	SupportLeaves(true);
2357	2657	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2658	+ if (source == unsupportleavesItem)
2359	2659	{
2360	2660	SupportLeaves(false);
2361	2661	} else
2362		- if (event.getSource() == hideleavesItem)
	2662	+ if (source == hideleavesItem)
2363	2663	{
2364	2664	HideLeaves(true);
2365	2665	} else
2366		- if (event.getSource() == showleavesItem)
	2666	+ if (source == showleavesItem)
2367	2667	{
2368	2668	HideLeaves(false);
2369	2669	} else
2370		- if (event.getSource() == markleavesItem)
	2670	+ if (source == markleavesItem)
2371	2671	{
2372	2672	MarkLeaves(true);
2373	2673	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2674	+ if (source == unmarkleavesItem)
2375	2675	{
2376	2676	MarkLeaves(false);
2377	2677	} else
2378		- if (event.getSource() == flipVItem)
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
	2693	+ } else
	2694	+ if (source == flipVItem)
2379	2695	{
2380	2696	FlipV(true);
2381	2697	} else
2382		- if (event.getSource() == unflipVItem)
	2698	+ if (source == unflipVItem)
2383	2699	{
2384	2700	FlipV(false);
2385	2701	} else
2386		- if (event.getSource() == lowTexturesItem)
	2702	+ if (source == lowTexturesItem)
2387	2703	{
2388	2704	SetTexRes(0);
2389	2705	} else
2390		- if (event.getSource() == normalTexturesItem)
	2706	+ if (source == normalTexturesItem)
2391	2707	{
2392	2708	SetTexRes(1);
2393	2709	} else
2394		- if (event.getSource() == highTexturesItem)
	2710	+ if (source == highTexturesItem)
2395	2711	{
2396	2712	SetTexRes(2);
2397	2713	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2714	+ if (source == veryhighTexturesItem)
2399	2715	{
2400	2716	SetTexRes(3);
2401	2717	} else
2402		- if (event.getSource() == maxTexturesItem)
	2718	+ if (source == maxTexturesItem)
2403	2719	{
2404	2720	SetTexRes(4);
2405	2721	} else
2406		- if (event.getSource() == panoTexturesItem)
	2722	+ if (source == panoTexturesItem)
2407	2723	{
2408	2724	SetTexRes(5);
2409	2725	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2726	+ if (source == reverseNormalsItem)
2411	2727	{
2412	2728	ReverseNormals();
2413	2729	} else
2414		- if (event.getSource() == parseverticesItem)
	2730	+ if (source == parseverticesItem)
2415	2731	{
2416	2732	ParseVertices();
2417	2733	} else
2418		- if (event.getSource() == textureFieldItem)
	2734	+ if (source == textureFieldItem)
2419	2735	{
2420	2736	TextureVertices();
2421	2737	} else
2422		- if (event.getSource() == alignItem)
	2738	+ if (source == alignItem)
2423	2739	{
2424	2740	Align();
2425	2741	} else
2426		- if (event.getSource() == mirrorItem)
	2742	+ if (source == mirrorItem)
2427	2743	{
2428	2744	MirrorPoses();
2429	2745	} else
2430		- if (event.getSource() == reduceMorphItem)
	2746	+ if (source == reduceMorphItem)
2431	2747	{
2432	2748	MeshReduction(false);
2433	2749	} else
2434		- if (event.getSource() == reduce34MorphItem)
	2750	+ if (source == reduce34MorphItem)
2435	2751	{
2436	2752	MeshReduction(true);
2437	2753	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	2754	+ if (source == reverseTrianglesItem)
2439	2755	{
2440	2756	ReverseTriangles();
2441	2757	} else
2442		- if (event.getSource() == reduceMeshItem)
	2758	+ if (source == reduceMeshItem)
2443	2759	{
2444	2760	ReduceMesh(false);
2445	2761	} else
2446		- if (event.getSource() == reduce34MeshItem)
	2762	+ if (source == reduce34MeshItem)
2447	2763	{
2448	2764	ReduceMesh(true);
2449	2765	} else
2450		- if (event.getSource() == increaseMeshItem)
	2766	+ if (source == increaseMeshItem)
2451	2767	{
2452	2768	IncreaseMesh();
2453	2769	} else
2454		- if (event.getSource() == clipMeshItem)
	2770	+ if (source == clipMeshItem)
2455	2771	{
2456	2772	ClipMesh();
2457	2773	} else
2458		- if (event.getSource() == smoothMeshItem)
	2774	+ if (source == smoothMeshItem)
2459	2775	{
2460	2776	SmoothMesh();
2461	2777	} else
2462		- if (event.getSource() == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2463	2779	{
2464	2780	TransformGeometry();
2465	2781	} else
2466		- if (event.getSource() == resetTransformItem)
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
	2785	+ } else
	2786	+ if (source == resetTransformItem)
2467	2787	{
2468	2788	ResetTransform();
2469	2789	} else
2470		- if (event.getSource() == resetCentroidItem)
	2790	+ if (source == resetCentroidItem)
2471	2791	{
2472		- ResetCentroid();
	2792	+ ResetCentroid(true);
2473	2793	} else
2474		- if (event.getSource() == resetParentItem)
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
	2797	+ } else
	2798	+ if (source == resetParentItem)
2475	2799	{
2476	2800	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2801	{
..	..	@@ -2481,7 +2805,7 @@
2481	2805
2482	2806	refreshContents();
2483	2807	} else
2484		- if (event.getSource() == repairParentItem)
	2808	+ if (source == repairParentItem)
2485	2809	{
2486	2810	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	2811	{
..	..	@@ -2495,7 +2819,21 @@
2495	2819
2496	2820	refreshContents();
2497	2821	} else
2498		- if (event.getSource() == sortbysizeItem)
	2822	+ if (source == repairShadowItem)
	2823	+ {
	2824	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2825	+ {
	2826	+ Object3D obj = (Object3D)e.nextElement();
	2827	+ obj.RepairShadow();
	2828	+// for (int i=0; i<obj.size(); i++)
	2829	+// {
	2830	+// obj.get(i).parent = obj;
	2831	+// }
	2832	+ }
	2833	+
	2834	+ refreshContents();
	2835	+ } else
	2836	+ if (source == sortbysizeItem)
2499	2837	{
2500	2838	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	2839	{
..	..	@@ -2507,7 +2845,7 @@
2507	2845	ResetModel();
2508	2846	refreshContents();
2509	2847	} else
2510		- if (event.getSource() == sortbynameItem)
	2848	+ if (source == sortbynameItem)
2511	2849	{
2512	2850	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	2851	{
..	..	@@ -2519,7 +2857,7 @@
2519	2857	ResetModel();
2520	2858	refreshContents();
2521	2859	} else
2522		- if (event.getSource() == attachPigmentItem)
	2860	+ if (source == attachPigmentItem)
2523	2861	{
2524	2862	String texture = GetFile("Attach pigment");
2525	2863	Object3D obj;
..	..	@@ -2531,7 +2869,7 @@
2531	2869
2532	2870	refreshContents();
2533	2871	} else
2534		- if (event.getSource() == detachPigmentItem)
	2872	+ if (source == detachPigmentItem)
2535	2873	{
2536	2874	Object3D obj;
2537	2875	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +2880,7 @@
2542	2880
2543	2881	refreshContents();
2544	2882	} else
2545		- if (event.getSource() == attachBumpItem)
	2883	+ if (source == attachBumpItem)
2546	2884	{
2547	2885	String texture = GetFile("Attach bump");
2548	2886	Object3D obj;
..	..	@@ -2554,7 +2892,7 @@
2554	2892
2555	2893	refreshContents();
2556	2894	} else
2557		- if (event.getSource() == detachBumpItem)
	2895	+ if (source == detachBumpItem)
2558	2896	{
2559	2897	Object3D obj;
2560	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2565,7 +2903,7 @@
2565	2903
2566	2904	refreshContents();
2567	2905	} else
2568		- if (event.getSource() == pigmentBumpItem)
	2906	+ if (source == pigmentBumpItem)
2569	2907	{
2570	2908	Object3D obj;
2571	2909	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +2914,221 @@
2576	2914
2577	2915	refreshContents();
2578	2916	} else
2579		- if (event.getSource() == flashSelectionButton)
	2917	+ if (source == flashSelectionButton)
2580	2918	{
2581	2919	CameraPane.flash = true;
2582	2920	refreshContents();
2583	2921	} else
2584		- if (event.getSource() == oneButton)
	2922	+ if (source == oneButton)
2585	2923	{
2586	2924	} else
2587		- if (event.getSource() == twoButton)
	2925	+ if (source == twoButton)
2588	2926	{
2589	2927	radio.layout = twoButton;
2590	2928	// bug
2591	2929	//gridPanel.setDividerLocation(1.0);
2592	2930	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	2931	+// bigThree.remove(scenePanel);
	2932	+// bigThree.remove(centralPanel);
	2933	+// bigThree.remove(XYZPanel);
	2934	+// aWindowConstraints.gridx = 0;
	2935	+// aWindowConstraints.gridy = 0;
	2936	+// aWindowConstraints.gridwidth = 1;
	2937	+// // aConstraints.gridheight = 3;
	2938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2939	+// aWindowConstraints.weightx = 0;
	2940	+// aWindowConstraints.weighty = 1;
	2941	+// //bigThree.add(jtp, aWindowConstraints);
	2942	+// aWindowConstraints.weightx = 1;
	2943	+// aWindowConstraints.gridwidth = 3;
	2944	+// // aConstraints.gridheight = 3;
	2945	+// aWindowConstraints.gridx = 1;
	2946	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2947	+// bigThree.add(centralPanel, aWindowConstraints);
	2948	+// aWindowConstraints.weightx = 0;
	2949	+// aWindowConstraints.gridx = 4;
	2950	+// aWindowConstraints.gridwidth = 1;
	2951	+// // aConstraints.gridheight = 3;
	2952	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2953	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2954	+// scenePanel.setVisible(false);
	2955	+// centralPanel.setVisible(true);
	2956	+// XYZPanel.setVisible(false);
	2957	+ bigThree.ClearUI();
	2958	+ bigThree.add(centralPanel);
	2959	+ bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2617	2978	} else
2618		- if (event.getSource() == threeButton)
	2979	+ if (source == threeButton)
2619	2980	{
2620	2981	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	2982	+
	2983	+// bigThree.remove(scenePanel);
	2984	+// bigThree.remove(centralPanel);
	2985	+// bigThree.remove(XYZPanel);
	2986	+// aWindowConstraints.gridx = 0;
	2987	+// aWindowConstraints.gridy = 0;
	2988	+// aWindowConstraints.gridwidth = 1;
	2989	+// // aConstraints.gridheight = 3;
	2990	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2991	+// aWindowConstraints.weightx = 0;
	2992	+// aWindowConstraints.weighty = 1;
	2993	+// //bigThree.add(jtp, aWindowConstraints);
	2994	+// aWindowConstraints.weightx = 1;
	2995	+// aWindowConstraints.gridwidth = 3;
	2996	+// // aConstraints.gridheight = 3;
	2997	+// aWindowConstraints.gridx = 1;
	2998	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2999	+// bigThree.add(centralPanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 0;
	3001	+// aWindowConstraints.gridx = 4;
	3002	+// aWindowConstraints.gridwidth = 1;
	3003	+// // aConstraints.gridheight = 3;
	3004	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3005	+// bigThree.add(XYZPanel, aWindowConstraints);
	3006	+// bigThree.validate();
	3007	+// scenePanel.setVisible(false);
	3008	+// centralPanel.setVisible(true);
	3009	+// XYZPanel.setVisible(true);
	3010	+ bigThree.ClearUI();
	3011	+ bigThree.add(centralPanel);
	3012	+ bigThree.add(XYZPanel);
	3013	+ bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2645	3016	} else
2646		- if (event.getSource() == fourButton)
	3017	+ if (source == fourButton)
2647	3018	{
2648	3019	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	3020	+
	3021	+// bigThree.remove(scenePanel);
	3022	+// bigThree.remove(centralPanel);
	3023	+// bigThree.remove(XYZPanel);
	3024	+// aWindowConstraints.gridx = 0;
	3025	+// aWindowConstraints.gridy = 0;
	3026	+// aWindowConstraints.gridwidth = 1;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3029	+// aWindowConstraints.weightx = 1;
	3030	+// aWindowConstraints.weighty = 1;
	3031	+// bigThree.add(scenePanel, aWindowConstraints);
	3032	+// aWindowConstraints.weightx = 1;
	3033	+// aWindowConstraints.gridwidth = 3;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.gridx = 1;
	3036	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3037	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3038	+// aWindowConstraints.weightx = 0;
	3039	+// aWindowConstraints.gridx = 4;
	3040	+// aWindowConstraints.gridwidth = 1;
	3041	+// // aWindowConstraints.gridheight = 3;
	3042	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3043	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3044	+// bigThree.validate();
	3045	+// scenePanel.setVisible(true);
	3046	+// centralPanel.setVisible(false);
	3047	+// XYZPanel.setVisible(false);
	3048	+ bigThree.ClearUI();
	3049	+ bigThree.add(scenePanel);
	3050	+ bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2673	3053	} else
2674		- if (event.getSource() == sixButton)
	3054	+ if (source == sixButton)
2675	3055	{
2676	3056	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3057	+
	3058	+// bigThree.remove(scenePanel);
	3059	+// bigThree.remove(centralPanel);
	3060	+// bigThree.remove(XYZPanel);
	3061	+// aWindowConstraints.gridx = 0;
	3062	+// aWindowConstraints.gridy = 0;
	3063	+// aWindowConstraints.gridwidth = 1;
	3064	+// // aConstraints.gridheight = 3;
	3065	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3066	+// aWindowConstraints.weightx = 0;
	3067	+// aWindowConstraints.weighty = 1;
	3068	+// bigThree.add(scenePanel, aWindowConstraints);
	3069	+// aWindowConstraints.weightx = 1;
	3070	+// aWindowConstraints.gridwidth = 3;
	3071	+// // aWindowConstraints.gridheight = 3;
	3072	+// aWindowConstraints.gridx = 1;
	3073	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3074	+// bigThree.add(centralPanel, aWindowConstraints);
	3075	+// aWindowConstraints.weightx = 0;
	3076	+// aWindowConstraints.gridx = 4;
	3077	+// aWindowConstraints.gridwidth = 1;
	3078	+// // aWindowConstraints.gridheight = 3;
	3079	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3080	+// //bigThree.add(XYZPanel, aConstraints);
	3081	+// bigThree.validate();
	3082	+// scenePanel.setVisible(true);
	3083	+// centralPanel.setVisible(true);
	3084	+// XYZPanel.setVisible(false);
	3085	+ bigThree.ClearUI();
	3086	+ bigThree.add(scenePanel);
	3087	+ bigThree.add(centralPanel);
	3088	+ bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2701	3091	} else
2702		- if (event.getSource() == sevenButton)
	3092	+ if (source == sevenButton)
2703	3093	{
2704	3094	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3095	+
	3096	+// bigThree.remove(scenePanel);
	3097	+// bigThree.remove(centralPanel);
	3098	+// bigThree.remove(XYZPanel);
	3099	+// aWindowConstraints.gridx = 0;
	3100	+// aWindowConstraints.gridy = 0;
	3101	+// aWindowConstraints.gridwidth = 1;
	3102	+// // aWindowConstraints.gridheight = 3;
	3103	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3104	+// aWindowConstraints.weightx = 0;
	3105	+// aWindowConstraints.weighty = 1;
	3106	+// bigThree.add(scenePanel, aWindowConstraints);
	3107	+// aWindowConstraints.weightx = 1;
	3108	+// aWindowConstraints.gridwidth = 3;
	3109	+// // aWindowConstraints.gridheight = 3;
	3110	+// aWindowConstraints.gridx = 1;
	3111	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3112	+// bigThree.add(centralPanel, aWindowConstraints);
	3113	+// aWindowConstraints.weightx = 0;
	3114	+// aWindowConstraints.gridx = 4;
	3115	+// aWindowConstraints.gridwidth = 1;
	3116	+// // aConstraints.gridheight = 3;
	3117	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3118	+// bigThree.add(XYZPanel, aWindowConstraints);
	3119	+// bigThree.validate();
	3120	+// scenePanel.setVisible(true);
	3121	+// centralPanel.setVisible(true);
	3122	+// XYZPanel.setVisible(true);
	3123	+ bigThree.ClearUI();
	3124	+ bigThree.add(scenePanel);
	3125	+ bigThree.add(centralPanel);
	3126	+ bigThree.add(XYZPanel);
	3127	+ bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2729	3130	} else
2730		- if (event.getSource() == rootButton)
	3131	+ if (source == rootButton)
2731	3132	{
2732	3133	Object3D obj;
2733	3134	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2737,17 +3138,24 @@
2737	3138	EditObject(obj);
2738	3139	}
2739	3140
	3141	+ cameraView.requestFocusInWindow();
2740	3142	refreshContents(true);
2741	3143	} else
2742		- if (event.getSource() == closeButton)
	3144	+ if (source == closeButton)
2743	3145	{
2744	3146	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3147	cRadio ab;
2746	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3149	{
2748	3150	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2751	3159	buttonGroup.remove(ab);
2752	3160	radioPanel.remove(ab);
2753	3161
..	..	@@ -2758,13 +3166,15 @@
2758	3166	break;
2759	3167	}
2760	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2761	3171	refreshContents(true);
2762	3172	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3173	+ if (source == editItem \|\| source == editButton)
2764	3174	{
2765	3175	EditSelection(false);
2766	3176	} else
2767		- if (event.getSource() == uneditButton)
	3177	+ if (source == uneditButton)
2768	3178	{
2769	3179	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3180	{
..	..	@@ -2774,14 +3184,14 @@
2774	3184	child.CloseUI();
2775	3185	listUI.remove(child);
2776	3186
2777		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2778	3188	}
2779		- objEditor.ctrlPanel.revalidate();
	3189	+ objEditor.ctrlPanel.FlushUI();
2780	3190	//objEditor.jTree.clearSelection();
2781	3191	//objEditor.ResetSliders();
2782	3192	refreshContents(true);
2783	3193	} else
2784		- if (event.getSource() == clearPanelButton)
	3194	+ if (source == clearPanelButton)
2785	3195	{
2786	3196	assert(copy == group);
2787	3197	//copy.ClearUI();
..	..	@@ -2792,7 +3202,7 @@
2792	3202	listUI.clear();
2793	3203	refreshContents(true);
2794	3204	} else
2795		- if (event.getSource() == allParamsButton)
	3205	+ if (source == allParamsButton)
2796	3206	{
2797	3207	assert(copy == group);
2798	3208
..	..	@@ -2813,19 +3223,19 @@
2813	3223
2814	3224	refreshContents(true);
2815	3225	} else
2816		- if (event.getSource() == unselectButton)
	3226	+ if (source == unselectButton)
2817	3227	{
2818	3228	objEditor.jTree.clearSelection();
2819	3229	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3230	objEditor.ResetSliders();
2821	3231	refreshContents(true);
2822	3232	} else
2823		- if(event.getSource() instanceof cRadio)
	3233	+ if(source instanceof cRadio)
2824	3234	{
2825	3235	group.parent = keepparent;
2826	3236	group.attributes = 0;
2827	3237	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3238	+ /cRadio/ radio = (cRadio)source;
2829	3239	Object3D obj = radio.GetObject();
2830	3240	System.out.println("Edit " + obj);
2831	3241	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3255,7 @@
2845	3255	}
2846	3256
2847	3257	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3258	+ //Globals.theRenderer.object = group;
2849	3259	if(!useclient)
2850	3260	{
2851	3261	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,12 +3264,16 @@
2854	3264	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3265	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3266	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3267	+ //cameraView.lighttouched = true;
	3268	+ Globals.lighttouched = true;
2858	3269	topView.object = group;
2859	3270	frontView.object = group;
2860	3271	sideView.object = group;
2861	3272	}
2862		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
2863	3277	/*
2864	3278	currentLayout = radio.layout;
2865	3279	if (currentLayout == null)
..	..	@@ -2871,8 +3285,23 @@
2871	3285	//group.parent = null; // ROOT
2872	3286	//group.attributes = -1;
2873	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
2874	3290	refreshContents(true);
2875		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
2876	3305	else
2877	3306	{
2878	3307	//return super.action(event, arg);
..	..	@@ -2881,7 +3310,6 @@
2881	3310	}
2882	3311
2883	3312	boolean useclient = false;
2884		- cRadio radio;
2885	3313
2886	3314	void ToggleRoot()
2887	3315	{
..	..	@@ -2890,7 +3318,7 @@
2890	3318	if (useclient)
2891	3319	{
2892	3320	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3321	+ Globals.lighttouched = true;
2894	3322	//topView.object = client;
2895	3323	//frontView.object = client;
2896	3324	//sideView.object = client;
..	..	@@ -2898,7 +3326,7 @@
2898	3326	else
2899	3327	{
2900	3328	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3329	+ Globals.lighttouched = true;
2902	3330	//topView.object = group;
2903	3331	//frontView.object = group;
2904	3332	//sideView.object = group;
..	..	@@ -2933,6 +3361,28 @@
2933	3361	refreshContents();
2934	3362	}
2935	3363
	3364	+ void TransformChildren()
	3365	+ {
	3366	+ Object3D obj;
	3367	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3368	+ {
	3369	+ obj = (Object3D)e.nextElement();
	3370	+ obj.KeepTextureMatrices();
	3371	+ obj.TransformChildren();
	3372	+ obj.RestoreTextureMatrices();
	3373	+
	3374	+// if (obj.parent == null)
	3375	+// {
	3376	+// System.out.println("NULL PARENT!");
	3377	+// new Exception().printStackTrace();
	3378	+// }
	3379	+// else
	3380	+// TouchTransform(obj);
	3381	+// //obj.parent.Touch();
	3382	+ }
	3383	+
	3384	+ refreshContents();
	3385	+ }
2936	3386
2937	3387	void ResetTransform()
2938	3388	{
..	..	@@ -3045,7 +3495,7 @@
3045	3495	refreshContents();
3046	3496	}
3047	3497
3048		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
3049	3499	{
3050	3500	Object3D obj;
3051	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3510,16 @@
3060	3510	LA.matIdentity(Object3D.mat);
3061	3511	obj.getBounds(minima, maxima, false);
3062	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3066	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3069	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +3548,8 @@
3094	3548
3095	3549	int size = obj.MemorySize();
3096	3550
3097		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3098	3553	}
3099	3554	}
3100	3555	catch (Exception e)
..	..	@@ -3131,9 +3586,9 @@
3131	3586	obj = (Object3D)e.nextElement();
3132	3587
3133	3588	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3135	3590	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3592
3138	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3594	}
..	..	@@ -3175,6 +3630,20 @@
3175	3630	void GenNormals(boolean crease)
3176	3631	{
3177	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
	3640	+
	3641	+ refreshContents();
	3642	+ }
	3643	+
	3644	+ void GenNormalsMINE()
	3645	+ {
	3646	+ group.selection.GenNormalsMINE();
3178	3647
3179	3648	refreshContents();
3180	3649	}
..	..	@@ -3340,8 +3809,8 @@
3340	3809
3341	3810	void ParseVertices()
3342	3811	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3345	3814
3346	3815	for (int i=0; i<group.selection.size(); i++)
3347	3816	{
..	..	@@ -3366,7 +3835,7 @@
3366	3835	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	3836	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	3837
3369		- g.add(GrafreeD.clipboard);
	3838	+ g.add(Grafreed.clipboard);
3370	3839
3371	3840	buffer.add(g);
3372	3841	}
..	..	@@ -3381,7 +3850,7 @@
3381	3850	makeSomething(buffer, i==group.selection.size()-1);
3382	3851	}
3383	3852
3384		- GrafreeD.epsequal = epsequal;
	3853	+ Grafreed.epsequal = epsequal;
3385	3854
3386	3855	refreshContents();
3387	3856	}
..	..	@@ -3399,7 +3868,16 @@
3399	3868	String pigment = Object3D.GetPigment(tex);
3400	3869	//String bump = Object3D.GetBump(tex);
3401	3870
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3871	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3872	+
	3873	+ try
	3874	+ {
	3875	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3876	+ }
	3877	+ catch (Exception e)
	3878	+ {
	3879	+ System.err.println("FAIL: " + node);
	3880	+ }
3403	3881
3404	3882	double s = v.s;
3405	3883
..	..	@@ -3447,12 +3925,26 @@
3447	3925
3448	3926	void Align()
3449	3927	{
	3928	+ if (group.selection.size() == 0)
	3929	+ return;
	3930	+
	3931	+ cVector bbmin = new cVector();
	3932	+ cVector bbmax = new cVector();
	3933	+
	3934	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3935	+
	3936	+ double dx = bbmax.x - bbmin.x;
	3937	+ double dy = bbmax.y - bbmin.y;
	3938	+ double dz = bbmax.z - bbmin.z;
	3939	+
	3940	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3941	+
3450	3942	for (int i=0; i<group.selection.size(); i++)
3451	3943	{
3452	3944	Object3D obj = group.selection.get(i);
3453	3945
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3946	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3947	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	3948	}
3457	3949
3458	3950	refreshContents();
..	..	@@ -3473,11 +3965,11 @@
3473	3965
3474	3966	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	3967
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	3968	+ boolean random = CameraPane.SWITCH;
	3969	+ CameraPane.SWITCH = false; // parse all random nodes
3478	3970	lowres.linkVerticesThis(null);
3479	3971	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	3972	+ CameraPane.SWITCH = random;
3481	3973
3482	3974	System.err.flush();
3483	3975
..	..	@@ -3517,7 +4009,7 @@
3517	4009	return;
3518	4010
3519	4011	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4013
3522	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4015
..	..	@@ -3686,7 +4178,7 @@
3686	4178	group.selection.RelinkToSupport(); // july 2014
3687	4179	System.out.println("DONE.");
3688	4180	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4181	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4182	}
3691	4183
3692	4184	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4203,9 @@
3711	4203
3712	4204	void ClipMesh()
3713	4205	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4207	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3717	4209
3718	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4211	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4214,7 @@
3722	4214	// {
3723	4215	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4216	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4218	}
3727	4219	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4220	System.out.println("DONE.");
..	..	@@ -3769,6 +4261,18 @@
3769	4261	void MarkLeaves(boolean hide)
3770	4262	{
3771	4263	group.selection.MarkLeaves(hide);
	4264	+ refreshContents();
	4265	+ }
	4266	+
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
3772	4276	refreshContents();
3773	4277	}
3774	4278
..	..	@@ -3857,7 +4361,7 @@
3857	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4362
3859	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
3861	4365	{
3862	4366	// if (!(elem instanceof Composite))
3863	4367	// newWindow = false;
..	..	@@ -3947,7 +4451,6 @@
3947	4451	//case 702: // Event.LIST_DESELECT
3948	4452	group.deselectAll();
3949	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	4454	if (tps != null)
3952	4455	{
3953	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,31 +4459,30 @@
3956	4459
3957	4460	//if (child.parent != null)
3958	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
3959	4463	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	4464	}
3964	4465	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4466	+// else
	4467	+// {
	4468	+// objEditor.SetMaterial(group); // .GetMaterial());
	4469	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4470	+// System.err.println("info : " + group.GetPath());
	4471	+// }
3971	4472
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3975	4474	CameraPane.flash = true;
3976	4475
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	4477	// a camera
3979	4478	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
	4484	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4485	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4486	}
3985	4487
3986	4488	refreshContents();
..	..	@@ -3991,6 +4493,26 @@
3991	4493
3992	4494	freezemodel = false;
3993	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
3994	4516
3995	4517	void linkSomething(Object3D thing)
3996	4518	{
..	..	@@ -4062,16 +4584,18 @@
4062	4584	{
4063	4585	if (group.selection.isEmpty())
4064	4586	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
4066	4589	Composite tGroup = null;
4067	4590	if (group.selection.size() > 0) // 1)
4068	4591	{
4069	4592	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
4071	4594	}
4072	4595
4073	4596	if (cut)
4074	4597	{
	4598	+ Save();
4075	4599	//int indices[] = jList.getSelectedIndices();
4076	4600	//for (int i = indices.length - 1; i >= 0; i--)
4077	4601	//jList.remove(indices[i]);
..	..	@@ -4107,16 +4631,16 @@
4107	4631	//System.out.println("cut " + child);
4108	4632	//System.out.println("parent = " + child.parent);
4109	4633	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
4111	4635	tGroup.add/Child/(tmp);
4112	4636	else
4113		- GrafreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
4114	4638	}
4115	4639	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
4117	4641	tGroup.add/Child/(child);
4118	4642	else
4119		- GrafreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
4120	4644	}
4121	4645
4122	4646	//ResetModel();
..	..	@@ -4148,21 +4672,23 @@
4148	4672	//System.out.println("cut " + elem);
4149	4673	//System.out.println("parent = " + elem.parent);
4150	4674	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
4152	4676	tGroup.add/Child/(tmp);
4153	4677	else
4154		- GrafreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
4155	4679	}
4156	4680	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
4158	4682	tGroup.add/Child/(child);
4159	4683	else
4160		- GrafreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
4161	4685	}
4162	4686
4163	4687	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
4166	4692	if (cut)
4167	4693	{
4168	4694	ResetModel();
..	..	@@ -4176,7 +4702,7 @@
4176	4702	// return;
4177	4703	boolean first = true;
4178	4704
4179		- if (GrafreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
4180	4706	{
4181	4707	Composite temp;
4182	4708
..	..	@@ -4187,7 +4713,7 @@
4187	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	4714	*/
4189	4715	Object3D elem;
4190		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4716	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4191	4717	{
4192	4718	Object3D child = (Object3D)e.nextElement();
4193	4719
..	..	@@ -4221,21 +4747,21 @@
4221	4747	//Object3D cb = Applet3D.clipboard;
4222	4748	//temp.addChild(cb);
4223	4749	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4750	+ assert(Grafreed.clipboard.parent == null);
	4751	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4752	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4753	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4754	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4229	4755	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	4758	}
4233	4759
4234	4760	ResetModel();
4235	4761	refreshContents();
4236	4762	}
4237	4763
4238		- void pasteInto(boolean copyit)
	4764	+ void pasteInto(boolean copyit, boolean clone)
4239	4765	{
4240	4766	// if (GrafreeD.clipboard == null)
4241	4767	// return;
..	..	@@ -4264,15 +4790,22 @@
4264	4790	if (copyit)
4265	4791	{
4266	4792	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	4793	+ if (clone)
	4794	+ {
	4795	+ CloneClipboard(false); // sept 2014
	4796	+ }
	4797	+ else
	4798	+ {
	4799	+ paste(false);
	4800	+ }
4268	4801	}
4269	4802	else
4270	4803	{
4271	4804	boolean first = true;
4272	4805
4273		- if (GrafreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4274	4807	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4276	4809	Object3D copy;
4277	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	4811	{
..	..	@@ -4282,7 +4815,7 @@
4282	4815	}
4283	4816	} else
4284	4817	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	4819	}
4287	4820	}
4288	4821	}
..	..	@@ -4474,6 +5007,26 @@
4474	5007	makeSomething(csg);
4475	5008	}
4476	5009
	5010	+ void Ungroup(Object3D g)
	5011	+ {
	5012	+ if (g instanceof HiddenObject)
	5013	+ {
	5014	+ HiddenObject h = (HiddenObject) g;
	5015	+
	5016	+ for (int i=0; i<h.ActualSize(); i++)
	5017	+ {
	5018	+ objEditor.makeSomething(h.get(i), false);
	5019	+ }
	5020	+ }
	5021	+ else
	5022	+ {
	5023	+ for (int i=0; i<g.Size(); i++)
	5024	+ {
	5025	+ objEditor.makeSomething(g.get(i), false);
	5026	+ }
	5027	+ }
	5028	+ }
	5029	+
4477	5030	void ungroup()
4478	5031	{
4479	5032	/*
..	..	@@ -4667,21 +5220,6 @@
4667	5220	}
4668	5221	*/
4669	5222
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5223	/*
4686	5224	public void Callback(Object obj)
4687	5225	{
..	..	@@ -4705,26 +5243,9 @@
4705	5243	}
4706	5244	*/
4707	5245
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5246	String GetFile(String dialogName)
4726	5247	{
4727		- if (GrafreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4728	5249	{
4729	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5251	browser.show();
..	..	@@ -4788,10 +5309,18 @@
4788	5309	cButton flashSelectionButton;
4789	5310	cButton editButton;
4790	5311	cButton uneditButton;
	5312	+ JCheckBox allParamsButton;
4791	5313	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5314	cButton unselectButton;
4794	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
	5322	+ cButton oneStepButton;
	5323	+
4795	5324	cButton screenfitButton;
4796	5325	cButton screenfitpointButton;
4797	5326	cButton snapobjectButton;
..	..	@@ -4802,14 +5331,6 @@
4802	5331	cButton closeButton;
4803	5332
4804	5333	cButton setsupportButton;
4805		-
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813	5334
4814	5335	//
4815	5336	//Composite
..	..	@@ -4822,6 +5343,8 @@
4822	5343	private MenuItem lookFromItem;
4823	5344	private MenuItem switchItem;
4824	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
4825	5348	private MenuItem duplicateItem;
4826	5349	private MenuItem cloneItem;
4827	5350	private MenuItem cloneSupportItem;
..	..	@@ -4833,8 +5356,9 @@
4833	5356	private MenuItem resetsupportItem;
4834	5357	private MenuItem resetreferencesItem;
4835	5358	private MenuItem linkverticesItem;
	5359	+ private MenuItem relinkverticesItem;
4836	5360	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
4838	5362	private MenuItem stepAllItem;
4839	5363	private MenuItem revertMeshItem;
4840	5364	private MenuItem poseMeshItem;
..	..	@@ -4845,6 +5369,7 @@
4845	5369	private MenuItem mergeGeometriesItem;
4846	5370	private MenuItem copyItem;
4847	5371	private MenuItem pasteItem;
	5372	+ private MenuItem pasteIntoItem;
4848	5373	private MenuItem pasteLinkItem;
4849	5374	private MenuItem pasteCloneItem;
4850	5375	private MenuItem pasteExpandItem;
..	..	@@ -4854,6 +5379,7 @@
4854	5379	private MenuItem genNormalsMESHItem;
4855	5380	private MenuItem genNormalsCADItem;
4856	5381	private MenuItem genNormalsORGANItem;
	5382	+ private MenuItem genNormalsMINEItem;
4857	5383	private MenuItem stripifyItem;
4858	5384	private MenuItem unstripifyItem;
4859	5385	private MenuItem trimItem;
..	..	@@ -4882,6 +5408,10 @@
4882	5408	private MenuItem showleavesItem;
4883	5409	private MenuItem markleavesItem;
4884	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
4885	5415
4886	5416	private MenuItem flipVItem;
4887	5417	private MenuItem unflipVItem;
..	..	@@ -4893,8 +5423,11 @@
4893	5423	private MenuItem panoTexturesItem;
4894	5424
4895	5425	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
4897	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
	5430	+ private MenuItem hideItem;
4898	5431	private MenuItem grabItem;
4899	5432	private MenuItem backItem;
4900	5433	private MenuItem frontItem;
..	..	@@ -4915,6 +5448,7 @@
4915	5448
4916	5449	private MenuItem resetParentItem;
4917	5450	private MenuItem repairParentItem;
	5451	+ private MenuItem repairShadowItem;
4918	5452	private MenuItem sortbysizeItem;
4919	5453	private MenuItem sortbynameItem;
4920	5454
..	..	@@ -4935,10 +5469,11 @@
4935	5469	private MenuItem coneItem;
4936	5470	private MenuItem torusItem;
4937	5471	private MenuItem superItem;
	5472	+ private MenuItem kleinItem;
4938	5473	private MenuItem blobItem;
4939	5474	private MenuItem latheItem;
4940	5475	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5476	+ private MenuItem overlayItem;
4942	5477	private MenuItem meshItem;
4943	5478	// private MenuItem meshGroupItem;
4944	5479	private MenuItem springItem;
..	..	@@ -4947,6 +5482,7 @@
4947	5482	private MenuItem csgItem;
4948	5483	private MenuItem templateItem;
4949	5484	private MenuItem textureItem;
	5485	+ private MenuItem billboardItem;
4950	5486	private MenuItem shadowXItem;
4951	5487	private MenuItem shadowYItem;
4952	5488	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5495,6 @@
4959	5495	private MenuItem doubleItem;
4960	5496	private MenuItem tripleItem;
4961	5497
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5498	private MenuItem computeAOItem;
4968	5499	private MenuItem recompileItem;
4969	5500	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5504,8 @@
4973	5504	private MenuItem analyzeItem;
4974	5505	private MenuItem dumpItem;
4975	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
4976	5511	}