~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,9 +12,10 @@
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		-class GroupEditor extends ObjEditor implements iParse, //iCallBack,
	18	+class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
18	19	ObjectUI,
19	20	Runnable,
20	21	ActionListener,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,130 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+ menu.add("-");
	180	+
	181	+ menu.add("-");
	182	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	183	+ pasteIntoItem.addActionListener(this);
	184	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	185	+ pasteLinkItem.addActionListener(this);
	186	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	187	+ pasteCloneItem.addActionListener(this);
	188	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	189	+// pasteExpandItem.addActionListener(this);
	190	+ menu.add("-");
	191	+ clearItem = menu.add(new MenuItem("Clear"));
	192	+ clearItem.addActionListener(this);
	193	+
	194	+ if (Globals.ADVANCED)
	195	+ {
	196	+ // Deletes the cameras...
	197	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	198	+ clearAllItem.addActionListener(this);
	199	+ }
	200	+
	201	+ menuBar.add(cameraMenu = new Menu("View"));
	202	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	203	+ //zBufferItem.addActionListener(this);
	204	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	205	+ //normalLensItem.addActionListener(this);
	206	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	207	+ revertCameraItem.addActionListener(this);
	208	+
	209	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	210	+ toggleFullScreenItem.addItemListener(this);
	211	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	212	+ cameraMenu.add("-");
	213	+
	214	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	215	+ toggleTextureItem.addItemListener(this);
	216	+ toggleTextureItem.setState(CameraPane.textureon);
	217	+
	218	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	219	+ toggleSwitchItem.addItemListener(this);
	220	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	221	+
	222	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ toggleHandleItem.addItemListener(this);
	224	+ toggleHandleItem.setState(CameraPane.HANDLES);
	225	+
	226	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	227	+ togglePaintItem.addItemListener(this);
	228	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	229	+
	230	+ if (Globals.ADVANCED)
	231	+ {
	232	+ cameraMenu.add("-");
	233	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	234	+ toggleLiveItem.addItemListener(this);
	235	+ toggleLiveItem.setState(Globals.isLIVE());
	236	+
	237	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	238	+ stepItem.addActionListener(this);
	239	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	240	+ // toggleDLItem.addItemListener(this);
	241	+ // toggleDLItem.setState(false);
	242	+
	243	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	244	+ toggleRenderItem.addItemListener(this);
	245	+ toggleRenderItem.setState(!CameraPane.frozen);
	246	+
	247	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	248	+ toggleDebugItem.addItemListener(this);
	249	+ toggleDebugItem.setState(CameraPane.DEBUG);
	250	+
	251	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	252	+ toggleFrustumItem.addItemListener(this);
	253	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	254	+
	255	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	256	+ toggleFootContactItem.addItemListener(this);
	257	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	258	+
	259	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	260	+ toggleTimelineItem.addItemListener(this);
	261	+ }
	262	+
	263	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	264	+// toggleRootItem.addItemListener(this);
	265	+// toggleRootItem.setState(false);
	266	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	267	+// animationItem.addItemListener(this);
	268	+// animationItem.setState(CameraPane.ANIMATION);
	269	+ cameraMenu.add("-");
	270	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	271	+ editCameraItem.addActionListener(this);
	272	+
	273	+ if (Globals.ADVANCED)
	274	+ {
152	275	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	276	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	277	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,44 +283,17 @@
160	283	lookAtItem.addActionListener(this);
161	284	//lookFromItem.addActinoListener(this);
162	285	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		- menu.add("-");
192		- resetMeshItem = menu.add(new MenuItem("Reset All"));
193		- resetMeshItem.addActionListener(this);
194		- stepAllItem = menu.add(new MenuItem("Step All"));
195		- stepAllItem.addActionListener(this);
	286	+ }
	287	+
	288	+ oe.menuBar.add(menu = new Menu("Setting"));
	289	+ if (Globals.ADVANCED)
	290	+ {
196	291	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	292	revertMeshItem.addActionListener(this);
198	293	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	294	resetreferencesItem.addActionListener(this);
200	295	menu.add("-");
	296	+ }
201	297	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	298	overwriteGeoItem.addActionListener(this);
203	299	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +305,68 @@
209	305	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	306	overwriteUVItem.addActionListener(this);
211	307	menu.add("-");
	308	+ if (Globals.ADVANCED)
	309	+ {
212	310	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	311	generateMeshItem.addActionListener(this);
214	312	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	313	poseMeshItem.addActionListener(this);
216	314	menu.add("-");
	315	+ }
217	316	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	317	resetsupportItem.addActionListener(this);
219	318	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	319	linkverticesItem.addActionListener(this);
	320	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	321	+ relinkverticesItem.addActionListener(this);
	322	+
	323	+ if (Globals.ADVANCED)
	324	+ {
221	325	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	326	setMasterItem.addActionListener(this);
	327	+ }
223	328
224		- oe.menuBar.add(menu = new Menu("Object"));
	329	+ oe.menuBar.add(menu = new Menu("Group"));
225	330	grabItem = menu.add(new MenuItem("Grab"));
226	331	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	332	backItem = menu.add(new MenuItem("Back"));
230	333	backItem.addActionListener(this);
	334	+ frontItem = menu.add(new MenuItem("Front"));
	335	+ frontItem.addActionListener(this);
231	336	compositeItem = menu.add(new MenuItem("Composite"));
232	337	compositeItem.addActionListener(this);
	338	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	339	+ hideItem.addActionListener(this);
	340	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	341	+ ungroupItem.addActionListener(this);
233	342	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	343	+ randomItem = menu.add(new MenuItem("Switch node"));
235	344	randomItem.addActionListener(this);
236		- physicsItem = menu.add(new MenuItem("Physics"));
237		- physicsItem.addActionListener(this);
238		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
239		- frameselectorItem.addActionListener(this);
240	345	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	346	switchGeoItem.addActionListener(this);
242	347	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	348	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	349	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	350	morphItem.addActionListener(this);
	351	+
	352	+ if (Globals.ADVANCED)
	353	+ {
	354	+ menu.add("-");
	355	+ physicsItem = menu.add(new MenuItem("Physics"));
	356	+ physicsItem.addActionListener(this);
	357	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	358	+ frameselectorItem.addActionListener(this);
246	359	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	360	scriptNodeItem.addActionListener(this);
248	361	cameraItem = menu.add(new MenuItem("Camera"));
249	362	cameraItem.addActionListener(this);
250		- menu.add("-");
	363	+ }
	364	+
	365	+ oe.menuBar.add(menu = new Menu("Object"));
251	366	textureItem = menu.add(new MenuItem("Texture"));
252	367	textureItem.addActionListener(this);
	368	+ billboardItem = menu.add(new MenuItem("Billboard"));
	369	+ billboardItem.addActionListener(this);
253	370	csgItem = menu.add(new MenuItem("CSG"));
254	371	csgItem.addActionListener(this);
255	372	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +375,29 @@
258	375	shadowYItem.addActionListener(this);
259	376	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	377	shadowZItem.addActionListener(this);
	378	+ if (Globals.ADVANCED)
	379	+ {
	380	+ menu.add("-");
261	381	linkerItem = menu.add(new MenuItem("Linker"));
262	382	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	383	attributeItem = menu.add(new MenuItem("Attribute"));
266	384	attributeItem.addActionListener(this);
	385	+ templateItem = menu.add(new MenuItem("Template"));
	386	+ templateItem.addActionListener(this);
267	387	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	388	pointflowItem.addActionListener(this);
	389	+ }
269	390	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	391	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	392	resetTransformItem.addActionListener(this);
274	393	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	394	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	395	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	396	+ resetCentroidXZItem.addActionListener(this);
	397	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	398	+ transformGeometryItem.addActionListener(this);
	399	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	400	+ transformChildrenItem.addActionListener(this);
278	401
279	402	oe.menuBar.add(menu = new Menu("Geometry"));
280	403	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +406,13 @@
283	406	genNormalsORGANItem.addActionListener(this);
284	407	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	408	genNormalsCADItem.addActionListener(this);
	409	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	410	+ genNormalsMESHItem.addActionListener(this);
	411	+ if (Globals.ADVANCED)
	412	+ {
	413	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	414	+ genNormalsMINEItem.addActionListener(this);
	415	+ }
286	416	stripifyItem = menu.add(new MenuItem("Stripify"));
287	417	stripifyItem.addActionListener(this);
288	418	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +422,6 @@
292	422	untrimItem = menu.add(new MenuItem("Untrim"));
293	423	untrimItem.addActionListener(this);
294	424	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	425	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	426	clearColorsItem.addActionListener(this);
299	427	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +434,34 @@
306	434	reduce34MeshItem.addActionListener(this);
307	435	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	436	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	437	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	438	clipMeshItem.addActionListener(this);
	439	+
	440	+ if (Globals.ADVANCED)
	441	+ {
	442	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	443	+ smoothMeshItem.addActionListener(this);
	444	+ }
	445	+
	446	+ oe.menuBar.add(menu = new Menu("Attributes"));
	447	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	448	+ clearMaterialsItem.addActionListener(this);
	449	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	450	+ resetAllItem.addActionListener(this);
	451	+ stepAllItem = menu.add(new MenuItem("Step All"));
	452	+ stepAllItem.addActionListener(this);
313	453	menu.add("-");
314	454	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	455	liveleavesItem.addActionListener(this);
316	456	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	457	unliveleavesItem.addActionListener(this);
	458	+ if (Globals.ADVANCED)
	459	+ {
318	460	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	461	supportleavesItem.addActionListener(this);
320	462	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	463	unsupportleavesItem.addActionListener(this);
	464	+ }
322	465	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	466	hideleavesItem.addActionListener(this);
324	467	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -332,27 +475,18 @@
332	475	flipVItem.addActionListener(this);
333	476	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	477	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	478	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	479	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	480	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	481	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	482	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	483	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	484	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	485	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	486	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	487	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	488	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	489	panoTexturesItem.addActionListener(this);
347		- menu.add("-");
348		- extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
349		- extractGeometriesItem.addActionListener(this);
350		- cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
351		- cloneGeometriesItem.addActionListener(this);
352		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
353		- shareGeometriesItem.addActionListener(this);
354		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
355		- mergeGeometriesItem.addActionListener(this);
356	490
357	491	oe.menuBar.add(menu = new Menu("Selection"));
358	492	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +504,24 @@
370	504	sortbysizeItem.addActionListener(this);
371	505	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	506	sortbynameItem.addActionListener(this);
	507	+ menu.add("-");
	508	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	509	+ shareGeometriesItem.addActionListener(this);
	510	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	511	+ mergeGeometriesItem.addActionListener(this);
	512	+ if (Globals.ADVANCED)
	513	+ {
	514	+ // Pretty much the same as duplicate and clone.
	515	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	516	+ extractGeometriesItem.addActionListener(this);
	517	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	518	+ cloneGeometriesItem.addActionListener(this);
	519	+ }
	520	+
373	521	oe.menuBar.add(menu = new Menu("Insert"));
374	522	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	523	+
	524	+ oe.menuBar.add(menu = new Menu("Tools"));
376	525	buildToolsMenu(menu);
377	526	}
378	527
..	..	@@ -406,150 +555,110 @@
406	555	oe.radioPanel.add(dummyButton);
407	556	oe.buttonGroup.add(dummyButton);
408	557	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	558	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	559
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	560	+ oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	561	+ undoButton.setToolTipText("Undo changes");
	562	+ undoButton.addActionListener(this);
	563	+
	564	+ oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	565	+ redoButton.setToolTipText("Redo changes");
	566	+ redoButton.addActionListener(this);
	567	+
	568	+ oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	569	+ saveButton.setToolTipText("Save changes");
	570	+ saveButton.addActionListener(this);
	571	+
	572	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	573	+ liveCB.setToolTipText("Enable animation");
414	574	liveCB.addItemListener(this);
415	575
416		- oe.aConstraints.gridx += 1;
417		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
418		- supportCB.addItemListener(this);
419		-
420		- // oe.aConstraints.gridx += 1;
421		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
422		- // localCB.addItemListener(this);
423		-
424		- oe.aConstraints.gridx += 1;
425		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
426		- crowdCB.addItemListener(this);
427		-
428		- oe.aConstraints.gridx += 1;
429		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
430		- smoothCB.addItemListener(this);
431		-
432		- oe.aConstraints.gridx += 1;
433		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	576	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	577	+ oneStepButton.setToolTipText("Animate one step forward");
	578	+ oneStepButton.addActionListener(this);
	579	+
	580	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	581	+ fastCB.setToolTipText("Fast mode");
434	582	fastCB.addItemListener(this);
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
437		- slowCB.addItemListener(this);
438		- oe.aConstraints.gridx += 1;
439		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
440		- boxCB.addItemListener(this);
441		-
442		-// oe.aConstraints.gridx += 1;
443		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
444		-// speakerMocapCB.addItemListener(this);
445		-
446		- if (false)
447		- {
448		- // handled in scripts
449		- oe.aConstraints.gridx += 1;
450		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
451		- speakerCameraCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
455		- speakerFocusCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
459		- smoothfocusCB.addItemListener(this);
460		- }
461		-
462		-//oe.aConstraints.gridx += 1;
463		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
464		-// debugCB.addItemListener(this);
465		-
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
468		- oeilCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
472		- lookAtCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	583	+
	584	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	585	+ trackCB.setToolTipText("Enable tracking");
