~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 = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", 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(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
	608	+ fastCB.setToolTipText("Fast mode");
451	609	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);
	610	+
	611	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ oneStepButton.setToolTipText("Animate one step forward");
	613	+ oneStepButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", 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 = GetButton("icons/fit.png", !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 = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Highlight 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,115 @@
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	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	819	+ autosaveCB.setToolTipText("Auto-save on structure change");
	820	+ autosaveCB.addItemListener(this);
	821	+
	822	+ if (Globals.ADVANCED)
	823	+ {
	824	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	825	+ lookAtCB.setToolTipText("Look-at target");
	826	+ lookAtCB.addItemListener(this);
	827	+ }
	828	+
	829	+ }
	830	+
	831	+ cGridBag fill = new cGridBag();
	832	+
	833	+ fill.preferredHeight = 200;
	834	+
	835	+ panel.add(fill);
	836	+
	837	+ }
636	838
637	839	void EditObject(Object3D obj)
638	840	{
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();
	841	+ cRadio radioButton = new cRadio(obj.name);
	842	+
	843	+ // Patch to avoid bug with transparency.
	844	+ radioButton.hadMaterial = obj.material != null;
	845	+ if (!radioButton.hadMaterial)
	846	+ {
	847	+ obj.material = new cMaterial();
	848	+ }
	849	+
	850	+ radioButton.SetObject(obj);
	851	+ radioButton.layout = sevenButton;
	852	+ radioButton.SetCamera(cameraView.renderCamera, false);
	853	+ radioButton.addActionListener(this);
	854	+ radioPanel.add(radioButton);
	855	+ buttonGroup.add(radioButton);
	856	+ radioButton.doClick();
647	857	}
	858	+
648	859	void SetupViews(ObjEditor oe)
649	860	{
	861	+ theFrame = this;
	862	+
650	863	oe.SetupViews();
651	864
652	865	System.out.println("SetupViews");
..	..	@@ -655,22 +868,26 @@
655	868	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	869	}
657	870
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	871	+ cCheckBox liveCB;
	872	+ cCheckBox supportCB;
	873	+ cCheckBox localCB;
	874	+ cCheckBox crowdCB;
	875	+ cCheckBox smoothCB;
	876	+ cCheckBox fastCB;
	877	+ cCheckBox slowCB;
	878	+ cCheckBox boxCB;
	879	+ cCheckBox zoomBoxCB;
	880	+ cCheckBox trackCB;
	881	+ cCheckBox smoothfocusCB;
668	882	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	883	+ cCheckBox speakerCameraCB;
	884	+ cCheckBox speakerFocusCB;
	885	+ cCheckBox debugCB;
	886	+
	887	+ cCheckBox oeilCB;
	888	+ cCheckBox shadowCB;
	889	+ cCheckBox autosaveCB;
	890	+ cCheckBox lookAtCB;
674	891
675	892	// static int COLOR = 1;
676	893	// static int MATERIAL = 2;
..	..	@@ -678,9 +895,9 @@
678	895
679	896	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	897
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	898	+ cCheckBox colorCB;
	899	+ cCheckBox materialCB;
	900	+ cCheckBox textureCB;
684	901
685	902	public void itemStateChanged(ItemEvent e)
686	903	{
..	..	@@ -705,10 +922,10 @@
705	922	dropAttributes \|= Object3D.TEXTURE;
706	923	else
707	924	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	925	+ } else if(e.getSource() == liveCB)
710	926	{
711	927	cameraView.ToggleLive();
	928	+ refreshContents(false);
712	929	}
713	930	else if(e.getSource() == supportCB)
714	931	{
..	..	@@ -744,6 +961,10 @@
744	961	cameraView.repaint();
745	962	// refreshContents();
746	963	}
	964	+ else if(e.getSource() == zoomBoxCB)
	965	+ {
	966	+ cameraView.ToggleZoomBoxMode();
	967	+ }
747	968	else if(e.getSource() == smoothfocusCB)
748	969	{
749	970	cameraView.ToggleSmoothFocus();
..	..	@@ -768,6 +989,14 @@
768	989	else if(e.getSource() == oeilCB)
769	990	{
770	991	cameraView.ToggleOeil();
	992	+ }
	993	+ else if(e.getSource() == shadowCB)
	994	+ {
	995	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	996	+ }
	997	+ else if(e.getSource() == autosaveCB)
	998	+ {
	999	+ Globals.SAVEONMAKE ^= true;
771	1000	}
772	1001	else if(e.getSource() == lookAtCB)
773	1002	{
..	..	@@ -857,7 +1086,9 @@
857	1086	// objEditor.DropFile((java.io.File[]) object, true);
858	1087	// return;
859	1088	// }
860		- if (string.charAt(0) == '/')
	1089	+
	1090	+ // File path for Mac and Windows
	1091	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1092	{
862	1093	// file(s)
863	1094	String[] names = string.split("\n");
..	..	@@ -884,7 +1115,7 @@
884	1115
885	1116	flashIt = false;
886	1117	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1118	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1119	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1120
890	1121	if (group.selection.size() == 1)
..	..	@@ -911,11 +1142,11 @@
911	1142	{
912	1143	loadClipboard(true);
913	1144	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
	1145	+ pasteInto(false, false);
915	1146	} else {
916	1147	loadClipboard(false);
917	1148	objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
	1149	+ pasteInto(false, false); // true); // ???
919	1150	}
920	1151	}
921	1152	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1033,29 +1264,37 @@
1033	1264	torusItem.addActionListener(this);
1034	1265	superItem = menu.add(new MenuItem("Superellipsoid"));
1035	1266	superItem.addActionListener(this);
	1267	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1268	+ kleinItem.addActionListener(this);
1036	1269	particleItem = menu.add(new MenuItem("Particle system"));
1037	1270	particleItem.addActionListener(this);
	1271	+ if (Globals.ADVANCED)
	1272	+ {
1038	1273	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1274	ragdollItem.addActionListener(this);
1040	1275	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1276	ragdoll2Item.addActionListener(this);
	1277	+ }
1042	1278	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1279	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1280	meshItem.addActionListener(this);
1045	1281	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1282	// meshGroupItem.addActionListener(this);
	1283	+ if (Globals.ADVANCED)
	1284	+ {
1047	1285	springItem = menu.add(new MenuItem("Spring"));
1048	1286	springItem.addActionListener(this);
1049	1287	flagItem = menu.add(new MenuItem("Flag"));
1050	1288	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	1289	blobItem = menu.add(new MenuItem("Blob"));
1056	1290	blobItem.addActionListener(this);
1057	1291	latheItem = menu.add(new MenuItem("Lathe"));
1058	1292	latheItem.addActionListener(this);
	1293	+ }
	1294	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1295	+ bezierItem.addActionListener(this);
	1296	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1297	+ overlayItem.addActionListener(this);
1059	1298	lightItem = menu.add(new MenuItem("Light"));
1060	1299	lightItem.addActionListener(this);
1061	1300	menu.add("-");
..	..	@@ -1065,39 +1304,44 @@
1065	1304	loopItem.addActionListener(this);
1066	1305	doubleItem = menu.add(new MenuItem("Fork"));
1067	1306	doubleItem.addActionListener(this);
	1307	+ if (Globals.ADVANCED)
	1308	+ {
1068	1309	tripleItem = menu.add(new MenuItem("Trident"));
1069	1310	tripleItem.addActionListener(this);
	1311	+ }
1070	1312	}
1071	1313
1072	1314	void buildToolsMenu(Menu menu)
1073	1315	{
1074	1316	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1317	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1318	+ animationItem.setState(Globals.ANIMATION);
1077	1319
1078	1320	menu.add("-");
1079	1321	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1322	parseverticesItem.addActionListener(this);
1081	1323	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1324	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1325	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1326	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1327	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1328	reduceMorphItem.addActionListener(this);
1089	1329	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1330	reduce34MorphItem.addActionListener(this);
1091		-
	1331	+ menu.add("-");
1092	1332	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1333	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1334
	1335	+ if (Globals.ADVANCED)
	1336	+ {
	1337	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1338	+ mirrorItem.addActionListener(this);
	1339	+ menu.add("-");
1096	1340	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1341	memoryItem.addActionListener(this);
1098	1342	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1343	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1344	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1345	dumpItem.addActionListener(this);
1102	1346	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1347	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1350,8 @@
1106	1350	resetParentItem.addActionListener(this);
1107	1351	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1352	repairParentItem.addActionListener(this);
	1353	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1354	+ repairShadowItem.addActionListener(this);
1109	1355	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1356	invariantsItem.addActionListener(this);
1111	1357	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1359,7 @@
1113	1359	menu.add("-");
1114	1360	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1361	editScriptItem.addActionListener(this);
	1362	+ }
1116	1363	}
1117	1364
1118	1365	void ScreenFit()
..	..	@@ -1235,6 +1482,7 @@
1235	1482	shadow.material = new cMaterial(obj.material);
1236	1483	shadow.material.diffuse = 0.0001f;
1237	1484	shadow.material.specular = 0.0001f;
	1485	+ //shadow.projectedVertices[1].x = 300;
1238	1486
1239	1487	makeSomething(shadow);
1240	1488	}
..	..	@@ -1441,9 +1689,9 @@
1441	1689
1442	1690	void Overwrite(int mask)
1443	1691	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1692	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1693	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1694	+ Object3D content = Grafreed.clipboard.get(0);
1447	1695
1448	1696	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1697	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1714,7 @@
1466	1714	//
1467	1715	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1716	{
	1717	+ Object source = event.getSource();
1469	1718	/*
1470	1719	if (event.getSource() == nameField)
1471	1720	{
..	..	@@ -1477,11 +1726,11 @@
1477	1726	}
1478	1727	else
1479	1728	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1729	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1730	{
1482	1731	ScreenFit();
1483	1732	} else
1484		- if (event.getSource() == switchItem)
	1733	+ if (source == switchItem)
1485	1734	{
1486	1735	cVector v1 = new cVector();
1487	1736	cVector v2 = new cVector();
..	..	@@ -1490,11 +1739,11 @@
1490	1739	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1740	objEditor.cameraView.repaint();
1492	1741	} else
1493		- if (event.getSource() == rectoidItem)
	1742	+ if (source == rectoidItem)
1494	1743	{
1495	1744	makeSomething(new Box());
1496	1745	} else
1497		- if (event.getSource() == particleItem)
	1746	+ if (source == particleItem)
1498	1747	{
1499	1748	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1749	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1764,9 @@
1515	1764	applyExample(particleGeom, "SMOKE");
1516	1765	makeSomething(particleGeom);
1517	1766	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1767	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1768	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1769	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1770
1522	1771	ragdoll.toParent = LA.newMatrix();
1523	1772	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1784,7 @@
1535	1784	} else
1536	1785	/*
1537	1786	*/
1538		- if (event.getSource() == heightFieldItem)
	1787	+ if (source == heightFieldItem)
1539	1788	{
1540	1789	Object3D obj = new Object3D();
1541	1790
..	..	@@ -1573,27 +1822,31 @@
1573	1822
1574	1823	makeSomething(obj);
1575	1824	} else
1576		- if (event.getSource() == gridItem)
	1825	+ if (source == gridItem)
1577	1826	{
1578	1827	makeSomething(new Grid());
1579	1828	} else
1580		- if (event.getSource() == ellipsoidItem)
	1829	+ if (source == ellipsoidItem)
1581	1830	{
1582	1831	makeSomething(new Sphere());
1583	1832	} else
1584		- if (event.getSource() == coneItem)
	1833	+ if (source == coneItem)
1585	1834	{
1586	1835	makeSomething(new Cone());
1587	1836	} else
1588		- if (event.getSource() == torusItem)
	1837	+ if (source == torusItem)
1589	1838	{
1590	1839	makeSomething(new Torus());
1591	1840	} else
1592		- if (event.getSource() == superItem)
	1841	+ if (source == superItem)
1593	1842	{
1594	1843	makeSomething(new Superellipsoid());
1595	1844	} else
1596		- if (event.getSource() == blobItem)
	1845	+ if (source == kleinItem)
	1846	+ {
	1847	+ makeSomething(new Klein());
	1848	+ } else
	1849	+ if (source == blobItem)
1597	1850	{
1598	1851	Blob blob = new Blob();
1599	1852	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +1854,15 @@
1601	1854	//blob.retile();
1602	1855	makeSomething(blob);
1603	1856	} else
1604		- if (event.getSource() == latheItem)
	1857	+ if (source == latheItem)
1605	1858	{
1606	1859	makeSomething(new Lathe());
1607	1860	} else
1608		- if (event.getSource() == bezierItem)
	1861	+ if (source == bezierItem)
1609	1862	{
1610	1863	makeSomething(new BezierSurface());
1611	1864	} else
1612		- if (event.getSource() == checkerItem)
	1865	+ if (source == overlayItem)
1613	1866	{
1614	1867	/*
1615	1868	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +1877,7 @@
1624	1877	*/
1625	1878	makeSomething(new Checker());
1626	1879	} else
1627		- if (event.getSource() == meshItem)
	1880	+ if (source == meshItem)
1628	1881	{
1629	1882	Object3D itemtomake = new Object3D();
1630	1883	Object3D child;
..	..	@@ -1645,35 +1898,35 @@
1645	1898	makeSomething(child);
1646	1899	}
1647	1900	} else
1648		- if (event.getSource() == springItem)
	1901	+ if (source == springItem)
