~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,129 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+ undoItem = menu.add(new MenuItem("Undo"));
	158	+ undoItem.addActionListener(this);
	159	+ redoItem = menu.add(new MenuItem("Redo"));
	160	+ redoItem.addActionListener(this);
	161	+ menu.add("-");
	162	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	163	+ duplicateItem.addActionListener(this);
	164	+ cloneItem = menu.add(new MenuItem("Clone"));
	165	+ cloneItem.addActionListener(this);
	166	+ if (Globals.ADVANCED)
	167	+ {
	168	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	169	+ cloneSupportItem.addActionListener(this);
	170	+ }
	171	+ menu.add("-");
	172	+ cutItem = menu.add(new MenuItem("Cut"));
	173	+ cutItem.addActionListener(this);
	174	+ copyItem = menu.add(new MenuItem("Copy"));
	175	+ copyItem.addActionListener(this);
	176	+ pasteItem = menu.add(new MenuItem("Paste"));
	177	+ pasteItem.addActionListener(this);
	178	+ menu.add("-");
	179	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(CameraPane.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,44 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		- 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);
	285	+ }
	286	+
	287	+ oe.menuBar.add(menu = new Menu("Setting"));
	288	+ if (Globals.ADVANCED)
	289	+ {
196	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
197	291	revertMeshItem.addActionListener(this);
198	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
199	293	resetreferencesItem.addActionListener(this);
200	294	menu.add("-");
	295	+ }
201	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
202	297	overwriteGeoItem.addActionListener(this);
203	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -209,47 +304,68 @@
209	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
210	305	overwriteUVItem.addActionListener(this);
211	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
212	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
213	310	generateMeshItem.addActionListener(this);
214	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
215	312	poseMeshItem.addActionListener(this);
216	313	menu.add("-");
	314	+ }
217	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
218	316	resetsupportItem.addActionListener(this);
219	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
220	318	linkverticesItem.addActionListener(this);
	319	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	320	+ relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
221	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
222	325	setMasterItem.addActionListener(this);
	326	+ }
223	327
224		- oe.menuBar.add(menu = new Menu("Object"));
	328	+ oe.menuBar.add(menu = new Menu("Group"));
225	329	grabItem = menu.add(new MenuItem("Grab"));
226	330	grabItem.addActionListener(this);
227		- frontItem = menu.add(new MenuItem("Front"));
228		- frontItem.addActionListener(this);
229	331	backItem = menu.add(new MenuItem("Back"));
230	332	backItem.addActionListener(this);
	333	+ frontItem = menu.add(new MenuItem("Front"));
	334	+ frontItem.addActionListener(this);
231	335	compositeItem = menu.add(new MenuItem("Composite"));
232	336	compositeItem.addActionListener(this);
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	338	+ hideItem.addActionListener(this);
	339	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	340	+ ungroupItem.addActionListener(this);
233	341	menu.add("-");
234		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
235	343	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	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
241	345	switchGeoItem.addActionListener(this);
242	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
243	347	switchTransfoItem.addActionListener(this);
244		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
245	349	morphItem.addActionListener(this);
	350	+
	351	+ if (Globals.ADVANCED)
	352	+ {
	353	+ menu.add("-");
	354	+ physicsItem = menu.add(new MenuItem("Physics"));
	355	+ physicsItem.addActionListener(this);
	356	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	357	+ frameselectorItem.addActionListener(this);
246	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
247	359	scriptNodeItem.addActionListener(this);
248	360	cameraItem = menu.add(new MenuItem("Camera"));
249	361	cameraItem.addActionListener(this);
250		- menu.add("-");
	362	+ }
	363	+
	364	+ oe.menuBar.add(menu = new Menu("Object"));
251	365	textureItem = menu.add(new MenuItem("Texture"));
252	366	textureItem.addActionListener(this);
	367	+ billboardItem = menu.add(new MenuItem("Billboard"));
	368	+ billboardItem.addActionListener(this);
253	369	csgItem = menu.add(new MenuItem("CSG"));
254	370	csgItem.addActionListener(this);
255	371	shadowXItem = menu.add(new MenuItem("Shadow X"));
..	..	@@ -258,23 +374,29 @@
258	374	shadowYItem.addActionListener(this);
259	375	shadowZItem = menu.add(new MenuItem("Shadow Z"));
260	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
261	380	linkerItem = menu.add(new MenuItem("Linker"));
262	381	linkerItem.addActionListener(this);
263		- templateItem = menu.add(new MenuItem("Template"));
264		- templateItem.addActionListener(this);
265	382	attributeItem = menu.add(new MenuItem("Attribute"));
266	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
267	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
268	387	pointflowItem.addActionListener(this);
	388	+ }
269	389	menu.add("-");
270		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
271		- transformgeometryItem.addActionListener(this);
272	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
273	391	resetTransformItem.addActionListener(this);
274	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
275	393	resetCentroidItem.addActionListener(this);
276		- ungroupItem = menu.add(new MenuItem("Ungroup"));
277		- ungroupItem.addActionListener(this);
	394	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	395	+ resetCentroidXZItem.addActionListener(this);
	396	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	397	+ transformGeometryItem.addActionListener(this);
	398	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	399	+ transformChildrenItem.addActionListener(this);
278	400
279	401	oe.menuBar.add(menu = new Menu("Geometry"));
280	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -283,6 +405,13 @@
283	405	genNormalsORGANItem.addActionListener(this);
284	406	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
285	407	genNormalsCADItem.addActionListener(this);
	408	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	409	+ genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
	412	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	413	+ genNormalsMINEItem.addActionListener(this);
	414	+ }
286	415	stripifyItem = menu.add(new MenuItem("Stripify"));
287	416	stripifyItem.addActionListener(this);
288	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -292,8 +421,6 @@
292	421	untrimItem = menu.add(new MenuItem("Untrim"));
293	422	untrimItem.addActionListener(this);
294	423	menu.add("-");
295		- clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
296		- clearMaterialsItem.addActionListener(this);
297	424	clearColorsItem = menu.add(new MenuItem("Clear AO"));
298	425	clearColorsItem.addActionListener(this);
299	426	reverseNormalsItem = menu.add(new MenuItem("Reverse Normals"));
..	..	@@ -306,19 +433,34 @@
306	433	reduce34MeshItem.addActionListener(this);
307	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	435	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
	444	+
	445	+ oe.menuBar.add(menu = new Menu("Attributes"));
	446	+ clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
	447	+ clearMaterialsItem.addActionListener(this);
	448	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	449	+ resetAllItem.addActionListener(this);
	450	+ stepAllItem = menu.add(new MenuItem("Step All"));
	451	+ stepAllItem.addActionListener(this);
313	452	menu.add("-");
314	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
315	454	liveleavesItem.addActionListener(this);
316	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
317	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
318	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
319	460	supportleavesItem.addActionListener(this);
320	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
321	462	unsupportleavesItem.addActionListener(this);
	463	+ }
322	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
323	465	hideleavesItem.addActionListener(this);
324	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -332,27 +474,18 @@
332	474	flipVItem.addActionListener(this);
333	475	unflipVItem = menu.add(new MenuItem("Unflip V"));
334	476	unflipVItem.addActionListener(this);
335		- lowTexturesItem = menu.add(new MenuItem("Low Texture"));
	477	+ lowTexturesItem = menu.add(new MenuItem("Low Texture (256)"));
336	478	lowTexturesItem.addActionListener(this);
337		- normalTexturesItem = menu.add(new MenuItem("Normal Texture"));
	479	+ normalTexturesItem = menu.add(new MenuItem("Normal Texture (512)"));
338	480	normalTexturesItem.addActionListener(this);
339		- highTexturesItem = menu.add(new MenuItem("High Texture"));
	481	+ highTexturesItem = menu.add(new MenuItem("High Texture (1024)"));
340	482	highTexturesItem.addActionListener(this);
341		- veryhighTexturesItem = menu.add(new MenuItem("Very high Texture"));
	483	+ veryhighTexturesItem = menu.add(new MenuItem("Very high Texture (2048)"));
342	484	veryhighTexturesItem.addActionListener(this);
343		- maxTexturesItem = menu.add(new MenuItem("Max Texture"));
	485	+ maxTexturesItem = menu.add(new MenuItem("Max Texture (4096)"));
344	486	maxTexturesItem.addActionListener(this);
345		- panoTexturesItem = menu.add(new MenuItem("Panoramic Texture"));
	487	+ panoTexturesItem = menu.add(new MenuItem("Panoramic Texture (8192)"));
346	488	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	489
357	490	oe.menuBar.add(menu = new Menu("Selection"));
358	491	attachPigmentItem = menu.add(new MenuItem("Attach Pigment..."));
..	..	@@ -370,9 +503,24 @@
370	503	sortbysizeItem.addActionListener(this);
371	504	sortbynameItem = menu.add(new MenuItem("Sort by name"));
372	505	sortbynameItem.addActionListener(this);
	506	+ menu.add("-");
	507	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	508	+ shareGeometriesItem.addActionListener(this);
	509	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	510	+ mergeGeometriesItem.addActionListener(this);
	511	+ if (Globals.ADVANCED)
	512	+ {
	513	+ // Pretty much the same as duplicate and clone.
	514	+ extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
	515	+ extractGeometriesItem.addActionListener(this);
	516	+ cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
	517	+ cloneGeometriesItem.addActionListener(this);
	518	+ }
	519	+
373	520	oe.menuBar.add(menu = new Menu("Insert"));
374	521	buildCreateMenu(menu);
375		- oe.menuBar.add(menu = new Menu("Tools"));
	522	+
	523	+ oe.menuBar.add(menu = new Menu("Tools"));
376	524	buildToolsMenu(menu);
377	525	}
378	526
..	..	@@ -406,150 +554,98 @@
406	554	oe.radioPanel.add(dummyButton);
407	555	oe.buttonGroup.add(dummyButton);
408	556	*/
409		- aConstraints.gridy += 1;
410		- oe.aConstraints.gridwidth = 1;
411		- oe.aConstraints.gridx = 0;
	557	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
412	558
413		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	559	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	560	+ liveCB.setToolTipText("Enable animation");
414	561	liveCB.addItemListener(this);
415	562
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);
	563	+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	564	+ oneStepButton.setToolTipText("Animate one step forward");
	565	+ oneStepButton.addActionListener(this);
	566	+
	567	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	568	+ fastCB.setToolTipText("Fast mode");
434	569	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);
	570	+
	571	+ oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	572	+ trackCB.setToolTipText("Enable tracking");
476	573	trackCB.addItemListener(this);
477	574
478		- oe.aConstraints.gridx += 1;
479		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	575	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	576	+ screenfitButton.setToolTipText("Screen fit");
480	577	screenfitButton.addActionListener(this);
481		- oe.aConstraints.gridx += 1;
	578	+
482	579	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
483	580	// 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	581
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);
	582	+ if (Globals.ADVANCED)
	583	+ {
	584	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	585	+ snapobjectButton.addActionListener(this);
	586	+ snapobjectButton.setToolTipText("Snap Object");
	587	+ }
	588	+
	589	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ flashSelectionButton.setToolTipText("Show selection");
495	591	flashSelectionButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		- oe.aConstraints.weighty = 0;
498		- oe.aConstraints.gridwidth = 1;
499	592
500		- //
501		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	593	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	594	+
	595	+ oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ twoButton.setToolTipText("Show center view only");
502	597	twoButton.addActionListener(this);
503		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	598	+ oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	599	fourButton.addActionListener(this);
505		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	600	+ fourButton.setToolTipText("Show left panel only");
	601	+ oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ sixButton.setToolTipText("2-column layout left");
506	603	sixButton.addActionListener(this);
507		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	604	+ oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ threeButton.setToolTipText("2-column layout right");
508	606	threeButton.addActionListener(this);
509		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	607	+ oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ sevenButton.setToolTipText("3-column layout");
510	609	sevenButton.addActionListener(this);
511	610	//
512	611
513		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	612	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ rootButton.setToolTipText("Edit selection in new tab");
514	614	rootButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	615	+
	616	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	617	+ closeButton.setToolTipText("Close tab");
517	618	closeButton.addActionListener(this);
518	619	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
519	620	//clearButton.addActionListener(this);
520		- oe.aConstraints.gridx += 1;
521	621
522		- oe.aConstraints.gridx = 1; //
523		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	622	+ cGridBag commandsPanel = new cGridBag();
	623	+
	624	+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	625	+ editButton.setToolTipText("Edit selection");
524	626	editButton.addActionListener(this);
525		- oe.aConstraints.gridx += 1;
526		- oe.aConstraints.weighty = 0;
527		- oe.aConstraints.gridwidth = 1;
528	627
529		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	628	+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ uneditButton.setToolTipText("Unedit selection");
530	630	uneditButton.addActionListener(this);
531	631
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);
	632	+ commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	633	+ allParamsButton.setToolTipText("Edit all params");
544	634	allParamsButton.addActionListener(this);
545	635
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);
	636	+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	637	+ clearPanelButton.setToolTipText("Clear edit panel");
	638	+ clearPanelButton.addActionListener(this);
	639	+
	640	+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	641	+ unselectButton.setToolTipText("Unselect");
551	642	unselectButton.addActionListener(this);
552	643
	644	+ commandsPanel.preferredHeight = 1;
	645	+
	646	+ oe.treePanel.add(commandsPanel);
	647	+ oe.treePanel.Return();
	648	+
553	649	// oe.aConstraints.gridx += 1;
554	650	// oe.aConstraints.weighty = 0;
555	651	// oe.aConstraints.gridwidth = 1;
..	..	@@ -561,40 +657,37 @@
561	657	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
562	658	// gcButton.addActionListener(this);
563	659
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;
	660	+ cGridBag jSPPanel = new cGridBag();
	661	+
	662	+ JScrollPane jSP;