476	586	trackCB.addItemListener(this);
477	587
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	588	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ screenfitButton.setToolTipText("Screen fit");
480	590	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	591	+
482	592	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	593	// screenfitpointButton.addActionListener(this);
484		-// oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
486		- snapobjectButton.addActionListener(this);
487		- oe.aConstraints.gridx += 1;
488	594
489		- //aConstraints.gridx = 0;
490		- //aConstraints.gridy += 1;
491		- oe.aConstraints.weighty = 0;
492		- oe.aConstraints.gridwidth = 1;
493		-
494		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	595	+ if (Globals.ADVANCED)
	596	+ {
	597	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ snapobjectButton.addActionListener(this);
	599	+ snapobjectButton.setToolTipText("Snap Object");
	600	+ }
	601	+
	602	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ flashSelectionButton.setToolTipText("Show selection");
495	604	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	605
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	606	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	607	+
	608	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ twoButton.setToolTipText("Show center view only");
502	610	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	611	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	612	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	613	+ fourButton.setToolTipText("Show left panel only");
	614	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ sixButton.setToolTipText("2-column layout left");
506	616	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	617	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ threeButton.setToolTipText("2-column layout right");
508	619	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	620	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ sevenButton.setToolTipText("3-column layout");
510	622	sevenButton.addActionListener(this);
511	623	//
512	624
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	625	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ rootButton.setToolTipText("Edit selection in new tab");
514	627	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	628	+
	629	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ closeButton.setToolTipText("Close tab");
517	631	closeButton.addActionListener(this);
518	632	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	633	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	634
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	635	+ cGridBag commandsPanel = new cGridBag();
	636	+
	637	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	638	+ editButton.setToolTipText("Edit selection");
524	639	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	640
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	641	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ uneditButton.setToolTipText("Unedit selection");
530	643	uneditButton.addActionListener(this);
531	644
532		- oe.aConstraints.gridx += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
537		- clearPanelButton.addActionListener(this);
538		-
539		- oe.aConstraints.gridx += 1;
540		- oe.aConstraints.weighty = 0;
541		- oe.aConstraints.gridwidth = 1;
542		-
543		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	645	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	646	+ allParamsButton.setToolTipText("Edit all params");
544	647	allParamsButton.addActionListener(this);
545	648
546		- oe.aConstraints.gridx += 1;
547		- oe.aConstraints.weighty = 0;
548		- oe.aConstraints.gridwidth = 1;
549		-
550		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	649	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	650	+ clearPanelButton.setToolTipText("Clear edit panel");
	651	+ clearPanelButton.addActionListener(this);
	652	+
	653	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ unselectButton.setToolTipText("Unselect");
551	655	unselectButton.addActionListener(this);
552	656
	657	+ commandsPanel.preferredHeight = 1;
	658	+
	659	+ oe.treePanel.add(commandsPanel);
	660	+ oe.treePanel.Return();
	661	+
553	662	// oe.aConstraints.gridx += 1;
554	663	// oe.aConstraints.weighty = 0;
555	664	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +670,37 @@
561	670	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	671	// gcButton.addActionListener(this);
563	672
564		- oe.aConstraints.gridx = 0;
565		- oe.aConstraints.gridy += 1;
566		-
567		- //ctrlPanel.add(objList = new List(5, true));
568		- oe.aConstraints.gridwidth = 100;
569		- // oe.aConstraints.gridheight = 100;
570		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
571		- oe.aConstraints.gridheight = 1;
572		- oe.aConstraints.weighty = 0.5;
573		- oe.aConstraints.gridx = 0;
574		- JScrollPane jSP;
	673	+ cGridBag jSPPanel = new cGridBag();
	674	+
	675	+ JScrollPane jSP;
575	676	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
576		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	677	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	678	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	679	+
	680	+ oe.treePanel.add(jSPPanel);
	681	+ oe.treePanel.Return();
582	682
583		- oe.aConstraints.weighty = 0;
584		- oe.aConstraints.gridwidth = 2;
585		-
586		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	683	+ cGridBag copyOptionsPanel = new cGridBag();
	684	+
	685	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	686	+ colorCB.setToolTipText("Copy color when dropped");
587	687	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	688	+
	689	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	690	+ materialCB.setToolTipText("Copy material when dropped");
590	691	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	692	+
	693	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	694	+ textureCB.setToolTipText("Copy texture when dropped");
593	695	textureCB.addItemListener(this);
594	696
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	697	+ copyOptionsPanel.preferredHeight = 1;
	698	+ oe.treePanel.add(copyOptionsPanel);
	699	+ oe.treePanel.Return();
597	700
	701	+// mainPanel.setDividerLocation(0.5); //1.0);
	702	+// mainPanel.setResizeWeight(0.5);
	703	+
598	704	//jList.addListSelectionListener(this);
599	705	oe.jTree.addTreeSelectionListener(this);
600	706	//jTree.setRootVisible(false);
..	..	@@ -616,18 +722,91 @@
616	722	radio.layout = sevenButton;
617	723	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	724	}
	725	+
	726	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	727	+ {
	728	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	729	+ boxCB.setToolTipText("Display bounding boxes");
	730	+ boxCB.addItemListener(this);
	731	+
	732	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	733	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	734	+ zoomBoxCB.addItemListener(this);
	735	+
	736	+ if (true) // Globals.ADVANCED)
	737	+ {
	738	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	739	+ supportCB.setToolTipText("Enable rigging");
	740	+ supportCB.addItemListener(this);
	741	+
	742	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	743	+ // localCB.addItemListener(this);
	744	+
	745	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	746	+ crowdCB.setToolTipText("Used for crowds");
	747	+ crowdCB.addItemListener(this);
	748	+
	749	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	750	+ smoothCB.setToolTipText("Snapping delay");
	751	+ smoothCB.addItemListener(this);
	752	+
	753	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	754	+ slowCB.setToolTipText("Smooth interpolation");
	755	+ slowCB.addItemListener(this);
	756	+
	757	+// constraints.gridy += 1;
	758	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	759	+// speakerMocapCB.addItemListener(this);
	760	+
	761	+ if (false)
	762	+ {
	763	+ // handled in scripts
	764	+ //constraints.gridy += 1;
	765	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	766	+ speakerCameraCB.addItemListener(this);
	767	+
	768	+ //constraints.gridy += 1;
	769	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	770	+ speakerFocusCB.addItemListener(this);
	771	+
	772	+ //constraints.gridy += 1;
	773	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	774	+ smoothfocusCB.addItemListener(this);
	775	+ }
	776	+
	777	+//constraints.gridx += 1;
	778	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	779	+// debugCB.addItemListener(this);
	780	+
	781	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	782	+ oeilCB.addItemListener(this);
	783	+
	784	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	785	+ lookAtCB.setToolTipText("Look-at target");
	786	+ lookAtCB.addItemListener(this);
	787	+
	788	+ }
	789	+
	790	+ cGridBag fill = new cGridBag();
	791	+
	792	+ fill.preferredHeight = 200;
	793	+
	794	+ panel.add(fill);
	795	+
	796	+ }
619	797
620	798	void EditObject(Object3D obj)
621	799	{
622		- cRadio dummyButton = new cRadio(obj.name);
623		- dummyButton.SetObject(obj);
624		- dummyButton.layout = sevenButton;
625		- dummyButton.SetCamera(cameraView.renderCamera, false);
626		- dummyButton.addActionListener(this);
627		- radioPanel.add(dummyButton);
628		- buttonGroup.add(dummyButton);
629		- dummyButton.doClick();
	800	+ cRadio radioButton = new cRadio(obj.name);
	801	+ radioButton.SetObject(obj);
	802	+ radioButton.layout = sevenButton;
	803	+ radioButton.SetCamera(cameraView.renderCamera, false);
	804	+ radioButton.addActionListener(this);
	805	+ radioPanel.add(radioButton);
	806	+ buttonGroup.add(radioButton);
	807	+ radioButton.doClick();
630	808	}
	809	+
