~nbriere/GrafreeD.git - Noware Git Repository

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