575	663	//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);
	664	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
577	665	ResetModel();
578		- oe.aConstraints.weighty = 0.5;
579		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
580		- oe.aConstraints.gridy += 1;
581		- oe.aConstraints.gridwidth = 1;
	666	+
	667	+ oe.treePanel.add(jSPPanel);
	668	+ oe.treePanel.Return();
582	669
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);
	670	+ cGridBag copyOptionsPanel = new cGridBag();
	671	+
	672	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	673	+ colorCB.setToolTipText("Copy color when dropped");
587	674	colorCB.addItemListener(this);
588		- oe.aConstraints.gridx += 2;
589		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	675	+
	676	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	677	+ materialCB.setToolTipText("Copy material when dropped");
590	678	materialCB.addItemListener(this);
591		- oe.aConstraints.gridx += 2;
592		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	679	+
	680	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	681	+ textureCB.setToolTipText("Copy texture when dropped");
593	682	textureCB.addItemListener(this);
594	683
595		- oe.aConstraints.gridx = 0;
596		- oe.aConstraints.gridy += 1;
	684	+ copyOptionsPanel.preferredHeight = 1;
	685	+ oe.treePanel.add(copyOptionsPanel);
	686	+ oe.treePanel.Return();
597	687
	688	+// mainPanel.setDividerLocation(0.5); //1.0);
	689	+// mainPanel.setResizeWeight(0.5);
	690	+
598	691	//jList.addListSelectionListener(this);
599	692	oe.jTree.addTreeSelectionListener(this);
600	693	//jTree.setRootVisible(false);
..	..	@@ -616,18 +709,91 @@
616	709	radio.layout = sevenButton;
617	710	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
618	711	}
	712	+
	713	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	714	+ {
	715	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	716	+ boxCB.setToolTipText("Display bounding boxes");
	717	+ boxCB.addItemListener(this);
	718	+
	719	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	720	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	721	+ zoomBoxCB.addItemListener(this);
	722	+
	723	+ if (true) // Globals.ADVANCED)
	724	+ {
	725	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	726	+ supportCB.setToolTipText("Enable rigging");
	727	+ supportCB.addItemListener(this);
	728	+
	729	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	730	+ // localCB.addItemListener(this);
	731	+
	732	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	733	+ crowdCB.setToolTipText("Used for crowds");
	734	+ crowdCB.addItemListener(this);
	735	+
	736	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	737	+ smoothCB.setToolTipText("Snapping delay");
	738	+ smoothCB.addItemListener(this);
	739	+
	740	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	741	+ slowCB.setToolTipText("Smooth interpolation");
	742	+ slowCB.addItemListener(this);
	743	+
	744	+// constraints.gridy += 1;
	745	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	746	+// speakerMocapCB.addItemListener(this);
	747	+
	748	+ if (false)
	749	+ {
	750	+ // handled in scripts
	751	+ //constraints.gridy += 1;
	752	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	753	+ speakerCameraCB.addItemListener(this);
	754	+
	755	+ //constraints.gridy += 1;
	756	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	757	+ speakerFocusCB.addItemListener(this);
	758	+
	759	+ //constraints.gridy += 1;
	760	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	761	+ smoothfocusCB.addItemListener(this);
	762	+ }
	763	+
	764	+//constraints.gridx += 1;
	765	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	766	+// debugCB.addItemListener(this);
	767	+
	768	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	769	+ oeilCB.addItemListener(this);
	770	+
	771	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	772	+ lookAtCB.setToolTipText("Look-at target");
	773	+ lookAtCB.addItemListener(this);
	774	+
	775	+ }
	776	+
	777	+ cGridBag fill = new cGridBag();
	778	+
	779	+ fill.preferredHeight = 200;
	780	+
	781	+ panel.add(fill);
	782	+
	783	+ }
619	784
620	785	void EditObject(Object3D obj)
621	786	{
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();
	787	+ cRadio radioButton = new cRadio(obj.name);
	788	+ radioButton.SetObject(obj);
	789	+ radioButton.layout = sevenButton;
	790	+ radioButton.SetCamera(cameraView.renderCamera, false);
	791	+ radioButton.addActionListener(this);
	792	+ radioPanel.add(radioButton);
	793	+ buttonGroup.add(radioButton);
	794	+ radioButton.doClick();
630	795	}
	796	+
631	797	void SetupViews(ObjEditor oe)
632	798	{
633	799	oe.SetupViews();
..	..	@@ -646,6 +812,7 @@
646	812	JCheckBox fastCB;
647	813	JCheckBox slowCB;
648	814	JCheckBox boxCB;
	815	+ JCheckBox zoomBoxCB;
649	816	JCheckBox trackCB;
650	817	JCheckBox smoothfocusCB;
651	818	// JCheckBox speakerMocapCB;
..	..	@@ -688,8 +855,7 @@
688	855	dropAttributes \|= Object3D.TEXTURE;
689	856	else
690	857	dropAttributes &= ~Object3D.TEXTURE;
691		- }
692		- else if(e.getSource() == liveCB)
	858	+ } else if(e.getSource() == liveCB)
693	859	{
694	860	cameraView.ToggleLive();
695	861	}
..	..	@@ -726,6 +892,10 @@
726	892	Recompile();
727	893	cameraView.repaint();
728	894	// refreshContents();
	895	+ }
	896	+ else if(e.getSource() == zoomBoxCB)
	897	+ {
	898	+ cameraView.ToggleZoomBoxMode();
729	899	}
730	900	else if(e.getSource() == smoothfocusCB)
731	901	{
..	..	@@ -840,7 +1010,9 @@
840	1010	// objEditor.DropFile((java.io.File[]) object, true);
841	1011	// return;
842	1012	// }
843		- if (string.charAt(0) == '/')
	1013	+
	1014	+ // File path for Mac and Windows
	1015	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
844	1016	{
845	1017	// file(s)
846	1018	String[] names = string.split("\n");
..	..	@@ -867,7 +1039,7 @@
867	1039
868	1040	flashIt = false;
869	1041	CameraPane pane = (CameraPane) target;
870		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1042	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
871	1043	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
872	1044
873	1045	if (group.selection.size() == 1)
..	..	@@ -894,11 +1066,11 @@
894	1066	{
895	1067	loadClipboard(true);
896	1068	objEditor.jTree.setSelectionPath(destinationPath);
897		- pasteInto(false);
	1069	+ pasteInto(false, false);
898	1070	} else {
899	1071	loadClipboard(false);
900	1072	objEditor.jTree.setSelectionPath(destinationPath);
901		- pasteInto(false); // true); // ???
	1073	+ pasteInto(false, false); // true); // ???
902	1074	}
903	1075	}
904	1076	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1002,6 +1174,8 @@
1002	1174
1003	1175	void buildCreateMenu(Menu menu)
1004	1176	{
	1177	+ //heightFieldItem = menu.add(new MenuItem("Height Field"));
	1178	+ //heightFieldItem.addActionListener(this);
1005	1179	gridItem = menu.add(new MenuItem("Grid"));
1006	1180	gridItem.addActionListener(this);
1007	1181	rectoidItem = menu.add(new MenuItem("Box"));
..	..	@@ -1014,29 +1188,37 @@
1014	1188	torusItem.addActionListener(this);
1015	1189	superItem = menu.add(new MenuItem("Superellipsoid"));
1016	1190	superItem.addActionListener(this);
	1191	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1192	+ kleinItem.addActionListener(this);
1017	1193	particleItem = menu.add(new MenuItem("Particle system"));
1018	1194	particleItem.addActionListener(this);
	1195	+ if (Globals.ADVANCED)
	1196	+ {
1019	1197	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1020	1198	ragdollItem.addActionListener(this);
1021	1199	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1022	1200	ragdoll2Item.addActionListener(this);
	1201	+ }
1023	1202	menu.add("-");
1024		- meshItem = menu.add(new MenuItem("Mesh"));
	1203	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1025	1204	meshItem.addActionListener(this);
1026	1205	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1027	1206	// meshGroupItem.addActionListener(this);
	1207	+ if (Globals.ADVANCED)
	1208	+ {
1028	1209	springItem = menu.add(new MenuItem("Spring"));
1029	1210	springItem.addActionListener(this);
1030	1211	flagItem = menu.add(new MenuItem("Flag"));
1031	1212	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	1213	blobItem = menu.add(new MenuItem("Blob"));
1037	1214	blobItem.addActionListener(this);
1038	1215	latheItem = menu.add(new MenuItem("Lathe"));
1039	1216	latheItem.addActionListener(this);
	1217	+ }
	1218	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1219	+ bezierItem.addActionListener(this);
	1220	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1221	+ overlayItem.addActionListener(this);
1040	1222	lightItem = menu.add(new MenuItem("Light"));
1041	1223	lightItem.addActionListener(this);
1042	1224	menu.add("-");
..	..	@@ -1046,41 +1228,39 @@
1046	1228	loopItem.addActionListener(this);
1047	1229	doubleItem = menu.add(new MenuItem("Fork"));
1048	1230	doubleItem.addActionListener(this);
	1231	+ if (Globals.ADVANCED)
	1232	+ {
1049	1233	tripleItem = menu.add(new MenuItem("Trident"));
1050	1234	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);
	1235	+ }
1060	1236	}
1061	1237
1062	1238	void buildToolsMenu(Menu menu)
1063	1239	{
1064	1240	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1065	1241	animationItem.addItemListener(this);
1066		- animationItem.setState(CameraPane.ANIMATION);
	1242	+ animationItem.setState(Globals.ANIMATION);
1067	1243
1068	1244	menu.add("-");
1069	1245	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1070	1246	parseverticesItem.addActionListener(this);
1071		- alignItem = menu.add(new MenuItem("Align"));
	1247	+ textureFieldItem = menu.add(new MenuItem("Texture Field"));
	1248	+ textureFieldItem.addActionListener(this);
	1249	+ alignItem = menu.add(new MenuItem("Align Objects"));
1072	1250	alignItem.addActionListener(this);
1073		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1074		- mirrorItem.addActionListener(this);
1075	1251	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1076	1252	reduceMorphItem.addActionListener(this);
1077	1253	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1078	1254	reduce34MorphItem.addActionListener(this);
1079		-
	1255	+ menu.add("-");
1080	1256	menu.add(computeAOItem = new MenuItem("Compute AO"));
1081	1257	computeAOItem.addActionListener(this);
1082		- menu.add("-");
1083	1258
	1259	+ if (Globals.ADVANCED)
	1260	+ {
	1261	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1262	+ mirrorItem.addActionListener(this);
	1263	+ menu.add("-");
1084	1264	menu.add(memoryItem = new MenuItem("Memory Usage"));
1085	1265	memoryItem.addActionListener(this);
1086	1266	menu.add(analyzeItem = new MenuItem("Analyze"));
..	..	@@ -1094,6 +1274,8 @@
1094	1274	resetParentItem.addActionListener(this);
1095	1275	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1096	1276	repairParentItem.addActionListener(this);
	1277	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1278	+ repairShadowItem.addActionListener(this);
1097	1279	menu.add(invariantsItem = new MenuItem("Invariants"));
1098	1280	invariantsItem.addActionListener(this);
1099	1281	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1101,6 +1283,7 @@
1101	1283	menu.add("-");
1102	1284	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1103	1285	editScriptItem.addActionListener(this);
	1286	+ }
1104	1287	}
1105	1288
1106	1289	void ScreenFit()
..	..	@@ -1429,9 +1612,9 @@
1429	1612
1430	1613	void Overwrite(int mask)
1431	1614	{
1432		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1615	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1433	1616	{
1434		- Object3D content = GraphreeD.clipboard.get(0);
	1617	+ Object3D content = Grafreed.clipboard.get(0);
1435	1618
1436	1619	if (content instanceof cGroup && ((cGroup)content).transientlink )
1437	1620	content = ((cGroup)content).get(0);
..	..	@@ -1454,6 +1637,7 @@
1454	1637	//
1455	1638	public void actionPerformed(ActionEvent event) // , Object arg)
1456	1639	{
	1640	+ Object source = event.getSource();
1457	1641	/*
1458	1642	if (event.getSource() == nameField)
1459	1643	{
..	..	@@ -1465,11 +1649,11 @@
1465	1649	}
1466	1650	else
1467	1651	*/
1468		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1652	+ if (source == lookAtItem \|\| source == lookFromItem)
1469	1653	{
1470	1654	ScreenFit();
1471	1655	} else
1472		- if (event.getSource() == switchItem)
	1656	+ if (source == switchItem)
1473	1657	{
1474	1658	cVector v1 = new cVector();
1475	1659	cVector v2 = new cVector();
..	..	@@ -1478,11 +1662,11 @@
1478	1662	objEditor.cameraView.renderCamera.setAim(v2, v1);
1479	1663	objEditor.cameraView.repaint();
1480	1664	} else
1481		- if (event.getSource() == rectoidItem)
	1665	+ if (source == rectoidItem)
1482	1666	{
1483	1667	makeSomething(new Box());
1484	1668	} else
1485		- if (event.getSource() == particleItem)
	1669	+ if (source == particleItem)
1486	1670	{
1487	1671	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1488	1672	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1503,9 +1687,9 @@
1503	1687	applyExample(particleGeom, "SMOKE");
1504	1688	makeSomething(particleGeom);
1505	1689	} else
1506		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1690	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1507	1691	{
1508		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1692	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1509	1693
1510	1694	ragdoll.toParent = LA.newMatrix();
1511	1695	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1521,27 +1705,71 @@
1521	1705	makeSomething(ragdoll);
1522	1706	//makeSomething(new VehicleDemo());
1523	1707	} else
1524		- if (event.getSource() == gridItem)
	1708	+ /*
	1709	+ */
	1710	+ if (source == heightFieldItem)
	1711	+ {
	1712	+ Object3D obj = new Object3D();
	1713	+
	1714	+ obj.CreateMaterial();
	1715	+ obj.bRep = new BoundaryRep();
	1716	+
	1717	+ obj.bRep.CreateMesh(new iHeightField()
	1718	+ {
	1719	+ public double f(double x, double y)
	1720	+ {
	1721	+ // The Mandelbrot set is represented by coloring
	1722	+ // each point (x,y) according to the number of
	1723	+ // iterations it takes before the while loop in
	1724	+ // this method ends. For points that are actually
	1725	+ // in the Mandelbrot set, or very close to it, the
	1726	+ // count will reach the maximum value, 80. These
	1727	+ // points will be colored purple. All other colors
	1728	+ // represent points that are definitely NOT in the set.
	1729	+ x -= 600;
	1730	+ y -= 500;
	1731	+ x /= 200;
	1732	+ y /= 200;
	1733	+ int count = 0;
	1734	+ double zx = x;
	1735	+ double zy = y;
	1736	+ while (count < 80 && Math.abs(x) < 100 && Math.abs(zy) < 100) {
	1737	+ double new_zx = zxzx - zyzy + x;
	1738	+ zy = 2zxzy + y;
	1739	+ zx = new_zx;
	1740	+ count++;
	1741	+ }
	1742	+ return count; // Math.sqrt(count);
	1743	+ }
	1744	+ }, 1000,1000);
	1745	+
	1746	+ makeSomething(obj);
	1747	+ } else
	1748	+ if (source == gridItem)
1525	1749	{
1526	1750	makeSomething(new Grid());
1527	1751	} else
1528		- if (event.getSource() == ellipsoidItem)
	1752	+ if (source == ellipsoidItem)
1529	1753	{
1530	1754	makeSomething(new Sphere());
1531	1755	} else
1532		- if (event.getSource() == coneItem)
	1756	+ if (source == coneItem)
1533	1757	{
1534	1758	makeSomething(new Cone());
1535	1759	} else
1536		- if (event.getSource() == torusItem)
	1760	+ if (source == torusItem)
1537	1761	{
1538	1762	makeSomething(new Torus());
1539	1763	} else
1540		- if (event.getSource() == superItem)
	1764	+ if (source == superItem)
1541	1765	{
1542	1766	makeSomething(new Superellipsoid());
1543	1767	} else
1544		- if (event.getSource() == blobItem)
	1768	+ if (source == kleinItem)
	1769	+ {
	1770	+ makeSomething(new Klein());
	1771	+ } else
	1772	+ if (source == blobItem)
1545	1773	{
1546	1774	Blob blob = new Blob();
1547	1775	BlobComponent comp = new BlobComponent();
..	..	@@ -1549,15 +1777,15 @@
1549	1777	//blob.retile();
1550	1778	makeSomething(blob);
1551	1779	} else
1552		- if (event.getSource() == latheItem)
	1780	+ if (source == latheItem)
1553	1781	{
1554	1782	makeSomething(new Lathe());
1555	1783	} else
1556		- if (event.getSource() == bezierItem)
	1784	+ if (source == bezierItem)
1557	1785	{
1558	1786	makeSomething(new BezierSurface());
1559	1787	} else
1560		- if (event.getSource() == checkerItem)
	1788	+ if (source == overlayItem)
1561	1789	{
1562	1790	/*
1563	1791	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1570,9 +1798,9 @@
1570	1798	LA.matConcat(obj.toParent, cameraView.renderCamera.fromParent, obj.toParent);
1571	1799	LA.matInvert(obj.toParent, obj.fromParent);
1572	1800	*/
1573		- makeSomething(new CheckerIG());
	1801	+ makeSomething(new Checker());
1574	1802	} else
1575		- if (event.getSource() == meshItem)
	1803	+ if (source == meshItem)
1576	1804	{
1577	1805	Object3D itemtomake = new Object3D();
1578	1806	Object3D child;
..	..	@@ -1593,35 +1821,35 @@
1593	1821	makeSomething(child);
1594	1822	}
1595	1823	} else
1596		- if (event.getSource() == springItem)
	1824	+ if (source == springItem)
1597	1825	{
1598	1826	cSpring s = new cSpring();
1599	1827	s.setup();
1600	1828	makeSomething(s);
1601	1829	} else
1602		- if (event.getSource() == flagItem)
	1830	+ if (source == flagItem)
1603	1831	{
1604	1832	cSpring s = new cFlag();
1605	1833	s.setup();
1606	1834	makeSomething(s);
1607	1835	} else
1608		- if (event.getSource() == lightItem)
	1836	+ if (source == lightItem)
1609	1837	{
1610	1838	makeSomething(new Light());
1611	1839	} else
1612		- if (event.getSource() == csgItem)
	1840	+ if (source == csgItem)
1613	1841	{
1614	1842	group(new CSG());
1615	1843	} else
1616		- if (event.getSource() == templateItem)
	1844	+ if (source == templateItem)
1617	1845	{
1618	1846	group(new cTemplate());
1619	1847	} else
1620		- if (event.getSource() == attributeItem)
	1848	+ if (source == attributeItem)
1621	1849	{
1622	1850	makeSomething(new Attribute());
1623	1851	} else
1624		- if (event.getSource() == pointflowItem)
	1852	+ if (source == pointflowItem)
1625	1853	{
1626	1854	makeSomething(new PointFlow());
1627	1855	} else
..	..	@@ -1633,7 +1861,7 @@
1633	1861	} else
1634	1862	*/
1635	1863
1636		- if (event.getSource() == superLoopItem)
	1864	+ if (source == superLoopItem)
1637	1865	{
1638	1866	Composite g = new cGroup();
1639	1867	for (int i=0; i<15; i++)
..	..	@@ -1655,7 +1883,7 @@
1655	1883
1656	1884	group(g);
1657	1885	} else
1658		- if (event.getSource() == loopItem)
	1886	+ if (source == loopItem)
1659	1887	{
1660	1888	Composite csg = new GroupLeaf();
1661	1889	csg.count = 5;
..	..	@@ -1664,7 +1892,7 @@
1664	1892	csg.addChild(child);
1665	1893	child.addChild(csg);
1666	1894	} else
1667		- if (event.getSource() == doubleItem)
	1895	+ if (source == doubleItem)
1668	1896	{
1669	1897	Composite csg = new GroupLeaf();
1670	1898	csg.count = 5;
..	..	@@ -1676,7 +1904,7 @@
1676	1904	csg.addChild(child);
1677	1905	child.addChild(csg);
1678	1906	} else
1679		- if (event.getSource() == tripleItem)
	1907	+ if (source == tripleItem)
1680	1908	{
1681	1909	Composite csg = new GroupLeaf();
1682	1910	csg.count = 4;
..	..	@@ -1691,71 +1919,59 @@
1691	1919	csg.addChild(child);
1692	1920	child.addChild(csg);
1693	1921	} else
1694		-
1695		- if (event.getSource() == importGFDItem)
	1922	+ if (source == computeAOItem)
1696	1923	{
1697		- ImportGFD();
	1924	+ Globals.drawMode = CameraPane.OCCLUSION;
	1925	+ Globals.theRenderer.repaint();
1698	1926	} 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)
	1927	+ if (source == recompileItem)