631	810	void SetupViews(ObjEditor oe)
632	811	{
633	812	oe.SetupViews();
..	..	@@ -646,6 +825,7 @@
646	825	JCheckBox fastCB;
647	826	JCheckBox slowCB;
648	827	JCheckBox boxCB;
	828	+ JCheckBox zoomBoxCB;
649	829	JCheckBox trackCB;
650	830	JCheckBox smoothfocusCB;
651	831	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +868,7 @@
688	868	dropAttributes \|= Object3D.TEXTURE;
689	869	else
690	870	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	871	+ } else if(e.getSource() == liveCB)
693	872	{
694	873	cameraView.ToggleLive();
695	874	}
..	..	@@ -726,6 +905,10 @@
726	905	Recompile();
727	906	cameraView.repaint();
728	907	// refreshContents();
	908	+ }
	909	+ else if(e.getSource() == zoomBoxCB)
	910	+ {
	911	+ cameraView.ToggleZoomBoxMode();
729	912	}
730	913	else if(e.getSource() == smoothfocusCB)
731	914	{
..	..	@@ -840,7 +1023,9 @@
840	1023	// objEditor.DropFile((java.io.File[]) object, true);
841	1024	// return;
842	1025	// }
843		- if (string.charAt(0) == '/')
	1026	+
	1027	+ // File path for Mac and Windows
	1028	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1029	{
845	1030	// file(s)
846	1031	String[] names = string.split("\n");
..	..	@@ -867,7 +1052,7 @@
867	1052
868	1053	flashIt = false;
869	1054	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1055	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1056	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1057
873	1058	if (group.selection.size() == 1)
..	..	@@ -894,11 +1079,11 @@
894	1079	{
895	1080	loadClipboard(true);
896	1081	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1082	+ pasteInto(false, false);
898	1083	} else {
899	1084	loadClipboard(false);
900	1085	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1086	+ pasteInto(false, false); // true); // ???
902	1087	}
903	1088	}
904	1089	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1187,8 @@
1002	1187
1003	1188	void buildCreateMenu(Menu menu)
1004	1189	{
	1190	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1191	+ //heightFieldItem.addActionListener(this);
1005	1192	gridItem = menu.add(new MenuItem("Grid"));
1006	1193	gridItem.addActionListener(this);
1007	1194	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1201,37 @@
1014	1201	torusItem.addActionListener(this);
1015	1202	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1203	superItem.addActionListener(this);
	1204	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1205	+ kleinItem.addActionListener(this);
1017	1206	particleItem = menu.add(new MenuItem("Particle system"));
1018	1207	particleItem.addActionListener(this);
	1208	+ if (Globals.ADVANCED)
	1209	+ {
1019	1210	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1211	ragdollItem.addActionListener(this);
1021	1212	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1213	ragdoll2Item.addActionListener(this);
	1214	+ }
1023	1215	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1216	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1217	meshItem.addActionListener(this);
1026	1218	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1219	// meshGroupItem.addActionListener(this);
	1220	+ if (Globals.ADVANCED)
	1221	+ {
1028	1222	springItem = menu.add(new MenuItem("Spring"));
1029	1223	springItem.addActionListener(this);
1030	1224	flagItem = menu.add(new MenuItem("Flag"));
1031	1225	flagItem.addActionListener(this);
1032		- bezierItem = menu.add(new MenuItem("Patch"));
1033		- bezierItem.addActionListener(this);
1034		- checkerItem = menu.add(new MenuItem("Checker"));
1035		- checkerItem.addActionListener(this);
1036	1226	blobItem = menu.add(new MenuItem("Blob"));
1037	1227	blobItem.addActionListener(this);
1038	1228	latheItem = menu.add(new MenuItem("Lathe"));
1039	1229	latheItem.addActionListener(this);
	1230	+ }
	1231	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1232	+ bezierItem.addActionListener(this);
	1233	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1234	+ overlayItem.addActionListener(this);
1040	1235	lightItem = menu.add(new MenuItem("Light"));
1041	1236	lightItem.addActionListener(this);
1042	1237	menu.add("-");
..	..	@@ -1046,41 +1241,39 @@
1046	1241	loopItem.addActionListener(this);
1047	1242	doubleItem = menu.add(new MenuItem("Fork"));
1048	1243	doubleItem.addActionListener(this);
	1244	+ if (Globals.ADVANCED)
	1245	+ {
1049	1246	tripleItem = menu.add(new MenuItem("Trident"));
1050	1247	tripleItem.addActionListener(this);
1051		- menu.add("-");
1052		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
1053		- importGFDItem.addActionListener(this);
1054		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
1055		- importVRMLX3DItem.addActionListener(this);
1056		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
1057		- importOBJItem.addActionListener(this);
1058		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
1059		- import3DSItem.addActionListener(this);
	1248	+ }
1060	1249	}
1061	1250
1062	1251	void buildToolsMenu(Menu menu)
1063	1252	{
1064	1253	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1254	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1255	+ animationItem.setState(Globals.ANIMATION);
1067	1256
1068	1257	menu.add("-");
1069	1258	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1259	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1260	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1261	+ textureFieldItem.addActionListener(this);
	1262	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1263	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1264	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1265	reduceMorphItem.addActionListener(this);
1077	1266	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1267	reduce34MorphItem.addActionListener(this);
1079		-
	1268	+ menu.add("-");
1080	1269	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1270	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1271
	1272	+ if (Globals.ADVANCED)
	1273	+ {
	1274	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1275	+ mirrorItem.addActionListener(this);
	1276	+ menu.add("-");
1084	1277	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1278	memoryItem.addActionListener(this);
1086	1279	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1094,6 +1287,8 @@
1094	1287	resetParentItem.addActionListener(this);
1095	1288	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1289	repairParentItem.addActionListener(this);
	1290	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1291	+ repairShadowItem.addActionListener(this);
1097	1292	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1293	invariantsItem.addActionListener(this);
1099	1294	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1296,7 @@
1101	1296	menu.add("-");
1102	1297	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1298	editScriptItem.addActionListener(this);
	1299	+ }
1104	1300	}
1105	1301
1106	1302	void ScreenFit()
..	..	@@ -1429,9 +1625,9 @@
1429	1625
1430	1626	void Overwrite(int mask)
1431	1627	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1628	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1629	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1630	+ Object3D content = Grafreed.clipboard.get(0);
1435	1631
1436	1632	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1633	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1650,7 @@
1454	1650	//
1455	1651	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1652	{
	1653	+ Object source = event.getSource();
1457	1654	/*
1458	1655	if (event.getSource() == nameField)
1459	1656	{
..	..	@@ -1465,11 +1662,11 @@
1465	1662	}
1466	1663	else
1467	1664	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1665	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1666	{
1470	1667	ScreenFit();
1471	1668	} else
1472		- if (event.getSource() == switchItem)
	1669	+ if (source == switchItem)
1473	1670	{
1474	1671	cVector v1 = new cVector();
1475	1672	cVector v2 = new cVector();
..	..	@@ -1478,11 +1675,11 @@
1478	1675	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1676	objEditor.cameraView.repaint();
1480	1677	} else
1481		- if (event.getSource() == rectoidItem)
	1678	+ if (source == rectoidItem)
1482	1679	{
1483	1680	makeSomething(new Box());
1484	1681	} else
1485		- if (event.getSource() == particleItem)
	1682	+ if (source == particleItem)
1486	1683	{
1487	1684	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1685	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1700,9 @@
1503	1700	applyExample(particleGeom, "SMOKE");
1504	1701	makeSomething(particleGeom);
1505	1702	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1703	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1704	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1705	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1706
1510	1707	ragdoll.toParent = LA.newMatrix();
1511	1708	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1718,71 @@
1521	1718	makeSomething(ragdoll);
1522	1719	//makeSomething(new VehicleDemo());
1523	1720	} else
1524		- if (event.getSource() == gridItem)
	1721	+ /*
	1722	+ */
	1723	+ if (source == heightFieldItem)
	1724	+ {
	1725	+ Object3D obj = new Object3D();
	1726	+
	1727	+ obj.CreateMaterial();
	1728	+ obj.bRep = new BoundaryRep();
	1729	+
	1730	+ obj.bRep.CreateMesh(new iHeightField()
	1731	+ {
	1732	+ public double f(double x, double y)
	1733	+ {
	1734	+ // The Mandelbrot set is represented by coloring
	1735	+ // each point (x,y) according to the number of
	1736	+ // iterations it takes before the while loop in
	1737	+ // this method ends. For points that are actually
	1738	+ // in the Mandelbrot set, or very close to it, the
	1739	+ // count will reach the maximum value, 80. These
	1740	+ // points will be colored purple. All other colors
	1741	+ // represent points that are definitely NOT in the set.
	1742	+ x -= 600;
	1743	+ y -= 500;
	1744	+ x /= 200;
	1745	+ y /= 200;
	1746	+ int count = 0;
	1747	+ double zx = x;
	1748	+ double zy = y;
	1749	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1750	+ double new_zx = zxzx - zyzy + x;
	1751	+ zy = 2zxzy + y;
	1752	+ zx = new_zx;
	1753	+ count++;
	1754	+ }
	1755	+ return count; // Math.sqrt(count);
	1756	+ }
	1757	+ }, 1000,1000);
	1758	+
	1759	+ makeSomething(obj);
	1760	+ } else
	1761	+ if (source == gridItem)
1525	1762	{
1526	1763	makeSomething(new Grid());
1527	1764	} else
1528		- if (event.getSource() == ellipsoidItem)
	1765	+ if (source == ellipsoidItem)
1529	1766	{
1530	1767	makeSomething(new Sphere());
1531	1768	} else
1532		- if (event.getSource() == coneItem)
	1769	+ if (source == coneItem)
1533	1770	{
1534	1771	makeSomething(new Cone());
1535	1772	} else
1536		- if (event.getSource() == torusItem)
	1773	+ if (source == torusItem)
1537	1774	{
1538	1775	makeSomething(new Torus());
1539	1776	} else
1540		- if (event.getSource() == superItem)
	1777	+ if (source == superItem)
1541	1778	{
1542	1779	makeSomething(new Superellipsoid());
1543	1780	} else
1544		- if (event.getSource() == blobItem)
	1781	+ if (source == kleinItem)
	1782	+ {
	1783	+ makeSomething(new Klein());
	1784	+ } else
	1785	+ if (source == blobItem)
1545	1786	{
1546	1787	Blob blob = new Blob();
1547	1788	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1790,15 @@
1549	1790	//blob.retile();
1550	1791	makeSomething(blob);
1551	1792	} else
1552		- if (event.getSource() == latheItem)
	1793	+ if (source == latheItem)
1553	1794	{
1554	1795	makeSomething(new Lathe());
1555	1796	} else
1556		- if (event.getSource() == bezierItem)
	1797	+ if (source == bezierItem)
1557	1798	{
1558	1799	makeSomething(new BezierSurface());
1559	1800	} else
1560		- if (event.getSource() == checkerItem)
	1801	+ if (source == overlayItem)
1561	1802	{
1562	1803	/*
1563	1804	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1811,9 @@
1570	1811	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1812	LA.matInvert(obj.toParent, obj.fromParent);
1572	1813	*/
1573		- makeSomething(new CheckerIG());
	1814	+ makeSomething(new Checker());
1574	1815	} else
1575		- if (event.getSource() == meshItem)
	1816	+ if (source == meshItem)
1576	1817	{
1577	1818	Object3D itemtomake = new Object3D();
1578	1819	Object3D child;
..	..	@@ -1593,35 +1834,35 @@
1593	1834	makeSomething(child);
1594	1835	}
1595	1836	} else
1596		- if (event.getSource() == springItem)
	1837	+ if (source == springItem)
1597	1838	{
1598	1839	cSpring s = new cSpring();
1599	1840	s.setup();
1600	1841	makeSomething(s);
1601	1842	} else
1602		- if (event.getSource() == flagItem)
	1843	+ if (source == flagItem)
1603	1844	{
1604	1845	cSpring s = new cFlag();
1605	1846	s.setup();
1606	1847	makeSomething(s);
1607	1848	} else
1608		- if (event.getSource() == lightItem)
	1849	+ if (source == lightItem)
1609	1850	{
1610	1851	makeSomething(new Light());
1611	1852	} else
1612		- if (event.getSource() == csgItem)
	1853	+ if (source == csgItem)
1613	1854	{
1614	1855	group(new CSG());
1615	1856	} else
1616		- if (event.getSource() == templateItem)
	1857	+ if (source == templateItem)
1617	1858	{
1618	1859	group(new cTemplate());
1619	1860	} else
1620		- if (event.getSource() == attributeItem)
	1861	+ if (source == attributeItem)
1621	1862	{
1622	1863	makeSomething(new Attribute());
1623	1864	} else
1624		- if (event.getSource() == pointflowItem)
	1865	+ if (source == pointflowItem)
1625	1866	{
1626	1867	makeSomething(new PointFlow());
1627	1868	} else
..	..	@@ -1633,7 +1874,7 @@
1633	1874	} else
1634	1875	*/
1635	1876
1636		- if (event.getSource() == superLoopItem)
	1877	+ if (source == superLoopItem)
1637	1878	{
1638	1879	Composite g = new cGroup();
1639	1880	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1896,7 @@
1655	1896
1656	1897	group(g);
1657	1898	} else
1658		- if (event.getSource() == loopItem)
	1899	+ if (source == loopItem)
1659	1900	{
1660	1901	Composite csg = new GroupLeaf();
1661	1902	csg.count = 5;
..	..	@@ -1664,7 +1905,7 @@
1664	1905	csg.addChild(child);
1665	1906	child.addChild(csg);
1666	1907	} else
1667		- if (event.getSource() == doubleItem)
	1908	+ if (source == doubleItem)
1668	1909	{
1669	1910	Composite csg = new GroupLeaf();
1670	1911	csg.count = 5;
..	..	@@ -1676,7 +1917,7 @@
1676	1917	csg.addChild(child);
1677	1918	child.addChild(csg);
1678	1919	} else
1679		- if (event.getSource() == tripleItem)
	1920	+ if (source == tripleItem)