1649	1902	{
1650	1903	cSpring s = new cSpring();
1651	1904	s.setup();
1652	1905	makeSomething(s);
1653	1906	} else
1654		- if (event.getSource() == flagItem)
	1907	+ if (source == flagItem)
1655	1908	{
1656	1909	cSpring s = new cFlag();
1657	1910	s.setup();
1658	1911	makeSomething(s);
1659	1912	} else
1660		- if (event.getSource() == lightItem)
	1913	+ if (source == lightItem)
1661	1914	{
1662	1915	makeSomething(new Light());
1663	1916	} else
1664		- if (event.getSource() == csgItem)
	1917	+ if (source == csgItem)
1665	1918	{
1666	1919	group(new CSG());
1667	1920	} else
1668		- if (event.getSource() == templateItem)
	1921	+ if (source == templateItem)
1669	1922	{
1670	1923	group(new cTemplate());
1671	1924	} else
1672		- if (event.getSource() == attributeItem)
	1925	+ if (source == attributeItem)
1673	1926	{
1674	1927	makeSomething(new Attribute());
1675	1928	} else
1676		- if (event.getSource() == pointflowItem)
	1929	+ if (source == pointflowItem)
1677	1930	{
1678	1931	makeSomething(new PointFlow());
1679	1932	} else
..	..	@@ -1685,7 +1938,7 @@
1685	1938	} else
1686	1939	*/
1687	1940
1688		- if (event.getSource() == superLoopItem)
	1941	+ if (source == superLoopItem)
1689	1942	{
1690	1943	Composite g = new cGroup();
1691	1944	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +1960,7 @@
1707	1960
1708	1961	group(g);
1709	1962	} else
1710		- if (event.getSource() == loopItem)
	1963	+ if (source == loopItem)
1711	1964	{
1712	1965	Composite csg = new GroupLeaf();
1713	1966	csg.count = 5;
..	..	@@ -1716,7 +1969,7 @@
1716	1969	csg.addChild(child);
1717	1970	child.addChild(csg);
1718	1971	} else
1719		- if (event.getSource() == doubleItem)
	1972	+ if (source == doubleItem)
1720	1973	{
1721	1974	Composite csg = new GroupLeaf();
1722	1975	csg.count = 5;
..	..	@@ -1728,7 +1981,7 @@
1728	1981	csg.addChild(child);
1729	1982	child.addChild(csg);
1730	1983	} else
1731		- if (event.getSource() == tripleItem)
	1984	+ if (source == tripleItem)
1732	1985	{
1733	1986	Composite csg = new GroupLeaf();
1734	1987	csg.count = 4;
..	..	@@ -1743,71 +1996,83 @@
1743	1996	csg.addChild(child);
1744	1997	child.addChild(csg);
1745	1998	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	1999	+ if (source == computeAOItem)
1748	2000	{
1749		- ImportGFD();
	2001	+ Globals.drawMode = CameraPane.OCCLUSION;
	2002	+ Globals.theRenderer.repaint();
1750	2003	} 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)
	2004	+ if (source == recompileItem)
1769	2005	{
1770	2006	Recompile();
1771	2007	refreshContents();
1772	2008	} else
1773		- if (event.getSource() == editScriptItem)
	2009	+ if (source == editScriptItem)
1774	2010	{
1775	2011	OpenDialog();
1776	2012	refreshContents();
1777	2013	} else
1778		- if (event.getSource() == invariantsItem)
	2014	+ if (source == invariantsItem)
1779	2015	{
1780	2016	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2017	+ Grafreed.grafreeD.universe.invariants();
1782	2018	} else
1783		- if (event.getSource() == memoryItem)
	2019	+ if (source == memoryItem)
1784	2020	{
1785	2021	//System.out.println("Invariants:");
1786	2022	PrintMemory();
1787	2023	} else
1788		- if (event.getSource() == pathItem)
	2024	+ if (source == pathItem)
1789	2025	{
1790	2026	PrintPath();
1791	2027	} else
1792		- if (event.getSource() == analyzeItem)
	2028	+ if (source == analyzeItem)
1793	2029	{
1794	2030	AnalyzeObject();
1795	2031	} else
1796		- if (event.getSource() == dumpItem)
	2032	+ if (source == dumpItem)
1797	2033	{
1798	2034	DumpObject();
1799	2035	} else
1800		- if (event.getSource() == screenfitButton)
	2036	+ if (source == minButton)
	2037	+ {
	2038	+ Minimize();
	2039	+ } else
	2040	+ if (source == maxButton)
	2041	+ {
	2042	+ Maximize();
	2043	+ } else
	2044	+ if (source == fullButton)
	2045	+ {
	2046	+ ToggleFullScreen();
	2047	+ } else
	2048	+ if (source == undoButton)
	2049	+ {
	2050	+ Undo();
	2051	+ } else
	2052	+ if (source == redoButton)
	2053	+ {
	2054	+ Redo();
	2055	+ } else
	2056	+ if (source == saveButton)
	2057	+ {
	2058	+ Save();
	2059	+ } else
	2060	+ if (source == oneStepButton)
	2061	+ {
	2062	+ Globals.ONESTEP = true;
	2063	+ cameraView.repaint();
	2064	+ } else
	2065	+ if (source == screenfitButton)
1801	2066	{
1802	2067	//Reload(lastConverter, lastFilename, true);
1803	2068	ScreenFit();
1804	2069	} else
1805		- if (event.getSource() == screenfitpointButton)
	2070	+ if (source == screenfitpointButton)
1806	2071	{
1807	2072	//Reload(lastConverter, lastFilename, true);
1808	2073	ScreenFitPoint();
1809	2074	} else
1810		- if (event.getSource() == snapobjectButton)
	2075	+ if (source == snapobjectButton)
1811	2076	{
1812	2077	//Reload(lastConverter, lastFilename, true);
1813	2078	SnapObject();
..	..	@@ -1818,13 +2083,13 @@
1818	2083	// Recompile();
1819	2084	// refreshContents();
1820	2085	// } else
1821		- if (event.getSource() == gcButton)
	2086	+ if (source == gcButton)
1822	2087	{
1823	2088	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2089	System.gc();
1825	2090	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2091	} else
1827		- if (event.getSource() == editLeafItem)
	2092	+ if (source == editLeafItem)
1828	2093	{
1829	2094	Object3D obj;
1830	2095	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2103,78 @@
1838	2103	}
1839	2104	refreshContents(true);
1840	2105	} else
1841		- if (event.getSource() == openWindowItem)
	2106	+ if (source == openWindowItem)