1717	1928	{
1718	1929	Recompile();
1719	1930	refreshContents();
1720	1931	} else
1721		- if (event.getSource() == editScriptItem)
	1932	+ if (source == editScriptItem)
1722	1933	{
1723	1934	OpenDialog();
1724	1935	refreshContents();
1725	1936	} else
1726		- if (event.getSource() == invariantsItem)
	1937	+ if (source == invariantsItem)
1727	1938	{
1728	1939	System.out.println("Invariants:");
1729		- GraphreeD.theApplet3D.universe.invariants();
	1940	+ Grafreed.grafreeD.universe.invariants();
1730	1941	} else
1731		- if (event.getSource() == memoryItem)
	1942	+ if (source == memoryItem)
1732	1943	{
1733	1944	//System.out.println("Invariants:");
1734	1945	PrintMemory();
1735	1946	} else
1736		- if (event.getSource() == pathItem)
	1947	+ if (source == pathItem)
1737	1948	{
1738	1949	PrintPath();
1739	1950	} else
1740		- if (event.getSource() == analyzeItem)
	1951	+ if (source == analyzeItem)
1741	1952	{
1742	1953	AnalyzeObject();
1743	1954	} else
1744		- if (event.getSource() == dumpItem)
	1955	+ if (source == dumpItem)
1745	1956	{
1746	1957	DumpObject();
1747	1958	} else
1748		- if (event.getSource() == screenfitButton)
	1959	+ if (source == oneStepButton)
	1960	+ {
	1961	+ Globals.ONESTEP = true;
	1962	+ cameraView.repaint();
	1963	+ } else
	1964	+ if (source == screenfitButton)
1749	1965	{
1750	1966	//Reload(lastConverter, lastFilename, true);
1751	1967	ScreenFit();
1752	1968	} else
1753		- if (event.getSource() == screenfitpointButton)
	1969	+ if (source == screenfitpointButton)
1754	1970	{
1755	1971	//Reload(lastConverter, lastFilename, true);
1756	1972	ScreenFitPoint();
1757	1973	} else
1758		- if (event.getSource() == snapobjectButton)
	1974	+ if (source == snapobjectButton)
1759	1975	{
1760	1976	//Reload(lastConverter, lastFilename, true);
1761	1977	SnapObject();
..	..	@@ -1766,13 +1982,13 @@
1766	1982	// Recompile();
1767	1983	// refreshContents();
1768	1984	// } else
1769		- if (event.getSource() == gcButton)
	1985	+ if (source == gcButton)
1770	1986	{
1771	1987	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1772	1988	System.gc();
1773	1989	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1774	1990	} else
1775		- if (event.getSource() == editLeafItem)
	1991	+ if (source == editLeafItem)
1776	1992	{
1777	1993	Object3D obj;
1778	1994	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1786,65 +2002,78 @@
1786	2002	}
1787	2003	refreshContents(true);
1788	2004	} else
1789		- if (event.getSource() == openWindowItem)
	2005	+ if (source == openWindowItem)
1790	2006	{
1791	2007	EditSelection(true);
1792	2008	} else
1793		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2009	+ if (source == cutItem \|\| source == clearButton)
1794	2010	{
1795	2011	loadClipboard(true);
1796	2012	} else
1797		- if (event.getSource() == duplicateItem)
	2013	+ if (source == undoItem)
1798	2014	{
1799		- Object3D keep = GraphreeD.clipboard;
	2015	+ Undo();
	2016	+ } else
	2017	+ if (source == redoItem)
	2018	+ {
	2019	+ Redo();
	2020	+ } else
	2021	+ if (source == duplicateItem)
	2022	+ {
	2023	+ Object3D keep = Grafreed.clipboard;
1800	2024	loadClipboard(false);
1801	2025	paste(false);
1802		- GraphreeD.clipboard = keep;
	2026	+ Grafreed.clipboard = keep;
1803	2027	} else
1804		- if (event.getSource() == cloneItem)
	2028	+ if (source == cloneItem)
1805	2029	{
1806	2030	CloneSelection(false);
1807	2031	} else
1808		- if (event.getSource() == cloneSupportItem)
	2032	+ if (source == cloneSupportItem)
1809	2033	{
1810	2034	CloneSelection(true);
1811	2035	} else
1812		- if (event.getSource() == copyItem)
	2036	+ if (source == copyItem)
1813	2037	{
1814	2038	loadClipboard(false);
1815	2039	} else
1816		- if (event.getSource() == pasteItem)
	2040	+ if (source == pasteItem)
1817	2041	{
1818	2042	paste(false);
1819	2043	} else
1820		- if (event.getSource() == pasteLinkItem)
	2044	+ if (source == pasteIntoItem)
1821	2045	{
1822		- pasteInto(false);
	2046	+ pasteInto(true, false);
1823	2047	} else
1824		- if (event.getSource() == pasteCloneItem)
	2048	+ if (source == pasteLinkItem)
1825	2049	{
1826		- pasteInto(true);
	2050	+ pasteInto(false, false);
1827	2051	} else
1828		- if (event.getSource() == pasteExpandItem)
	2052	+ if (source == pasteCloneItem)
	2053	+ {
	2054	+ pasteInto(true, true);
	2055	+ } else
	2056	+ if (source == pasteExpandItem)
1829	2057	{
1830	2058	paste(true);
1831	2059	} else
1832		- if (event.getSource() == synchronizeItem)
	2060	+ if (source == synchronizeItem)
1833	2061	{
1834	2062	Overwrite(Object3D.TRANSFORM);
1835	2063	} else
1836		- if (event.getSource() == overwriteNameItem)
	2064	+ if (source == overwriteNameItem)
1837	2065	{
1838	2066	Overwrite(Object3D.NAME);
1839	2067	} else
1840		- if (event.getSource() == overwriteUVItem)
	2068	+ if (source == overwriteUVItem)
1841	2069	{
1842	2070	Overwrite(Object3D.UV);
1843	2071	} else
1844		- if (event.getSource() == overwriteMatItem)
	2072	+ if (source == overwriteMatItem)