1680	1921	{
1681	1922	Composite csg = new GroupLeaf();
1682	1923	csg.count = 4;
..	..	@@ -1691,71 +1932,71 @@
1691	1932	csg.addChild(child);
1692	1933	child.addChild(csg);
1693	1934	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	1935	+ if (source == computeAOItem)
1696	1936	{
1697		- ImportGFD();
	1937	+ Globals.drawMode = CameraPane.OCCLUSION;
	1938	+ Globals.theRenderer.repaint();
1698	1939	} else
1699		- if (event.getSource() == importVRMLX3DItem)
1700		- {
1701		- ImportVRMLX3D();
1702		- } else
1703		- if (event.getSource() == import3DSItem)
1704		- {
1705		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1706		- } else
1707		- if (event.getSource() == importOBJItem)
1708		- {
1709		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1710		- } else
1711		- if (event.getSource() == computeAOItem)
1712		- {
1713		- CameraPane.drawMode = CameraPane.OCCLUSION;
1714		- CameraPane.theRenderer.repaint();
1715		- } else
1716		- if (event.getSource() == recompileItem)
	1940	+ if (source == recompileItem)
1717	1941	{
1718	1942	Recompile();
1719	1943	refreshContents();
1720	1944	} else
1721		- if (event.getSource() == editScriptItem)
	1945	+ if (source == editScriptItem)
1722	1946	{
1723	1947	OpenDialog();
1724	1948	refreshContents();
1725	1949	} else
1726		- if (event.getSource() == invariantsItem)
	1950	+ if (source == invariantsItem)
1727	1951	{
1728	1952	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1953	+ Grafreed.grafreeD.universe.invariants();
1730	1954	} else
1731		- if (event.getSource() == memoryItem)
	1955	+ if (source == memoryItem)
1732	1956	{
1733	1957	//System.out.println("Invariants:");
1734	1958	PrintMemory();
1735	1959	} else
1736		- if (event.getSource() == pathItem)
	1960	+ if (source == pathItem)
1737	1961	{
1738	1962	PrintPath();
1739	1963	} else
1740		- if (event.getSource() == analyzeItem)
	1964	+ if (source == analyzeItem)
1741	1965	{
1742	1966	AnalyzeObject();
1743	1967	} else
1744		- if (event.getSource() == dumpItem)
	1968	+ if (source == dumpItem)
1745	1969	{
1746	1970	DumpObject();
1747	1971	} else
1748		- if (event.getSource() == screenfitButton)
	1972	+ if (source == undoButton)
	1973	+ {
	1974	+ Undo();
	1975	+ } else
	1976	+ if (source == redoButton)
	1977	+ {
	1978	+ Redo();
	1979	+ } else
	1980	+ if (source == saveButton)
	1981	+ {
	1982	+ Save();
	1983	+ } else
	1984	+ if (source == oneStepButton)
	1985	+ {
	1986	+ Globals.ONESTEP = true;
	1987	+ cameraView.repaint();
	1988	+ } else
	1989	+ if (source == screenfitButton)
1749	1990	{
1750	1991	//Reload(lastConverter, lastFilename, true);
1751	1992	ScreenFit();
1752	1993	} else
1753		- if (event.getSource() == screenfitpointButton)
	1994	+ if (source == screenfitpointButton)
1754	1995	{
1755	1996	//Reload(lastConverter, lastFilename, true);
1756	1997	ScreenFitPoint();
1757	1998	} else
1758		- if (event.getSource() == snapobjectButton)
	1999	+ if (source == snapobjectButton)
1759	2000	{
1760	2001	//Reload(lastConverter, lastFilename, true);
1761	2002	SnapObject();
..	..	@@ -1766,13 +2007,13 @@
1766	2007	// Recompile();
1767	2008	// refreshContents();
1768	2009	// } else
1769		- if (event.getSource() == gcButton)
	2010	+ if (source == gcButton)
1770	2011	{
1771	2012	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	2013	System.gc();
1773	2014	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	2015	} else
1775		- if (event.getSource() == editLeafItem)
	2016	+ if (source == editLeafItem)
1776	2017	{
1777	2018	Object3D obj;
1778	2019	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2027,78 @@
1786	2027	}
1787	2028	refreshContents(true);
1788	2029	} else
1789		- if (event.getSource() == openWindowItem)
	2030	+ if (source == openWindowItem)
1790	2031	{
1791	2032	EditSelection(true);
1792	2033	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2034	+ if (source == cutItem \|\| source == clearButton)
1794	2035	{
1795	2036	loadClipboard(true);
1796	2037	} else
1797		- if (event.getSource() == duplicateItem)
	2038	+ if (source == undoItem)
1798	2039	{
1799		- Object3D keep = GraphreeD.clipboard;
	2040	+ Undo();
	2041	+ } else
	2042	+ if (source == redoItem)
	2043	+ {
	2044	+ Redo();
	2045	+ } else
	2046	+ if (source == duplicateItem)
	2047	+ {
	2048	+ Object3D keep = Grafreed.clipboard;
1800	2049	loadClipboard(false);
1801	2050	paste(false);
1802		- GraphreeD.clipboard = keep;
	2051	+ Grafreed.clipboard = keep;
1803	2052	} else
1804		- if (event.getSource() == cloneItem)
	2053	+ if (source == cloneItem)
1805	2054	{
1806	2055	CloneSelection(false);
1807	2056	} else
1808		- if (event.getSource() == cloneSupportItem)
	2057	+ if (source == cloneSupportItem)
1809	2058	{
1810	2059	CloneSelection(true);
1811	2060	} else
1812		- if (event.getSource() == copyItem)
	2061	+ if (source == copyItem)
1813	2062	{
1814	2063	loadClipboard(false);
1815	2064	} else
1816		- if (event.getSource() == pasteItem)
	2065	+ if (source == pasteItem)
1817	2066	{
1818	2067	paste(false);
1819	2068	} else
1820		- if (event.getSource() == pasteLinkItem)
	2069	+ if (source == pasteIntoItem)
1821	2070	{
1822		- pasteInto(false);
	2071	+ pasteInto(true, false);
1823	2072	} else
1824		- if (event.getSource() == pasteCloneItem)
	2073	+ if (source == pasteLinkItem)
1825	2074	{
1826		- pasteInto(true);
	2075	+ pasteInto(false, false);
1827	2076	} else
1828		- if (event.getSource() == pasteExpandItem)
	2077	+ if (source == pasteCloneItem)
	2078	+ {
	2079	+ pasteInto(true, true);
	2080	+ } else
	2081	+ if (source == pasteExpandItem)
1829	2082	{
1830	2083	paste(true);
1831	2084	} else
1832		- if (event.getSource() == synchronizeItem)
	2085	+ if (source == synchronizeItem)
1833	2086	{
1834	2087	Overwrite(Object3D.TRANSFORM);
1835	2088	} else
1836		- if (event.getSource() == overwriteNameItem)
	2089	+ if (source == overwriteNameItem)
1837	2090	{
1838	2091	Overwrite(Object3D.NAME);
1839	2092	} else
1840		- if (event.getSource() == overwriteUVItem)
	2093	+ if (source == overwriteUVItem)
1841	2094	{
1842	2095	Overwrite(Object3D.UV);
1843	2096	} else
1844		- if (event.getSource() == overwriteMatItem)
	2097	+ if (source == overwriteMatItem)
1845	2098	{
	2099	+ /* july 2015
1846	2100	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2101	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2102	else
1849	2103	{
1850	2104	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2110,16 @@
1856	2110	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2111	}
1858	2112	}
	2113	+ */
	2114	+
	2115	+ Overwrite(dropAttributes);
1859	2116	}
1860		- if (event.getSource() == overwriteGeoItem)
	2117	+ if (source == overwriteGeoItem)
1861	2118	{
1862	2119	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2120	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2121	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2122	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2123	//
1867	2124	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2125	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2131,7 @@
1874	2131	// refreshContents();
1875	2132	// }
1876	2133	} else
1877		- if (event.getSource() == generateMeshItem)
	2134	+ if (source == generateMeshItem)
1878	2135	{
1879	2136	//if (group.selection.size() == 1)
1880	2137	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2142,7 @@
1885	2142	ResetModel();
1886	2143	refreshContents();
1887	2144	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2145	+ if (source == extractGeometriesItem)
1889	2146	{
1890	2147	boolean one = false;
1891	2148
..	..	@@ -1912,7 +2169,7 @@
1912	2169	ResetModel();
1913	2170	refreshContents();
1914	2171	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2172	+ if (source == cloneGeometriesItem)
1916	2173	{
1917	2174	boolean one = false;
1918	2175
..	..	@@ -1938,32 +2195,37 @@
1938	2195	ResetModel();
1939	2196	refreshContents();
1940	2197	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2198	+ if (source == shareGeometriesItem)
1942	2199	{
1943	2200	boolean one = false;
1944	2201
1945	2202	if (group.selection.size() == 1)
1946	2203	one = true;
1947	2204
	2205	+ Object3D merge = null;
	2206	+
1948	2207	Object3D content = new cGroup();
1949	2208
1950	2209	for (int i=0; i<group.selection.size(); i++)
1951	2210	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2211	+ merge = new Merge(group.selection.get(i));
1953	2212
1954	2213	if (one)
1955		- makeSomething(sel, false);
	2214	+ makeSomething(merge, false);
1956	2215	else
1957		- content.addChild(sel);
	2216	+ content.addChild(merge);
1958	2217	}
1959	2218
1960	2219	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2220	+ makeSomething(content, true);
	2221	+ else
	2222	+ {
	2223	+ ResetModel();
	2224	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2225	+ refreshContents();
	2226	+ }
1965	2227	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2228	+ if (source == mergeGeometriesItem)
1967	2229	{
1968	2230	boolean one = false;
1969	2231
..	..	@@ -1993,11 +2255,11 @@
1993	2255	ResetModel();
1994	2256	refreshContents();
1995	2257	} else
1996		- if (event.getSource() == linkverticesItem)
	2258	+ if (source == linkverticesItem)
1997	2259	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2260	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2261	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2262	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2263	//
2002	2264	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2265	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2268,48 @@
2006	2268	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2269	// refreshContents();
2008	2270	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2271	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2272	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2273	+ Object3D content = Grafreed.clipboard.get(0);
2012	2274
2013	2275	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2276	content = ((cGroup)content).get(0);
2015	2277
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2278	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2279	for (int i=0; i<group.selection.size(); i++)
2018	2280	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2281	+ boolean random = CameraPane.SWITCH;
	2282	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2283	group.selection.get(i).linkVerticesThis(content);
2022	2284	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2285	+ CameraPane.SWITCH = random;
2024	2286	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2287	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2288	refreshContents();
2027	2289	}
2028	2290	} else
2029		- if (event.getSource() == resetsupportItem)
	2291	+ if (source == resetsupportItem)
2030	2292	{
2031	2293	for (int i=0; i<group.selection.size(); i++)
2032	2294	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2295	+ boolean random = CameraPane.SWITCH;
	2296	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2297	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2298	+ CameraPane.SWITCH = random;
2037	2299	}
2038	2300
2039	2301	refreshContents();
2040	2302	} else
2041		- if (event.getSource() == resetreferencesItem)
	2303	+ if (source == relinkverticesItem)
	2304	+ {
	2305	+ boolean random = CameraPane.SWITCH;
	2306	+ CameraPane.SWITCH = false; // parse all random nodes
	2307	+ group.selection.RelinkToSupport();
	2308	+ CameraPane.SWITCH = random;
	2309	+
	2310	+ refreshContents();
	2311	+ } else
	2312	+ if (source == resetreferencesItem)
2042	2313	{
2043	2314	for (int i=0; i<group.selection.size(); i++)
2044	2315	{
..	..	@@ -2047,11 +2318,11 @@
2047	2318
2048	2319	refreshContents();
2049	2320	} else
2050		- if (event.getSource() == setMasterItem)
	2321	+ if (source == setMasterItem)
2051	2322	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2323	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2324	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2325	+ Object3D content = Grafreed.clipboard.get(0);
2055	2326
2056	2327	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2328	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2331,13 @@
2060	2331	refreshContents();
2061	2332	}
2062	2333	} else
2063		- if (event.getSource() == poseMeshItem)
	2334	+ if (source == poseMeshItem)
2064	2335	{
2065	2336	if (group.selection.size() == 1)
2066	2337	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2338	+ if (Grafreed.clipboard.size() == 1)
2068	2339	{
2069		- Object3D content = GraphreeD.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);
..	..	@@ -2079,19 +2350,19 @@
2079	2350	}
2080	2351
2081	2352	} else
2082		- if (event.getSource() == revertMeshItem)
	2353	+ if (source == revertMeshItem)
2083	2354	{
2084	2355	RevertMeshes();
2085	2356	} else
2086		- if (event.getSource() == resetMeshItem)
	2357	+ if (source == resetAllItem)
2087	2358	{
2088	2359	ResetAll();
2089	2360	} else
2090		- if (event.getSource() == stepAllItem)
	2361	+ if (source == stepAllItem)