1842	2107	{
1843	2108	EditSelection(true);
1844	2109	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2110	+ if (source == cutItem \|\| source == clearButton)
1846	2111	{
1847	2112	loadClipboard(true);
1848	2113	} else
1849		- if (event.getSource() == duplicateItem)
	2114	+ if (source == undoItem)
1850	2115	{
1851		- Object3D keep = GraphreeD.clipboard;
	2116	+ Undo();
	2117	+ } else
	2118	+ if (source == redoItem)
	2119	+ {
	2120	+ Redo();
	2121	+ } else
	2122	+ if (source == duplicateItem)
	2123	+ {
	2124	+ Object3D keep = Grafreed.clipboard;
1852	2125	loadClipboard(false);
1853	2126	paste(false);
1854		- GraphreeD.clipboard = keep;
	2127	+ Grafreed.clipboard = keep;
1855	2128	} else
1856		- if (event.getSource() == cloneItem)
	2129	+ if (source == cloneItem)
1857	2130	{
1858	2131	CloneSelection(false);
1859	2132	} else
1860		- if (event.getSource() == cloneSupportItem)
	2133	+ if (source == cloneSupportItem)
1861	2134	{
1862	2135	CloneSelection(true);
1863	2136	} else
1864		- if (event.getSource() == copyItem)
	2137	+ if (source == copyItem)
1865	2138	{
1866	2139	loadClipboard(false);
1867	2140	} else
1868		- if (event.getSource() == pasteItem)
	2141	+ if (source == pasteItem)
1869	2142	{
1870	2143	paste(false);
1871	2144	} else
1872		- if (event.getSource() == pasteLinkItem)
	2145	+ if (source == pasteIntoItem)
1873	2146	{
1874		- pasteInto(false);
	2147	+ pasteInto(true, false);
1875	2148	} else
1876		- if (event.getSource() == pasteCloneItem)
	2149	+ if (source == pasteLinkItem)
1877	2150	{
1878		- pasteInto(true);
	2151	+ pasteInto(false, false);
1879	2152	} else
1880		- if (event.getSource() == pasteExpandItem)
	2153	+ if (source == pasteCloneItem)
	2154	+ {
	2155	+ pasteInto(true, true);
	2156	+ } else
	2157	+ if (source == pasteExpandItem)
1881	2158	{
1882	2159	paste(true);
1883	2160	} else
1884		- if (event.getSource() == synchronizeItem)
	2161	+ if (source == synchronizeItem)
1885	2162	{
1886	2163	Overwrite(Object3D.TRANSFORM);
1887	2164	} else
1888		- if (event.getSource() == overwriteNameItem)
	2165	+ if (source == overwriteNameItem)
1889	2166	{
1890	2167	Overwrite(Object3D.NAME);
1891	2168	} else
1892		- if (event.getSource() == overwriteUVItem)
	2169	+ if (source == overwriteUVItem)
1893	2170	{
1894	2171	Overwrite(Object3D.UV);
1895	2172	} else
1896		- if (event.getSource() == overwriteMatItem)
	2173	+ if (source == overwriteMatItem)
1897	2174	{
	2175	+ /* july 2015
1898	2176	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2177	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2178	else
1901	2179	{
1902	2180	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2186,16 @@
1908	2186	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2187	}
1910	2188	}
	2189	+ */
	2190	+
	2191	+ Overwrite(dropAttributes);
1911	2192	}
1912		- if (event.getSource() == overwriteGeoItem)
	2193	+ if (source == overwriteGeoItem)
1913	2194	{
1914	2195	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2196	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2197	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2198	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2199	//
1919	2200	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2201	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2207,7 @@
1926	2207	// refreshContents();
1927	2208	// }
1928	2209	} else
1929		- if (event.getSource() == generateMeshItem)
	2210	+ if (source == generateMeshItem)
1930	2211	{
1931	2212	//if (group.selection.size() == 1)
1932	2213	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2218,7 @@
1937	2218	ResetModel();
1938	2219	refreshContents();
1939	2220	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2221	+ if (source == extractGeometriesItem)
1941	2222	{
1942	2223	boolean one = false;
1943	2224
..	..	@@ -1964,7 +2245,7 @@
1964	2245	ResetModel();
1965	2246	refreshContents();
1966	2247	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2248	+ if (source == cloneGeometriesItem)
1968	2249	{
1969	2250	boolean one = false;
1970	2251
..	..	@@ -1990,32 +2271,37 @@
1990	2271	ResetModel();
1991	2272	refreshContents();
1992	2273	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2274	+ if (source == shareGeometriesItem)
1994	2275	{
1995	2276	boolean one = false;
1996	2277
1997	2278	if (group.selection.size() == 1)
1998	2279	one = true;
1999	2280
	2281	+ Object3D merge = null;
	2282	+
2000	2283	Object3D content = new cGroup();
2001	2284
2002	2285	for (int i=0; i<group.selection.size(); i++)
2003	2286	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2287	+ merge = new Merge(group.selection.get(i));
2005	2288
2006	2289	if (one)
2007		- makeSomething(sel, false);
	2290	+ makeSomething(merge, false);
2008	2291	else
2009		- content.addChild(sel);
	2292	+ content.addChild(merge);
2010	2293	}
2011	2294
2012	2295	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2296	+ makeSomething(content, true);
	2297	+ else
	2298	+ {
	2299	+ ResetModel();
	2300	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2301	+ refreshContents();
	2302	+ }
2017	2303	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2304	+ if (source == mergeGeometriesItem)
2019	2305	{
2020	2306	boolean one = false;
2021	2307
..	..	@@ -2045,11 +2331,11 @@
2045	2331	ResetModel();
2046	2332	refreshContents();
2047	2333	} else
2048		- if (event.getSource() == linkverticesItem)
	2334	+ if (source == linkverticesItem)
2049	2335	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2336	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2337	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2338	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2339	//
2054	2340	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2341	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2344,48 @@
2058	2344	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2345	// refreshContents();
2060	2346	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2347	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2348	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2064	2350
2065	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2352	content = ((cGroup)content).get(0);
2067	2353
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2354	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2355	for (int i=0; i<group.selection.size(); i++)
2070	2356	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2357	+ boolean random = CameraPane.SWITCH;
	2358	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2359	group.selection.get(i).linkVerticesThis(content);
2074	2360	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2361	+ CameraPane.SWITCH = random;
2076	2362	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2363	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2364	refreshContents();
2079	2365	}
2080	2366	} else
2081		- if (event.getSource() == resetsupportItem)
	2367	+ if (source == resetsupportItem)
2082	2368	{
2083	2369	for (int i=0; i<group.selection.size(); i++)
2084	2370	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2371	+ boolean random = CameraPane.SWITCH;
	2372	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2373	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2374	+ CameraPane.SWITCH = random;
2089	2375	}
2090	2376
2091	2377	refreshContents();
2092	2378	} else
2093		- if (event.getSource() == resetreferencesItem)
	2379	+ if (source == relinkverticesItem)
	2380	+ {
	2381	+ boolean random = CameraPane.SWITCH;
	2382	+ CameraPane.SWITCH = false; // parse all random nodes
	2383	+ group.selection.RelinkToSupport();
	2384	+ CameraPane.SWITCH = random;
	2385	+
	2386	+ refreshContents();
	2387	+ } else
	2388	+ if (source == resetreferencesItem)
2094	2389	{
2095	2390	for (int i=0; i<group.selection.size(); i++)
2096	2391	{
..	..	@@ -2099,11 +2394,11 @@
2099	2394
2100	2395	refreshContents();
2101	2396	} else
2102		- if (event.getSource() == setMasterItem)
	2397	+ if (source == setMasterItem)
2103	2398	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2399	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2400	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
2107	2402
2108	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2404	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2407,13 @@
2112	2407	refreshContents();
2113	2408	}
2114	2409	} else
2115		- if (event.getSource() == poseMeshItem)
	2410	+ if (source == poseMeshItem)
2116	2411	{
2117	2412	if (group.selection.size() == 1)
2118	2413	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2414	+ if (Grafreed.clipboard.size() == 1)
2120	2415	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2416	+ Object3D content = Grafreed.clipboard.get(0);
2122	2417
2123	2418	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2419	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2426,19 @@
2131	2426	}
2132	2427
2133	2428	} else
2134		- if (event.getSource() == revertMeshItem)
	2429	+ if (source == revertMeshItem)
2135	2430	{
2136	2431	RevertMeshes();
2137	2432	} else
2138		- if (event.getSource() == resetMeshItem)
	2433	+ if (source == resetAllItem)
2139	2434	{
2140	2435	ResetAll();
2141	2436	} else
2142		- if (event.getSource() == stepAllItem)
	2437	+ if (source == stepAllItem)