1845	2073	{
	2074	+ /* july 2015
1846	2075	if ((dropAttributes & Object3D.TEXTURE) == 0)
1847		- Overwrite(Object3D.MATERIAL);
	2076	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1848	2077	else
1849	2078	{
1850	2079	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1856,13 +2085,16 @@
1856	2085	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1857	2086	}
1858	2087	}
	2088	+ */
	2089	+
	2090	+ Overwrite(dropAttributes);
1859	2091	}
1860		- if (event.getSource() == overwriteGeoItem)
	2092	+ if (source == overwriteGeoItem)
1861	2093	{
1862	2094	Overwrite(Object3D.GEOMETRY);
1863		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2095	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1864	2096	// {
1865		-// Object3D content = GraphreeD.clipboard.get(0);
	2097	+// Object3D content = GrafreeD.clipboard.get(0);
1866	2098	//
1867	2099	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1868	2100	// content = ((cGroup)content).get(0);
..	..	@@ -1874,7 +2106,7 @@
1874	2106	// refreshContents();
1875	2107	// }
1876	2108	} else
1877		- if (event.getSource() == generateMeshItem)
	2109	+ if (source == generateMeshItem)
1878	2110	{
1879	2111	//if (group.selection.size() == 1)
1880	2112	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1885,7 +2117,7 @@
1885	2117	ResetModel();
1886	2118	refreshContents();
1887	2119	} else
1888		- if (event.getSource() == extractGeometriesItem)
	2120	+ if (source == extractGeometriesItem)
1889	2121	{
1890	2122	boolean one = false;
1891	2123
..	..	@@ -1912,7 +2144,7 @@
1912	2144	ResetModel();
1913	2145	refreshContents();
1914	2146	} else
1915		- if (event.getSource() == cloneGeometriesItem)
	2147	+ if (source == cloneGeometriesItem)
1916	2148	{
1917	2149	boolean one = false;
1918	2150
..	..	@@ -1938,32 +2170,37 @@
1938	2170	ResetModel();
1939	2171	refreshContents();
1940	2172	} else
1941		- if (event.getSource() == shareGeometriesItem)
	2173	+ if (source == shareGeometriesItem)
1942	2174	{
1943	2175	boolean one = false;
1944	2176
1945	2177	if (group.selection.size() == 1)
1946	2178	one = true;
1947	2179
	2180	+ Object3D merge = null;
	2181	+
1948	2182	Object3D content = new cGroup();
1949	2183
1950	2184	for (int i=0; i<group.selection.size(); i++)
1951	2185	{
1952		- Object3D sel = new Merge(group.selection.get(i));
	2186	+ merge = new Merge(group.selection.get(i));
1953	2187
1954	2188	if (one)
1955		- makeSomething(sel, false);
	2189	+ makeSomething(merge, false);
1956	2190	else
1957		- content.addChild(sel);
	2191	+ content.addChild(merge);
1958	2192	}
1959	2193
1960	2194	if (!one)
1961		- makeSomething(content, false);
1962		-
1963		- ResetModel();
1964		- refreshContents();
	2195	+ makeSomething(content, true);
	2196	+ else
	2197	+ {
	2198	+ ResetModel();
	2199	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2200	+ refreshContents();
	2201	+ }
1965	2202	} else
1966		- if (event.getSource() == mergeGeometriesItem)
	2203	+ if (source == mergeGeometriesItem)
1967	2204	{
1968	2205	boolean one = false;
1969	2206
..	..	@@ -1993,11 +2230,11 @@
1993	2230	ResetModel();
1994	2231	refreshContents();
1995	2232	} else
1996		- if (event.getSource() == linkverticesItem)
	2233	+ if (source == linkverticesItem)
1997	2234	{
1998		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2235	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
1999	2236	// {
2000		-// Object3D content = GraphreeD.clipboard.get(0);
	2237	+// Object3D content = GrafreeD.clipboard.get(0);
2001	2238	//
2002	2239	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2003	2240	// content = ((cGroup)content).get(0);
..	..	@@ -2006,39 +2243,48 @@
2006	2243	// group.selection.get(0).setMasterThis(content); // should be identity
2007	2244	// refreshContents();
2008	2245	// }
2009		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2246	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2010	2247	{
2011		- Object3D content = GraphreeD.clipboard.get(0);
	2248	+ Object3D content = Grafreed.clipboard.get(0);
2012	2249
2013	2250	if (content instanceof cGroup && ((cGroup)content).transientlink )
2014	2251	content = ((cGroup)content).get(0);
2015	2252
2016		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2253	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2017	2254	for (int i=0; i<group.selection.size(); i++)
2018	2255	{
2019		- boolean random = CameraPane.RANDOM;
2020		- CameraPane.RANDOM = false; // parse all random nodes
	2256	+ boolean random = CameraPane.SWITCH;
	2257	+ CameraPane.SWITCH = false; // parse all random nodes
2021	2258	group.selection.get(i).linkVerticesThis(content);
2022	2259	// group.selection.get(i).setMasterThis(content); // should be identity
2023		- CameraPane.RANDOM = random;
	2260	+ CameraPane.SWITCH = random;
2024	2261	}
2025		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2262	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2026	2263	refreshContents();
2027	2264	}
2028	2265	} else
2029		- if (event.getSource() == resetsupportItem)
	2266	+ if (source == resetsupportItem)
2030	2267	{
2031	2268	for (int i=0; i<group.selection.size(); i++)
2032	2269	{
2033		- boolean random = CameraPane.RANDOM;
2034		- CameraPane.RANDOM = false; // parse all random nodes
	2270	+ boolean random = CameraPane.SWITCH;
	2271	+ CameraPane.SWITCH = false; // parse all random nodes
2035	2272	group.selection.get(i).linkVerticesThis(null);
2036		- CameraPane.RANDOM = random;
	2273	+ CameraPane.SWITCH = random;
2037	2274	}
2038	2275
2039	2276	refreshContents();
2040	2277	} else
2041		- if (event.getSource() == resetreferencesItem)
	2278	+ if (source == relinkverticesItem)
	2279	+ {
	2280	+ boolean random = CameraPane.SWITCH;
	2281	+ CameraPane.SWITCH = false; // parse all random nodes
	2282	+ group.selection.RelinkToSupport();
	2283	+ CameraPane.SWITCH = random;
	2284	+
	2285	+ refreshContents();
	2286	+ } else
	2287	+ if (source == resetreferencesItem)