2091	2362	{
2092	2363	StepAll();
2093	2364	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2365	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2366	{
2096	2367	//int indices[] = jList.getSelectedIndices();
2097	2368	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2370,46 @@
2099	2370
2100	2371	ClearSelection(false);
2101	2372	} else
2102		- if (event.getSource() == clearAllItem)
	2373	+ if (source == clearAllItem)
2103	2374	{
2104	2375	ClearSelection(true);
2105	2376	} else
2106		- if (event.getSource() == grabItem)
	2377	+ if (source == grabItem)
2107	2378	{
2108	2379	group(new cGroup(), true);
2109	2380	} else
2110		- if (event.getSource() == frontItem)
	2381	+ if (source == hideItem)
	2382	+ {
	2383	+ group(new HiddenObject());
	2384	+ } else
	2385	+ if (source == frontItem)
2111	2386	{
2112	2387	front();
2113	2388	} else
2114		- if (event.getSource() == backItem)
	2389	+ if (source == backItem)
2115	2390	{
2116	2391	back();
2117	2392	} else
2118		- if (event.getSource() == cameraItem)
	2393	+ if (source == cameraItem)
2119	2394	{
2120	2395	makeSomething(new Camera());
2121	2396	} else
2122		- if (event.getSource() == compositeItem)
	2397	+ if (source == compositeItem)
2123	2398	{
2124	2399	group(new Composite());
2125	2400	} else
2126		- if (event.getSource() == randomItem)
	2401	+ if (source == randomItem)
2127	2402	{
2128	2403	RandomNode random = new RandomNode();
2129	2404	group(random);
2130	2405	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2406	+ random.name = random.get(0).name + "Switch";
2132	2407	} else
2133		- if (event.getSource() == physicsItem)
	2408	+ if (source == physicsItem)
2134	2409	{
2135	2410	group(new PhysicsNode());
2136	2411	} else
2137		- if (event.getSource() == frameselectorItem)
	2412	+ if (source == frameselectorItem)
2138	2413	{
2139	2414	for (int i=0; i<group.selection.size(); i++)
2140	2415	{
..	..	@@ -2146,7 +2421,7 @@
2146	2421	ResetModel();
2147	2422	refreshContents();
2148	2423	} else
2149		- if (event.getSource() == switchGeoItem)
	2424	+ if (source == switchGeoItem)
2150	2425	{
2151	2426	for (int i=0; i<group.selection.size(); i++)
2152	2427	{
..	..	@@ -2158,7 +2433,7 @@
2158	2433	ResetModel();
2159	2434	refreshContents();
2160	2435	} else
2161		- if (event.getSource() == switchTransfoItem)
	2436	+ if (source == switchTransfoItem)
2162	2437	{
2163	2438	for (int i=0; i<group.selection.size(); i++)
2164	2439	{
..	..	@@ -2170,7 +2445,7 @@
2170	2445	ResetModel();
2171	2446	refreshContents();
2172	2447	} else
2173		- if (event.getSource() == morphItem)
	2448	+ if (source == morphItem)
2174	2449	{
2175	2450	for (int i=0; i<group.selection.size(); i++)
2176	2451	{
..	..	@@ -2182,7 +2457,7 @@
2182	2457	ResetModel();
2183	2458	refreshContents();
2184	2459	} else
2185		- if (event.getSource() == scriptNodeItem)
	2460	+ if (source == scriptNodeItem)
2186	2461	{
2187	2462	boolean atleastone = false;
2188	2463
..	..	@@ -2221,191 +2496,223 @@
2221	2496	}
2222	2497	}
2223	2498	} else
2224		- if (event.getSource() == linkerItem)
	2499	+ if (source == linkerItem)
2225	2500	{
2226	2501	group(new cLinker());
2227	2502	} else
2228		- if (event.getSource() == textureItem)
	2503	+ if (source == textureItem)
2229	2504	{
2230	2505	group(new TextureNode());
2231	2506	} else
2232		- if (event.getSource() == shadowXItem)
	2507	+ if (source == billboardItem)
	2508	+ {
	2509	+ group(new BillboardNode());
	2510	+ } else
	2511	+ if (source == shadowXItem)
2233	2512	{
2234	2513	CastShadow(0);
2235	2514	} else
2236		- if (event.getSource() == shadowYItem)
	2515	+ if (source == shadowYItem)
2237	2516	{
2238	2517	CastShadow(1);
2239	2518	} else
2240		- if (event.getSource() == shadowZItem)
	2519	+ if (source == shadowZItem)
2241	2520	{
2242	2521	CastShadow(2);
2243	2522	} else
2244		- if (event.getSource() == ungroupItem)
	2523	+ if (source == ungroupItem)
2245	2524	{
2246		- ungroup();
	2525	+ //ungroup();
	2526	+ for (int i=0; i<group.selection.size(); i++)
	2527	+ {
	2528	+ Ungroup(group.selection.get(i));
	2529	+ }
	2530	+
	2531	+ ClearSelection(false);
	2532	+
	2533	+ refreshContents();
2247	2534	} else
2248		- if (event.getSource() == genUVItem)
	2535	+ if (source == genUVItem)
2249	2536	{
2250	2537	GenUV();
2251	2538	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2539	+ if (source == genNormalsCADItem)
2253	2540	{
2254	2541	GenNormals(true);
2255	2542	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2543	+ if (source == genNormalsMESHItem)
	2544	+ {
	2545	+ GenNormals(true); // TODO
	2546	+ } else
	2547	+ if (source == genNormalsORGANItem)
2257	2548	{
2258	2549	GenNormals(false);
2259	2550	} else
2260		- if (event.getSource() == stripifyItem)
	2551	+ if (source == genNormalsMINEItem)
	2552	+ {
	2553	+ GenNormalsMINE();
	2554	+ } else
	2555	+ if (source == stripifyItem)
2261	2556	{
2262	2557	Stripify();
2263	2558	} else
2264		- if (event.getSource() == unstripifyItem)
	2559	+ if (source == unstripifyItem)
2265	2560	{
2266	2561	Unstripify();
2267	2562	} else
2268		- if (event.getSource() == trimItem)
	2563	+ if (source == trimItem)
2269	2564	{
2270	2565	Trim();
2271	2566	} else
2272		- if (event.getSource() == untrimItem)
	2567	+ if (source == untrimItem)
2273	2568	{
2274	2569	Untrim();
2275	2570	} else
2276		- if (event.getSource() == clearColorsItem)
	2571	+ if (source == clearColorsItem)
2277	2572	{
2278	2573	ClearColors();
2279	2574	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2575	+ if (source == clearMaterialsItem)
2281	2576	{
2282	2577	ClearMaterials();
2283	2578	} else
2284		- if (event.getSource() == liveleavesItem)
	2579	+ if (source == liveleavesItem)
2285	2580	{
2286	2581	LiveLeaves(true);
2287	2582	} else
2288		- if (event.getSource() == unliveleavesItem)
	2583	+ if (source == unliveleavesItem)
2289	2584	{
2290	2585	LiveLeaves(false);
2291	2586	} else
2292		- if (event.getSource() == supportleavesItem)
	2587	+ if (source == supportleavesItem)
2293	2588	{
2294	2589	SupportLeaves(true);
2295	2590	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2591	+ if (source == unsupportleavesItem)
2297	2592	{
2298	2593	SupportLeaves(false);
2299	2594	} else
2300		- if (event.getSource() == hideleavesItem)
	2595	+ if (source == hideleavesItem)
2301	2596	{
2302	2597	HideLeaves(true);
2303	2598	} else
2304		- if (event.getSource() == showleavesItem)
	2599	+ if (source == showleavesItem)
2305	2600	{
2306	2601	HideLeaves(false);
2307	2602	} else
2308		- if (event.getSource() == markleavesItem)
	2603	+ if (source == markleavesItem)
2309	2604	{
2310	2605	MarkLeaves(true);
2311	2606	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2607	+ if (source == unmarkleavesItem)
2313	2608	{
2314	2609	MarkLeaves(false);
2315	2610	} else
2316		- if (event.getSource() == flipVItem)
	2611	+ if (source == flipVItem)
2317	2612	{
2318	2613	FlipV(true);
2319	2614	} else
2320		- if (event.getSource() == unflipVItem)
	2615	+ if (source == unflipVItem)
2321	2616	{
2322	2617	FlipV(false);
2323	2618	} else
2324		- if (event.getSource() == lowTexturesItem)
	2619	+ if (source == lowTexturesItem)
2325	2620	{
2326	2621	SetTexRes(0);
2327	2622	} else
2328		- if (event.getSource() == normalTexturesItem)
	2623	+ if (source == normalTexturesItem)
2329	2624	{
2330	2625	SetTexRes(1);
2331	2626	} else
2332		- if (event.getSource() == highTexturesItem)
	2627	+ if (source == highTexturesItem)
2333	2628	{
2334	2629	SetTexRes(2);
2335	2630	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2631	+ if (source == veryhighTexturesItem)
2337	2632	{
2338	2633	SetTexRes(3);
2339	2634	} else
2340		- if (event.getSource() == maxTexturesItem)
	2635	+ if (source == maxTexturesItem)
2341	2636	{
2342	2637	SetTexRes(4);
2343	2638	} else
2344		- if (event.getSource() == panoTexturesItem)
	2639	+ if (source == panoTexturesItem)
2345	2640	{
2346	2641	SetTexRes(5);
2347	2642	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2643	+ if (source == reverseNormalsItem)
2349	2644	{
2350	2645	ReverseNormals();
2351	2646	} else
2352		- if (event.getSource() == parseverticesItem)
	2647	+ if (source == parseverticesItem)
2353	2648	{
2354	2649	ParseVertices();
2355	2650	} else
2356		- if (event.getSource() == alignItem)
	2651	+ if (source == textureFieldItem)
	2652	+ {
	2653	+ TextureVertices();
	2654	+ } else
	2655	+ if (source == alignItem)
2357	2656	{
2358	2657	Align();
2359	2658	} else
2360		- if (event.getSource() == mirrorItem)
	2659	+ if (source == mirrorItem)
2361	2660	{
2362	2661	MirrorPoses();
2363	2662	} else
2364		- if (event.getSource() == reduceMorphItem)
	2663	+ if (source == reduceMorphItem)
2365	2664	{
2366	2665	MeshReduction(false);
2367	2666	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2667	+ if (source == reduce34MorphItem)
2369	2668	{
2370	2669	MeshReduction(true);
2371	2670	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2671	+ if (source == reverseTrianglesItem)
2373	2672	{
2374	2673	ReverseTriangles();
2375	2674	} else
2376		- if (event.getSource() == reduceMeshItem)
	2675	+ if (source == reduceMeshItem)
2377	2676	{
2378	2677	ReduceMesh(false);
2379	2678	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2679	+ if (source == reduce34MeshItem)
2381	2680	{
2382	2681	ReduceMesh(true);
2383	2682	} else
2384		- if (event.getSource() == increaseMeshItem)
	2683	+ if (source == increaseMeshItem)
2385	2684	{
2386	2685	IncreaseMesh();
2387	2686	} else
2388		- if (event.getSource() == clipMeshItem)
	2687	+ if (source == clipMeshItem)
2389	2688	{
2390	2689	ClipMesh();
2391	2690	} else
2392		- if (event.getSource() == smoothMeshItem)
	2691	+ if (source == smoothMeshItem)
2393	2692	{
2394	2693	SmoothMesh();
2395	2694	} else
2396		- if (event.getSource() == transformgeometryItem)
	2695	+ if (source == transformGeometryItem)
2397	2696	{
2398	2697	TransformGeometry();
2399	2698	} else
2400		- if (event.getSource() == resetTransformItem)
	2699	+ if (source == transformChildrenItem)
	2700	+ {
	2701	+ TransformChildren();
	2702	+ } else
	2703	+ if (source == resetTransformItem)
2401	2704	{
2402	2705	ResetTransform();
2403	2706	} else
2404		- if (event.getSource() == resetCentroidItem)
	2707	+ if (source == resetCentroidItem)
2405	2708	{
2406		- ResetCentroid();
	2709	+ ResetCentroid(true);
2407	2710	} else
2408		- if (event.getSource() == resetParentItem)
	2711	+ if (source == resetCentroidXZItem)
	2712	+ {
	2713	+ ResetCentroid(false);
	2714	+ } else
	2715	+ if (source == resetParentItem)
2409	2716	{
2410	2717	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2718	{
..	..	@@ -2415,7 +2722,7 @@
2415	2722
2416	2723	refreshContents();
2417	2724	} else
2418		- if (event.getSource() == repairParentItem)
	2725	+ if (source == repairParentItem)
2419	2726	{
2420	2727	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2728	{
..	..	@@ -2429,7 +2736,21 @@
2429	2736
2430	2737	refreshContents();
2431	2738	} else
2432		- if (event.getSource() == sortbysizeItem)
	2739	+ if (source == repairShadowItem)
	2740	+ {
	2741	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2742	+ {
	2743	+ Object3D obj = (Object3D)e.nextElement();
	2744	+ obj.RepairShadow();
	2745	+// for (int i=0; i<obj.size(); i++)
	2746	+// {
	2747	+// obj.get(i).parent = obj;
	2748	+// }
	2749	+ }
	2750	+
	2751	+ refreshContents();
	2752	+ } else
	2753	+ if (source == sortbysizeItem)
2433	2754	{
2434	2755	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2756	{
..	..	@@ -2441,7 +2762,7 @@
2441	2762	ResetModel();
2442	2763	refreshContents();
2443	2764	} else
2444		- if (event.getSource() == sortbynameItem)
	2765	+ if (source == sortbynameItem)
2445	2766	{
2446	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2768	{
..	..	@@ -2453,7 +2774,7 @@
2453	2774	ResetModel();
2454	2775	refreshContents();
2455	2776	} else
2456		- if (event.getSource() == attachPigmentItem)
	2777	+ if (source == attachPigmentItem)
2457	2778	{
2458	2779	String texture = GetFile("Attach pigment");
2459	2780	Object3D obj;
..	..	@@ -2465,7 +2786,7 @@
2465	2786
2466	2787	refreshContents();
2467	2788	} else
2468		- if (event.getSource() == detachPigmentItem)
	2789	+ if (source == detachPigmentItem)
2469	2790	{
2470	2791	Object3D obj;
2471	2792	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2797,7 @@
2476	2797
2477	2798	refreshContents();
2478	2799	} else
2479		- if (event.getSource() == attachBumpItem)
	2800	+ if (source == attachBumpItem)
2480	2801	{
2481	2802	String texture = GetFile("Attach bump");
2482	2803	Object3D obj;
..	..	@@ -2488,7 +2809,7 @@
2488	2809
2489	2810	refreshContents();
2490	2811	} else
2491		- if (event.getSource() == detachBumpItem)
	2812	+ if (source == detachBumpItem)
2492	2813	{
2493	2814	Object3D obj;
2494	2815	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2820,7 @@
2499	2820
2500	2821	refreshContents();
2501	2822	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2823	+ if (source == pigmentBumpItem)
2503	2824	{
2504	2825	Object3D obj;
2505	2826	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2831,195 @@
2510	2831
2511	2832	refreshContents();
2512	2833	} else
2513		- if (event.getSource() == flashSelectionButton)
	2834	+ if (source == flashSelectionButton)
2514	2835	{
2515	2836	CameraPane.flash = true;
2516	2837	refreshContents();
2517	2838	} else
2518		- if (event.getSource() == oneButton)
	2839	+ if (source == oneButton)
2519	2840	{
2520	2841	} else
2521		- if (event.getSource() == twoButton)
	2842	+ if (source == twoButton)
2522	2843	{
2523	2844	radio.layout = twoButton;
2524	2845	// bug
2525	2846	//gridPanel.setDividerLocation(1.0);
2526	2847	//bigPanel.setDividerLocation(0.0);
2527		- bigThree.remove(jtp);
2528		- bigThree.remove(cameraPanel);
2529		- bigThree.remove(XYZPanel);
2530		- aWindowConstraints.gridx = 0;
2531		- aWindowConstraints.gridy = 0;
2532		- aWindowConstraints.gridwidth = 1;
2533		- // aConstraints.gridheight = 3;
2534		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2535		- aWindowConstraints.weightx = 0;
2536		- aWindowConstraints.weighty = 1;
2537		- //bigThree.add(jtp, aWindowConstraints);
2538		- aWindowConstraints.weightx = 1;
2539		- aWindowConstraints.gridwidth = 3;
2540		- // aConstraints.gridheight = 3;
2541		- aWindowConstraints.gridx = 1;
2542		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2543		- bigThree.add(cameraPanel, aWindowConstraints);
2544		- aWindowConstraints.weightx = 0;
2545		- aWindowConstraints.gridx = 4;
2546		- aWindowConstraints.gridwidth = 1;
2547		- // aConstraints.gridheight = 3;
2548		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2549		- //bigThree.add(XYZPanel, aWindowConstraints);
2550		- bigThree.revalidate();
	2848	+// bigThree.remove(scenePanel);
	2849	+// bigThree.remove(centralPanel);
	2850	+// bigThree.remove(XYZPanel);
	2851	+// aWindowConstraints.gridx = 0;
	2852	+// aWindowConstraints.gridy = 0;
	2853	+// aWindowConstraints.gridwidth = 1;
	2854	+// // aConstraints.gridheight = 3;
	2855	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2856	+// aWindowConstraints.weightx = 0;
	2857	+// aWindowConstraints.weighty = 1;
	2858	+// //bigThree.add(jtp, aWindowConstraints);
	2859	+// aWindowConstraints.weightx = 1;
	2860	+// aWindowConstraints.gridwidth = 3;
	2861	+// // aConstraints.gridheight = 3;
	2862	+// aWindowConstraints.gridx = 1;
	2863	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2864	+// bigThree.add(centralPanel, aWindowConstraints);
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.gridx = 4;
	2867	+// aWindowConstraints.gridwidth = 1;
	2868	+// // aConstraints.gridheight = 3;
	2869	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2870	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2871	+// scenePanel.setVisible(false);
	2872	+// centralPanel.setVisible(true);
	2873	+// XYZPanel.setVisible(false);
	2874	+ bigThree.ClearUI();
	2875	+ bigThree.add(centralPanel);
	2876	+ bigThree.FlushUI();
2551	2877	} else
2552		- if (event.getSource() == threeButton)
	2878	+ if (source == threeButton)
2553	2879	{
2554	2880	radio.layout = threeButton;
2555		- bigThree.remove(jtp);
2556		- bigThree.remove(cameraPanel);
2557		- bigThree.remove(XYZPanel);
2558		- aWindowConstraints.gridx = 0;
2559		- aWindowConstraints.gridy = 0;
2560		- aWindowConstraints.gridwidth = 1;
2561		- // aConstraints.gridheight = 3;
2562		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2563		- aWindowConstraints.weightx = 0;
2564		- aWindowConstraints.weighty = 1;
2565		- //bigThree.add(jtp, aWindowConstraints);
2566		- aWindowConstraints.weightx = 1;
2567		- aWindowConstraints.gridwidth = 3;
2568		- // aConstraints.gridheight = 3;
2569		- aWindowConstraints.gridx = 1;
2570		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2571		- bigThree.add(cameraPanel, aWindowConstraints);
2572		- aWindowConstraints.weightx = 0;
2573		- aWindowConstraints.gridx = 4;
2574		- aWindowConstraints.gridwidth = 1;
2575		- // aConstraints.gridheight = 3;
2576		- aConstraints.fill = GridBagConstraints.VERTICAL;
2577		- bigThree.add(XYZPanel, aWindowConstraints);
2578		- bigThree.revalidate();
	2881	+
	2882	+// bigThree.remove(scenePanel);
	2883	+// bigThree.remove(centralPanel);
	2884	+// bigThree.remove(XYZPanel);
	2885	+// aWindowConstraints.gridx = 0;
	2886	+// aWindowConstraints.gridy = 0;
	2887	+// aWindowConstraints.gridwidth = 1;
	2888	+// // aConstraints.gridheight = 3;
	2889	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2890	+// aWindowConstraints.weightx = 0;
	2891	+// aWindowConstraints.weighty = 1;
	2892	+// //bigThree.add(jtp, aWindowConstraints);
	2893	+// aWindowConstraints.weightx = 1;
	2894	+// aWindowConstraints.gridwidth = 3;
	2895	+// // aConstraints.gridheight = 3;
	2896	+// aWindowConstraints.gridx = 1;
	2897	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2898	+// bigThree.add(centralPanel, aWindowConstraints);
	2899	+// aWindowConstraints.weightx = 0;
	2900	+// aWindowConstraints.gridx = 4;
	2901	+// aWindowConstraints.gridwidth = 1;
	2902	+// // aConstraints.gridheight = 3;
	2903	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2904	+// bigThree.add(XYZPanel, aWindowConstraints);
	2905	+// bigThree.validate();
	2906	+// scenePanel.setVisible(false);
	2907	+// centralPanel.setVisible(true);
	2908	+// XYZPanel.setVisible(true);
	2909	+ bigThree.ClearUI();
	2910	+ bigThree.add(centralPanel);
	2911	+ bigThree.add(XYZPanel);
	2912	+ bigThree.FlushUI();
2579	2913	} else
2580		- if (event.getSource() == fourButton)
	2914	+ if (source == fourButton)
2581	2915	{
2582	2916	radio.layout = fourButton;
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aWindowConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2591		- aWindowConstraints.weightx = 1;
2592		- aWindowConstraints.weighty = 1;
2593		- bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- //bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aWindowConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	2917	+
	2918	+// bigThree.remove(scenePanel);
	2919	+// bigThree.remove(centralPanel);
	2920	+// bigThree.remove(XYZPanel);
	2921	+// aWindowConstraints.gridx = 0;
	2922	+// aWindowConstraints.gridy = 0;
	2923	+// aWindowConstraints.gridwidth = 1;
	2924	+// // aWindowConstraints.gridheight = 3;
	2925	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2926	+// aWindowConstraints.weightx = 1;
	2927	+// aWindowConstraints.weighty = 1;
	2928	+// bigThree.add(scenePanel, aWindowConstraints);
	2929	+// aWindowConstraints.weightx = 1;
	2930	+// aWindowConstraints.gridwidth = 3;
	2931	+// // aConstraints.gridheight = 3;
	2932	+// aWindowConstraints.gridx = 1;
	2933	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2934	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2935	+// aWindowConstraints.weightx = 0;
	2936	+// aWindowConstraints.gridx = 4;
	2937	+// aWindowConstraints.gridwidth = 1;
	2938	+// // aWindowConstraints.gridheight = 3;
	2939	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2940	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2941	+// bigThree.validate();
	2942	+// scenePanel.setVisible(true);
	2943	+// centralPanel.setVisible(false);
	2944	+// XYZPanel.setVisible(false);
	2945	+ bigThree.ClearUI();
	2946	+ bigThree.add(scenePanel);
	2947	+ bigThree.FlushUI();
2607	2948	} else
2608		- if (event.getSource() == sixButton)
	2949	+ if (source == sixButton)
2609	2950	{
2610	2951	radio.layout = sixButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aWindowConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aWindowConstraints.gridheight = 3;
2632		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2633		- //bigThree.add(XYZPanel, aConstraints);
2634		- bigThree.revalidate();
	2952	+
	2953	+// bigThree.remove(scenePanel);
	2954	+// bigThree.remove(centralPanel);
	2955	+// bigThree.remove(XYZPanel);
	2956	+// aWindowConstraints.gridx = 0;
	2957	+// aWindowConstraints.gridy = 0;
	2958	+// aWindowConstraints.gridwidth = 1;
	2959	+// // aConstraints.gridheight = 3;
	2960	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2961	+// aWindowConstraints.weightx = 0;
	2962	+// aWindowConstraints.weighty = 1;
	2963	+// bigThree.add(scenePanel, aWindowConstraints);
	2964	+// aWindowConstraints.weightx = 1;
	2965	+// aWindowConstraints.gridwidth = 3;
	2966	+// // aWindowConstraints.gridheight = 3;
	2967	+// aWindowConstraints.gridx = 1;
	2968	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2969	+// bigThree.add(centralPanel, aWindowConstraints);
	2970	+// aWindowConstraints.weightx = 0;
	2971	+// aWindowConstraints.gridx = 4;
	2972	+// aWindowConstraints.gridwidth = 1;
	2973	+// // aWindowConstraints.gridheight = 3;
	2974	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2975	+// //bigThree.add(XYZPanel, aConstraints);
	2976	+// bigThree.validate();
	2977	+// scenePanel.setVisible(true);
	2978	+// centralPanel.setVisible(true);
	2979	+// XYZPanel.setVisible(false);
	2980	+ bigThree.ClearUI();
	2981	+ bigThree.add(scenePanel);
	2982	+ bigThree.add(centralPanel);
	2983	+ bigThree.FlushUI();
2635	2984	} else
2636		- if (event.getSource() == sevenButton)
	2985	+ if (source == sevenButton)
2637	2986	{
2638	2987	radio.layout = sevenButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2647		- aWindowConstraints.weightx = 0;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aWindowConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	2988	+
	2989	+// bigThree.remove(scenePanel);
	2990	+// bigThree.remove(centralPanel);
	2991	+// bigThree.remove(XYZPanel);
	2992	+// aWindowConstraints.gridx = 0;
	2993	+// aWindowConstraints.gridy = 0;
	2994	+// aWindowConstraints.gridwidth = 1;
	2995	+// // aWindowConstraints.gridheight = 3;
	2996	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2997	+// aWindowConstraints.weightx = 0;
	2998	+// aWindowConstraints.weighty = 1;
	2999	+// bigThree.add(scenePanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 1;
	3001	+// aWindowConstraints.gridwidth = 3;
	3002	+// // aWindowConstraints.gridheight = 3;
	3003	+// aWindowConstraints.gridx = 1;
	3004	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3005	+// bigThree.add(centralPanel, aWindowConstraints);
	3006	+// aWindowConstraints.weightx = 0;
	3007	+// aWindowConstraints.gridx = 4;
	3008	+// aWindowConstraints.gridwidth = 1;
	3009	+// // aConstraints.gridheight = 3;
	3010	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3011	+// bigThree.add(XYZPanel, aWindowConstraints);
	3012	+// bigThree.validate();
	3013	+// scenePanel.setVisible(true);
	3014	+// centralPanel.setVisible(true);
	3015	+// XYZPanel.setVisible(true);
	3016	+ bigThree.ClearUI();
	3017	+ bigThree.add(scenePanel);
	3018	+ bigThree.add(centralPanel);
	3019	+ bigThree.add(XYZPanel);
	3020	+ bigThree.FlushUI();
2663	3021	} else
2664		- if (event.getSource() == rootButton)
	3022	+ if (source == rootButton)
2665	3023	{
2666	3024	Object3D obj;
2667	3025	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +3031,7 @@
2673	3031
2674	3032	refreshContents(true);
2675	3033	} else
2676		- if (event.getSource() == closeButton)
	3034	+ if (source == closeButton)
2677	3035	{
2678	3036	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3037	cRadio ab;
..	..	@@ -2694,11 +3052,11 @@
2694	3052	}
2695	3053	refreshContents(true);
2696	3054	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3055	+ if (source == editItem \|\| source == editButton)
2698	3056	{
2699	3057	EditSelection(false);
2700	3058	} else
2701		- if (event.getSource() == uneditButton)
	3059	+ if (source == uneditButton)
2702	3060	{
2703	3061	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3062	{
..	..	@@ -2708,14 +3066,14 @@
2708	3066	child.CloseUI();
2709	3067	listUI.remove(child);
2710	3068
2711		- child.editWindow = null; // ???????????
	3069	+ //child.editWindow = null; // ???????????
2712	3070	}
2713		- objEditor.ctrlPanel.revalidate();
	3071	+ objEditor.ctrlPanel.FlushUI();
2714	3072	//objEditor.jTree.clearSelection();
2715	3073	//objEditor.ResetSliders();
2716	3074	refreshContents(true);
2717	3075	} else
2718		- if (event.getSource() == clearPanelButton)
	3076	+ if (source == clearPanelButton)
2719	3077	{
2720	3078	assert(copy == group);
2721	3079	//copy.ClearUI();
..	..	@@ -2726,7 +3084,7 @@
2726	3084	listUI.clear();
2727	3085	refreshContents(true);
2728	3086	} else
2729		- if (event.getSource() == allParamsButton)
	3087	+ if (source == allParamsButton)
2730	3088	{
2731	3089	assert(copy == group);
2732	3090
..	..	@@ -2747,19 +3105,19 @@
2747	3105
2748	3106	refreshContents(true);
2749	3107	} else
2750		- if (event.getSource() == unselectButton)
	3108	+ if (source == unselectButton)
2751	3109	{
2752	3110	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3111	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3112	objEditor.ResetSliders();
2755	3113	refreshContents(true);
2756	3114	} else
2757		- if(event.getSource() instanceof cRadio)
	3115	+ if(source instanceof cRadio)
2758	3116	{
2759	3117	group.parent = keepparent;
2760	3118	group.attributes = 0;
2761	3119	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3120	+ /cRadio/ radio = (cRadio)source;
2763	3121	Object3D obj = radio.GetObject();
2764	3122	System.out.println("Edit " + obj);
2765	3123	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3137,7 @@
2779	3137	}
2780	3138
2781	3139	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3140	+ //Globals.theRenderer.object = group;
2783	3141	if(!useclient)
2784	3142	{
2785	3143	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3146,16 @@
2788	3146	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3147	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3148	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3149	+ //cameraView.lighttouched = true;
	3150	+ Globals.lighttouched = true;
2792	3151	topView.object = group;
2793	3152	frontView.object = group;
2794	3153	sideView.object = group;
2795	3154	}
	3155	+
	3156	+// fix "+" issue
2796	3157	group.editWindow = this;
	3158	+
2797	3159	/*
2798	3160	currentLayout = radio.layout;
2799	3161	if (currentLayout == null)
..	..	@@ -2806,7 +3168,20 @@
2806	3168	//group.attributes = -1;
2807	3169	ResetModel();
2808	3170	refreshContents(true);
2809		- }
	3171	+ } else if (event.getSource() == editCameraItem)
	3172	+ {
	3173	+ cameraView.ProtectCamera();
	3174	+ cameraView.repaint();
	3175	+ return;
	3176	+ } else if (event.getSource() == revertCameraItem)
	3177	+ {
	3178	+ cameraView.RevertCamera();
	3179	+ cameraView.repaint();
	3180	+ return;
	3181	+ // } else if (event.getSource() == textureButton)
	3182	+ // {
	3183	+ // return; // true;
	3184	+ }
2810	3185	else
2811	3186	{
2812	3187	//return super.action(event, arg);
..	..	@@ -2824,7 +3199,7 @@
2824	3199	if (useclient)
2825	3200	{
2826	3201	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3202	+ Globals.lighttouched = true;
2828	3203	//topView.object = client;
2829	3204	//frontView.object = client;
2830	3205	//sideView.object = client;
..	..	@@ -2832,7 +3207,7 @@
2832	3207	else
2833	3208	{
2834	3209	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3210	+ Globals.lighttouched = true;
2836	3211	//topView.object = group;
2837	3212	//frontView.object = group;
2838	3213	//sideView.object = group;
..	..	@@ -2867,6 +3242,28 @@
2867	3242	refreshContents();
2868	3243	}
2869	3244
	3245	+ void TransformChildren()
	3246	+ {
	3247	+ Object3D obj;
	3248	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3249	+ {
	3250	+ obj = (Object3D)e.nextElement();
	3251	+ obj.KeepTextureMatrices();
	3252	+ obj.TransformChildren();
	3253	+ obj.RestoreTextureMatrices();
	3254	+
	3255	+// if (obj.parent == null)
	3256	+// {
	3257	+// System.out.println("NULL PARENT!");
	3258	+// new Exception().printStackTrace();
	3259	+// }
	3260	+// else
	3261	+// TouchTransform(obj);
	3262	+// //obj.parent.Touch();
	3263	+ }
	3264	+
	3265	+ refreshContents();
	3266	+ }
2870	3267
2871	3268	void ResetTransform()
2872	3269	{
..	..	@@ -2979,7 +3376,7 @@
2979	3376	refreshContents();
2980	3377	}
2981	3378
2982		- void ResetCentroid()
	3379	+ void ResetCentroid(boolean full)
2983	3380	{
2984	3381	Object3D obj;
2985	3382	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3391,16 @@
2994	3391	LA.matIdentity(Object3D.mat);
2995	3392	obj.getBounds(minima, maxima, false);
2996	3393	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3394	+ if (full)
	3395	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3396	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3397	obj.TransformMesh(Object3D.mat);
	3398	+
3000	3399	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3400	+ if (full)
	3401	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3402	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3403	+
3003	3404	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3405	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3406	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3065,9 +3466,9 @@
3065	3466	obj = (Object3D)e.nextElement();
3066	3467
3067	3468	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3469	+ Grafreed.AnalyzeObject(obj);
3069	3470	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3471	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3472
3072	3473	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3474	}
..	..	@@ -3109,6 +3510,13 @@
3109	3510	void GenNormals(boolean crease)
3110	3511	{
3111	3512	group.GenNormalsS(crease);
	3513	+
	3514	+ refreshContents();
	3515	+ }
	3516	+
	3517	+ void GenNormalsMINE()
	3518	+ {
	3519	+ group.selection.GenNormalsMINE();
3112	3520
3113	3521	refreshContents();
3114	3522	}
..	..	@@ -3157,104 +3565,259 @@
3157	3565
3158	3566	//Object3D buffer;
3159	3567	cVector temp = new cVector();
3160		- BoundaryRep temprep;
3161		- Object3D nodes;
3162		- Vector<Vertex> vertices;
3163		-
3164		- public void Vertex(Object3D node, Vertex v)
3165		- {
3166		- vertices.add(v);
3167		- nodes.addElement(node);
3168		-
3169		- if (temprep.GetCache(v) != null)
3170		- {
3171		- temprep.Remove(v);
3172		- }
3173		- else
3174		- {
3175		- temprep.Remember(v);
3176		- }
3177		- }
3178		-
3179		- public void Face(Object3D node, Face f)
3180		- {
3181		-
3182		- }
3183		-
	3568	+// BoundaryRep temprep;
	3569	+// Object3D nodes;
	3570	+// Vector<Vertex> vertices;
	3571	+//
	3572	+// cGroup buffer;
	3573	+//
	3574	+// public void Vertex(Object3D node, Vertex v)
	3575	+// {
	3576	+//// vertices.add(v);
	3577	+//// nodes.addElement(node);
	3578	+////
	3579	+//// if (temprep.GetCache(v) != null)
	3580	+//// {
	3581	+//// temprep.Remove(v);
	3582	+//// } else
	3583	+//// {
	3584	+//// temprep.Remember(v);
	3585	+//// }
	3586	+//
	3587	+// //Object3D node = nodes.get(index);
	3588	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3589	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3590	+//
	3591	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3592	+//
	3593	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3594	+//
	3595	+// cGroup g = new cGroup();
	3596	+//
	3597	+// if (g.toParent == null)
	3598	+// {
	3599	+// g.toParent = LA.newMatrix();
	3600	+// g.fromParent = LA.newMatrix();
	3601	+// }
	3602	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3603	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3604	+//
	3605	+// g.add(GrafreeD.clipboard);
	3606	+//
	3607	+// buffer.add(g);
	3608	+// }
	3609	+//
	3610	+// public void Face(Object3D node, Face f)
	3611	+// {
	3612	+//
	3613	+// }
	3614	+//
	3615	+// void ParseVerticesOld() // ??
	3616	+// {
	3617	+// //if (group.selection.size() != 1)
	3618	+// // return;
	3619	+//
	3620	+// temprep = new BoundaryRep();
	3621	+// nodes = new Object3D();
	3622	+// vertices = new Vector<Vertex>();
	3623	+//
	3624	+// boolean epsequal = GrafreeD.epsequal;
	3625	+// GrafreeD.epsequal = true;
	3626	+//
	3627	+// for (int i=0; i<group.selection.size(); i++)
	3628	+// {
	3629	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3630	+//
	3631	+// group.selection.get(i).Parse(
	3632	+//this );
	3633	+//
	3634	+// int repsize = temprep.VertexCount();
	3635	+// int tablesize = temprep.vertextable.size();
	3636	+// int nodesize = nodes.size();
	3637	+//
	3638	+// assert(vertices.size() == nodes.size());
	3639	+//
	3640	+// temprep.vertextable.elements();
	3641	+//
	3642	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3643	+//
	3644	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3645	+// {
	3646	+// cGroup g = new cGroup();
	3647	+//
	3648	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3649	+//
	3650	+// Object3D node = nodes.get(index);
	3651	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3652	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3653	+//
	3654	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3655	+//
	3656	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3657	+//
	3658	+// if (g.toParent == null)
	3659	+// {
	3660	+// g.toParent = LA.newMatrix();
	3661	+// g.fromParent = LA.newMatrix();
	3662	+// }
	3663	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3664	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3665	+//
	3666	+// g.add(GrafreeD.clipboard);
	3667	+//
	3668	+// buffer.add(g);
	3669	+// }
	3670	+//
	3671	+// makeSomething(buffer, i==group.selection.size()-1);
	3672	+// }
	3673	+//
	3674	+// GrafreeD.epsequal = epsequal;
	3675	+//
	3676	+// //buffer = null;
	3677	+// temprep = null;
	3678	+// nodes = null;
	3679	+//
	3680	+// refreshContents();
	3681	+// }
	3682	+
3184	3683	void ParseVertices()
3185	3684	{
3186		- //if (group.selection.size() != 1)
3187		- // return;
3188		-
3189		- temprep = new BoundaryRep();
3190		- nodes = new Object3D();
3191		- vertices = new Vector<Vertex>();
3192		-
3193		- boolean epsequal = GraphreeD.epsequal;
3194		- GraphreeD.epsequal = true;
	3685	+ boolean epsequal = Grafreed.epsequal;
	3686	+ Grafreed.epsequal = true;
3195	3687
3196	3688	for (int i=0; i<group.selection.size(); i++)
3197	3689	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3690	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3691
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3692	+ group.selection.get(i).Parse(
	3693	+
	3694	+ new iParse()
	3695	+ {
	3696	+ public void Vertex(Object3D node, Vertex v)
	3697	+ {
	3698	+ temp.set(v);
	3699	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3700
3206		- assert(vertices.size() == nodes.size());
3207		-
3208		- temprep.vertextable.elements();
3209		-
3210		- java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3701	+ cGroup g = new cGroup();
3211	3702
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3703	+ if (g.toParent == null)
	3704	+ {
	3705	+ g.toParent = LA.newMatrix();
	3706	+ g.fromParent = LA.newMatrix();
	3707	+ }
	3708	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3709	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3710
3216		- int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
3217		- Object3D node = nodes.get(index);
3218		- temp.set(vertices.get(index)); // temprep.GetVertex(k));
3219		- // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3711	+ g.add(Grafreed.clipboard);
3220	3712
3221		- LA.xformPos(temp, node.GlobalTransformInv(), temp);
3222		-
3223		- // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
3224		-
3225		- if (g.toParent == null)
3226		- {
3227		- g.toParent = LA.newMatrix();
3228		- g.fromParent = LA.newMatrix();
3229		- }
3230		- LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3231		- LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3713	+ buffer.add(g);
	3714	+ }
3232	3715
3233		- g.add(GraphreeD.clipboard);
	3716	+ public void Face(Object3D node, Face f)
	3717	+ {
3234	3718
3235		- buffer.add(g);
3236		- }
	3719	+ }
	3720	+ }
	3721	+ );
3237	3722
3238	3723	makeSomething(buffer, i==group.selection.size()-1);
3239	3724	}
3240	3725
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3726	+ Grafreed.epsequal = epsequal;
3246	3727
3247	3728	refreshContents();
3248	3729	}
3249		-
	3730	+
	3731	+ void TextureVertices()
	3732	+ {
	3733	+ for (int i=0; i<group.selection.size(); i++)
	3734	+ {
	3735	+ group.selection.get(i).Parse(
	3736	+ new iParse()
	3737	+ {
	3738	+ public void Vertex(Object3D node, Vertex v)
	3739	+ {
	3740	+ cTexture tex = node.GetTextures();
	3741	+ String pigment = Object3D.GetPigment(tex);
	3742	+ //String bump = Object3D.GetBump(tex);
	3743	+
	3744	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3745	+
	3746	+ try
	3747	+ {
	3748	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3749	+ }
	3750	+ catch (Exception e)
	3751	+ {
	3752	+ System.err.println("FAIL: " + node);
	3753	+ }
	3754	+
	3755	+ double s = v.s;
	3756	+
	3757	+ if (s == 1)
	3758	+ s = 0;
	3759	+
	3760	+ double t = v.t;
	3761	+
	3762	+ if (t == 1)
	3763	+ t = 0;
	3764	+
	3765	+ int indexs = (int) (texturedata.getWidth() * s);
	3766	+ int indext = (int) (texturedata.getHeight() * t);
	3767	+
	3768	+ int index = indext * texturedata.getWidth() + indexs;
	3769	+
	3770	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3771	+
	3772	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3773	+
	3774	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3775	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3776	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3777	+ scale /= 3;
	3778	+
	3779	+ scale /= 0xFF;
	3780	+ // c'est quoi ca? scale /= 4;
	3781	+
	3782	+ //v.AO = scale;
	3783	+
	3784	+ v.x += v.norm.x * scale;
	3785	+ v.y += v.norm.y * scale;
	3786	+ v.z += v.norm.z * scale;
	3787	+ }
	3788	+
	3789	+ public void Face(Object3D node, Face f)
	3790	+ {
	3791	+ }
	3792	+ }
	3793	+ );
	3794	+ }
	3795	+
	3796	+ refreshContents();
	3797	+ }
	3798	+
3250	3799	void Align()
3251	3800	{
	3801	+ if (group.selection.size() == 0)
	3802	+ return;
	3803	+
	3804	+ cVector bbmin = new cVector();
	3805	+ cVector bbmax = new cVector();
	3806	+
	3807	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3808	+
	3809	+ double dx = bbmax.x - bbmin.x;
	3810	+ double dy = bbmax.y - bbmin.y;
	3811	+ double dz = bbmax.z - bbmin.z;
	3812	+
	3813	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3814	+
3252	3815	for (int i=0; i<group.selection.size(); i++)
3253	3816	{
3254	3817	Object3D obj = group.selection.get(i);
3255	3818
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3819	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3820	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3821	}
3259	3822
3260	3823	refreshContents();
..	..	@@ -3267,7 +3830,7 @@
3267	3830	// ref.SaveSupports();
3268	3831	// Object3D par = ref.parent;
3269	3832	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3833	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3834	// ref.parent = par;
3272	3835	// ref.RestoreSupports();
3273	3836
..	..	@@ -3275,11 +3838,11 @@
3275	3838
3276	3839	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3840
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3841	+ boolean random = CameraPane.SWITCH;
	3842	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3843	lowres.linkVerticesThis(null);
3281	3844	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3845	+ CameraPane.SWITCH = random;
3283	3846
3284	3847	System.err.flush();
3285	3848
..	..	@@ -3297,7 +3860,7 @@
3297	3860	// lowres.SaveSupports();
3298	3861	// par = lowres.parent;
3299	3862	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3863	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3864	Object3D newlow = CloneObject(lowres, false);
3302	3865	newlow.name = sn.switchobject.get(i).name;
3303	3866	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3882,7 @@
3319	3882	return;
3320	3883
3321	3884	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3885	+ Object3D ref = Grafreed.clipboard.get(0);
3323	3886
3324	3887	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3888
..	..	@@ -3488,7 +4051,7 @@
3488	4051	group.selection.RelinkToSupport(); // july 2014
3489	4052	System.out.println("DONE.");
3490	4053	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4054	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4055	}
3493	4056
3494	4057	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4076,20 @@
3513	4076
3514	4077	void ClipMesh()
3515	4078	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4079	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4080	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4081	+ Object3D content = Grafreed.clipboard.get(0);
3519	4082
3520	4083	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4084	content = ((cGroup)content).get(0);
3522	4085
3523	4086	// for (int i=0; i<group.selection.size(); i++)
3524	4087	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4088	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4089	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4090	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4091	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4092	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4093	System.out.println("DONE.");
3531	4094	refreshContents();
3532	4095	}
..	..	@@ -3659,7 +4222,7 @@
3659	4222	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4223
3661	4224	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4225	+ if(elem != group \|\| !newWindow)
3663	4226	{
3664	4227	// if (!(elem instanceof Composite))
3665	4228	// newWindow = false;
..	..	@@ -3764,25 +4327,28 @@
3764	4327	System.err.println("info : " + child.GetPath());
3765	4328	}
3766	4329	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4330	+// else
	4331	+// {
	4332	+// objEditor.SetMaterial(group); // .GetMaterial());
	4333	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4334	+// System.err.println("info : " + group.GetPath());
	4335	+// }
3773	4336
3774	4337	objEditor.SetText(); // jan 2014
3775	4338
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4339	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4340	CameraPane.flash = true;
3778	4341
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4342	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4343	// a camera
3781	4344	{
3782		- CameraPane.camerachangeframe = 0; // don't refuse it
3783		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3784		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3785		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4345	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4346	+ {
	4347	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4348	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4349	+ }
	4350	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4351	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4352	}
3787	4353
3788	4354	refreshContents();
..	..	@@ -3864,16 +4430,18 @@
3864	4430	{
3865	4431	if (group.selection.isEmpty())
3866	4432	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4433	+
	4434	+ Grafreed.clipboardIsTempGroup = false;
3868	4435	Composite tGroup = null;
3869	4436	if (group.selection.size() > 0) // 1)
3870	4437	{
3871	4438	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4439	+ Grafreed.clipboardIsTempGroup = true;
3873	4440	}
3874	4441
3875	4442	if (cut)
3876	4443	{
	4444	+ Save();
3877	4445	//int indices[] = jList.getSelectedIndices();
3878	4446	//for (int i = indices.length - 1; i >= 0; i--)
3879	4447	//jList.remove(indices[i]);
..	..	@@ -3909,16 +4477,16 @@
3909	4477	//System.out.println("cut " + child);
3910	4478	//System.out.println("parent = " + child.parent);
3911	4479	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4480	+ if (Grafreed.clipboardIsTempGroup)
3913	4481	tGroup.add/Child/(tmp);
3914	4482	else
3915		- GraphreeD.clipboard = tmp;
	4483	+ Grafreed.clipboard = tmp;
3916	4484	}
3917	4485	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4486	+ if (Grafreed.clipboardIsTempGroup)
3919	4487	tGroup.add/Child/(child);
3920	4488	else
3921		- GraphreeD.clipboard = child;
	4489	+ Grafreed.clipboard = child;
3922	4490	}
3923	4491
3924	4492	//ResetModel();
..	..	@@ -3950,21 +4518,23 @@
3950	4518	//System.out.println("cut " + elem);
3951	4519	//System.out.println("parent = " + elem.parent);
3952	4520	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
3954	4522	tGroup.add/Child/(tmp);
3955	4523	else
3956		- GraphreeD.clipboard = tmp;
	4524	+ Grafreed.clipboard = tmp;
3957	4525	}
3958	4526	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4527	+ if (Grafreed.clipboardIsTempGroup)
3960	4528	tGroup.add/Child/(child);
3961	4529	else
3962		- GraphreeD.clipboard = child;
	4530	+ Grafreed.clipboard = child;
3963	4531	}
3964	4532
3965	4533	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4534	+
	4535	+ if (Grafreed.clipboardIsTempGroup)
	4536	+ Grafreed.clipboard = tGroup;
	4537	+
3968	4538	if (cut)
3969	4539	{
3970	4540	ResetModel();
..	..	@@ -3974,11 +4544,11 @@
3974	4544
3975	4545	void paste(boolean expand)
3976	4546	{
3977		- // if (GraphreeD.clipboard == null)
	4547	+ // if (GrafreeD.clipboard == null)
3978	4548	// return;
3979	4549	boolean first = true;
3980	4550
3981		- if (GraphreeD.clipboardIsTempGroup)
	4551	+ if (Grafreed.clipboardIsTempGroup)
3982	4552	{
3983	4553	Composite temp;
3984	4554
..	..	@@ -3989,7 +4559,7 @@
3989	4559	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4560	*/
3991	4561	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4562	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4563	{
3994	4564	Object3D child = (Object3D)e.nextElement();
3995	4565
..	..	@@ -4003,7 +4573,7 @@
4003	4573	else
4004	4574	elem = child.deepCopy(); // ?
4005	4575	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4576	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4577	// elem = elem.get(0);
4008	4578	makeSomething(elem, true); // ?? first);
4009	4579	//group.addChild(elem);
..	..	@@ -4023,23 +4593,23 @@
4023	4593	//Object3D cb = Applet3D.clipboard;
4024	4594	//temp.addChild(cb);
4025	4595	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4026		- assert(GraphreeD.clipboard.parent == null);
4027		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4028		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4029		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4030		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4596	+ assert(Grafreed.clipboard.parent == null);
	4597	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4598	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4599	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4600	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4601	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4602	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4603	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4604	}
4035	4605
4036	4606	ResetModel();
4037	4607	refreshContents();
4038	4608	}
4039	4609
4040		- void pasteInto(boolean copyit)
	4610	+ void pasteInto(boolean copyit, boolean clone)
4041	4611	{
4042		-// if (GraphreeD.clipboard == null)
	4612	+// if (GrafreeD.clipboard == null)
4043	4613	// return;
4044	4614
4045	4615	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4636,22 @@
4066	4636	if (copyit)
4067	4637	{
4068	4638	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4639	+ if (clone)
	4640	+ {
	4641	+ CloneClipboard(false); // sept 2014
	4642	+ }
	4643	+ else
	4644	+ {
	4645	+ paste(false);
	4646	+ }
4070	4647	}
4071	4648	else
4072	4649	{
4073	4650	boolean first = true;
4074	4651
4075		- if (GraphreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4076	4653	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4654	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4655	Object3D copy;
4079	4656	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4657	{
..	..	@@ -4084,7 +4661,7 @@
4084	4661	}
4085	4662	} else
4086	4663	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4664	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4665	}
4089	4666	}
4090	4667	}
..	..	@@ -4276,6 +4853,26 @@
4276	4853	makeSomething(csg);
4277	4854	}
4278	4855
	4856	+ void Ungroup(Object3D g)
	4857	+ {
	4858	+ if (g instanceof HiddenObject)
	4859	+ {
	4860	+ HiddenObject h = (HiddenObject) g;
	4861	+
	4862	+ for (int i=0; i<h.ActualSize(); i++)
	4863	+ {
	4864	+ objEditor.makeSomething(h.get(i), false);
	4865	+ }
	4866	+ }
	4867	+ else
	4868	+ {
	4869	+ for (int i=0; i<g.Size(); i++)
	4870	+ {
	4871	+ objEditor.makeSomething(g.get(i), false);
	4872	+ }
	4873	+ }
	4874	+ }
	4875	+
4279	4876	void ungroup()
4280	4877	{
4281	4878	/*
..	..	@@ -4469,21 +5066,6 @@
4469	5066	}
4470	5067	*/
4471	5068
4472		- void ImportGFD()
4473		- {
4474		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4475		- browser.show();
4476		- String filename = browser.getFile();
4477		- if (filename != null && filename.length() > 0)
4478		- {
4479		- String fullname = browser.getDirectory() + filename;
4480		-
4481		- //Object3D readobj =
4482		- objEditor.ReadGFD(fullname, objEditor);
4483		- //makeSomething(readobj);
4484		- }
4485		- }
4486		-
4487	5069	/*
4488	5070	public void Callback(Object obj)
4489	5071	{
..	..	@@ -4507,26 +5089,9 @@
4507	5089	}
4508	5090	*/
4509	5091
4510		- void ImportVRMLX3D()
4511		- {
4512		- if (GraphreeD.standAlone)
4513		- {
4514		- /**/
4515		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4516		- browser.show();
4517		- String filename = browser.getFile();
4518		- if (filename != null && filename.length() > 0)
4519		- {
4520		- String fullname = browser.getDirectory() + filename;
4521		- LoadVRMLX3D(fullname);
4522		- }
4523		- /**/
4524		- }
4525		- }
4526		-
4527	5092	String GetFile(String dialogName)
4528	5093	{
4529		- if (GraphreeD.standAlone)
	5094	+ if (Grafreed.standAlone)
4530	5095	{
4531	5096	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5097	browser.show();
..	..	@@ -4590,10 +5155,15 @@
4590	5155	cButton flashSelectionButton;
4591	5156	cButton editButton;
4592	5157	cButton uneditButton;
	5158	+ JCheckBox allParamsButton;
4593	5159	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5160	cButton unselectButton;
4596	5161
	5162	+ cButton saveButton;
	5163	+ cButton undoButton;
	5164	+ cButton redoButton;
	5165	+ cButton oneStepButton;
	5166	+
4597	5167	cButton screenfitButton;
4598	5168	cButton screenfitpointButton;
4599	5169	cButton snapobjectButton;
..	..	@@ -4624,6 +5194,8 @@
4624	5194	private MenuItem lookFromItem;
4625	5195	private MenuItem switchItem;
4626	5196	private MenuItem cutItem;
	5197	+ private MenuItem undoItem;
	5198	+ private MenuItem redoItem;
4627	5199	private MenuItem duplicateItem;
4628	5200	private MenuItem cloneItem;
4629	5201	private MenuItem cloneSupportItem;
..	..	@@ -4635,8 +5207,9 @@
4635	5207	private MenuItem resetsupportItem;
4636	5208	private MenuItem resetreferencesItem;
4637	5209	private MenuItem linkverticesItem;
	5210	+ private MenuItem relinkverticesItem;
4638	5211	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5212	+ private MenuItem resetAllItem;
4640	5213	private MenuItem stepAllItem;
4641	5214	private MenuItem revertMeshItem;
4642	5215	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5220,17 @@
4647	5220	private MenuItem mergeGeometriesItem;
4648	5221	private MenuItem copyItem;
4649	5222	private MenuItem pasteItem;
	5223	+ private MenuItem pasteIntoItem;
4650	5224	private MenuItem pasteLinkItem;
4651	5225	private MenuItem pasteCloneItem;
4652	5226	private MenuItem pasteExpandItem;
4653	5227	private MenuItem clearItem;
4654	5228	private MenuItem clearAllItem;
4655	5229	private MenuItem genUVItem;
	5230	+ private MenuItem genNormalsMESHItem;
4656	5231	private MenuItem genNormalsCADItem;
4657	5232	private MenuItem genNormalsORGANItem;
	5233	+ private MenuItem genNormalsMINEItem;
4658	5234	private MenuItem stripifyItem;
4659	5235	private MenuItem unstripifyItem;
4660	5236	private MenuItem trimItem;
..	..	@@ -4694,8 +5270,11 @@
4694	5270	private MenuItem panoTexturesItem;
4695	5271
4696	5272	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5273	+ private MenuItem resetCentroidXZItem;
4698	5274	private MenuItem resetTransformItem;
	5275	+ private MenuItem transformGeometryItem;
	5276	+ private MenuItem transformChildrenItem;
	5277	+ private MenuItem hideItem;
4699	5278	private MenuItem grabItem;
4700	5279	private MenuItem backItem;
4701	5280	private MenuItem frontItem;
..	..	@@ -4716,6 +5295,7 @@
4716	5295
4717	5296	private MenuItem resetParentItem;
4718	5297	private MenuItem repairParentItem;
	5298	+ private MenuItem repairShadowItem;
4719	5299	private MenuItem sortbysizeItem;
4720	5300	private MenuItem sortbynameItem;
4721	5301
..	..	@@ -4728,16 +5308,19 @@
4728	5308	private MenuItem particleItem;
4729	5309	private MenuItem ragdollItem;
4730	5310	private MenuItem ragdoll2Item;
	5311	+ private MenuItem heightFieldItem;
	5312	+ private MenuItem textureFieldItem;
4731	5313	private MenuItem gridItem;
4732	5314	private MenuItem rectoidItem;
4733	5315	private MenuItem ellipsoidItem;
4734	5316	private MenuItem coneItem;
4735	5317	private MenuItem torusItem;
4736	5318	private MenuItem superItem;
	5319	+ private MenuItem kleinItem;
4737	5320	private MenuItem blobItem;
4738	5321	private MenuItem latheItem;
4739	5322	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5323	+ private MenuItem overlayItem;
4741	5324	private MenuItem meshItem;
4742	5325	// private MenuItem meshGroupItem;
4743	5326	private MenuItem springItem;
..	..	@@ -4746,6 +5329,7 @@
4746	5329	private MenuItem csgItem;
4747	5330	private MenuItem templateItem;
4748	5331	private MenuItem textureItem;
	5332	+ private MenuItem billboardItem;
4749	5333	private MenuItem shadowXItem;
4750	5334	private MenuItem shadowYItem;
4751	5335	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5342,6 @@
4758	5342	private MenuItem doubleItem;
4759	5343	private MenuItem tripleItem;
4760	5344
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5345	private MenuItem computeAOItem;
4767	5346	private MenuItem recompileItem;
4768	5347	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5351,8 @@
4772	5351	private MenuItem analyzeItem;
4773	5352	private MenuItem dumpItem;
4774	5353	//boolean freezemodel = false;
	5354	+
	5355	+ Menu cameraMenu;
	5356	+ MenuItem editCameraItem;
	5357	+ MenuItem revertCameraItem;
4775	5358	}