2143	2438	{
2144	2439	StepAll();
2145	2440	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2441	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2442	{
2148	2443	//int indices[] = jList.getSelectedIndices();
2149	2444	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2446,46 @@
2151	2446
2152	2447	ClearSelection(false);
2153	2448	} else
2154		- if (event.getSource() == clearAllItem)
	2449	+ if (source == clearAllItem)
2155	2450	{
2156	2451	ClearSelection(true);
2157	2452	} else
2158		- if (event.getSource() == grabItem)
	2453	+ if (source == grabItem)
2159	2454	{
2160	2455	group(new cGroup(), true);
2161	2456	} else
2162		- if (event.getSource() == frontItem)
	2457	+ if (source == hideItem)
	2458	+ {
	2459	+ group(new HiddenObject());
	2460	+ } else
	2461	+ if (source == frontItem)
2163	2462	{
2164	2463	front();
2165	2464	} else
2166		- if (event.getSource() == backItem)
	2465	+ if (source == backItem)
2167	2466	{
2168	2467	back();
2169	2468	} else
2170		- if (event.getSource() == cameraItem)
	2469	+ if (source == cameraItem)
2171	2470	{
2172	2471	makeSomething(new Camera());
2173	2472	} else
2174		- if (event.getSource() == compositeItem)
	2473	+ if (source == compositeItem)
2175	2474	{
2176	2475	group(new Composite());
2177	2476	} else
2178		- if (event.getSource() == randomItem)
	2477	+ if (source == randomItem)
2179	2478	{
2180	2479	RandomNode random = new RandomNode();
2181	2480	group(random);
2182	2481	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2482	+ random.name = random.get(0).name + "Switch";
2184	2483	} else
2185		- if (event.getSource() == physicsItem)
	2484	+ if (source == physicsItem)
2186	2485	{
2187	2486	group(new PhysicsNode());
2188	2487	} else
2189		- if (event.getSource() == frameselectorItem)
	2488	+ if (source == frameselectorItem)
2190	2489	{
2191	2490	for (int i=0; i<group.selection.size(); i++)
2192	2491	{
..	..	@@ -2198,7 +2497,7 @@
2198	2497	ResetModel();
2199	2498	refreshContents();
2200	2499	} else
2201		- if (event.getSource() == switchGeoItem)
	2500	+ if (source == switchGeoItem)
2202	2501	{
2203	2502	for (int i=0; i<group.selection.size(); i++)
2204	2503	{
..	..	@@ -2210,7 +2509,7 @@
2210	2509	ResetModel();
2211	2510	refreshContents();
2212	2511	} else
2213		- if (event.getSource() == switchTransfoItem)
	2512	+ if (source == switchTransfoItem)
2214	2513	{
2215	2514	for (int i=0; i<group.selection.size(); i++)
2216	2515	{
..	..	@@ -2222,7 +2521,7 @@
2222	2521	ResetModel();
2223	2522	refreshContents();
2224	2523	} else
2225		- if (event.getSource() == morphItem)
	2524	+ if (source == morphItem)
2226	2525	{
2227	2526	for (int i=0; i<group.selection.size(); i++)
2228	2527	{
..	..	@@ -2234,7 +2533,7 @@
2234	2533	ResetModel();
2235	2534	refreshContents();
2236	2535	} else
2237		- if (event.getSource() == scriptNodeItem)
	2536	+ if (source == scriptNodeItem)
2238	2537	{
2239	2538	boolean atleastone = false;
2240	2539
..	..	@@ -2273,195 +2572,239 @@
2273	2572	}
2274	2573	}
2275	2574	} else
2276		- if (event.getSource() == linkerItem)
	2575	+ if (source == linkerItem)
2277	2576	{
2278	2577	group(new cLinker());
2279	2578	} else
2280		- if (event.getSource() == textureItem)
	2579	+ if (source == textureItem)
2281	2580	{
2282	2581	group(new TextureNode());
2283	2582	} else
2284		- if (event.getSource() == shadowXItem)
	2583	+ if (source == billboardItem)
	2584	+ {
	2585	+ group(new BillboardNode());
	2586	+ } else
	2587	+ if (source == shadowXItem)
2285	2588	{
2286	2589	CastShadow(0);
2287	2590	} else
2288		- if (event.getSource() == shadowYItem)
	2591	+ if (source == shadowYItem)
2289	2592	{
2290	2593	CastShadow(1);
2291	2594	} else
2292		- if (event.getSource() == shadowZItem)
	2595	+ if (source == shadowZItem)
2293	2596	{
2294	2597	CastShadow(2);
2295	2598	} else
2296		- if (event.getSource() == ungroupItem)
	2599	+ if (source == ungroupItem)
2297	2600	{
2298		- ungroup();
	2601	+ //ungroup();
	2602	+ for (int i=0; i<group.selection.size(); i++)
	2603	+ {
	2604	+ Ungroup(group.selection.get(i));
	2605	+ }
	2606	+
	2607	+ ClearSelection(false);
	2608	+
	2609	+ refreshContents();
2299	2610	} else
2300		- if (event.getSource() == genUVItem)
	2611	+ if (source == genUVItem)
2301	2612	{
2302	2613	GenUV();
2303	2614	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2615	+ if (source == genNormalsCADItem)
2305	2616	{
2306	2617	GenNormals(true);
2307	2618	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2619	+ if (source == genNormalsMESHItem)
	2620	+ {
	2621	+ GenNormalsMESH();
	2622	+ } else
	2623	+ if (source == genNormalsORGANItem)
2309	2624	{
2310	2625	GenNormals(false);
2311	2626	} else
2312		- if (event.getSource() == stripifyItem)
	2627	+ if (source == genNormalsMINEItem)
	2628	+ {
	2629	+ GenNormalsMINE();
	2630	+ } else
	2631	+ if (source == stripifyItem)
2313	2632	{
2314	2633	Stripify();
2315	2634	} else
2316		- if (event.getSource() == unstripifyItem)
	2635	+ if (source == unstripifyItem)
2317	2636	{
2318	2637	Unstripify();
2319	2638	} else
2320		- if (event.getSource() == trimItem)
	2639	+ if (source == trimItem)
2321	2640	{
2322	2641	Trim();
2323	2642	} else
2324		- if (event.getSource() == untrimItem)
	2643	+ if (source == untrimItem)
2325	2644	{
2326	2645	Untrim();
2327	2646	} else
2328		- if (event.getSource() == clearColorsItem)
	2647	+ if (source == clearColorsItem)
2329	2648	{
2330	2649	ClearColors();
2331	2650	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2651	+ if (source == clearMaterialsItem)
2333	2652	{
2334	2653	ClearMaterials();
2335	2654	} else
2336		- if (event.getSource() == liveleavesItem)
	2655	+ if (source == liveleavesItem)
2337	2656	{
2338	2657	LiveLeaves(true);
2339	2658	} else
2340		- if (event.getSource() == unliveleavesItem)
	2659	+ if (source == unliveleavesItem)
2341	2660	{
2342	2661	LiveLeaves(false);
2343	2662	} else
2344		- if (event.getSource() == supportleavesItem)
	2663	+ if (source == supportleavesItem)
2345	2664	{
2346	2665	SupportLeaves(true);
2347	2666	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2667	+ if (source == unsupportleavesItem)
2349	2668	{
2350	2669	SupportLeaves(false);
2351	2670	} else
2352		- if (event.getSource() == hideleavesItem)
	2671	+ if (source == hideleavesItem)
2353	2672	{
2354	2673	HideLeaves(true);
2355	2674	} else
2356		- if (event.getSource() == showleavesItem)
	2675	+ if (source == showleavesItem)
2357	2676	{
2358	2677	HideLeaves(false);
2359	2678	} else
2360		- if (event.getSource() == markleavesItem)
	2679	+ if (source == markleavesItem)
2361	2680	{
2362	2681	MarkLeaves(true);
2363	2682	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2683	+ if (source == unmarkleavesItem)
2365	2684	{
2366	2685	MarkLeaves(false);
2367	2686	} else
2368		- if (event.getSource() == flipVItem)
	2687	+ if (source == rewindleavesItem)
	2688	+ {
	2689	+ RewindLeaves(true);
	2690	+ } else
	2691	+ if (source == unrewindleavesItem)
	2692	+ {
	2693	+ RewindLeaves(false);
	2694	+ } else
	2695	+ if (source == randomleavesItem)
	2696	+ {
	2697	+ RandomLeaves(true);
	2698	+ } else
	2699	+ if (source == unrandomleavesItem)
	2700	+ {
	2701	+ RandomLeaves(false);
	2702	+ } else
	2703	+ if (source == flipVItem)
2369	2704	{
2370	2705	FlipV(true);
2371	2706	} else
2372		- if (event.getSource() == unflipVItem)
	2707	+ if (source == unflipVItem)
2373	2708	{
2374	2709	FlipV(false);
2375	2710	} else
2376		- if (event.getSource() == lowTexturesItem)
	2711	+ if (source == lowTexturesItem)
2377	2712	{
2378	2713	SetTexRes(0);
2379	2714	} else
2380		- if (event.getSource() == normalTexturesItem)
	2715	+ if (source == normalTexturesItem)
2381	2716	{
2382	2717	SetTexRes(1);
2383	2718	} else
2384		- if (event.getSource() == highTexturesItem)
	2719	+ if (source == highTexturesItem)
2385	2720	{
2386	2721	SetTexRes(2);
2387	2722	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2723	+ if (source == veryhighTexturesItem)
2389	2724	{
2390	2725	SetTexRes(3);
2391	2726	} else
2392		- if (event.getSource() == maxTexturesItem)
	2727	+ if (source == maxTexturesItem)
2393	2728	{
2394	2729	SetTexRes(4);
2395	2730	} else
2396		- if (event.getSource() == panoTexturesItem)
	2731	+ if (source == panoTexturesItem)
2397	2732	{
2398	2733	SetTexRes(5);
2399	2734	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2735	+ if (source == reverseNormalsItem)
2401	2736	{
2402	2737	ReverseNormals();
2403	2738	} else
2404		- if (event.getSource() == parseverticesItem)
	2739	+ if (source == parseverticesItem)
2405	2740	{
2406	2741	ParseVertices();
2407	2742	} else
2408		- if (event.getSource() == textureFieldItem)
	2743	+ if (source == textureFieldItem)
2409	2744	{
2410	2745	TextureVertices();
2411	2746	} else
2412		- if (event.getSource() == alignItem)
	2747	+ if (source == alignItem)
2413	2748	{
2414	2749	Align();
2415	2750	} else
2416		- if (event.getSource() == mirrorItem)
	2751	+ if (source == mirrorItem)
2417	2752	{
2418	2753	MirrorPoses();
2419	2754	} else
2420		- if (event.getSource() == reduceMorphItem)
	2755	+ if (source == reduceMorphItem)
2421	2756	{
2422	2757	MeshReduction(false);
2423	2758	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2759	+ if (source == reduce34MorphItem)
2425	2760	{
2426	2761	MeshReduction(true);
2427	2762	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2763	+ if (source == reverseTrianglesItem)
2429	2764	{
2430	2765	ReverseTriangles();
2431	2766	} else
2432		- if (event.getSource() == reduceMeshItem)
	2767	+ if (source == reduceMeshItem)
2433	2768	{
2434	2769	ReduceMesh(false);
2435	2770	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2771	+ if (source == reduce34MeshItem)
2437	2772	{
2438	2773	ReduceMesh(true);
2439	2774	} else
2440		- if (event.getSource() == increaseMeshItem)
	2775	+ if (source == increaseMeshItem)
2441	2776	{
2442	2777	IncreaseMesh();
2443	2778	} else
2444		- if (event.getSource() == clipMeshItem)
	2779	+ if (source == clipMeshItem)
2445	2780	{
2446	2781	ClipMesh();
2447	2782	} else
2448		- if (event.getSource() == smoothMeshItem)
	2783	+ if (source == smoothMeshItem)
2449	2784	{
2450	2785	SmoothMesh();
2451	2786	} else
2452		- if (event.getSource() == transformgeometryItem)
	2787	+ if (source == transformGeometryItem)
2453	2788	{
2454	2789	TransformGeometry();
2455	2790	} else
2456		- if (event.getSource() == resetTransformItem)
	2791	+ if (source == transformChildrenItem)
	2792	+ {
	2793	+ TransformChildren();
	2794	+ } else
	2795	+ if (source == resetTransformItem)
2457	2796	{
2458	2797	ResetTransform();
2459	2798	} else
2460		- if (event.getSource() == resetCentroidItem)
	2799	+ if (source == resetCentroidItem)
2461	2800	{
2462		- ResetCentroid();
	2801	+ ResetCentroid(true);
2463	2802	} else
2464		- if (event.getSource() == resetParentItem)
	2803	+ if (source == resetCentroidXZItem)
	2804	+ {
	2805	+ ResetCentroid(false);
	2806	+ } else
	2807	+ if (source == resetParentItem)
2465	2808	{
2466	2809	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2810	{
..	..	@@ -2471,7 +2814,7 @@
2471	2814
2472	2815	refreshContents();
2473	2816	} else
2474		- if (event.getSource() == repairParentItem)
	2817	+ if (source == repairParentItem)
2475	2818	{
2476	2819	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2820	{
..	..	@@ -2485,7 +2828,21 @@
2485	2828
2486	2829	refreshContents();
2487	2830	} else
2488		- if (event.getSource() == sortbysizeItem)
	2831	+ if (source == repairShadowItem)
	2832	+ {
	2833	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2834	+ {
	2835	+ Object3D obj = (Object3D)e.nextElement();
	2836	+ obj.RepairShadow();
	2837	+// for (int i=0; i<obj.size(); i++)
	2838	+// {
	2839	+// obj.get(i).parent = obj;
	2840	+// }
	2841	+ }
	2842	+
	2843	+ refreshContents();
	2844	+ } else
	2845	+ if (source == sortbysizeItem)
2489	2846	{
2490	2847	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	2848	{
..	..	@@ -2497,7 +2854,7 @@
2497	2854	ResetModel();
2498	2855	refreshContents();
2499	2856	} else
2500		- if (event.getSource() == sortbynameItem)
	2857	+ if (source == sortbynameItem)
2501	2858	{
2502	2859	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	2860	{
..	..	@@ -2509,7 +2866,7 @@
2509	2866	ResetModel();
2510	2867	refreshContents();
2511	2868	} else
2512		- if (event.getSource() == attachPigmentItem)
	2869	+ if (source == attachPigmentItem)
2513	2870	{
2514	2871	String texture = GetFile("Attach pigment");
2515	2872	Object3D obj;
..	..	@@ -2521,7 +2878,7 @@
2521	2878
2522	2879	refreshContents();
2523	2880	} else
2524		- if (event.getSource() == detachPigmentItem)
	2881	+ if (source == detachPigmentItem)
2525	2882	{
2526	2883	Object3D obj;
2527	2884	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +2889,7 @@
2532	2889
2533	2890	refreshContents();
2534	2891	} else
2535		- if (event.getSource() == attachBumpItem)
	2892	+ if (source == attachBumpItem)
2536	2893	{
2537	2894	String texture = GetFile("Attach bump");
2538	2895	Object3D obj;
..	..	@@ -2544,7 +2901,7 @@
2544	2901
2545	2902	refreshContents();
2546	2903	} else
2547		- if (event.getSource() == detachBumpItem)
	2904	+ if (source == detachBumpItem)
2548	2905	{
2549	2906	Object3D obj;
2550	2907	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +2912,7 @@
2555	2912
2556	2913	refreshContents();
2557	2914	} else
2558		- if (event.getSource() == pigmentBumpItem)
	2915	+ if (source == pigmentBumpItem)
2559	2916	{
2560	2917	Object3D obj;
2561	2918	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +2923,221 @@
2566	2923
2567	2924	refreshContents();
2568	2925	} else
2569		- if (event.getSource() == flashSelectionButton)
	2926	+ if (source == flashSelectionButton)
2570	2927	{
2571	2928	CameraPane.flash = true;
2572	2929	refreshContents();
2573	2930	} else
2574		- if (event.getSource() == oneButton)
	2931	+ if (source == oneButton)
2575	2932	{
2576	2933	} else
2577		- if (event.getSource() == twoButton)
	2934	+ if (source == twoButton)
2578	2935	{
2579	2936	radio.layout = twoButton;
2580	2937	// bug
2581	2938	//gridPanel.setDividerLocation(1.0);
2582	2939	//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();
	2940	+// bigThree.remove(scenePanel);
	2941	+// bigThree.remove(centralPanel);
	2942	+// bigThree.remove(XYZPanel);
	2943	+// aWindowConstraints.gridx = 0;
	2944	+// aWindowConstraints.gridy = 0;
	2945	+// aWindowConstraints.gridwidth = 1;
	2946	+// // aConstraints.gridheight = 3;
	2947	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2948	+// aWindowConstraints.weightx = 0;
	2949	+// aWindowConstraints.weighty = 1;
	2950	+// //bigThree.add(jtp, aWindowConstraints);
	2951	+// aWindowConstraints.weightx = 1;
	2952	+// aWindowConstraints.gridwidth = 3;
	2953	+// // aConstraints.gridheight = 3;
	2954	+// aWindowConstraints.gridx = 1;
	2955	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2956	+// bigThree.add(centralPanel, aWindowConstraints);
	2957	+// aWindowConstraints.weightx = 0;
	2958	+// aWindowConstraints.gridx = 4;
	2959	+// aWindowConstraints.gridwidth = 1;
	2960	+// // aConstraints.gridheight = 3;
	2961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2962	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2963	+// scenePanel.setVisible(false);
	2964	+// centralPanel.setVisible(true);
	2965	+// XYZPanel.setVisible(false);
	2966	+ bigThree.ClearUI();
	2967	+ bigThree.add(centralPanel);
	2968	+ bigThree.FlushUI();
	2969	+
	2970	+ cameraView.requestFocusInWindow();
	2971	+
	2972	+// refreshContents(true);
	2973	+//
	2974	+// try
	2975	+// {
	2976	+// java.awt.Robot bot = new java.awt.Robot();
	2977	+// int mask = InputEvent.BUTTON1_MASK;
	2978	+// bot.mouseMove(100, 100);
	2979	+// bot.mousePress(mask);
	2980	+// bot.mouseRelease(mask);
	2981	+// }
	2982	+// catch (Exception e)
	2983	+// {
	2984	+//
	2985	+// }
	2986	+
2607	2987	} else
2608		- if (event.getSource() == threeButton)
	2988	+ if (source == threeButton)
2609	2989	{
2610	2990	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();
	2991	+
	2992	+// bigThree.remove(scenePanel);
	2993	+// bigThree.remove(centralPanel);
	2994	+// bigThree.remove(XYZPanel);
	2995	+// aWindowConstraints.gridx = 0;
	2996	+// aWindowConstraints.gridy = 0;
	2997	+// aWindowConstraints.gridwidth = 1;
	2998	+// // aConstraints.gridheight = 3;
	2999	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3000	+// aWindowConstraints.weightx = 0;
	3001	+// aWindowConstraints.weighty = 1;
	3002	+// //bigThree.add(jtp, aWindowConstraints);
	3003	+// aWindowConstraints.weightx = 1;
	3004	+// aWindowConstraints.gridwidth = 3;
	3005	+// // aConstraints.gridheight = 3;
	3006	+// aWindowConstraints.gridx = 1;
	3007	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3008	+// bigThree.add(centralPanel, aWindowConstraints);
	3009	+// aWindowConstraints.weightx = 0;
	3010	+// aWindowConstraints.gridx = 4;
	3011	+// aWindowConstraints.gridwidth = 1;
	3012	+// // aConstraints.gridheight = 3;
	3013	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3014	+// bigThree.add(XYZPanel, aWindowConstraints);
	3015	+// bigThree.validate();
	3016	+// scenePanel.setVisible(false);
	3017	+// centralPanel.setVisible(true);
	3018	+// XYZPanel.setVisible(true);
	3019	+ bigThree.ClearUI();
	3020	+ bigThree.add(centralPanel);
	3021	+ bigThree.add(XYZPanel);
	3022	+ bigThree.FlushUI();
	3023	+
	3024	+ cameraView.requestFocusInWindow();
2635	3025	} else
2636		- if (event.getSource() == fourButton)
	3026	+ if (source == fourButton)
2637	3027	{
2638	3028	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();
	3029	+
	3030	+// bigThree.remove(scenePanel);
	3031	+// bigThree.remove(centralPanel);
	3032	+// bigThree.remove(XYZPanel);
	3033	+// aWindowConstraints.gridx = 0;
	3034	+// aWindowConstraints.gridy = 0;
	3035	+// aWindowConstraints.gridwidth = 1;
	3036	+// // aWindowConstraints.gridheight = 3;
	3037	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3038	+// aWindowConstraints.weightx = 1;
	3039	+// aWindowConstraints.weighty = 1;
	3040	+// bigThree.add(scenePanel, aWindowConstraints);
	3041	+// aWindowConstraints.weightx = 1;
	3042	+// aWindowConstraints.gridwidth = 3;
	3043	+// // aConstraints.gridheight = 3;
	3044	+// aWindowConstraints.gridx = 1;
	3045	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3046	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3047	+// aWindowConstraints.weightx = 0;
	3048	+// aWindowConstraints.gridx = 4;
	3049	+// aWindowConstraints.gridwidth = 1;
	3050	+// // aWindowConstraints.gridheight = 3;
	3051	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3052	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3053	+// bigThree.validate();
	3054	+// scenePanel.setVisible(true);
	3055	+// centralPanel.setVisible(false);
	3056	+// XYZPanel.setVisible(false);
	3057	+ bigThree.ClearUI();
	3058	+ bigThree.add(scenePanel);
	3059	+ bigThree.FlushUI();
	3060	+
	3061	+ cameraView.requestFocusInWindow();
2663	3062	} else
2664		- if (event.getSource() == sixButton)
	3063	+ if (source == sixButton)
2665	3064	{
2666	3065	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();
	3066	+
	3067	+// bigThree.remove(scenePanel);
	3068	+// bigThree.remove(centralPanel);
	3069	+// bigThree.remove(XYZPanel);
	3070	+// aWindowConstraints.gridx = 0;
	3071	+// aWindowConstraints.gridy = 0;
	3072	+// aWindowConstraints.gridwidth = 1;
	3073	+// // aConstraints.gridheight = 3;
	3074	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3075	+// aWindowConstraints.weightx = 0;
	3076	+// aWindowConstraints.weighty = 1;
	3077	+// bigThree.add(scenePanel, aWindowConstraints);
	3078	+// aWindowConstraints.weightx = 1;
	3079	+// aWindowConstraints.gridwidth = 3;
	3080	+// // aWindowConstraints.gridheight = 3;
	3081	+// aWindowConstraints.gridx = 1;
	3082	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3083	+// bigThree.add(centralPanel, aWindowConstraints);
	3084	+// aWindowConstraints.weightx = 0;
	3085	+// aWindowConstraints.gridx = 4;
	3086	+// aWindowConstraints.gridwidth = 1;
	3087	+// // aWindowConstraints.gridheight = 3;
	3088	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3089	+// //bigThree.add(XYZPanel, aConstraints);
	3090	+// bigThree.validate();
	3091	+// scenePanel.setVisible(true);
	3092	+// centralPanel.setVisible(true);
	3093	+// XYZPanel.setVisible(false);
	3094	+ bigThree.ClearUI();
	3095	+ bigThree.add(scenePanel);
	3096	+ bigThree.add(centralPanel);
	3097	+ bigThree.FlushUI();
	3098	+
	3099	+ cameraView.requestFocusInWindow();
2691	3100	} else
2692		- if (event.getSource() == sevenButton)
	3101	+ if (source == sevenButton)
2693	3102	{
2694	3103	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();
	3104	+
	3105	+// bigThree.remove(scenePanel);
	3106	+// bigThree.remove(centralPanel);
	3107	+// bigThree.remove(XYZPanel);
	3108	+// aWindowConstraints.gridx = 0;
	3109	+// aWindowConstraints.gridy = 0;
	3110	+// aWindowConstraints.gridwidth = 1;
	3111	+// // aWindowConstraints.gridheight = 3;
	3112	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3113	+// aWindowConstraints.weightx = 0;
	3114	+// aWindowConstraints.weighty = 1;
	3115	+// bigThree.add(scenePanel, aWindowConstraints);
	3116	+// aWindowConstraints.weightx = 1;
	3117	+// aWindowConstraints.gridwidth = 3;
	3118	+// // aWindowConstraints.gridheight = 3;
	3119	+// aWindowConstraints.gridx = 1;
	3120	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3121	+// bigThree.add(centralPanel, aWindowConstraints);
	3122	+// aWindowConstraints.weightx = 0;
	3123	+// aWindowConstraints.gridx = 4;
	3124	+// aWindowConstraints.gridwidth = 1;
	3125	+// // aConstraints.gridheight = 3;
	3126	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3127	+// bigThree.add(XYZPanel, aWindowConstraints);
	3128	+// bigThree.validate();
	3129	+// scenePanel.setVisible(true);
	3130	+// centralPanel.setVisible(true);
	3131	+// XYZPanel.setVisible(true);
	3132	+ bigThree.ClearUI();
	3133	+ bigThree.add(scenePanel);
	3134	+ bigThree.add(centralPanel);
	3135	+ bigThree.add(XYZPanel);
	3136	+ bigThree.FlushUI();
	3137	+
	3138	+ cameraView.requestFocusInWindow();
2719	3139	} else
2720		- if (event.getSource() == rootButton)
	3140	+ if (source == rootButton)
2721	3141	{
2722	3142	Object3D obj;
2723	3143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,34 +3147,44 @@
2727	3147	EditObject(obj);
2728	3148	}
2729	3149
	3150	+ cameraView.requestFocusInWindow();
2730	3151	refreshContents(true);
2731	3152	} else
2732		- if (event.getSource() == closeButton)
	3153	+ if (source == closeButton)
2733	3154	{
2734	3155	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3156	cRadio ab;
2736	3157	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3158	{
2738	3159	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3160	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3161	{
	3162	+ // Patch to avoid bug with transparency.
	3163	+ if (!ab.hadMaterial)
	3164	+ {
	3165	+ ab.object.material = null;
	3166	+ }
	3167	+
2741	3168	buttonGroup.remove(ab);
2742	3169	radioPanel.remove(ab);
2743	3170
2744		- ab.GetObject().editWindow = null;
	3171	+ //ab.GetObject().editWindow = null;
	3172	+ ab.GetObject().manipWindow = null;
2745	3173	// ab.GetObject().objectUI = null; // ?????????
2746	3174
2747	3175	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3176	break;
2749	3177	}
2750	3178	}
	3179	+
	3180	+ cameraView.requestFocusInWindow();
2751	3181	refreshContents(true);
2752	3182	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3183	+ if (source == editItem \|\| source == editButton)
2754	3184	{
2755	3185	EditSelection(false);
2756	3186	} else
2757		- if (event.getSource() == uneditButton)
	3187	+ if (source == uneditButton)
2758	3188	{
2759	3189	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3190	{
..	..	@@ -2764,14 +3194,14 @@
2764	3194	child.CloseUI();
2765	3195	listUI.remove(child);
2766	3196
2767		- child.editWindow = null; // ???????????
	3197	+ //child.editWindow = null; // ???????????
2768	3198	}
2769		- objEditor.ctrlPanel.revalidate();
	3199	+ objEditor.ctrlPanel.FlushUI();
2770	3200	//objEditor.jTree.clearSelection();
2771	3201	//objEditor.ResetSliders();
2772	3202	refreshContents(true);
2773	3203	} else
2774		- if (event.getSource() == clearPanelButton)
	3204	+ if (source == clearPanelButton)
2775	3205	{
2776	3206	assert(copy == group);
2777	3207	//copy.ClearUI();
..	..	@@ -2782,7 +3212,7 @@
2782	3212	listUI.clear();
2783	3213	refreshContents(true);
2784	3214	} else
2785		- if (event.getSource() == allParamsButton)
	3215	+ if (source == allParamsButton)
2786	3216	{
2787	3217	assert(copy == group);
2788	3218
..	..	@@ -2803,19 +3233,19 @@
2803	3233
2804	3234	refreshContents(true);
2805	3235	} else
2806		- if (event.getSource() == unselectButton)
	3236	+ if (source == unselectButton)
2807	3237	{
2808	3238	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3239	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3240	objEditor.ResetSliders();
2811	3241	refreshContents(true);
2812	3242	} else
2813		- if(event.getSource() instanceof cRadio)
	3243	+ if(source instanceof cRadio)
2814	3244	{
2815	3245	group.parent = keepparent;
2816	3246	group.attributes = 0;
2817	3247	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3248	+ /cRadio/ radio = (cRadio)source;
2819	3249	Object3D obj = radio.GetObject();
2820	3250	System.out.println("Edit " + obj);
2821	3251	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3265,7 @@
2835	3265	}
2836	3266
2837	3267	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3268	+ //Globals.theRenderer.object = group;
2839	3269	if(!useclient)
2840	3270	{
2841	3271	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,12 +3274,17 @@
2844	3274	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3275	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3276	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3277	+ //cameraView.lighttouched = true;
	3278	+ Globals.lighttouched = true;
2848	3279	topView.object = group;
2849	3280	frontView.object = group;
2850	3281	sideView.object = group;
2851	3282	}
2852		- group.editWindow = this;
	3283	+
	3284	+// fix "+" issue
	3285	+ //group.editWindow = this;
	3286	+ group.manipWindow = this;
	3287	+
2853	3288	/*
2854	3289	currentLayout = radio.layout;
2855	3290	if (currentLayout == null)
..	..	@@ -2861,8 +3296,23 @@
2861	3296	//group.parent = null; // ROOT
2862	3297	//group.attributes = -1;
2863	3298	ResetModel();
	3299	+
	3300	+ cameraView.requestFocusInWindow();
2864	3301	refreshContents(true);
2865		- }
	3302	+ } else if (event.getSource() == editCameraItem)
	3303	+ {
	3304	+ cameraView.ProtectCamera();
	3305	+ cameraView.repaint();
	3306	+ return;
	3307	+ } else if (event.getSource() == revertCameraItem)
	3308	+ {
	3309	+ cameraView.RevertCamera();
	3310	+ cameraView.repaint();
	3311	+ return;
	3312	+ // } else if (event.getSource() == textureButton)
	3313	+ // {
	3314	+ // return; // true;
	3315	+ }
2866	3316	else
2867	3317	{
2868	3318	//return super.action(event, arg);
..	..	@@ -2871,7 +3321,6 @@
2871	3321	}
2872	3322
2873	3323	boolean useclient = false;
2874		- cRadio radio;
2875	3324
2876	3325	void ToggleRoot()
2877	3326	{
..	..	@@ -2880,7 +3329,7 @@
2880	3329	if (useclient)
2881	3330	{
2882	3331	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3332	+ Globals.lighttouched = true;
2884	3333	//topView.object = client;
2885	3334	//frontView.object = client;
2886	3335	//sideView.object = client;
..	..	@@ -2888,7 +3337,7 @@
2888	3337	else
2889	3338	{
2890	3339	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3340	+ Globals.lighttouched = true;
2892	3341	//topView.object = group;
2893	3342	//frontView.object = group;
2894	3343	//sideView.object = group;
..	..	@@ -2923,6 +3372,28 @@
2923	3372	refreshContents();
2924	3373	}
2925	3374
	3375	+ void TransformChildren()
	3376	+ {
	3377	+ Object3D obj;
	3378	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3379	+ {
	3380	+ obj = (Object3D)e.nextElement();
	3381	+ obj.KeepTextureMatrices();
	3382	+ obj.TransformChildren();
	3383	+ obj.RestoreTextureMatrices();
	3384	+
	3385	+// if (obj.parent == null)
	3386	+// {
	3387	+// System.out.println("NULL PARENT!");
	3388	+// new Exception().printStackTrace();
	3389	+// }
	3390	+// else
	3391	+// TouchTransform(obj);
	3392	+// //obj.parent.Touch();
	3393	+ }
	3394	+
	3395	+ refreshContents();
	3396	+ }
2926	3397
2927	3398	void ResetTransform()
2928	3399	{
..	..	@@ -3035,7 +3506,7 @@
3035	3506	refreshContents();
3036	3507	}
3037	3508
3038		- void ResetCentroid()
	3509	+ void ResetCentroid(boolean full)
3039	3510	{
3040	3511	Object3D obj;
3041	3512	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3521,16 @@
3050	3521	LA.matIdentity(Object3D.mat);
3051	3522	obj.getBounds(minima, maxima, false);
3052	3523	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3524	+ if (full)
	3525	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3526	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3527	obj.TransformMesh(Object3D.mat);
	3528	+
3056	3529	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3530	+ if (full)
	3531	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3532	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3533	+
3059	3534	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3535	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3536	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3559,8 @@
3084	3559
3085	3560	int size = obj.MemorySize();
3086	3561
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3562	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3563	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3564	}
3089	3565	}
3090	3566	catch (Exception e)
..	..	@@ -3121,9 +3597,9 @@
3121	3597	obj = (Object3D)e.nextElement();
3122	3598
3123	3599	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3600	+ Grafreed.AnalyzeObject(obj);
3125	3601	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3602	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3603
3128	3604	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3605	}
..	..	@@ -3165,6 +3641,20 @@
3165	3641	void GenNormals(boolean crease)
3166	3642	{
3167	3643	group.GenNormalsS(crease);
	3644	+
	3645	+ refreshContents();
	3646	+ }
	3647	+
	3648	+ void GenNormalsMESH()
	3649	+ {
	3650	+ group.GenNormalsMeshS();
	3651	+
	3652	+ refreshContents();
	3653	+ }
	3654	+
	3655	+ void GenNormalsMINE()
	3656	+ {
	3657	+ group.selection.GenNormalsMINE();
3168	3658
3169	3659	refreshContents();
3170	3660	}
..	..	@@ -3250,7 +3740,7 @@
3250	3740	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3741	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3742	//
3253		-// g.add(GraphreeD.clipboard);
	3743	+// g.add(GrafreeD.clipboard);
3254	3744	//
3255	3745	// buffer.add(g);
3256	3746	// }
..	..	@@ -3269,8 +3759,8 @@
3269	3759	// nodes = new Object3D();
3270	3760	// vertices = new Vector<Vertex>();
3271	3761	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3762	+// boolean epsequal = GrafreeD.epsequal;
	3763	+// GrafreeD.epsequal = true;
3274	3764	//
3275	3765	// for (int i=0; i<group.selection.size(); i++)
3276	3766	// {
..	..	@@ -3311,7 +3801,7 @@
3311	3801	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3802	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3803	//
3314		-// g.add(GraphreeD.clipboard);
	3804	+// g.add(GrafreeD.clipboard);
3315	3805	//
3316	3806	// buffer.add(g);
3317	3807	// }
..	..	@@ -3319,7 +3809,7 @@
3319	3809	// makeSomething(buffer, i==group.selection.size()-1);
3320	3810	// }
3321	3811	//
3322		-// GraphreeD.epsequal = epsequal;
	3812	+// GrafreeD.epsequal = epsequal;
3323	3813	//
3324	3814	// //buffer = null;
3325	3815	// temprep = null;
..	..	@@ -3330,8 +3820,8 @@
3330	3820
3331	3821	void ParseVertices()
3332	3822	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	3823	+ boolean epsequal = Grafreed.epsequal;
	3824	+ Grafreed.epsequal = true;
3335	3825
3336	3826	for (int i=0; i<group.selection.size(); i++)
3337	3827	{
..	..	@@ -3356,7 +3846,7 @@
3356	3846	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	3847	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	3848
3359		- g.add(GraphreeD.clipboard);
	3849	+ g.add(Grafreed.clipboard);
3360	3850
3361	3851	buffer.add(g);
3362	3852	}
..	..	@@ -3371,7 +3861,7 @@
3371	3861	makeSomething(buffer, i==group.selection.size()-1);
3372	3862	}
3373	3863
3374		- GraphreeD.epsequal = epsequal;
	3864	+ Grafreed.epsequal = epsequal;
3375	3865
3376	3866	refreshContents();
3377	3867	}
..	..	@@ -3389,7 +3879,16 @@
3389	3879	String pigment = Object3D.GetPigment(tex);
3390	3880	//String bump = Object3D.GetBump(tex);
3391	3881
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	3882	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3883	+
	3884	+ try
	3885	+ {
	3886	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3887	+ }
	3888	+ catch (Exception e)
	3889	+ {
	3890	+ System.err.println("FAIL: " + node);
	3891	+ }
3393	3892
3394	3893	double s = v.s;
3395	3894
..	..	@@ -3416,7 +3915,7 @@
3416	3915	scale /= 3;
3417	3916
3418	3917	scale /= 0xFF;
3419		- scale /= 4;
	3918	+ // c'est quoi ca? scale /= 4;
3420	3919
3421	3920	//v.AO = scale;
3422	3921
..	..	@@ -3437,12 +3936,26 @@
3437	3936
3438	3937	void Align()
3439	3938	{
	3939	+ if (group.selection.size() == 0)
	3940	+ return;
	3941	+
	3942	+ cVector bbmin = new cVector();
	3943	+ cVector bbmax = new cVector();
	3944	+
	3945	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	3946	+
	3947	+ double dx = bbmax.x - bbmin.x;
	3948	+ double dy = bbmax.y - bbmin.y;
	3949	+ double dz = bbmax.z - bbmin.z;
	3950	+
	3951	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	3952	+
3440	3953	for (int i=0; i<group.selection.size(); i++)
3441	3954	{
3442	3955	Object3D obj = group.selection.get(i);
3443	3956
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	3957	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	3958	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	3959	}
3447	3960
3448	3961	refreshContents();
..	..	@@ -3455,7 +3968,7 @@
3455	3968	// ref.SaveSupports();
3456	3969	// Object3D par = ref.parent;
3457	3970	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	3971	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	3972	// ref.parent = par;
3460	3973	// ref.RestoreSupports();
3461	3974
..	..	@@ -3463,11 +3976,11 @@
3463	3976
3464	3977	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	3978
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	3979	+ boolean random = CameraPane.SWITCH;
	3980	+ CameraPane.SWITCH = false; // parse all random nodes
3468	3981	lowres.linkVerticesThis(null);
3469	3982	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	3983	+ CameraPane.SWITCH = random;
3471	3984
3472	3985	System.err.flush();
3473	3986
..	..	@@ -3485,7 +3998,7 @@
3485	3998	// lowres.SaveSupports();
3486	3999	// par = lowres.parent;
3487	4000	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4001	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4002	Object3D newlow = CloneObject(lowres, false);
3490	4003	newlow.name = sn.switchobject.get(i).name;
3491	4004	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4020,7 @@
3507	4020	return;
3508	4021
3509	4022	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4023	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4024
3512	4025	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4026
..	..	@@ -3676,7 +4189,7 @@
3676	4189	group.selection.RelinkToSupport(); // july 2014
3677	4190	System.out.println("DONE.");
3678	4191	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4192	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4193	}
3681	4194
3682	4195	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4214,20 @@
3701	4214
3702	4215	void ClipMesh()
3703	4216	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4217	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4218	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4219	+ Object3D content = Grafreed.clipboard.get(0);
3707	4220
3708	4221	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4222	content = ((cGroup)content).get(0);
3710	4223
3711	4224	// for (int i=0; i<group.selection.size(); i++)
3712	4225	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4226	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4227	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4228	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4229	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4230	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4231	System.out.println("DONE.");
3719	4232	refreshContents();
3720	4233	}
..	..	@@ -3759,6 +4272,18 @@
3759	4272	void MarkLeaves(boolean hide)
3760	4273	{
3761	4274	group.selection.MarkLeaves(hide);
	4275	+ refreshContents();
	4276	+ }
	4277	+
	4278	+ void RewindLeaves(boolean hide)
	4279	+ {
	4280	+ group.selection.RewindLeaves(hide);
	4281	+ refreshContents();
	4282	+ }
	4283	+
	4284	+ void RandomLeaves(boolean hide)
	4285	+ {
	4286	+ group.selection.RandomLeaves(hide);
3762	4287	refreshContents();
3763	4288	}
3764	4289
..	..	@@ -3847,7 +4372,7 @@
3847	4372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4373
3849	4374	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4375	+ if(elem != group \|\| !newWindow)
3851	4376	{
3852	4377	// if (!(elem instanceof Composite))
3853	4378	// newWindow = false;
..	..	@@ -3937,7 +4462,6 @@
3937	4462	//case 702: // Event.LIST_DESELECT
3938	4463	group.deselectAll();
3939	4464	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4465	if (tps != null)
3942	4466	{
3943	4467	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,31 +4470,30 @@
3946	4470
3947	4471	//if (child.parent != null)
3948	4472	//child.parent.addSelectee(child);
	4473	+ objEditor.SetMaterial(child);
3949	4474	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4475	}
3954	4476	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4477	+// else
	4478	+// {
	4479	+// objEditor.SetMaterial(group); // .GetMaterial());
	4480	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4481	+// System.err.println("info : " + group.GetPath());
	4482	+// }
3961	4483
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4484	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4485	CameraPane.flash = true;
3966	4486
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4487	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4488	// a camera
3969	4489	{
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;
	4490	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4491	+ {
	4492	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4493	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4494	+ }
	4495	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4496	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4497	}
3975	4498
3976	4499	refreshContents();
..	..	@@ -3981,6 +4504,26 @@
3981	4504
3982	4505	freezemodel = false;
3983	4506	}
	4507	+
	4508	+ void refreshContents(boolean cp)
	4509	+ {
	4510	+ if (!Globals.MOUSEDRAGGED)
	4511	+ {
	4512	+ objEditor.ClearInfo(); // .GetMaterial());
	4513	+
	4514	+ for (int i=0; i < group.selection.Size(); i++)
	4515	+ {
	4516	+ Object3D child = (Object3D) group.selection.get(i);
	4517	+
	4518	+ objEditor.AddInfo(child, this, true);
	4519	+ System.err.println("info : " + child.GetPath());
	4520	+ }
	4521	+
	4522	+ objEditor.SetText(); // jan 2014
	4523	+ }
	4524	+
	4525	+ super.refreshContents(cp);
	4526	+ }
3984	4527
3985	4528	void linkSomething(Object3D thing)
3986	4529	{
..	..	@@ -4052,16 +4595,19 @@
4052	4595	{
4053	4596	if (group.selection.isEmpty())
4054	4597	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4598	+
	4599	+ Grafreed.clipboardIsTempGroup = false;
4056	4600	Composite tGroup = null;
4057	4601	if (group.selection.size() > 0) // 1)
4058	4602	{
4059	4603	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4604	+ Grafreed.clipboardIsTempGroup = true;
4061	4605	}
4062	4606
4063	4607	if (cut)
4064	4608	{
	4609	+ if (Globals.SAVEONMAKE)
	4610	+ Save();
4065	4611	//int indices[] = jList.getSelectedIndices();
4066	4612	//for (int i = indices.length - 1; i >= 0; i--)
4067	4613	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4643,16 @@
4097	4643	//System.out.println("cut " + child);
4098	4644	//System.out.println("parent = " + child.parent);
4099	4645	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4646	+ if (Grafreed.clipboardIsTempGroup)
4101	4647	tGroup.add/Child/(tmp);
4102	4648	else
4103		- GraphreeD.clipboard = tmp;
	4649	+ Grafreed.clipboard = tmp;
4104	4650	}
4105	4651	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4107	4653	tGroup.add/Child/(child);
4108	4654	else
4109		- GraphreeD.clipboard = child;
	4655	+ Grafreed.clipboard = child;
4110	4656	}
4111	4657
4112	4658	//ResetModel();
..	..	@@ -4138,21 +4684,23 @@
4138	4684	//System.out.println("cut " + elem);
4139	4685	//System.out.println("parent = " + elem.parent);
4140	4686	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4687	+ if (Grafreed.clipboardIsTempGroup)
4142	4688	tGroup.add/Child/(tmp);
4143	4689	else
4144		- GraphreeD.clipboard = tmp;
	4690	+ Grafreed.clipboard = tmp;
4145	4691	}
4146	4692	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4693	+ if (Grafreed.clipboardIsTempGroup)
4148	4694	tGroup.add/Child/(child);
4149	4695	else
4150		- GraphreeD.clipboard = child;
	4696	+ Grafreed.clipboard = child;
4151	4697	}
4152	4698
4153	4699	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4700	+
	4701	+ if (Grafreed.clipboardIsTempGroup)
	4702	+ Grafreed.clipboard = tGroup;
	4703	+
4156	4704	if (cut)
4157	4705	{
4158	4706	ResetModel();
..	..	@@ -4162,11 +4710,11 @@
4162	4710
4163	4711	void paste(boolean expand)
4164	4712	{
4165		- // if (GraphreeD.clipboard == null)
	4713	+ // if (GrafreeD.clipboard == null)
4166	4714	// return;
4167	4715	boolean first = true;
4168	4716
4169		- if (GraphreeD.clipboardIsTempGroup)
	4717	+ if (Grafreed.clipboardIsTempGroup)
4170	4718	{
4171	4719	Composite temp;
4172	4720
..	..	@@ -4177,7 +4725,7 @@
4177	4725	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4726	*/
4179	4727	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4728	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4729	{
4182	4730	Object3D child = (Object3D)e.nextElement();
4183	4731
..	..	@@ -4191,7 +4739,7 @@
4191	4739	else
4192	4740	elem = child.deepCopy(); // ?
4193	4741	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4742	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4743	// elem = elem.get(0);
4196	4744	makeSomething(elem, true); // ?? first);
4197	4745	//group.addChild(elem);
..	..	@@ -4211,23 +4759,23 @@
4211	4759	//Object3D cb = Applet3D.clipboard;
4212	4760	//temp.addChild(cb);
4213	4761	//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());
	4762	+ assert(Grafreed.clipboard.parent == null);
	4763	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4764	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4765	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4766	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4767	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4768	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4769	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4770	}
4223	4771
4224	4772	ResetModel();
4225	4773	refreshContents();
4226	4774	}
4227	4775
4228		- void pasteInto(boolean copyit)
	4776	+ void pasteInto(boolean copyit, boolean clone)
4229	4777	{
4230		-// if (GraphreeD.clipboard == null)
	4778	+// if (GrafreeD.clipboard == null)
4231	4779	// return;
4232	4780
4233	4781	if (group.selection.size() != 1)
..	..	@@ -4254,15 +4802,22 @@
4254	4802	if (copyit)
4255	4803	{
4256	4804	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	4805	+ if (clone)
	4806	+ {
	4807	+ CloneClipboard(false); // sept 2014
	4808	+ }
	4809	+ else
	4810	+ {
	4811	+ paste(false);
	4812	+ }
4258	4813	}
4259	4814	else
4260	4815	{
4261	4816	boolean first = true;
4262	4817
4263		- if (GraphreeD.clipboardIsTempGroup)
	4818	+ if (Grafreed.clipboardIsTempGroup)
4264	4819	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	4820	+ Composite temp = (Composite)Grafreed.clipboard;
4266	4821	Object3D copy;
4267	4822	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	4823	{
..	..	@@ -4272,7 +4827,7 @@
4272	4827	}
4273	4828	} else
4274	4829	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	4830	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	4831	}
4277	4832	}
4278	4833	}
..	..	@@ -4464,6 +5019,26 @@
4464	5019	makeSomething(csg);
4465	5020	}
4466	5021
	5022	+ void Ungroup(Object3D g)
	5023	+ {
	5024	+ if (g instanceof HiddenObject)
	5025	+ {
	5026	+ HiddenObject h = (HiddenObject) g;
	5027	+
	5028	+ for (int i=0; i<h.ActualSize(); i++)
	5029	+ {
	5030	+ objEditor.makeSomething(h.get(i), false);
	5031	+ }
	5032	+ }
	5033	+ else
	5034	+ {
	5035	+ for (int i=0; i<g.Size(); i++)
	5036	+ {
	5037	+ objEditor.makeSomething(g.get(i), false);
	5038	+ }
	5039	+ }
	5040	+ }
	5041	+
4467	5042	void ungroup()
4468	5043	{
4469	5044	/*
..	..	@@ -4657,21 +5232,6 @@
4657	5232	}
4658	5233	*/
4659	5234
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	5235	/*
4676	5236	public void Callback(Object obj)
4677	5237	{
..	..	@@ -4695,26 +5255,9 @@
4695	5255	}
4696	5256	*/
4697	5257
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	5258	String GetFile(String dialogName)
4716	5259	{
4717		- if (GraphreeD.standAlone)
	5260	+ if (Grafreed.standAlone)
4718	5261	{
4719	5262	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5263	browser.show();
..	..	@@ -4778,10 +5321,18 @@
4778	5321	cButton flashSelectionButton;
4779	5322	cButton editButton;
4780	5323	cButton uneditButton;
	5324	+ JCheckBox allParamsButton;
4781	5325	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5326	cButton unselectButton;
4784	5327
	5328	+ cButton minButton;
	5329	+ cButton maxButton;
	5330	+ cButton fullButton;
	5331	+ cButton undoButton;
	5332	+ cButton redoButton;
	5333	+ cButton saveButton;
	5334	+ cButton oneStepButton;
	5335	+
4785	5336	cButton screenfitButton;
4786	5337	cButton screenfitpointButton;
4787	5338	cButton snapobjectButton;
..	..	@@ -4792,14 +5343,6 @@
4792	5343	cButton closeButton;
4793	5344
4794	5345	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	5346
4804	5347	//
4805	5348	//Composite
..	..	@@ -4812,6 +5355,8 @@
4812	5355	private MenuItem lookFromItem;
4813	5356	private MenuItem switchItem;
4814	5357	private MenuItem cutItem;
	5358	+ private MenuItem undoItem;
	5359	+ private MenuItem redoItem;
4815	5360	private MenuItem duplicateItem;
4816	5361	private MenuItem cloneItem;
4817	5362	private MenuItem cloneSupportItem;
..	..	@@ -4823,8 +5368,9 @@
4823	5368	private MenuItem resetsupportItem;
4824	5369	private MenuItem resetreferencesItem;
4825	5370	private MenuItem linkverticesItem;
	5371	+ private MenuItem relinkverticesItem;
4826	5372	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5373	+ private MenuItem resetAllItem;
4828	5374	private MenuItem stepAllItem;
4829	5375	private MenuItem revertMeshItem;
4830	5376	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5381,17 @@
4835	5381	private MenuItem mergeGeometriesItem;
4836	5382	private MenuItem copyItem;
4837	5383	private MenuItem pasteItem;
	5384	+ private MenuItem pasteIntoItem;
4838	5385	private MenuItem pasteLinkItem;
4839	5386	private MenuItem pasteCloneItem;
4840	5387	private MenuItem pasteExpandItem;
4841	5388	private MenuItem clearItem;
4842	5389	private MenuItem clearAllItem;
4843	5390	private MenuItem genUVItem;
	5391	+ private MenuItem genNormalsMESHItem;
4844	5392	private MenuItem genNormalsCADItem;
4845	5393	private MenuItem genNormalsORGANItem;
	5394	+ private MenuItem genNormalsMINEItem;
4846	5395	private MenuItem stripifyItem;
4847	5396	private MenuItem unstripifyItem;
4848	5397	private MenuItem trimItem;
..	..	@@ -4871,6 +5420,10 @@
4871	5420	private MenuItem showleavesItem;
4872	5421	private MenuItem markleavesItem;
4873	5422	private MenuItem unmarkleavesItem;
	5423	+ private MenuItem rewindleavesItem;
	5424	+ private MenuItem unrewindleavesItem;
	5425	+ private MenuItem randomleavesItem;
	5426	+ private MenuItem unrandomleavesItem;
4874	5427
4875	5428	private MenuItem flipVItem;
4876	5429	private MenuItem unflipVItem;
..	..	@@ -4882,8 +5435,11 @@
4882	5435	private MenuItem panoTexturesItem;
4883	5436
4884	5437	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5438	+ private MenuItem resetCentroidXZItem;
4886	5439	private MenuItem resetTransformItem;
	5440	+ private MenuItem transformGeometryItem;
	5441	+ private MenuItem transformChildrenItem;
	5442	+ private MenuItem hideItem;
4887	5443	private MenuItem grabItem;
4888	5444	private MenuItem backItem;
4889	5445	private MenuItem frontItem;
..	..	@@ -4904,6 +5460,7 @@
4904	5460
4905	5461	private MenuItem resetParentItem;
4906	5462	private MenuItem repairParentItem;
	5463	+ private MenuItem repairShadowItem;
4907	5464	private MenuItem sortbysizeItem;
4908	5465	private MenuItem sortbynameItem;
4909	5466
..	..	@@ -4924,10 +5481,11 @@
4924	5481	private MenuItem coneItem;
4925	5482	private MenuItem torusItem;
4926	5483	private MenuItem superItem;
	5484	+ private MenuItem kleinItem;
4927	5485	private MenuItem blobItem;
4928	5486	private MenuItem latheItem;
4929	5487	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5488	+ private MenuItem overlayItem;
4931	5489	private MenuItem meshItem;
4932	5490	// private MenuItem meshGroupItem;
4933	5491	private MenuItem springItem;
..	..	@@ -4936,6 +5494,7 @@
4936	5494	private MenuItem csgItem;
4937	5495	private MenuItem templateItem;
4938	5496	private MenuItem textureItem;
	5497	+ private MenuItem billboardItem;
4939	5498	private MenuItem shadowXItem;
4940	5499	private MenuItem shadowYItem;
4941	5500	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5507,6 @@
4948	5507	private MenuItem doubleItem;
4949	5508	private MenuItem tripleItem;
4950	5509
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5510	private MenuItem computeAOItem;
4957	5511	private MenuItem recompileItem;
4958	5512	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5516,8 @@
4962	5516	private MenuItem analyzeItem;
4963	5517	private MenuItem dumpItem;
4964	5518	//boolean freezemodel = false;
	5519	+
	5520	+ Menu cameraMenu;
	5521	+ MenuItem editCameraItem;
	5522	+ MenuItem revertCameraItem;
4965	5523	}