2042	2288	{
2043	2289	for (int i=0; i<group.selection.size(); i++)
2044	2290	{
..	..	@@ -2047,11 +2293,11 @@
2047	2293
2048	2294	refreshContents();
2049	2295	} else
2050		- if (event.getSource() == setMasterItem)
	2296	+ if (source == setMasterItem)
2051	2297	{
2052		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2298	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2053	2299	{
2054		- Object3D content = GraphreeD.clipboard.get(0);
	2300	+ Object3D content = Grafreed.clipboard.get(0);
2055	2301
2056	2302	if (content instanceof cGroup && ((cGroup)content).transientlink )
2057	2303	content = ((cGroup)content).get(0);
..	..	@@ -2060,13 +2306,13 @@
2060	2306	refreshContents();
2061	2307	}
2062	2308	} else
2063		- if (event.getSource() == poseMeshItem)
	2309	+ if (source == poseMeshItem)
2064	2310	{
2065	2311	if (group.selection.size() == 1)
2066	2312	{
2067		- if (GraphreeD.clipboard.size() == 1)
	2313	+ if (Grafreed.clipboard.size() == 1)
2068	2314	{
2069		- Object3D content = GraphreeD.clipboard.get(0);
	2315	+ Object3D content = Grafreed.clipboard.get(0);
2070	2316
2071	2317	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2318	content = ((cGroup)content).get(0);
..	..	@@ -2079,19 +2325,19 @@
2079	2325	}
2080	2326
2081	2327	} else
2082		- if (event.getSource() == revertMeshItem)
	2328	+ if (source == revertMeshItem)
2083	2329	{
2084	2330	RevertMeshes();
2085	2331	} else
2086		- if (event.getSource() == resetMeshItem)
	2332	+ if (source == resetAllItem)
2087	2333	{
2088	2334	ResetAll();
2089	2335	} else
2090		- if (event.getSource() == stepAllItem)
	2336	+ if (source == stepAllItem)
2091	2337	{
2092	2338	StepAll();
2093	2339	} else
2094		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2340	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2095	2341	{
2096	2342	//int indices[] = jList.getSelectedIndices();
2097	2343	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2099,42 +2345,46 @@
2099	2345
2100	2346	ClearSelection(false);
2101	2347	} else
2102		- if (event.getSource() == clearAllItem)
	2348	+ if (source == clearAllItem)
2103	2349	{
2104	2350	ClearSelection(true);
2105	2351	} else
2106		- if (event.getSource() == grabItem)
	2352	+ if (source == grabItem)
2107	2353	{
2108	2354	group(new cGroup(), true);
2109	2355	} else
2110		- if (event.getSource() == frontItem)
	2356	+ if (source == hideItem)
	2357	+ {
	2358	+ group(new HiddenObject());
	2359	+ } else
	2360	+ if (source == frontItem)
2111	2361	{
2112	2362	front();
2113	2363	} else
2114		- if (event.getSource() == backItem)
	2364	+ if (source == backItem)
2115	2365	{
2116	2366	back();
2117	2367	} else
2118		- if (event.getSource() == cameraItem)
	2368	+ if (source == cameraItem)
2119	2369	{
2120	2370	makeSomething(new Camera());
2121	2371	} else
2122		- if (event.getSource() == compositeItem)
	2372	+ if (source == compositeItem)
2123	2373	{
2124	2374	group(new Composite());
2125	2375	} else
2126		- if (event.getSource() == randomItem)
	2376	+ if (source == randomItem)
2127	2377	{
2128	2378	RandomNode random = new RandomNode();
2129	2379	group(random);
2130	2380	if (random.size() > 0)
2131		- random.name = random.get(0).name + "Rnd";
	2381	+ random.name = random.get(0).name + "Switch";
2132	2382	} else
2133		- if (event.getSource() == physicsItem)
	2383	+ if (source == physicsItem)
2134	2384	{
2135	2385	group(new PhysicsNode());
2136	2386	} else
2137		- if (event.getSource() == frameselectorItem)
	2387	+ if (source == frameselectorItem)
2138	2388	{
2139	2389	for (int i=0; i<group.selection.size(); i++)
2140	2390	{
..	..	@@ -2146,7 +2396,7 @@
2146	2396	ResetModel();
2147	2397	refreshContents();
2148	2398	} else
2149		- if (event.getSource() == switchGeoItem)
	2399	+ if (source == switchGeoItem)
2150	2400	{
2151	2401	for (int i=0; i<group.selection.size(); i++)
2152	2402	{
..	..	@@ -2158,7 +2408,7 @@
2158	2408	ResetModel();
2159	2409	refreshContents();
2160	2410	} else
2161		- if (event.getSource() == switchTransfoItem)
	2411	+ if (source == switchTransfoItem)
2162	2412	{
2163	2413	for (int i=0; i<group.selection.size(); i++)
2164	2414	{
..	..	@@ -2170,7 +2420,7 @@
2170	2420	ResetModel();
2171	2421	refreshContents();
2172	2422	} else
2173		- if (event.getSource() == morphItem)
	2423	+ if (source == morphItem)
2174	2424	{
2175	2425	for (int i=0; i<group.selection.size(); i++)
2176	2426	{
..	..	@@ -2182,7 +2432,7 @@
2182	2432	ResetModel();
2183	2433	refreshContents();
2184	2434	} else
2185		- if (event.getSource() == scriptNodeItem)
	2435	+ if (source == scriptNodeItem)
2186	2436	{
2187	2437	boolean atleastone = false;
2188	2438
..	..	@@ -2221,191 +2471,223 @@
2221	2471	}
2222	2472	}
2223	2473	} else
2224		- if (event.getSource() == linkerItem)
	2474	+ if (source == linkerItem)
2225	2475	{
2226	2476	group(new cLinker());
2227	2477	} else
2228		- if (event.getSource() == textureItem)
	2478	+ if (source == textureItem)
2229	2479	{
2230	2480	group(new TextureNode());
2231	2481	} else
2232		- if (event.getSource() == shadowXItem)
	2482	+ if (source == billboardItem)
	2483	+ {
	2484	+ group(new BillboardNode());
	2485	+ } else
	2486	+ if (source == shadowXItem)
2233	2487	{
2234	2488	CastShadow(0);
2235	2489	} else
2236		- if (event.getSource() == shadowYItem)
	2490	+ if (source == shadowYItem)
2237	2491	{
2238	2492	CastShadow(1);
2239	2493	} else
2240		- if (event.getSource() == shadowZItem)
	2494	+ if (source == shadowZItem)
2241	2495	{
2242	2496	CastShadow(2);
2243	2497	} else
2244		- if (event.getSource() == ungroupItem)
	2498	+ if (source == ungroupItem)
2245	2499	{
2246		- ungroup();
	2500	+ //ungroup();
	2501	+ for (int i=0; i<group.selection.size(); i++)
	2502	+ {
	2503	+ Ungroup(group.selection.get(i));
	2504	+ }
	2505	+
	2506	+ ClearSelection(false);
	2507	+
	2508	+ refreshContents();
2247	2509	} else
2248		- if (event.getSource() == genUVItem)
	2510	+ if (source == genUVItem)
2249	2511	{
2250	2512	GenUV();
2251	2513	} else
2252		- if (event.getSource() == genNormalsCADItem)
	2514	+ if (source == genNormalsCADItem)
2253	2515	{
2254	2516	GenNormals(true);
2255	2517	} else
2256		- if (event.getSource() == genNormalsORGANItem)
	2518	+ if (source == genNormalsMESHItem)
	2519	+ {
	2520	+ GenNormals(true); // TODO
	2521	+ } else
	2522	+ if (source == genNormalsORGANItem)
2257	2523	{
2258	2524	GenNormals(false);
2259	2525	} else
2260		- if (event.getSource() == stripifyItem)
	2526	+ if (source == genNormalsMINEItem)
	2527	+ {
	2528	+ GenNormalsMINE();
	2529	+ } else
	2530	+ if (source == stripifyItem)
2261	2531	{
2262	2532	Stripify();
2263	2533	} else
2264		- if (event.getSource() == unstripifyItem)
	2534	+ if (source == unstripifyItem)
2265	2535	{
2266	2536	Unstripify();
2267	2537	} else
2268		- if (event.getSource() == trimItem)
	2538	+ if (source == trimItem)
2269	2539	{
2270	2540	Trim();
2271	2541	} else
2272		- if (event.getSource() == untrimItem)
	2542	+ if (source == untrimItem)
2273	2543	{
2274	2544	Untrim();
2275	2545	} else
2276		- if (event.getSource() == clearColorsItem)
	2546	+ if (source == clearColorsItem)
2277	2547	{
2278	2548	ClearColors();
2279	2549	} else
2280		- if (event.getSource() == clearMaterialsItem)
	2550	+ if (source == clearMaterialsItem)
2281	2551	{
2282	2552	ClearMaterials();
2283	2553	} else
2284		- if (event.getSource() == liveleavesItem)
	2554	+ if (source == liveleavesItem)
2285	2555	{
2286	2556	LiveLeaves(true);
2287	2557	} else
2288		- if (event.getSource() == unliveleavesItem)
	2558	+ if (source == unliveleavesItem)
2289	2559	{
2290	2560	LiveLeaves(false);
2291	2561	} else
2292		- if (event.getSource() == supportleavesItem)
	2562	+ if (source == supportleavesItem)
2293	2563	{
2294	2564	SupportLeaves(true);
2295	2565	} else
2296		- if (event.getSource() == unsupportleavesItem)
	2566	+ if (source == unsupportleavesItem)
2297	2567	{
2298	2568	SupportLeaves(false);
2299	2569	} else
2300		- if (event.getSource() == hideleavesItem)
	2570	+ if (source == hideleavesItem)
2301	2571	{
2302	2572	HideLeaves(true);
2303	2573	} else
2304		- if (event.getSource() == showleavesItem)
	2574	+ if (source == showleavesItem)
2305	2575	{
2306	2576	HideLeaves(false);
2307	2577	} else
2308		- if (event.getSource() == markleavesItem)
	2578	+ if (source == markleavesItem)
2309	2579	{
2310	2580	MarkLeaves(true);
2311	2581	} else
2312		- if (event.getSource() == unmarkleavesItem)
	2582	+ if (source == unmarkleavesItem)
2313	2583	{
2314	2584	MarkLeaves(false);
2315	2585	} else
2316		- if (event.getSource() == flipVItem)
	2586	+ if (source == flipVItem)
2317	2587	{
2318	2588	FlipV(true);
2319	2589	} else
2320		- if (event.getSource() == unflipVItem)
	2590	+ if (source == unflipVItem)
2321	2591	{
2322	2592	FlipV(false);
2323	2593	} else
2324		- if (event.getSource() == lowTexturesItem)
	2594	+ if (source == lowTexturesItem)
2325	2595	{
2326	2596	SetTexRes(0);
2327	2597	} else
2328		- if (event.getSource() == normalTexturesItem)
	2598	+ if (source == normalTexturesItem)
2329	2599	{
2330	2600	SetTexRes(1);
2331	2601	} else
2332		- if (event.getSource() == highTexturesItem)
	2602	+ if (source == highTexturesItem)
2333	2603	{
2334	2604	SetTexRes(2);
2335	2605	} else
2336		- if (event.getSource() == veryhighTexturesItem)
	2606	+ if (source == veryhighTexturesItem)
2337	2607	{
2338	2608	SetTexRes(3);
2339	2609	} else
2340		- if (event.getSource() == maxTexturesItem)
	2610	+ if (source == maxTexturesItem)
2341	2611	{
2342	2612	SetTexRes(4);
2343	2613	} else
2344		- if (event.getSource() == panoTexturesItem)
	2614	+ if (source == panoTexturesItem)
2345	2615	{
2346	2616	SetTexRes(5);
2347	2617	} else
2348		- if (event.getSource() == reverseNormalsItem)
	2618	+ if (source == reverseNormalsItem)
2349	2619	{
2350	2620	ReverseNormals();
2351	2621	} else
2352		- if (event.getSource() == parseverticesItem)
	2622	+ if (source == parseverticesItem)
2353	2623	{
2354	2624	ParseVertices();
2355	2625	} else
2356		- if (event.getSource() == alignItem)
	2626	+ if (source == textureFieldItem)
	2627	+ {
	2628	+ TextureVertices();
	2629	+ } else
	2630	+ if (source == alignItem)
2357	2631	{
2358	2632	Align();
2359	2633	} else
2360		- if (event.getSource() == mirrorItem)
	2634	+ if (source == mirrorItem)
2361	2635	{
2362	2636	MirrorPoses();
2363	2637	} else
2364		- if (event.getSource() == reduceMorphItem)
	2638	+ if (source == reduceMorphItem)
2365	2639	{
2366	2640	MeshReduction(false);
2367	2641	} else
2368		- if (event.getSource() == reduce34MorphItem)
	2642	+ if (source == reduce34MorphItem)
2369	2643	{
2370	2644	MeshReduction(true);
2371	2645	} else
2372		- if (event.getSource() == reverseTrianglesItem)
	2646	+ if (source == reverseTrianglesItem)
2373	2647	{
2374	2648	ReverseTriangles();
2375	2649	} else
2376		- if (event.getSource() == reduceMeshItem)
	2650	+ if (source == reduceMeshItem)
2377	2651	{
2378	2652	ReduceMesh(false);
2379	2653	} else
2380		- if (event.getSource() == reduce34MeshItem)
	2654	+ if (source == reduce34MeshItem)
2381	2655	{
2382	2656	ReduceMesh(true);
2383	2657	} else
2384		- if (event.getSource() == increaseMeshItem)
	2658	+ if (source == increaseMeshItem)
2385	2659	{
2386	2660	IncreaseMesh();
2387	2661	} else
2388		- if (event.getSource() == clipMeshItem)
	2662	+ if (source == clipMeshItem)
2389	2663	{
2390	2664	ClipMesh();
2391	2665	} else
2392		- if (event.getSource() == smoothMeshItem)
	2666	+ if (source == smoothMeshItem)
2393	2667	{
2394	2668	SmoothMesh();
2395	2669	} else
2396		- if (event.getSource() == transformgeometryItem)
	2670	+ if (source == transformGeometryItem)
2397	2671	{
2398	2672	TransformGeometry();
2399	2673	} else
2400		- if (event.getSource() == resetTransformItem)
	2674	+ if (source == transformChildrenItem)
	2675	+ {
	2676	+ TransformChildren();
	2677	+ } else
	2678	+ if (source == resetTransformItem)
2401	2679	{
2402	2680	ResetTransform();
2403	2681	} else
2404		- if (event.getSource() == resetCentroidItem)
	2682	+ if (source == resetCentroidItem)
2405	2683	{
2406		- ResetCentroid();
	2684	+ ResetCentroid(true);
2407	2685	} else
2408		- if (event.getSource() == resetParentItem)
	2686	+ if (source == resetCentroidXZItem)
	2687	+ {
	2688	+ ResetCentroid(false);
	2689	+ } else
	2690	+ if (source == resetParentItem)
2409	2691	{
2410	2692	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2411	2693	{
..	..	@@ -2415,7 +2697,7 @@
2415	2697
2416	2698	refreshContents();
2417	2699	} else
2418		- if (event.getSource() == repairParentItem)
	2700	+ if (source == repairParentItem)
2419	2701	{
2420	2702	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2421	2703	{
..	..	@@ -2429,7 +2711,21 @@
2429	2711
2430	2712	refreshContents();
2431	2713	} else
2432		- if (event.getSource() == sortbysizeItem)
	2714	+ if (source == repairShadowItem)
	2715	+ {
	2716	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2717	+ {
	2718	+ Object3D obj = (Object3D)e.nextElement();
	2719	+ obj.RepairShadow();
	2720	+// for (int i=0; i<obj.size(); i++)
	2721	+// {
	2722	+// obj.get(i).parent = obj;
	2723	+// }
	2724	+ }
	2725	+
	2726	+ refreshContents();
	2727	+ } else
	2728	+ if (source == sortbysizeItem)
2433	2729	{
2434	2730	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2435	2731	{
..	..	@@ -2441,7 +2737,7 @@
2441	2737	ResetModel();
2442	2738	refreshContents();
2443	2739	} else
2444		- if (event.getSource() == sortbynameItem)
	2740	+ if (source == sortbynameItem)
2445	2741	{
2446	2742	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2447	2743	{
..	..	@@ -2453,7 +2749,7 @@
2453	2749	ResetModel();
2454	2750	refreshContents();
2455	2751	} else
2456		- if (event.getSource() == attachPigmentItem)
	2752	+ if (source == attachPigmentItem)
2457	2753	{
2458	2754	String texture = GetFile("Attach pigment");
2459	2755	Object3D obj;
..	..	@@ -2465,7 +2761,7 @@
2465	2761
2466	2762	refreshContents();
2467	2763	} else
2468		- if (event.getSource() == detachPigmentItem)
	2764	+ if (source == detachPigmentItem)
2469	2765	{
2470	2766	Object3D obj;
2471	2767	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2476,7 +2772,7 @@
2476	2772
2477	2773	refreshContents();
2478	2774	} else
2479		- if (event.getSource() == attachBumpItem)
	2775	+ if (source == attachBumpItem)
2480	2776	{
2481	2777	String texture = GetFile("Attach bump");
2482	2778	Object3D obj;
..	..	@@ -2488,7 +2784,7 @@
2488	2784
2489	2785	refreshContents();
2490	2786	} else
2491		- if (event.getSource() == detachBumpItem)
	2787	+ if (source == detachBumpItem)
2492	2788	{
2493	2789	Object3D obj;
2494	2790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2499,7 +2795,7 @@
2499	2795
2500	2796	refreshContents();
2501	2797	} else
2502		- if (event.getSource() == pigmentBumpItem)
	2798	+ if (source == pigmentBumpItem)
2503	2799	{
2504	2800	Object3D obj;
2505	2801	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2510,158 +2806,195 @@
2510	2806
2511	2807	refreshContents();
2512	2808	} else
2513		- if (event.getSource() == flashSelectionButton)
	2809	+ if (source == flashSelectionButton)
2514	2810	{
2515	2811	CameraPane.flash = true;
2516	2812	refreshContents();
2517	2813	} else
2518		- if (event.getSource() == oneButton)
	2814	+ if (source == oneButton)
2519	2815	{
2520	2816	} else
2521		- if (event.getSource() == twoButton)
	2817	+ if (source == twoButton)
2522	2818	{
2523	2819	radio.layout = twoButton;
2524	2820	// bug
2525	2821	//gridPanel.setDividerLocation(1.0);
2526	2822	//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();
	2823	+// bigThree.remove(scenePanel);
	2824	+// bigThree.remove(centralPanel);
	2825	+// bigThree.remove(XYZPanel);
	2826	+// aWindowConstraints.gridx = 0;
	2827	+// aWindowConstraints.gridy = 0;
	2828	+// aWindowConstraints.gridwidth = 1;
	2829	+// // aConstraints.gridheight = 3;
	2830	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2831	+// aWindowConstraints.weightx = 0;
	2832	+// aWindowConstraints.weighty = 1;
	2833	+// //bigThree.add(jtp, aWindowConstraints);
	2834	+// aWindowConstraints.weightx = 1;
	2835	+// aWindowConstraints.gridwidth = 3;
	2836	+// // aConstraints.gridheight = 3;
	2837	+// aWindowConstraints.gridx = 1;
	2838	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2839	+// bigThree.add(centralPanel, aWindowConstraints);
	2840	+// aWindowConstraints.weightx = 0;
	2841	+// aWindowConstraints.gridx = 4;
	2842	+// aWindowConstraints.gridwidth = 1;
	2843	+// // aConstraints.gridheight = 3;
	2844	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2845	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2846	+// scenePanel.setVisible(false);
	2847	+// centralPanel.setVisible(true);
	2848	+// XYZPanel.setVisible(false);
	2849	+ bigThree.ClearUI();
	2850	+ bigThree.add(centralPanel);
	2851	+ bigThree.FlushUI();
2551	2852	} else
2552		- if (event.getSource() == threeButton)
	2853	+ if (source == threeButton)
2553	2854	{
2554	2855	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();
	2856	+
	2857	+// bigThree.remove(scenePanel);
	2858	+// bigThree.remove(centralPanel);
	2859	+// bigThree.remove(XYZPanel);
	2860	+// aWindowConstraints.gridx = 0;
	2861	+// aWindowConstraints.gridy = 0;
	2862	+// aWindowConstraints.gridwidth = 1;
	2863	+// // aConstraints.gridheight = 3;
	2864	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2865	+// aWindowConstraints.weightx = 0;
	2866	+// aWindowConstraints.weighty = 1;
	2867	+// //bigThree.add(jtp, aWindowConstraints);
	2868	+// aWindowConstraints.weightx = 1;
	2869	+// aWindowConstraints.gridwidth = 3;
	2870	+// // aConstraints.gridheight = 3;
	2871	+// aWindowConstraints.gridx = 1;
	2872	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2873	+// bigThree.add(centralPanel, aWindowConstraints);
	2874	+// aWindowConstraints.weightx = 0;
	2875	+// aWindowConstraints.gridx = 4;
	2876	+// aWindowConstraints.gridwidth = 1;
	2877	+// // aConstraints.gridheight = 3;
	2878	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	2879	+// bigThree.add(XYZPanel, aWindowConstraints);
	2880	+// bigThree.validate();
	2881	+// scenePanel.setVisible(false);
	2882	+// centralPanel.setVisible(true);
	2883	+// XYZPanel.setVisible(true);
	2884	+ bigThree.ClearUI();
	2885	+ bigThree.add(centralPanel);
	2886	+ bigThree.add(XYZPanel);
	2887	+ bigThree.FlushUI();
2579	2888	} else
2580		- if (event.getSource() == fourButton)
	2889	+ if (source == fourButton)
2581	2890	{
2582	2891	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();
	2892	+
	2893	+// bigThree.remove(scenePanel);
	2894	+// bigThree.remove(centralPanel);
	2895	+// bigThree.remove(XYZPanel);
	2896	+// aWindowConstraints.gridx = 0;
	2897	+// aWindowConstraints.gridy = 0;
	2898	+// aWindowConstraints.gridwidth = 1;
	2899	+// // aWindowConstraints.gridheight = 3;
	2900	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2901	+// aWindowConstraints.weightx = 1;
	2902	+// aWindowConstraints.weighty = 1;
	2903	+// bigThree.add(scenePanel, aWindowConstraints);
	2904	+// aWindowConstraints.weightx = 1;
	2905	+// aWindowConstraints.gridwidth = 3;
	2906	+// // aConstraints.gridheight = 3;
	2907	+// aWindowConstraints.gridx = 1;
	2908	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2909	+// //bigThree.add(cameraPanel, aWindowConstraints);
	2910	+// aWindowConstraints.weightx = 0;
	2911	+// aWindowConstraints.gridx = 4;
	2912	+// aWindowConstraints.gridwidth = 1;
	2913	+// // aWindowConstraints.gridheight = 3;
	2914	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2915	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2916	+// bigThree.validate();
	2917	+// scenePanel.setVisible(true);
	2918	+// centralPanel.setVisible(false);
	2919	+// XYZPanel.setVisible(false);
	2920	+ bigThree.ClearUI();
	2921	+ bigThree.add(scenePanel);
	2922	+ bigThree.FlushUI();
2607	2923	} else
2608		- if (event.getSource() == sixButton)
	2924	+ if (source == sixButton)
2609	2925	{
2610	2926	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();
	2927	+
	2928	+// bigThree.remove(scenePanel);
	2929	+// bigThree.remove(centralPanel);
	2930	+// bigThree.remove(XYZPanel);
	2931	+// aWindowConstraints.gridx = 0;
	2932	+// aWindowConstraints.gridy = 0;
	2933	+// aWindowConstraints.gridwidth = 1;
	2934	+// // aConstraints.gridheight = 3;
	2935	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2936	+// aWindowConstraints.weightx = 0;
	2937	+// aWindowConstraints.weighty = 1;
	2938	+// bigThree.add(scenePanel, aWindowConstraints);
	2939	+// aWindowConstraints.weightx = 1;
	2940	+// aWindowConstraints.gridwidth = 3;
	2941	+// // aWindowConstraints.gridheight = 3;
	2942	+// aWindowConstraints.gridx = 1;
	2943	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2944	+// bigThree.add(centralPanel, aWindowConstraints);
	2945	+// aWindowConstraints.weightx = 0;
	2946	+// aWindowConstraints.gridx = 4;
	2947	+// aWindowConstraints.gridwidth = 1;
	2948	+// // aWindowConstraints.gridheight = 3;
	2949	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2950	+// //bigThree.add(XYZPanel, aConstraints);
	2951	+// bigThree.validate();
	2952	+// scenePanel.setVisible(true);
	2953	+// centralPanel.setVisible(true);
	2954	+// XYZPanel.setVisible(false);
	2955	+ bigThree.ClearUI();
	2956	+ bigThree.add(scenePanel);
	2957	+ bigThree.add(centralPanel);
	2958	+ bigThree.FlushUI();
2635	2959	} else
2636		- if (event.getSource() == sevenButton)
	2960	+ if (source == sevenButton)
2637	2961	{
2638	2962	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();
	2963	+
	2964	+// bigThree.remove(scenePanel);
	2965	+// bigThree.remove(centralPanel);
	2966	+// bigThree.remove(XYZPanel);
	2967	+// aWindowConstraints.gridx = 0;
	2968	+// aWindowConstraints.gridy = 0;
	2969	+// aWindowConstraints.gridwidth = 1;
	2970	+// // aWindowConstraints.gridheight = 3;
	2971	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2972	+// aWindowConstraints.weightx = 0;
	2973	+// aWindowConstraints.weighty = 1;
	2974	+// bigThree.add(scenePanel, aWindowConstraints);
	2975	+// aWindowConstraints.weightx = 1;
	2976	+// aWindowConstraints.gridwidth = 3;
	2977	+// // aWindowConstraints.gridheight = 3;
	2978	+// aWindowConstraints.gridx = 1;
	2979	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2980	+// bigThree.add(centralPanel, aWindowConstraints);
	2981	+// aWindowConstraints.weightx = 0;
	2982	+// aWindowConstraints.gridx = 4;
	2983	+// aWindowConstraints.gridwidth = 1;
	2984	+// // aConstraints.gridheight = 3;
	2985	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2986	+// bigThree.add(XYZPanel, aWindowConstraints);
	2987	+// bigThree.validate();
	2988	+// scenePanel.setVisible(true);
	2989	+// centralPanel.setVisible(true);
	2990	+// XYZPanel.setVisible(true);
	2991	+ bigThree.ClearUI();
	2992	+ bigThree.add(scenePanel);
	2993	+ bigThree.add(centralPanel);
	2994	+ bigThree.add(XYZPanel);
	2995	+ bigThree.FlushUI();
2663	2996	} else
2664		- if (event.getSource() == rootButton)
	2997	+ if (source == rootButton)
2665	2998	{
2666	2999	Object3D obj;
2667	3000	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2673,7 +3006,7 @@
2673	3006
2674	3007	refreshContents(true);
2675	3008	} else
2676		- if (event.getSource() == closeButton)
	3009	+ if (source == closeButton)
2677	3010	{
2678	3011	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2679	3012	cRadio ab;
..	..	@@ -2694,11 +3027,11 @@
2694	3027	}
2695	3028	refreshContents(true);
2696	3029	} else
2697		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3030	+ if (source == editItem \|\| source == editButton)
2698	3031	{
2699	3032	EditSelection(false);
2700	3033	} else
2701		- if (event.getSource() == uneditButton)
	3034	+ if (source == uneditButton)
2702	3035	{
2703	3036	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2704	3037	{
..	..	@@ -2708,14 +3041,14 @@
2708	3041	child.CloseUI();
2709	3042	listUI.remove(child);
2710	3043
2711		- child.editWindow = null; // ???????????
	3044	+ //child.editWindow = null; // ???????????
2712	3045	}
2713		- objEditor.ctrlPanel.revalidate();
	3046	+ objEditor.ctrlPanel.FlushUI();
2714	3047	//objEditor.jTree.clearSelection();
2715	3048	//objEditor.ResetSliders();
2716	3049	refreshContents(true);
2717	3050	} else
2718		- if (event.getSource() == clearPanelButton)
	3051	+ if (source == clearPanelButton)
2719	3052	{
2720	3053	assert(copy == group);
2721	3054	//copy.ClearUI();
..	..	@@ -2726,7 +3059,7 @@
2726	3059	listUI.clear();
2727	3060	refreshContents(true);
2728	3061	} else
2729		- if (event.getSource() == allParamsButton)
	3062	+ if (source == allParamsButton)
2730	3063	{
2731	3064	assert(copy == group);
2732	3065
..	..	@@ -2747,19 +3080,19 @@
2747	3080
2748	3081	refreshContents(true);
2749	3082	} else
2750		- if (event.getSource() == unselectButton)
	3083	+ if (source == unselectButton)
2751	3084	{
2752	3085	objEditor.jTree.clearSelection();
2753		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3086	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2754	3087	objEditor.ResetSliders();
2755	3088	refreshContents(true);
2756	3089	} else
2757		- if(event.getSource() instanceof cRadio)
	3090	+ if(source instanceof cRadio)
2758	3091	{
2759	3092	group.parent = keepparent;
2760	3093	group.attributes = 0;
2761	3094	//group.editWindow = null;
2762		- /cRadio/ radio = (cRadio)event.getSource();
	3095	+ /cRadio/ radio = (cRadio)source;
2763	3096	Object3D obj = radio.GetObject();
2764	3097	System.out.println("Edit " + obj);
2765	3098	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2779,7 +3112,7 @@
2779	3112	}
2780	3113
2781	3114	copy = group;
2782		- //CameraPane.theRenderer.object = group;
	3115	+ //Globals.theRenderer.object = group;
2783	3116	if(!useclient)
2784	3117	{
2785	3118	cameraView.renderCamera = radio.camera;
..	..	@@ -2788,12 +3121,15 @@
2788	3121	cameraView.cameras[cameraView.cameracount] = radio.camera;
2789	3122	cameraView.targetLookAt.set(radio.camera.lookAt);
2790	3123	cameraView.object = group;
2791		- cameraView.lighttouched = true;
	3124	+ //cameraView.lighttouched = true;
	3125	+ Globals.lighttouched = true;
2792	3126	topView.object = group;
2793	3127	frontView.object = group;
2794	3128	sideView.object = group;
2795	3129	}
2796		- group.editWindow = this;
	3130	+
	3131	+// fix "+" issue group.editWindow = this;
	3132	+
2797	3133	/*
2798	3134	currentLayout = radio.layout;
2799	3135	if (currentLayout == null)
..	..	@@ -2806,7 +3142,20 @@
2806	3142	//group.attributes = -1;
2807	3143	ResetModel();
2808	3144	refreshContents(true);
2809		- }
	3145	+ } else if (event.getSource() == editCameraItem)
	3146	+ {
	3147	+ cameraView.ProtectCamera();
	3148	+ cameraView.repaint();
	3149	+ return;
	3150	+ } else if (event.getSource() == revertCameraItem)
	3151	+ {
	3152	+ cameraView.RevertCamera();
	3153	+ cameraView.repaint();
	3154	+ return;
	3155	+ // } else if (event.getSource() == textureButton)
	3156	+ // {
	3157	+ // return; // true;
	3158	+ }
2810	3159	else
2811	3160	{
2812	3161	//return super.action(event, arg);
..	..	@@ -2824,7 +3173,7 @@
2824	3173	if (useclient)
2825	3174	{
2826	3175	cameraView.object = client;
2827		- cameraView.lighttouched = true;
	3176	+ Globals.lighttouched = true;
2828	3177	//topView.object = client;
2829	3178	//frontView.object = client;
2830	3179	//sideView.object = client;
..	..	@@ -2832,7 +3181,7 @@
2832	3181	else
2833	3182	{
2834	3183	cameraView.object = group;
2835		- cameraView.lighttouched = true;
	3184	+ Globals.lighttouched = true;
2836	3185	//topView.object = group;
2837	3186	//frontView.object = group;
2838	3187	//sideView.object = group;
..	..	@@ -2867,6 +3216,28 @@
2867	3216	refreshContents();
2868	3217	}
2869	3218
	3219	+ void TransformChildren()
	3220	+ {
	3221	+ Object3D obj;
	3222	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3223	+ {
	3224	+ obj = (Object3D)e.nextElement();
	3225	+ obj.KeepTextureMatrices();
	3226	+ obj.TransformChildren();
	3227	+ obj.RestoreTextureMatrices();
	3228	+
	3229	+// if (obj.parent == null)
	3230	+// {
	3231	+// System.out.println("NULL PARENT!");
	3232	+// new Exception().printStackTrace();
	3233	+// }
	3234	+// else
	3235	+// TouchTransform(obj);
	3236	+// //obj.parent.Touch();
	3237	+ }
	3238	+
	3239	+ refreshContents();
	3240	+ }
2870	3241
2871	3242	void ResetTransform()
2872	3243	{
..	..	@@ -2979,7 +3350,7 @@
2979	3350	refreshContents();
2980	3351	}
2981	3352
2982		- void ResetCentroid()
	3353	+ void ResetCentroid(boolean full)
2983	3354	{
2984	3355	Object3D obj;
2985	3356	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2994,12 +3365,16 @@
2994	3365	LA.matIdentity(Object3D.mat);
2995	3366	obj.getBounds(minima, maxima, false);
2996	3367	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
2997		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3368	+ if (full)
	3369	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
2998	3370	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
2999	3371	obj.TransformMesh(Object3D.mat);
	3372	+
3000	3373	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3001		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3374	+ if (full)
	3375	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3002	3376	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3377	+
3003	3378	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3004	3379	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3005	3380	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3065,9 +3440,9 @@
3065	3440	obj = (Object3D)e.nextElement();
3066	3441
3067	3442	System.out.println("Object is: " + obj);
3068		- GraphreeD.AnalyzeObject(obj);
	3443	+ Grafreed.AnalyzeObject(obj);
3069	3444	System.out.println("Boundary rep: " + obj.bRep);
3070		- GraphreeD.AnalyzeObject(obj.bRep);
	3445	+ Grafreed.AnalyzeObject(obj.bRep);
3071	3446
3072	3447	// System.err.println((size/1024) + " KB is the size of " + obj);
3073	3448	}
..	..	@@ -3109,6 +3484,13 @@
3109	3484	void GenNormals(boolean crease)
3110	3485	{
3111	3486	group.GenNormalsS(crease);
	3487	+
	3488	+ refreshContents();
	3489	+ }
	3490	+
	3491	+ void GenNormalsMINE()
	3492	+ {
	3493	+ group.selection.GenNormalsMINE();
3112	3494
3113	3495	refreshContents();
3114	3496	}
..	..	@@ -3157,104 +3539,259 @@
3157	3539
3158	3540	//Object3D buffer;
3159	3541	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		-
	3542	+// BoundaryRep temprep;
	3543	+// Object3D nodes;
	3544	+// Vector<Vertex> vertices;
	3545	+//
	3546	+// cGroup buffer;
	3547	+//
	3548	+// public void Vertex(Object3D node, Vertex v)
	3549	+// {
	3550	+//// vertices.add(v);
	3551	+//// nodes.addElement(node);
	3552	+////
	3553	+//// if (temprep.GetCache(v) != null)
	3554	+//// {
	3555	+//// temprep.Remove(v);
	3556	+//// } else
	3557	+//// {
	3558	+//// temprep.Remember(v);
	3559	+//// }
	3560	+//
	3561	+// //Object3D node = nodes.get(index);
	3562	+// temp.set(v); // vertices.get(index)); // temprep.GetVertex(k));
	3563	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3564	+//
	3565	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3566	+//
	3567	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3568	+//
	3569	+// cGroup g = new cGroup();
	3570	+//
	3571	+// if (g.toParent == null)
	3572	+// {
	3573	+// g.toParent = LA.newMatrix();
	3574	+// g.fromParent = LA.newMatrix();
	3575	+// }
	3576	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3577	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3578	+//
	3579	+// g.add(GrafreeD.clipboard);
	3580	+//
	3581	+// buffer.add(g);
	3582	+// }
	3583	+//
	3584	+// public void Face(Object3D node, Face f)
	3585	+// {
	3586	+//
	3587	+// }
	3588	+//
	3589	+// void ParseVerticesOld() // ??
	3590	+// {
	3591	+// //if (group.selection.size() != 1)
	3592	+// // return;
	3593	+//
	3594	+// temprep = new BoundaryRep();
	3595	+// nodes = new Object3D();
	3596	+// vertices = new Vector<Vertex>();
	3597	+//
	3598	+// boolean epsequal = GrafreeD.epsequal;
	3599	+// GrafreeD.epsequal = true;
	3600	+//
	3601	+// for (int i=0; i<group.selection.size(); i++)
	3602	+// {
	3603	+// Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3604	+//
	3605	+// group.selection.get(i).Parse(
	3606	+//this );
	3607	+//
	3608	+// int repsize = temprep.VertexCount();
	3609	+// int tablesize = temprep.vertextable.size();
	3610	+// int nodesize = nodes.size();
	3611	+//
	3612	+// assert(vertices.size() == nodes.size());
	3613	+//
	3614	+// temprep.vertextable.elements();
	3615	+//
	3616	+// java.util.Set<java.util.Map.Entry<Vertex,Vertex>> set = temprep.vertextable.entrySet();
	3617	+//
	3618	+// for (java.util.Map.Entry<Vertex,Vertex> entry : set)
	3619	+// {
	3620	+// cGroup g = new cGroup();
	3621	+//
	3622	+// int index = vertices.indexOf(entry.getValue()); // temprep.vertextable.(k));
	3623	+//
	3624	+// Object3D node = nodes.get(index);
	3625	+// temp.set(vertices.get(index)); // temprep.GetVertex(k));
	3626	+// // System.out.println("temp = " + temp.x + ", " + temp.y + ", " + temp.z);
	3627	+//
	3628	+// LA.xformPos(temp, node.GlobalTransformInv(), temp);
	3629	+//
	3630	+// // System.out.println("tem+ = " + temp.x + ", " + temp.y + ", " + temp.z);
	3631	+//
	3632	+// if (g.toParent == null)
	3633	+// {
	3634	+// g.toParent = LA.newMatrix();
	3635	+// g.fromParent = LA.newMatrix();
	3636	+// }
	3637	+// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3638	+// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
	3639	+//
	3640	+// g.add(GrafreeD.clipboard);
	3641	+//
	3642	+// buffer.add(g);
	3643	+// }
	3644	+//
	3645	+// makeSomething(buffer, i==group.selection.size()-1);
	3646	+// }
	3647	+//
	3648	+// GrafreeD.epsequal = epsequal;
	3649	+//
	3650	+// //buffer = null;
	3651	+// temprep = null;
	3652	+// nodes = null;
	3653	+//
	3654	+// refreshContents();
	3655	+// }
	3656	+
3184	3657	void ParseVertices()
3185	3658	{
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;
	3659	+ boolean epsequal = Grafreed.epsequal;
	3660	+ Grafreed.epsequal = true;
3195	3661
3196	3662	for (int i=0; i<group.selection.size(); i++)
3197	3663	{
3198		- Object3D buffer = new cGroup(group.selection.get(i).name + "+");
	3664	+ final cGroup buffer = new cGroup(group.selection.get(i).name + "+");
3199	3665
3200		- group.selection.get(i).Parse(this);
3201		-
3202		- int repsize = temprep.VertexCount();
3203		- int tablesize = temprep.vertextable.size();
3204		- int nodesize = nodes.size();
	3666	+ group.selection.get(i).Parse(
	3667	+
	3668	+ new iParse()
	3669	+ {
	3670	+ public void Vertex(Object3D node, Vertex v)
	3671	+ {
	3672	+ temp.set(v);
	3673	+ LA.xformPos(temp, node.GlobalTransformInv(), temp);
3205	3674
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();
	3675	+ cGroup g = new cGroup();
3211	3676
3212		- for (java.util.Map.Entry<Vertex,Vertex> entry : set)
3213		- {
3214		- cGroup g = new cGroup();
	3677	+ if (g.toParent == null)
	3678	+ {
	3679	+ g.toParent = LA.newMatrix();
	3680	+ g.fromParent = LA.newMatrix();
	3681	+ }
	3682	+ LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
	3683	+ LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3215	3684
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);
	3685	+ g.add(Grafreed.clipboard);
3220	3686
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);
	3687	+ buffer.add(g);
	3688	+ }
3232	3689
3233		- g.add(GraphreeD.clipboard);
	3690	+ public void Face(Object3D node, Face f)
	3691	+ {
3234	3692
3235		- buffer.add(g);
3236		- }
	3693	+ }
	3694	+ }
	3695	+ );
3237	3696
3238	3697	makeSomething(buffer, i==group.selection.size()-1);
3239	3698	}
3240	3699
3241		- GraphreeD.epsequal = epsequal;
3242		-
3243		- //buffer = null;
3244		- temprep = null;
3245		- nodes = null;
	3700	+ Grafreed.epsequal = epsequal;
3246	3701
3247	3702	refreshContents();
3248	3703	}
3249		-
	3704	+
	3705	+ void TextureVertices()
	3706	+ {
	3707	+ for (int i=0; i<group.selection.size(); i++)
	3708	+ {
	3709	+ group.selection.get(i).Parse(
	3710	+ new iParse()
	3711	+ {
	3712	+ public void Vertex(Object3D node, Vertex v)
	3713	+ {
	3714	+ cTexture tex = node.GetTextures();
	3715	+ String pigment = Object3D.GetPigment(tex);
	3716	+ //String bump = Object3D.GetBump(tex);
	3717	+
	3718	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3719	+
	3720	+ try
	3721	+ {
	3722	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3723	+ }
	3724	+ catch (Exception e)
	3725	+ {
	3726	+ System.err.println("FAIL: " + node);
	3727	+ }
	3728	+
	3729	+ double s = v.s;
	3730	+
	3731	+ if (s == 1)
	3732	+ s = 0;
	3733	+
	3734	+ double t = v.t;
	3735	+
	3736	+ if (t == 1)
	3737	+ t = 0;
	3738	+
	3739	+ int indexs = (int) (texturedata.getWidth() * s);
	3740	+ int indext = (int) (texturedata.getHeight() * t);
	3741	+
	3742	+ int index = indext * texturedata.getWidth() + indexs;
	3743	+
	3744	+ java.nio.ByteBuffer bytebuf = (java.nio.ByteBuffer)texturedata.getBuffer();
	3745	+
	3746	+ int slide = bytebuf.capacity() / texturedata.getWidth() / texturedata.getHeight();
	3747	+
	3748	+ float scale = bytebuf.get(index*slide) & 0xFF;
	3749	+ scale += bytebuf.get(index*slide+1) & 0xFF;
	3750	+ scale += bytebuf.get(index*slide+2) & 0xFF;
	3751	+ scale /= 3;
	3752	+
	3753	+ scale /= 0xFF;
	3754	+ // c'est quoi ca? scale /= 4;
	3755	+
	3756	+ //v.AO = scale;
	3757	+
	3758	+ v.x += v.norm.x * scale;
	3759	+ v.y += v.norm.y * scale;
	3760	+ v.z += v.norm.z * scale;
	3761	+ }
	3762	+
	3763	+ public void Face(Object3D node, Face f)
	3764	+ {
	3765	+ }
	3766	+ }
	3767	+ );
	3768	+ }
	3769	+
	3770	+ refreshContents();
	3771	+ }
	3772	+
3250	3773	void Align()
3251	3774	{
	3775	+ if (group.selection.size() == 0)
	3776	+ return;
	3777	+
	3778	+ cVector bbmin = new cVector();
	3779	+ cVector bbmax = new cVector();
	3780	+
	3781	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3782	+
	3783	+ double dx = bbmax.x - bbmin.x;
	3784	+ double dy = bbmax.y - bbmin.y;
	3785	+ double dz = bbmax.z - bbmin.z;
	3786	+
	3787	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3788	+
3252	3789	for (int i=0; i<group.selection.size(); i++)
3253	3790	{
3254	3791	Object3D obj = group.selection.get(i);
3255	3792
3256		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3257		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3793	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3794	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3258	3795	}
3259	3796
3260	3797	refreshContents();
..	..	@@ -3267,7 +3804,7 @@
3267	3804	// ref.SaveSupports();
3268	3805	// Object3D par = ref.parent;
3269	3806	// ref.parent = null;
3270		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3807	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3271	3808	// ref.parent = par;
3272	3809	// ref.RestoreSupports();
3273	3810
..	..	@@ -3275,11 +3812,11 @@
3275	3812
3276	3813	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3277	3814
3278		- boolean random = CameraPane.RANDOM;
3279		- CameraPane.RANDOM = false; // parse all random nodes
	3815	+ boolean random = CameraPane.SWITCH;
	3816	+ CameraPane.SWITCH = false; // parse all random nodes
3280	3817	lowres.linkVerticesThis(null);
3281	3818	lowres.linkVerticesThis(sn);
3282		- CameraPane.RANDOM = random;
	3819	+ CameraPane.SWITCH = random;
3283	3820
3284	3821	System.err.flush();
3285	3822
..	..	@@ -3297,7 +3834,7 @@
3297	3834	// lowres.SaveSupports();
3298	3835	// par = lowres.parent;
3299	3836	// lowres.parent = null;
3300		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	3837	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3301	3838	Object3D newlow = CloneObject(lowres, false);
3302	3839	newlow.name = sn.switchobject.get(i).name;
3303	3840	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3319,7 +3856,7 @@
3319	3856	return;
3320	3857
3321	3858	Object3D poses = group.selection.get(0);
3322		- Object3D ref = GraphreeD.clipboard.get(0);
	3859	+ Object3D ref = Grafreed.clipboard.get(0);
3323	3860
3324	3861	Object3D newgroup = new Object3D("Po:" + poses.name);
3325	3862
..	..	@@ -3488,7 +4025,7 @@
3488	4025	group.selection.RelinkToSupport(); // july 2014
3489	4026	System.out.println("DONE.");
3490	4027	refreshContents();
3491		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4028	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3492	4029	}
3493	4030
3494	4031	void ReduceMesh(boolean reduction34)
..	..	@@ -3513,20 +4050,20 @@
3513	4050
3514	4051	void ClipMesh()
3515	4052	{
3516		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4053	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3517	4054	{
3518		- Object3D content = GraphreeD.clipboard.get(0);
	4055	+ Object3D content = Grafreed.clipboard.get(0);
3519	4056
3520	4057	if (content instanceof cGroup && ((cGroup)content).transientlink )
3521	4058	content = ((cGroup)content).get(0);
3522	4059
3523	4060	// for (int i=0; i<group.selection.size(); i++)
3524	4061	// {
3525		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4062	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3526	4063	// }
3527		- group.selection.ClipMesh(GraphreeD.clipboard);
	4064	+ group.selection.ClipMesh(Grafreed.clipboard);
3528	4065	}
3529		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4066	+// group.selection.ClipMesh(GrafreeD.clipboard);
3530	4067	System.out.println("DONE.");
3531	4068	refreshContents();
3532	4069	}
..	..	@@ -3659,7 +4196,7 @@
3659	4196	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3660	4197
3661	4198	Object3D elem = (Object3D)group.selection.elementAt(i);
3662		- if(elem != group)
	4199	+ if(elem != group \|\| !newWindow)
3663	4200	{
3664	4201	// if (!(elem instanceof Composite))
3665	4202	// newWindow = false;
..	..	@@ -3764,25 +4301,28 @@
3764	4301	System.err.println("info : " + child.GetPath());
3765	4302	}
3766	4303	}
3767		- else
3768		- {
3769		- objEditor.SetMaterial(group); // .GetMaterial());
3770		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3771		- System.err.println("info : " + group.GetPath());
3772		- }
	4304	+// else
	4305	+// {
	4306	+// objEditor.SetMaterial(group); // .GetMaterial());
	4307	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4308	+// System.err.println("info : " + group.GetPath());
	4309	+// }
3773	4310
3774	4311	objEditor.SetText(); // jan 2014
3775	4312
3776		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4313	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3777	4314	CameraPane.flash = true;
3778	4315
3779		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4316	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3780	4317	// a camera
3781	4318	{
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;
	4319	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4320	+ {
	4321	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4322	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4323	+ }
	4324	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4325	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3786	4326	}
3787	4327
3788	4328	refreshContents();
..	..	@@ -3864,12 +4404,12 @@
3864	4404	{
3865	4405	if (group.selection.isEmpty())
3866	4406	return;
3867		- GraphreeD.clipboardIsTempGroup = false;
	4407	+ Grafreed.clipboardIsTempGroup = false;
3868	4408	Composite tGroup = null;
3869	4409	if (group.selection.size() > 0) // 1)
3870	4410	{
3871	4411	tGroup = new cGroup();
3872		- GraphreeD.clipboardIsTempGroup = true;
	4412	+ Grafreed.clipboardIsTempGroup = true;
3873	4413	}
3874	4414
3875	4415	if (cut)
..	..	@@ -3909,16 +4449,16 @@
3909	4449	//System.out.println("cut " + child);
3910	4450	//System.out.println("parent = " + child.parent);
3911	4451	// tmp.addChild(child);
3912		- if (GraphreeD.clipboardIsTempGroup)
	4452	+ if (Grafreed.clipboardIsTempGroup)
3913	4453	tGroup.add/Child/(tmp);
3914	4454	else
3915		- GraphreeD.clipboard = tmp;
	4455	+ Grafreed.clipboard = tmp;
3916	4456	}
3917	4457	else
3918		- if (GraphreeD.clipboardIsTempGroup)
	4458	+ if (Grafreed.clipboardIsTempGroup)
3919	4459	tGroup.add/Child/(child);
3920	4460	else
3921		- GraphreeD.clipboard = child;
	4461	+ Grafreed.clipboard = child;
3922	4462	}
3923	4463
3924	4464	//ResetModel();
..	..	@@ -3950,21 +4490,21 @@
3950	4490	//System.out.println("cut " + elem);
3951	4491	//System.out.println("parent = " + elem.parent);
3952	4492	// tmp.addChild(elem);
3953		- if (GraphreeD.clipboardIsTempGroup)
	4493	+ if (Grafreed.clipboardIsTempGroup)
3954	4494	tGroup.add/Child/(tmp);
3955	4495	else
3956		- GraphreeD.clipboard = tmp;
	4496	+ Grafreed.clipboard = tmp;
3957	4497	}
3958	4498	else
3959		- if (GraphreeD.clipboardIsTempGroup)
	4499	+ if (Grafreed.clipboardIsTempGroup)
3960	4500	tGroup.add/Child/(child);
3961	4501	else
3962		- GraphreeD.clipboard = child;
	4502	+ Grafreed.clipboard = child;
3963	4503	}
3964	4504
3965	4505	}
3966		- if (GraphreeD.clipboardIsTempGroup)
3967		- GraphreeD.clipboard = tGroup;
	4506	+ if (Grafreed.clipboardIsTempGroup)
	4507	+ Grafreed.clipboard = tGroup;
3968	4508	if (cut)
3969	4509	{
3970	4510	ResetModel();
..	..	@@ -3974,11 +4514,11 @@
3974	4514
3975	4515	void paste(boolean expand)
3976	4516	{
3977		- // if (GraphreeD.clipboard == null)
	4517	+ // if (GrafreeD.clipboard == null)
3978	4518	// return;
3979	4519	boolean first = true;
3980	4520
3981		- if (GraphreeD.clipboardIsTempGroup)
	4521	+ if (Grafreed.clipboardIsTempGroup)
3982	4522	{
3983	4523	Composite temp;
3984	4524
..	..	@@ -3989,7 +4529,7 @@
3989	4529	temp = (Composite)Applet3D.clipboard.deepCopy();
3990	4530	*/
3991	4531	Object3D elem;
3992		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4532	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
3993	4533	{
3994	4534	Object3D child = (Object3D)e.nextElement();
3995	4535
..	..	@@ -4003,7 +4543,7 @@
4003	4543	else
4004	4544	elem = child.deepCopy(); // ?
4005	4545	child.parent = keepparent;
4006		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4546	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4007	4547	// elem = elem.get(0);
4008	4548	makeSomething(elem, true); // ?? first);
4009	4549	//group.addChild(elem);
..	..	@@ -4023,23 +4563,23 @@
4023	4563	//Object3D cb = Applet3D.clipboard;
4024	4564	//temp.addChild(cb);
4025	4565	//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());
	4566	+ assert(Grafreed.clipboard.parent == null);
	4567	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4568	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4569	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4570	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4031	4571	else
4032		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4033		- GraphreeD.clipboard.get(0).parent = keepparent;
	4572	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4573	+ Grafreed.clipboard.get(0).parent = keepparent;
4034	4574	}
4035	4575
4036	4576	ResetModel();
4037	4577	refreshContents();
4038	4578	}
4039	4579
4040		- void pasteInto(boolean copyit)
	4580	+ void pasteInto(boolean copyit, boolean clone)
4041	4581	{
4042		-// if (GraphreeD.clipboard == null)
	4582	+// if (GrafreeD.clipboard == null)
4043	4583	// return;
4044	4584
4045	4585	if (group.selection.size() != 1)
..	..	@@ -4066,15 +4606,22 @@
4066	4606	if (copyit)
4067	4607	{
4068	4608	// paste(false);
4069		- CloneClipboard(false); // sept 2014
	4609	+ if (clone)
	4610	+ {
	4611	+ CloneClipboard(false); // sept 2014
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ paste(false);
	4616	+ }
4070	4617	}
4071	4618	else
4072	4619	{
4073	4620	boolean first = true;
4074	4621
4075		- if (GraphreeD.clipboardIsTempGroup)
	4622	+ if (Grafreed.clipboardIsTempGroup)
4076	4623	{
4077		- Composite temp = (Composite)GraphreeD.clipboard;
	4624	+ Composite temp = (Composite)Grafreed.clipboard;
4078	4625	Object3D copy;
4079	4626	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4080	4627	{
..	..	@@ -4084,7 +4631,7 @@
4084	4631	}
4085	4632	} else
4086	4633	{
4087		- linkSomething(GraphreeD.clipboard); //.get(0));
	4634	+ linkSomething(Grafreed.clipboard); //.get(0));
4088	4635	}
4089	4636	}
4090	4637	}
..	..	@@ -4276,6 +4823,26 @@
4276	4823	makeSomething(csg);
4277	4824	}
4278	4825
	4826	+ void Ungroup(Object3D g)
	4827	+ {
	4828	+ if (g instanceof HiddenObject)
	4829	+ {
	4830	+ HiddenObject h = (HiddenObject) g;
	4831	+
	4832	+ for (int i=0; i<h.ActualSize(); i++)
	4833	+ {
	4834	+ objEditor.makeSomething(h.get(i), false);
	4835	+ }
	4836	+ }
	4837	+ else
	4838	+ {
	4839	+ for (int i=0; i<g.Size(); i++)
	4840	+ {
	4841	+ objEditor.makeSomething(g.get(i), false);
	4842	+ }
	4843	+ }
	4844	+ }
	4845	+
4279	4846	void ungroup()
4280	4847	{
4281	4848	/*
..	..	@@ -4469,21 +5036,6 @@
4469	5036	}
4470	5037	*/
4471	5038
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	5039	/*
4488	5040	public void Callback(Object obj)
4489	5041	{
..	..	@@ -4507,26 +5059,9 @@
4507	5059	}
4508	5060	*/
4509	5061
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	5062	String GetFile(String dialogName)
4528	5063	{
4529		- if (GraphreeD.standAlone)
	5064	+ if (Grafreed.standAlone)
4530	5065	{
4531	5066	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4532	5067	browser.show();
..	..	@@ -4590,10 +5125,12 @@
4590	5125	cButton flashSelectionButton;
4591	5126	cButton editButton;
4592	5127	cButton uneditButton;
	5128	+ JCheckBox allParamsButton;
4593	5129	cButton clearpanelButton;
4594		- cButton allParamsButton;
4595	5130	cButton unselectButton;
4596	5131
	5132	+ cButton oneStepButton;
	5133	+
4597	5134	cButton screenfitButton;
4598	5135	cButton screenfitpointButton;
4599	5136	cButton snapobjectButton;
..	..	@@ -4624,6 +5161,8 @@
4624	5161	private MenuItem lookFromItem;
4625	5162	private MenuItem switchItem;
4626	5163	private MenuItem cutItem;
	5164	+ private MenuItem undoItem;
	5165	+ private MenuItem redoItem;
4627	5166	private MenuItem duplicateItem;
4628	5167	private MenuItem cloneItem;
4629	5168	private MenuItem cloneSupportItem;
..	..	@@ -4635,8 +5174,9 @@
4635	5174	private MenuItem resetsupportItem;
4636	5175	private MenuItem resetreferencesItem;
4637	5176	private MenuItem linkverticesItem;
	5177	+ private MenuItem relinkverticesItem;
4638	5178	private MenuItem setMasterItem;
4639		- private MenuItem resetMeshItem;
	5179	+ private MenuItem resetAllItem;
4640	5180	private MenuItem stepAllItem;
4641	5181	private MenuItem revertMeshItem;
4642	5182	private MenuItem poseMeshItem;
..	..	@@ -4647,14 +5187,17 @@
4647	5187	private MenuItem mergeGeometriesItem;
4648	5188	private MenuItem copyItem;
4649	5189	private MenuItem pasteItem;
	5190	+ private MenuItem pasteIntoItem;
4650	5191	private MenuItem pasteLinkItem;
4651	5192	private MenuItem pasteCloneItem;
4652	5193	private MenuItem pasteExpandItem;
4653	5194	private MenuItem clearItem;
4654	5195	private MenuItem clearAllItem;
4655	5196	private MenuItem genUVItem;
	5197	+ private MenuItem genNormalsMESHItem;
4656	5198	private MenuItem genNormalsCADItem;
4657	5199	private MenuItem genNormalsORGANItem;
	5200	+ private MenuItem genNormalsMINEItem;
4658	5201	private MenuItem stripifyItem;
4659	5202	private MenuItem unstripifyItem;
4660	5203	private MenuItem trimItem;
..	..	@@ -4694,8 +5237,11 @@
4694	5237	private MenuItem panoTexturesItem;
4695	5238
4696	5239	private MenuItem resetCentroidItem;
4697		- private MenuItem transformgeometryItem;
	5240	+ private MenuItem resetCentroidXZItem;
4698	5241	private MenuItem resetTransformItem;
	5242	+ private MenuItem transformGeometryItem;
	5243	+ private MenuItem transformChildrenItem;
	5244	+ private MenuItem hideItem;
4699	5245	private MenuItem grabItem;
4700	5246	private MenuItem backItem;
4701	5247	private MenuItem frontItem;
..	..	@@ -4716,6 +5262,7 @@
4716	5262
4717	5263	private MenuItem resetParentItem;
4718	5264	private MenuItem repairParentItem;
	5265	+ private MenuItem repairShadowItem;
4719	5266	private MenuItem sortbysizeItem;
4720	5267	private MenuItem sortbynameItem;
4721	5268
..	..	@@ -4728,16 +5275,19 @@
4728	5275	private MenuItem particleItem;
4729	5276	private MenuItem ragdollItem;
4730	5277	private MenuItem ragdoll2Item;
	5278	+ private MenuItem heightFieldItem;
	5279	+ private MenuItem textureFieldItem;
4731	5280	private MenuItem gridItem;
4732	5281	private MenuItem rectoidItem;
4733	5282	private MenuItem ellipsoidItem;
4734	5283	private MenuItem coneItem;
4735	5284	private MenuItem torusItem;
4736	5285	private MenuItem superItem;
	5286	+ private MenuItem kleinItem;
4737	5287	private MenuItem blobItem;
4738	5288	private MenuItem latheItem;
4739	5289	private MenuItem bezierItem;
4740		- private MenuItem checkerItem;
	5290	+ private MenuItem overlayItem;
4741	5291	private MenuItem meshItem;
4742	5292	// private MenuItem meshGroupItem;
4743	5293	private MenuItem springItem;
..	..	@@ -4746,6 +5296,7 @@
4746	5296	private MenuItem csgItem;
4747	5297	private MenuItem templateItem;
4748	5298	private MenuItem textureItem;
	5299	+ private MenuItem billboardItem;
4749	5300	private MenuItem shadowXItem;
4750	5301	private MenuItem shadowYItem;
4751	5302	private MenuItem shadowZItem;
..	..	@@ -4758,11 +5309,6 @@
4758	5309	private MenuItem doubleItem;
4759	5310	private MenuItem tripleItem;
4760	5311
4761		- private MenuItem importGFDItem;
4762		- private MenuItem importVRMLX3DItem;
4763		- private MenuItem import3DSItem;
4764		- private MenuItem importOBJItem;
4765		-
4766	5312	private MenuItem computeAOItem;
4767	5313	private MenuItem recompileItem;
4768	5314	private MenuItem editScriptItem;
..	..	@@ -4772,4 +5318,8 @@
4772	5318	private MenuItem analyzeItem;
4773	5319	private MenuItem dumpItem;
4774	5320	//boolean freezemodel = false;
	5321	+
	5322	+ Menu cameraMenu;
	5323	+ MenuItem editCameraItem;
	5324	+ MenuItem revertCameraItem;
4775	5325	}