~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,8 +148,129 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ Menu menu;
	154	+ oe.menuBar.add(menu = new Menu("Edit"));
	155	+ //editItem = menu.add(new MenuItem("Edit"));
	156	+ //editItem.addActionListener(this);
	157	+
	158	+// undoItem = menu.add(new MenuItem("Undo"));
	159	+// undoItem.addActionListener(this);
	160	+// redoItem = menu.add(new MenuItem("Redo"));
	161	+// redoItem.addActionListener(this);
	162	+// menu.add("-");
	163	+ duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+ duplicateItem.addActionListener(this);
	165	+ cloneItem = menu.add(new MenuItem("Clone"));
	166	+ cloneItem.addActionListener(this);
	167	+ if (Globals.ADVANCED)
	168	+ {
	169	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	170	+ cloneSupportItem.addActionListener(this);
	171	+ }
	172	+ menu.add("-");
	173	+ cutItem = menu.add(new MenuItem("Cut"));
	174	+ cutItem.addActionListener(this);
	175	+ copyItem = menu.add(new MenuItem("Copy"));
	176	+ copyItem.addActionListener(this);
	177	+ pasteItem = menu.add(new MenuItem("Paste"));
	178	+ pasteItem.addActionListener(this);
	179	+
	180	+ menu.add("-");
	181	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	182	+ pasteIntoItem.addActionListener(this);
	183	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	184	+ pasteLinkItem.addActionListener(this);
	185	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	186	+ pasteCloneItem.addActionListener(this);
	187	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	188	+// pasteExpandItem.addActionListener(this);
	189	+ menu.add("-");
	190	+ clearItem = menu.add(new MenuItem("Clear"));
	191	+ clearItem.addActionListener(this);
	192	+
	193	+ if (Globals.ADVANCED)
	194	+ {
	195	+ // Deletes the cameras...
	196	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	197	+ clearAllItem.addActionListener(this);
	198	+ }
	199	+
	200	+ menuBar.add(cameraMenu = new Menu("View"));
	201	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	202	+ //zBufferItem.addActionListener(this);
	203	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	204	+ //normalLensItem.addActionListener(this);
	205	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	206	+ revertCameraItem.addActionListener(this);
	207	+
	208	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	209	+ toggleFullScreenItem.addItemListener(this);
	210	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	211	+ cameraMenu.add("-");
	212	+
	213	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	214	+ toggleTextureItem.addItemListener(this);
	215	+ toggleTextureItem.setState(CameraPane.textureon);
	216	+
	217	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	218	+ toggleSwitchItem.addItemListener(this);
	219	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	220	+
	221	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	222	+ toggleHandleItem.addItemListener(this);
	223	+ toggleHandleItem.setState(CameraPane.HANDLES);
	224	+
	225	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	226	+ togglePaintItem.addItemListener(this);
	227	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	228	+
	229	+ if (Globals.ADVANCED)
	230	+ {
	231	+ cameraMenu.add("-");
	232	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	233	+ toggleLiveItem.addItemListener(this);
	234	+ toggleLiveItem.setState(Globals.isLIVE());
	235	+
	236	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	237	+ stepItem.addActionListener(this);
	238	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	239	+ // toggleDLItem.addItemListener(this);
	240	+ // toggleDLItem.setState(false);
	241	+
	242	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	243	+ toggleRenderItem.addItemListener(this);
	244	+ toggleRenderItem.setState(!CameraPane.frozen);
	245	+
	246	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	247	+ toggleDebugItem.addItemListener(this);
	248	+ toggleDebugItem.setState(Globals.DEBUG);
	249	+
	250	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	251	+ toggleFrustumItem.addItemListener(this);
	252	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	253	+
	254	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	255	+ toggleFootContactItem.addItemListener(this);
	256	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	257	+
	258	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	259	+ toggleTimelineItem.addItemListener(this);
	260	+ }
	261	+
	262	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	263	+// toggleRootItem.addItemListener(this);
	264	+// toggleRootItem.setState(false);
	265	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	266	+// animationItem.addItemListener(this);
	267	+// animationItem.setState(CameraPane.ANIMATION);
	268	+ cameraMenu.add("-");
	269	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	270	+ editCameraItem.addActionListener(this);
	271	+
	272	+ if (Globals.ADVANCED)
	273	+ {
152	274	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	275	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	276	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +282,17 @@
160	282	lookAtItem.addActionListener(this);
161	283	//lookFromItem.addActinoListener(this);
162	284	//switchItem.addActionListener(this);
163		- Menu menu;
164		- oe.menuBar.add(menu = new Menu("Edit"));
165		- //editItem = menu.add(new MenuItem("Edit"));
166		- //editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
168		- duplicateItem.addActionListener(this);
169		- menu.add("-");
170		- cloneItem = menu.add(new MenuItem("Clone"));
171		- cloneItem.addActionListener(this);
172		- cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173		- cloneSupportItem.addActionListener(this);
174		- menu.add("-");
175		- cutItem = menu.add(new MenuItem("Cut"));
176		- cutItem.addActionListener(this);
177		- copyItem = menu.add(new MenuItem("Copy"));
178		- copyItem.addActionListener(this);
179		- pasteItem = menu.add(new MenuItem("Paste"));
180		- pasteItem.addActionListener(this);
181		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
182		- pasteLinkItem.addActionListener(this);
183		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184		- pasteCloneItem.addActionListener(this);
185		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186		-// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
189		- clearAllItem = menu.add(new MenuItem("Clear All"));
190		- clearAllItem.addActionListener(this);
191		-
	285	+ }
	286	+
192	287	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	288	+ if (Globals.ADVANCED)
	289	+ {
197	290	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	291	revertMeshItem.addActionListener(this);
199	292	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	293	resetreferencesItem.addActionListener(this);
201	294	menu.add("-");
	295	+ }
202	296	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	297	overwriteGeoItem.addActionListener(this);
204	298	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +304,26 @@
210	304	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	305	overwriteUVItem.addActionListener(this);
212	306	menu.add("-");
	307	+ if (Globals.ADVANCED)
	308	+ {
213	309	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	310	generateMeshItem.addActionListener(this);
215	311	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	312	poseMeshItem.addActionListener(this);
217	313	menu.add("-");
	314	+ }
218	315	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	316	resetsupportItem.addActionListener(this);
220	317	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	318	linkverticesItem.addActionListener(this);
222	319	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	320	relinkverticesItem.addActionListener(this);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
224	324	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	325	setMasterItem.addActionListener(this);
	326	+ }
226	327
227	328	oe.menuBar.add(menu = new Menu("Group"));
228	329	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +334,32 @@
233	334	frontItem.addActionListener(this);
234	335	compositeItem = menu.add(new MenuItem("Composite"));
235	336	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	338	hideItem.addActionListener(this);
238	339	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	340	ungroupItem.addActionListener(this);
240	341	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	342	+ randomItem = menu.add(new MenuItem("Switch node"));
242	343	randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
247	344	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	345	switchGeoItem.addActionListener(this);
249	346	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	347	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	348	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	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);
253	358	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	359	scriptNodeItem.addActionListener(this);
255	360	cameraItem = menu.add(new MenuItem("Camera"));
256	361	cameraItem.addActionListener(this);
	362	+ }
257	363
258	364	oe.menuBar.add(menu = new Menu("Object"));
259	365	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -262,27 +368,35 @@
262	368	billboardItem.addActionListener(this);
263	369	csgItem = menu.add(new MenuItem("CSG"));
264	370	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	371	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	372	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	373	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	374	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	375	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	376	shadowZItem.addActionListener(this);
	377	+ if (Globals.ADVANCED)
	378	+ {
	379	+ menu.add("-");
271	380	linkerItem = menu.add(new MenuItem("Linker"));
272	381	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	382	attributeItem = menu.add(new MenuItem("Attribute"));
276	383	attributeItem.addActionListener(this);
	384	+ templateItem = menu.add(new MenuItem("Template"));
	385	+ templateItem.addActionListener(this);
277	386	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	387	pointflowItem.addActionListener(this);
	388	+ }
279	389	menu.add("-");
280	390	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	391	resetTransformItem.addActionListener(this);
282	392	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	393	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.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);
286	400
287	401	oe.menuBar.add(menu = new Menu("Geometry"));
288	402	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +407,11 @@
293	407	genNormalsCADItem.addActionListener(this);
294	408	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	409	genNormalsMESHItem.addActionListener(this);
	410	+ if (Globals.ADVANCED)
	411	+ {
296	412	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	413	genNormalsMINEItem.addActionListener(this);
	414	+ }
298	415	stripifyItem = menu.add(new MenuItem("Stripify"));
299	416	stripifyItem.addActionListener(this);
300	417	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +433,34 @@
316	433	reduce34MeshItem.addActionListener(this);
317	434	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	435	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	436	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	437	clipMeshItem.addActionListener(this);
	438	+
	439	+ if (Globals.ADVANCED)
	440	+ {
	441	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	442	+ smoothMeshItem.addActionListener(this);
	443	+ }
323	444
324	445	oe.menuBar.add(menu = new Menu("Attributes"));
325	446	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	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);
327	452	menu.add("-");
328	453	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	454	liveleavesItem.addActionListener(this);
330	455	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	456	unliveleavesItem.addActionListener(this);
	457	+ if (Globals.ADVANCED)
	458	+ {
332	459	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	460	supportleavesItem.addActionListener(this);
334	461	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	462	unsupportleavesItem.addActionListener(this);
	463	+ }
336	464	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	465	hideleavesItem.addActionListener(this);
338	466	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +469,14 @@
341	469	markleavesItem.addActionListener(this);
342	470	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	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);
344	480	menu.add("-");
345	481	flipVItem = menu.add(new MenuItem("Flip V"));
346	482	flipVItem.addActionListener(this);
..	..	@@ -376,35 +512,40 @@
376	512	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	513	sortbynameItem.addActionListener(this);
378	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.
379	522	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	523	extractGeometriesItem.addActionListener(this);
381	524	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	525	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	526	+ }
387	527
388	528	oe.menuBar.add(menu = new Menu("Insert"));
389	529	buildCreateMenu(menu);
390	530
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	531	oe.menuBar.add(menu = new Menu("Tools"));
403	532	buildToolsMenu(menu);
404	533	}
405	534
406	535	void SetupUI2(ObjEditor oe)
407	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	+
408	549	//new Exception().printStackTrace();
409	550
410	551	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +574,120 @@
433	574	oe.radioPanel.add(dummyButton);
434	575	oe.buttonGroup.add(dummyButton);
435	576	*/
436		- aConstraints.gridy += 1;
437		-
438	577	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	578
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
442	582
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
	583	+ oe.toolbarPanel.add(maxButton = new cButton("\u271A", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = new cButton("\u2b1c", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = new cButton("\u21a9", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = new cButton("\u21aa", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = new cButton("\u21e3", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
445	605	liveCB.addItemListener(this);
446	606
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
	607	+ oe.toolbarPanel.add(oneStepButton = new cButton("\u29f4", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ oneStepButton.setToolTipText("Animate one step forward");
	609	+ oneStepButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	612	+ fastCB.setToolTipText("Fast mode");
	613	+ fastCB.addItemListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK)); //, oe.aConstraints);
449	616	trackCB.setToolTipText("Enable tracking");
450	617	trackCB.addItemListener(this);
451	618
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	620	screenfitButton.setToolTipText("Screen fit");
455	621	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	622	+
457	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	624	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	625
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	634	flashSelectionButton.setToolTipText("Show selection");
472	635	flashSelectionButton.addActionListener(this);
473	636
474		- oe.toolbarPanel.add(new cButton(" ", false));
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
475	638
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	640	twoButton.setToolTipText("Show center view only");
483	641	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	643	fourButton.addActionListener(this);
486	644	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	646	sixButton.setToolTipText("2-column layout left");
489	647	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	649	threeButton.setToolTipText("2-column layout right");
492	650	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	652	sevenButton.setToolTipText("3-column layout");
495	653	sevenButton.addActionListener(this);
496	654	//
497	655
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
500	658	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	661	closeButton.setToolTipText("Close tab");
504	662	closeButton.addActionListener(this);
505	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	664	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508	665
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
511	668	editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	669
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
517	672	uneditButton.addActionListener(this);
518	673
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- 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");
531	676	allParamsButton.addActionListener(this);
532	677
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- 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");
538	684	unselectButton.addActionListener(this);
539	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
540	691	// oe.aConstraints.gridx += 1;
541	692	// oe.aConstraints.weighty = 0;
542	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +699,37 @@
548	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	700	// gcButton.addActionListener(this);
550	701
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
562	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- 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);
564	707	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
569	711
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- 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");
574	716	colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- 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");
577	720	materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- 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");
580	724	textureCB.addItemListener(this);
581	725
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
584	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
585	733	//jList.addListSelectionListener(this);
586	734	oe.jTree.addTreeSelectionListener(this);
587	735	//jTree.setRootVisible(false);
..	..	@@ -604,45 +752,37 @@
604	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	753	}
606	754
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	756	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
618		-
619		- // constraints.gridy += 1;
620		- // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621		- // localCB.addItemListener(this);
622		-
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
625		- crowdCB.setToolTipText("Used for crowds");
626		- crowdCB.addItemListener(this);
627		-
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
630		- smoothCB.setToolTipText("Snapping delay");
631		- smoothCB.addItemListener(this);
632		-
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
635		- slowCB.setToolTipText("Smooth interpolation");
636		- slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
639	758	boxCB.setToolTipText("Display bounding boxes");
640	759	boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
643	762	zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644	763	zoomBoxCB.addItemListener(this);
645	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	+
646	786	// constraints.gridy += 1;
647	787	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	788	// speakerMocapCB.addItemListener(this);
..	..	@@ -650,16 +790,16 @@
650	790	if (false)
651	791	{
652	792	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	795	speakerCameraCB.addItemListener(this);
656	796
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	799	speakerFocusCB.addItemListener(this);
660	800
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	803	smoothfocusCB.addItemListener(this);
664	804	}
665	805
..	..	@@ -667,20 +807,42 @@
667	807	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	808	// debugCB.addItemListener(this);
669	809
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
672	812	oeilCB.addItemListener(this);
673	813
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ if (Globals.ADVANCED)
	819	+ {
	820	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	821	lookAtCB.setToolTipText("Look-at target");
677	822	lookAtCB.addItemListener(this);
	823	+ }
	824	+
	825	+ }
	826	+
	827	+ cGridBag fill = new cGridBag();
	828	+
	829	+ fill.preferredHeight = 200;
	830	+
	831	+ panel.add(fill);
678	832
679	833	}
680	834
681	835	void EditObject(Object3D obj)
682	836	{
683	837	cRadio radioButton = new cRadio(obj.name);
	838	+
	839	+ // Patch to avoid bug with transparency.
	840	+ radioButton.hadMaterial = obj.material != null;
	841	+ if (!radioButton.hadMaterial)
	842	+ {
	843	+ obj.material = new cMaterial();
	844	+ }
	845	+
684	846	radioButton.SetObject(obj);
685	847	radioButton.layout = sevenButton;
686	848	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +851,11 @@
689	851	buttonGroup.add(radioButton);
690	852	radioButton.doClick();
691	853	}
	854	+
692	855	void SetupViews(ObjEditor oe)
693	856	{
	857	+ theFrame = this;
	858	+
694	859	oe.SetupViews();
695	860
696	861	System.out.println("SetupViews");
..	..	@@ -714,7 +879,9 @@
714	879	JCheckBox speakerCameraCB;
715	880	JCheckBox speakerFocusCB;
716	881	JCheckBox debugCB;
	882	+
717	883	JCheckBox oeilCB;
	884	+ JCheckBox shadowCB;
718	885	JCheckBox lookAtCB;
719	886
720	887	// static int COLOR = 1;
..	..	@@ -753,6 +920,7 @@
753	920	} else if(e.getSource() == liveCB)
754	921	{
755	922	cameraView.ToggleLive();
	923	+ refreshContents(false);
756	924	}
757	925	else if(e.getSource() == supportCB)
758	926	{
..	..	@@ -816,6 +984,10 @@
816	984	else if(e.getSource() == oeilCB)
817	985	{
818	986	cameraView.ToggleOeil();
	987	+ }
	988	+ else if(e.getSource() == shadowCB)
	989	+ {
	990	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
819	991	}
820	992	else if(e.getSource() == lookAtCB)
821	993	{
..	..	@@ -905,7 +1077,9 @@
905	1077	// objEditor.DropFile((java.io.File[]) object, true);
906	1078	// return;
907	1079	// }
908		- if (string.charAt(0) == '/')
	1080	+
	1081	+ // File path for Mac and Windows
	1082	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1083	{
910	1084	// file(s)
911	1085	String[] names = string.split("\n");
..	..	@@ -932,7 +1106,7 @@
932	1106
933	1107	flashIt = false;
934	1108	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1109	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1110	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1111
938	1112	if (group.selection.size() == 1)
..	..	@@ -959,11 +1133,11 @@
959	1133	{
960	1134	loadClipboard(true);
961	1135	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
	1136	+ pasteInto(false, false);
963	1137	} else {
964	1138	loadClipboard(false);
965	1139	objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
	1140	+ pasteInto(false, false); // true); // ???
967	1141	}
968	1142	}
969	1143	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1085,27 +1259,33 @@
1085	1259	kleinItem.addActionListener(this);
1086	1260	particleItem = menu.add(new MenuItem("Particle system"));
1087	1261	particleItem.addActionListener(this);
	1262	+ if (Globals.ADVANCED)
	1263	+ {
1088	1264	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1265	ragdollItem.addActionListener(this);
1090	1266	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1267	ragdoll2Item.addActionListener(this);
	1268	+ }
1092	1269	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1270	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1271	meshItem.addActionListener(this);
1095	1272	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1273	// meshGroupItem.addActionListener(this);
	1274	+ if (Globals.ADVANCED)
	1275	+ {
1097	1276	springItem = menu.add(new MenuItem("Spring"));
1098	1277	springItem.addActionListener(this);
1099	1278	flagItem = menu.add(new MenuItem("Flag"));
1100	1279	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1280	blobItem = menu.add(new MenuItem("Blob"));
1106	1281	blobItem.addActionListener(this);
1107	1282	latheItem = menu.add(new MenuItem("Lathe"));
1108	1283	latheItem.addActionListener(this);
	1284	+ }
	1285	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1286	+ bezierItem.addActionListener(this);
	1287	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1288	+ overlayItem.addActionListener(this);
1109	1289	lightItem = menu.add(new MenuItem("Light"));
1110	1290	lightItem.addActionListener(this);
1111	1291	menu.add("-");
..	..	@@ -1115,39 +1295,44 @@
1115	1295	loopItem.addActionListener(this);
1116	1296	doubleItem = menu.add(new MenuItem("Fork"));
1117	1297	doubleItem.addActionListener(this);
	1298	+ if (Globals.ADVANCED)
	1299	+ {
1118	1300	tripleItem = menu.add(new MenuItem("Trident"));
1119	1301	tripleItem.addActionListener(this);
	1302	+ }
1120	1303	}
1121	1304
1122	1305	void buildToolsMenu(Menu menu)
1123	1306	{
1124	1307	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1308	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1309	+ animationItem.setState(Globals.ANIMATION);
1127	1310
1128	1311	menu.add("-");
1129	1312	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1313	parseverticesItem.addActionListener(this);
1131	1314	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1315	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1316	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1317	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1318	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1319	reduceMorphItem.addActionListener(this);
1139	1320	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1321	reduce34MorphItem.addActionListener(this);
1141		-
	1322	+ menu.add("-");
1142	1323	menu.add(computeAOItem = new MenuItem("Compute AO"));
1143	1324	computeAOItem.addActionListener(this);
1144		- menu.add("-");
1145	1325
	1326	+ if (Globals.ADVANCED)
	1327	+ {
	1328	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1329	+ mirrorItem.addActionListener(this);
	1330	+ menu.add("-");
1146	1331	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1332	memoryItem.addActionListener(this);
1148	1333	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1334	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1335	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1336	dumpItem.addActionListener(this);
1152	1337	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1338	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1350,7 @@
1165	1350	menu.add("-");
1166	1351	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1352	editScriptItem.addActionListener(this);
	1353	+ }
1168	1354	}
1169	1355
1170	1356	void ScreenFit()
..	..	@@ -1287,6 +1473,7 @@
1287	1473	shadow.material = new cMaterial(obj.material);
1288	1474	shadow.material.diffuse = 0.0001f;
1289	1475	shadow.material.specular = 0.0001f;
	1476	+ //shadow.projectedVertices[1].x = 300;
1290	1477
1291	1478	makeSomething(shadow);
1292	1479	}
..	..	@@ -1493,9 +1680,9 @@
1493	1680
1494	1681	void Overwrite(int mask)
1495	1682	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1683	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1684	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1685	+ Object3D content = Grafreed.clipboard.get(0);
1499	1686
1500	1687	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1688	content = ((cGroup)content).get(0);
..	..	@@ -1518,6 +1705,7 @@
1518	1705	//
1519	1706	public void actionPerformed(ActionEvent event) // , Object arg)
1520	1707	{
	1708	+ Object source = event.getSource();
1521	1709	/*
1522	1710	if (event.getSource() == nameField)
1523	1711	{
..	..	@@ -1529,11 +1717,11 @@
1529	1717	}
1530	1718	else
1531	1719	*/
1532		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1720	+ if (source == lookAtItem \|\| source == lookFromItem)
1533	1721	{
1534	1722	ScreenFit();
1535	1723	} else
1536		- if (event.getSource() == switchItem)
	1724	+ if (source == switchItem)
1537	1725	{
1538	1726	cVector v1 = new cVector();
1539	1727	cVector v2 = new cVector();
..	..	@@ -1542,11 +1730,11 @@
1542	1730	objEditor.cameraView.renderCamera.setAim(v2, v1);
1543	1731	objEditor.cameraView.repaint();
1544	1732	} else
1545		- if (event.getSource() == rectoidItem)
	1733	+ if (source == rectoidItem)
1546	1734	{
1547	1735	makeSomething(new Box());
1548	1736	} else
1549		- if (event.getSource() == particleItem)
	1737	+ if (source == particleItem)
1550	1738	{
1551	1739	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1552	1740	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1567,9 +1755,9 @@
1567	1755	applyExample(particleGeom, "SMOKE");
1568	1756	makeSomething(particleGeom);
1569	1757	} else
1570		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1758	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1571	1759	{
1572		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1760	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1573	1761
1574	1762	ragdoll.toParent = LA.newMatrix();
1575	1763	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1587,7 +1775,7 @@
1587	1775	} else
1588	1776	/*
1589	1777	*/
1590		- if (event.getSource() == heightFieldItem)
	1778	+ if (source == heightFieldItem)
1591	1779	{
1592	1780	Object3D obj = new Object3D();
1593	1781
..	..	@@ -1625,31 +1813,31 @@
1625	1813
1626	1814	makeSomething(obj);
1627	1815	} else
1628		- if (event.getSource() == gridItem)
	1816	+ if (source == gridItem)
1629	1817	{
1630	1818	makeSomething(new Grid());
1631	1819	} else
1632		- if (event.getSource() == ellipsoidItem)
	1820	+ if (source == ellipsoidItem)
1633	1821	{
1634	1822	makeSomething(new Sphere());
1635	1823	} else
1636		- if (event.getSource() == coneItem)
	1824	+ if (source == coneItem)
1637	1825	{
1638	1826	makeSomething(new Cone());
1639	1827	} else
1640		- if (event.getSource() == torusItem)
	1828	+ if (source == torusItem)
1641	1829	{
1642	1830	makeSomething(new Torus());
1643	1831	} else
1644		- if (event.getSource() == superItem)
	1832	+ if (source == superItem)
1645	1833	{
1646	1834	makeSomething(new Superellipsoid());
1647	1835	} else
1648		- if (event.getSource() == kleinItem)
	1836	+ if (source == kleinItem)
1649	1837	{
1650	1838	makeSomething(new Klein());
1651	1839	} else
1652		- if (event.getSource() == blobItem)
	1840	+ if (source == blobItem)
1653	1841	{
1654	1842	Blob blob = new Blob();
1655	1843	BlobComponent comp = new BlobComponent();
..	..	@@ -1657,15 +1845,15 @@
1657	1845	//blob.retile();
1658	1846	makeSomething(blob);
1659	1847	} else
1660		- if (event.getSource() == latheItem)
	1848	+ if (source == latheItem)
1661	1849	{
1662	1850	makeSomething(new Lathe());
1663	1851	} else
1664		- if (event.getSource() == bezierItem)
	1852	+ if (source == bezierItem)
1665	1853	{
1666	1854	makeSomething(new BezierSurface());
1667	1855	} else
1668		- if (event.getSource() == checkerItem)
	1856	+ if (source == overlayItem)
1669	1857	{
1670	1858	/*
1671	1859	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1680,7 +1868,7 @@
1680	1868	*/
1681	1869	makeSomething(new Checker());
1682	1870	} else
1683		- if (event.getSource() == meshItem)
	1871	+ if (source == meshItem)
1684	1872	{
1685	1873	Object3D itemtomake = new Object3D();
1686	1874	Object3D child;
..	..	@@ -1701,35 +1889,35 @@
1701	1889	makeSomething(child);
1702	1890	}
1703	1891	} else
1704		- if (event.getSource() == springItem)
	1892	+ if (source == springItem)
1705	1893	{
1706	1894	cSpring s = new cSpring();
1707	1895	s.setup();
1708	1896	makeSomething(s);
1709	1897	} else
1710		- if (event.getSource() == flagItem)
	1898	+ if (source == flagItem)
1711	1899	{
1712	1900	cSpring s = new cFlag();
1713	1901	s.setup();
1714	1902	makeSomething(s);
1715	1903	} else
1716		- if (event.getSource() == lightItem)
	1904	+ if (source == lightItem)
1717	1905	{
1718	1906	makeSomething(new Light());
1719	1907	} else
1720		- if (event.getSource() == csgItem)
	1908	+ if (source == csgItem)
1721	1909	{
1722	1910	group(new CSG());
1723	1911	} else
1724		- if (event.getSource() == templateItem)
	1912	+ if (source == templateItem)
1725	1913	{
1726	1914	group(new cTemplate());
1727	1915	} else
1728		- if (event.getSource() == attributeItem)
	1916	+ if (source == attributeItem)
1729	1917	{
1730	1918	makeSomething(new Attribute());
1731	1919	} else
1732		- if (event.getSource() == pointflowItem)
	1920	+ if (source == pointflowItem)
1733	1921	{
1734	1922	makeSomething(new PointFlow());
1735	1923	} else
..	..	@@ -1741,7 +1929,7 @@
1741	1929	} else
1742	1930	*/
1743	1931
1744		- if (event.getSource() == superLoopItem)
	1932	+ if (source == superLoopItem)
1745	1933	{
1746	1934	Composite g = new cGroup();
1747	1935	for (int i=0; i<15; i++)
..	..	@@ -1763,7 +1951,7 @@
1763	1951
1764	1952	group(g);
1765	1953	} else
1766		- if (event.getSource() == loopItem)
	1954	+ if (source == loopItem)
1767	1955	{
1768	1956	Composite csg = new GroupLeaf();
1769	1957	csg.count = 5;
..	..	@@ -1772,7 +1960,7 @@
1772	1960	csg.addChild(child);
1773	1961	child.addChild(csg);
1774	1962	} else
1775		- if (event.getSource() == doubleItem)
	1963	+ if (source == doubleItem)
1776	1964	{
1777	1965	Composite csg = new GroupLeaf();
1778	1966	csg.count = 5;
..	..	@@ -1784,7 +1972,7 @@
1784	1972	csg.addChild(child);
1785	1973	child.addChild(csg);
1786	1974	} else
1787		- if (event.getSource() == tripleItem)
	1975	+ if (source == tripleItem)
1788	1976	{
1789	1977	Composite csg = new GroupLeaf();
1790	1978	csg.count = 4;
..	..	@@ -1799,71 +1987,83 @@
1799	1987	csg.addChild(child);
1800	1988	child.addChild(csg);
1801	1989	} else
1802		-
1803		- if (event.getSource() == importGFDItem)
1804		- {
1805		- ImportGFD();
1806		- } else
1807		- if (event.getSource() == importVRMLX3DItem)
1808		- {
1809		- ImportVRMLX3D();
1810		- } else
1811		- if (event.getSource() == import3DSItem)
1812		- {
1813		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1814		- } else
1815		- if (event.getSource() == importOBJItem)
1816		- {
1817		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1818		- } else
1819		- if (event.getSource() == computeAOItem)
	1990	+ if (source == computeAOItem)
1820	1991	{
1821	1992	Globals.drawMode = CameraPane.OCCLUSION;
1822	1993	Globals.theRenderer.repaint();
1823	1994	} else
1824		- if (event.getSource() == recompileItem)
	1995	+ if (source == recompileItem)
1825	1996	{
1826	1997	Recompile();
1827	1998	refreshContents();
1828	1999	} else
1829		- if (event.getSource() == editScriptItem)
	2000	+ if (source == editScriptItem)
1830	2001	{
1831	2002	OpenDialog();
1832	2003	refreshContents();
1833	2004	} else
1834		- if (event.getSource() == invariantsItem)
	2005	+ if (source == invariantsItem)
1835	2006	{
1836	2007	System.out.println("Invariants:");
1837		- GrafreeD.grafreeD.universe.invariants();
	2008	+ Grafreed.grafreeD.universe.invariants();
1838	2009	} else
1839		- if (event.getSource() == memoryItem)
	2010	+ if (source == memoryItem)
1840	2011	{
1841	2012	//System.out.println("Invariants:");
1842	2013	PrintMemory();
1843	2014	} else
1844		- if (event.getSource() == pathItem)
	2015	+ if (source == pathItem)
1845	2016	{
1846	2017	PrintPath();
1847	2018	} else
1848		- if (event.getSource() == analyzeItem)
	2019	+ if (source == analyzeItem)
1849	2020	{
1850	2021	AnalyzeObject();
1851	2022	} else
1852		- if (event.getSource() == dumpItem)
	2023	+ if (source == dumpItem)
1853	2024	{
1854	2025	DumpObject();
1855	2026	} else
1856		- if (event.getSource() == screenfitButton)
	2027	+ if (source == minButton)
	2028	+ {
	2029	+ Minimize();
	2030	+ } else
	2031	+ if (source == maxButton)
	2032	+ {
	2033	+ Maximize();
	2034	+ } else
	2035	+ if (source == fullButton)
	2036	+ {
	2037	+ ToggleFullScreen();
	2038	+ } else
	2039	+ if (source == undoButton)
	2040	+ {
	2041	+ Undo();
	2042	+ } else
	2043	+ if (source == redoButton)
	2044	+ {
	2045	+ Redo();
	2046	+ } else
	2047	+ if (source == saveButton)
	2048	+ {
	2049	+ Save();
	2050	+ } else
	2051	+ if (source == oneStepButton)
	2052	+ {
	2053	+ Globals.ONESTEP = true;
	2054	+ cameraView.repaint();
	2055	+ } else
	2056	+ if (source == screenfitButton)
1857	2057	{
1858	2058	//Reload(lastConverter, lastFilename, true);
1859	2059	ScreenFit();
1860	2060	} else
1861		- if (event.getSource() == screenfitpointButton)
	2061	+ if (source == screenfitpointButton)
1862	2062	{
1863	2063	//Reload(lastConverter, lastFilename, true);
1864	2064	ScreenFitPoint();
1865	2065	} else
1866		- if (event.getSource() == snapobjectButton)
	2066	+ if (source == snapobjectButton)
1867	2067	{
1868	2068	//Reload(lastConverter, lastFilename, true);
1869	2069	SnapObject();
..	..	@@ -1874,13 +2074,13 @@
1874	2074	// Recompile();
1875	2075	// refreshContents();
1876	2076	// } else
1877		- if (event.getSource() == gcButton)
	2077	+ if (source == gcButton)
1878	2078	{
1879	2079	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1880	2080	System.gc();
1881	2081	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1882	2082	} else
1883		- if (event.getSource() == editLeafItem)
	2083	+ if (source == editLeafItem)
1884	2084	{
1885	2085	Object3D obj;
1886	2086	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1894,62 +2094,74 @@
1894	2094	}
1895	2095	refreshContents(true);
1896	2096	} else
1897		- if (event.getSource() == openWindowItem)
	2097	+ if (source == openWindowItem)
1898	2098	{
1899	2099	EditSelection(true);
1900	2100	} else
1901		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2101	+ if (source == cutItem \|\| source == clearButton)
1902	2102	{
1903	2103	loadClipboard(true);
1904	2104	} else
1905		- if (event.getSource() == duplicateItem)
	2105	+ if (source == undoItem)
1906	2106	{
1907		- Object3D keep = GrafreeD.clipboard;
	2107	+ Undo();
	2108	+ } else
	2109	+ if (source == redoItem)
	2110	+ {
	2111	+ Redo();
	2112	+ } else
	2113	+ if (source == duplicateItem)
	2114	+ {
	2115	+ Object3D keep = Grafreed.clipboard;
1908	2116	loadClipboard(false);
1909	2117	paste(false);
1910		- GrafreeD.clipboard = keep;
	2118	+ Grafreed.clipboard = keep;
1911	2119	} else
1912		- if (event.getSource() == cloneItem)
	2120	+ if (source == cloneItem)
1913	2121	{
1914	2122	CloneSelection(false);
1915	2123	} else
1916		- if (event.getSource() == cloneSupportItem)
	2124	+ if (source == cloneSupportItem)
1917	2125	{
1918	2126	CloneSelection(true);
1919	2127	} else
1920		- if (event.getSource() == copyItem)
	2128	+ if (source == copyItem)
1921	2129	{
1922	2130	loadClipboard(false);
1923	2131	} else
1924		- if (event.getSource() == pasteItem)
	2132	+ if (source == pasteItem)
1925	2133	{
1926	2134	paste(false);
1927	2135	} else
1928		- if (event.getSource() == pasteLinkItem)
	2136	+ if (source == pasteIntoItem)
1929	2137	{
1930		- pasteInto(false);
	2138	+ pasteInto(true, false);
1931	2139	} else
1932		- if (event.getSource() == pasteCloneItem)
	2140	+ if (source == pasteLinkItem)
1933	2141	{
1934		- pasteInto(true);
	2142	+ pasteInto(false, false);
1935	2143	} else
1936		- if (event.getSource() == pasteExpandItem)
	2144	+ if (source == pasteCloneItem)
	2145	+ {
	2146	+ pasteInto(true, true);
	2147	+ } else
	2148	+ if (source == pasteExpandItem)
1937	2149	{
1938	2150	paste(true);
1939	2151	} else
1940		- if (event.getSource() == synchronizeItem)
	2152	+ if (source == synchronizeItem)
1941	2153	{
1942	2154	Overwrite(Object3D.TRANSFORM);
1943	2155	} else
1944		- if (event.getSource() == overwriteNameItem)
	2156	+ if (source == overwriteNameItem)
1945	2157	{
1946	2158	Overwrite(Object3D.NAME);
1947	2159	} else
1948		- if (event.getSource() == overwriteUVItem)
	2160	+ if (source == overwriteUVItem)
1949	2161	{
1950	2162	Overwrite(Object3D.UV);
1951	2163	} else
1952		- if (event.getSource() == overwriteMatItem)
	2164	+ if (source == overwriteMatItem)
1953	2165	{
1954	2166	/* july 2015
1955	2167	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1969,7 +2181,7 @@
1969	2181
1970	2182	Overwrite(dropAttributes);
1971	2183	}
1972		- if (event.getSource() == overwriteGeoItem)
	2184	+ if (source == overwriteGeoItem)
1973	2185	{
1974	2186	Overwrite(Object3D.GEOMETRY);
1975	2187	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1986,7 +2198,7 @@
1986	2198	// refreshContents();
1987	2199	// }
1988	2200	} else
1989		- if (event.getSource() == generateMeshItem)
	2201	+ if (source == generateMeshItem)
1990	2202	{
1991	2203	//if (group.selection.size() == 1)
1992	2204	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1997,7 +2209,7 @@
1997	2209	ResetModel();
1998	2210	refreshContents();
1999	2211	} else
2000		- if (event.getSource() == extractGeometriesItem)
	2212	+ if (source == extractGeometriesItem)
2001	2213	{
2002	2214	boolean one = false;
2003	2215
..	..	@@ -2024,7 +2236,7 @@
2024	2236	ResetModel();
2025	2237	refreshContents();
2026	2238	} else
2027		- if (event.getSource() == cloneGeometriesItem)
	2239	+ if (source == cloneGeometriesItem)
2028	2240	{
2029	2241	boolean one = false;
2030	2242
..	..	@@ -2050,7 +2262,7 @@
2050	2262	ResetModel();
2051	2263	refreshContents();
2052	2264	} else
2053		- if (event.getSource() == shareGeometriesItem)
	2265	+ if (source == shareGeometriesItem)
2054	2266	{
2055	2267	boolean one = false;
2056	2268
..	..	@@ -2080,7 +2292,7 @@
2080	2292	refreshContents();
2081	2293	}
2082	2294	} else
2083		- if (event.getSource() == mergeGeometriesItem)
	2295	+ if (source == mergeGeometriesItem)
2084	2296	{
2085	2297	boolean one = false;
2086	2298
..	..	@@ -2110,7 +2322,7 @@
2110	2322	ResetModel();
2111	2323	refreshContents();
2112	2324	} else
2113		- if (event.getSource() == linkverticesItem)
	2325	+ if (source == linkverticesItem)
2114	2326	{
2115	2327	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2116	2328	// {
..	..	@@ -2123,9 +2335,9 @@
2123	2335	// group.selection.get(0).setMasterThis(content); // should be identity
2124	2336	// refreshContents();
2125	2337	// }
2126		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2338	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2127	2339	{
2128		- Object3D content = GrafreeD.clipboard.get(0);
	2340	+ Object3D content = Grafreed.clipboard.get(0);
2129	2341
2130	2342	if (content instanceof cGroup && ((cGroup)content).transientlink )
2131	2343	content = ((cGroup)content).get(0);
..	..	@@ -2133,38 +2345,38 @@
2133	2345	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2134	2346	for (int i=0; i<group.selection.size(); i++)
2135	2347	{
2136		- boolean random = CameraPane.RANDOM;
2137		- CameraPane.RANDOM = false; // parse all random nodes
	2348	+ boolean random = CameraPane.SWITCH;
	2349	+ CameraPane.SWITCH = false; // parse all random nodes
2138	2350	group.selection.get(i).linkVerticesThis(content);
2139	2351	// group.selection.get(i).setMasterThis(content); // should be identity
2140		- CameraPane.RANDOM = random;
	2352	+ CameraPane.SWITCH = random;
2141	2353	}
2142	2354	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2143	2355	refreshContents();
2144	2356	}
2145	2357	} else
2146		- if (event.getSource() == resetsupportItem)
	2358	+ if (source == resetsupportItem)
2147	2359	{
2148	2360	for (int i=0; i<group.selection.size(); i++)
2149	2361	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2362	+ boolean random = CameraPane.SWITCH;
	2363	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2364	group.selection.get(i).linkVerticesThis(null);
2153		- CameraPane.RANDOM = random;
	2365	+ CameraPane.SWITCH = random;
2154	2366	}
2155	2367
2156	2368	refreshContents();
2157	2369	} else
2158		- if (event.getSource() == relinkverticesItem)
	2370	+ if (source == relinkverticesItem)
2159	2371	{
2160		- boolean random = CameraPane.RANDOM;
2161		- CameraPane.RANDOM = false; // parse all random nodes
	2372	+ boolean random = CameraPane.SWITCH;
	2373	+ CameraPane.SWITCH = false; // parse all random nodes
2162	2374	group.selection.RelinkToSupport();
2163		- CameraPane.RANDOM = random;
	2375	+ CameraPane.SWITCH = random;
2164	2376
2165	2377	refreshContents();
2166	2378	} else
2167		- if (event.getSource() == resetreferencesItem)
	2379	+ if (source == resetreferencesItem)
2168	2380	{
2169	2381	for (int i=0; i<group.selection.size(); i++)
2170	2382	{
..	..	@@ -2173,11 +2385,11 @@
2173	2385
2174	2386	refreshContents();
2175	2387	} else
2176		- if (event.getSource() == setMasterItem)
	2388	+ if (source == setMasterItem)
2177	2389	{
2178		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2390	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2179	2391	{
2180		- Object3D content = GrafreeD.clipboard.get(0);
	2392	+ Object3D content = Grafreed.clipboard.get(0);
2181	2393
2182	2394	if (content instanceof cGroup && ((cGroup)content).transientlink )
2183	2395	content = ((cGroup)content).get(0);
..	..	@@ -2186,13 +2398,13 @@
2186	2398	refreshContents();
2187	2399	}
2188	2400	} else
2189		- if (event.getSource() == poseMeshItem)
	2401	+ if (source == poseMeshItem)
2190	2402	{
2191	2403	if (group.selection.size() == 1)
2192	2404	{
2193		- if (GrafreeD.clipboard.size() == 1)
	2405	+ if (Grafreed.clipboard.size() == 1)
2194	2406	{
2195		- Object3D content = GrafreeD.clipboard.get(0);
	2407	+ Object3D content = Grafreed.clipboard.get(0);
2196	2408
2197	2409	if (content instanceof cGroup && ((cGroup)content).transientlink )
2198	2410	content = ((cGroup)content).get(0);
..	..	@@ -2205,19 +2417,19 @@
2205	2417	}
2206	2418
2207	2419	} else
2208		- if (event.getSource() == revertMeshItem)
	2420	+ if (source == revertMeshItem)
2209	2421	{
2210	2422	RevertMeshes();
2211	2423	} else
2212		- if (event.getSource() == resetMeshItem)
	2424	+ if (source == resetAllItem)
2213	2425	{
2214	2426	ResetAll();
2215	2427	} else
2216		- if (event.getSource() == stepAllItem)
	2428	+ if (source == stepAllItem)
2217	2429	{
2218	2430	StepAll();
2219	2431	} else
2220		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2432	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2221	2433	{
2222	2434	//int indices[] = jList.getSelectedIndices();
2223	2435	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2225,46 +2437,46 @@
2225	2437
2226	2438	ClearSelection(false);
2227	2439	} else
2228		- if (event.getSource() == clearAllItem)
	2440	+ if (source == clearAllItem)
2229	2441	{
2230	2442	ClearSelection(true);
2231	2443	} else
2232		- if (event.getSource() == grabItem)
	2444	+ if (source == grabItem)
2233	2445	{
2234	2446	group(new cGroup(), true);
2235	2447	} else
2236		- if (event.getSource() == hideItem)
	2448	+ if (source == hideItem)
2237	2449	{
2238	2450	group(new HiddenObject());
2239	2451	} else
2240		- if (event.getSource() == frontItem)
	2452	+ if (source == frontItem)
2241	2453	{
2242	2454	front();
2243	2455	} else
2244		- if (event.getSource() == backItem)
	2456	+ if (source == backItem)
2245	2457	{
2246	2458	back();
2247	2459	} else
2248		- if (event.getSource() == cameraItem)
	2460	+ if (source == cameraItem)
2249	2461	{
2250	2462	makeSomething(new Camera());
2251	2463	} else
2252		- if (event.getSource() == compositeItem)
	2464	+ if (source == compositeItem)
2253	2465	{
2254	2466	group(new Composite());
2255	2467	} else
2256		- if (event.getSource() == randomItem)
	2468	+ if (source == randomItem)
2257	2469	{
2258	2470	RandomNode random = new RandomNode();
2259	2471	group(random);
2260	2472	if (random.size() > 0)
2261		- random.name = random.get(0).name + "Rnd";
	2473	+ random.name = random.get(0).name + "Switch";
2262	2474	} else
2263		- if (event.getSource() == physicsItem)
	2475	+ if (source == physicsItem)
2264	2476	{
2265	2477	group(new PhysicsNode());
2266	2478	} else
2267		- if (event.getSource() == frameselectorItem)
	2479	+ if (source == frameselectorItem)
2268	2480	{
2269	2481	for (int i=0; i<group.selection.size(); i++)
2270	2482	{
..	..	@@ -2276,7 +2488,7 @@
2276	2488	ResetModel();
2277	2489	refreshContents();
2278	2490	} else
2279		- if (event.getSource() == switchGeoItem)
	2491	+ if (source == switchGeoItem)
2280	2492	{
2281	2493	for (int i=0; i<group.selection.size(); i++)
2282	2494	{
..	..	@@ -2288,7 +2500,7 @@
2288	2500	ResetModel();
2289	2501	refreshContents();
2290	2502	} else
2291		- if (event.getSource() == switchTransfoItem)
	2503	+ if (source == switchTransfoItem)
2292	2504	{
2293	2505	for (int i=0; i<group.selection.size(); i++)
2294	2506	{
..	..	@@ -2300,7 +2512,7 @@
2300	2512	ResetModel();
2301	2513	refreshContents();
2302	2514	} else
2303		- if (event.getSource() == morphItem)
	2515	+ if (source == morphItem)
2304	2516	{
2305	2517	for (int i=0; i<group.selection.size(); i++)
2306	2518	{
..	..	@@ -2312,7 +2524,7 @@
2312	2524	ResetModel();
2313	2525	refreshContents();
2314	2526	} else
2315		- if (event.getSource() == scriptNodeItem)
	2527	+ if (source == scriptNodeItem)
2316	2528	{
2317	2529	boolean atleastone = false;
2318	2530
..	..	@@ -2351,31 +2563,31 @@
2351	2563	}
2352	2564	}
2353	2565	} else
2354		- if (event.getSource() == linkerItem)
	2566	+ if (source == linkerItem)
2355	2567	{
2356	2568	group(new cLinker());
2357	2569	} else
2358		- if (event.getSource() == textureItem)
	2570	+ if (source == textureItem)
2359	2571	{
2360	2572	group(new TextureNode());
2361	2573	} else
2362		- if (event.getSource() == billboardItem)
	2574	+ if (source == billboardItem)
2363	2575	{
2364	2576	group(new BillboardNode());
2365	2577	} else
2366		- if (event.getSource() == shadowXItem)
	2578	+ if (source == shadowXItem)
2367	2579	{
2368	2580	CastShadow(0);
2369	2581	} else
2370		- if (event.getSource() == shadowYItem)
	2582	+ if (source == shadowYItem)
2371	2583	{
2372	2584	CastShadow(1);
2373	2585	} else
2374		- if (event.getSource() == shadowZItem)
	2586	+ if (source == shadowZItem)
2375	2587	{
2376	2588	CastShadow(2);
2377	2589	} else
2378		- if (event.getSource() == ungroupItem)
	2590	+ if (source == ungroupItem)
2379	2591	{
2380	2592	//ungroup();
2381	2593	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2387,179 +2599,203 @@
2387	2599
2388	2600	refreshContents();
2389	2601	} else
2390		- if (event.getSource() == genUVItem)
	2602	+ if (source == genUVItem)
2391	2603	{
2392	2604	GenUV();
2393	2605	} else
2394		- if (event.getSource() == genNormalsCADItem)
	2606	+ if (source == genNormalsCADItem)
2395	2607	{
2396	2608	GenNormals(true);
2397	2609	} else
2398		- if (event.getSource() == genNormalsMESHItem)
	2610	+ if (source == genNormalsMESHItem)
2399	2611	{
2400		- GenNormals(true); // TODO
	2612	+ GenNormalsMESH();
2401	2613	} else
2402		- if (event.getSource() == genNormalsORGANItem)
	2614	+ if (source == genNormalsORGANItem)
2403	2615	{
2404	2616	GenNormals(false);
2405	2617	} else
2406		- if (event.getSource() == genNormalsMINEItem)
	2618	+ if (source == genNormalsMINEItem)
2407	2619	{
2408	2620	GenNormalsMINE();
2409	2621	} else
2410		- if (event.getSource() == stripifyItem)
	2622	+ if (source == stripifyItem)
2411	2623	{
2412	2624	Stripify();
2413	2625	} else
2414		- if (event.getSource() == unstripifyItem)
	2626	+ if (source == unstripifyItem)
2415	2627	{
2416	2628	Unstripify();
2417	2629	} else
2418		- if (event.getSource() == trimItem)
	2630	+ if (source == trimItem)
2419	2631	{
2420	2632	Trim();
2421	2633	} else
2422		- if (event.getSource() == untrimItem)
	2634	+ if (source == untrimItem)
2423	2635	{
2424	2636	Untrim();
2425	2637	} else
2426		- if (event.getSource() == clearColorsItem)
	2638	+ if (source == clearColorsItem)
2427	2639	{
2428	2640	ClearColors();
2429	2641	} else
2430		- if (event.getSource() == clearMaterialsItem)
	2642	+ if (source == clearMaterialsItem)
2431	2643	{
2432	2644	ClearMaterials();
2433	2645	} else
2434		- if (event.getSource() == liveleavesItem)
	2646	+ if (source == liveleavesItem)
2435	2647	{
2436	2648	LiveLeaves(true);
2437	2649	} else
2438		- if (event.getSource() == unliveleavesItem)
	2650	+ if (source == unliveleavesItem)
2439	2651	{
2440	2652	LiveLeaves(false);
2441	2653	} else
2442		- if (event.getSource() == supportleavesItem)
	2654	+ if (source == supportleavesItem)
2443	2655	{
2444	2656	SupportLeaves(true);
2445	2657	} else
2446		- if (event.getSource() == unsupportleavesItem)
	2658	+ if (source == unsupportleavesItem)
2447	2659	{
2448	2660	SupportLeaves(false);
2449	2661	} else
2450		- if (event.getSource() == hideleavesItem)
	2662	+ if (source == hideleavesItem)
2451	2663	{
2452	2664	HideLeaves(true);
2453	2665	} else
2454		- if (event.getSource() == showleavesItem)
	2666	+ if (source == showleavesItem)
2455	2667	{
2456	2668	HideLeaves(false);
2457	2669	} else
2458		- if (event.getSource() == markleavesItem)
	2670	+ if (source == markleavesItem)
2459	2671	{
2460	2672	MarkLeaves(true);
2461	2673	} else
2462		- if (event.getSource() == unmarkleavesItem)
	2674	+ if (source == unmarkleavesItem)
2463	2675	{
2464	2676	MarkLeaves(false);
2465	2677	} else
2466		- if (event.getSource() == flipVItem)
	2678	+ if (source == rewindleavesItem)
	2679	+ {
	2680	+ RewindLeaves(true);
	2681	+ } else
	2682	+ if (source == unrewindleavesItem)
	2683	+ {
	2684	+ RewindLeaves(false);
	2685	+ } else
	2686	+ if (source == randomleavesItem)
	2687	+ {
	2688	+ RandomLeaves(true);
	2689	+ } else
	2690	+ if (source == unrandomleavesItem)
	2691	+ {
	2692	+ RandomLeaves(false);
	2693	+ } else
	2694	+ if (source == flipVItem)
2467	2695	{
2468	2696	FlipV(true);
2469	2697	} else
2470		- if (event.getSource() == unflipVItem)
	2698	+ if (source == unflipVItem)
2471	2699	{
2472	2700	FlipV(false);
2473	2701	} else
2474		- if (event.getSource() == lowTexturesItem)
	2702	+ if (source == lowTexturesItem)
2475	2703	{
2476	2704	SetTexRes(0);
2477	2705	} else
2478		- if (event.getSource() == normalTexturesItem)
	2706	+ if (source == normalTexturesItem)
2479	2707	{
2480	2708	SetTexRes(1);
2481	2709	} else
2482		- if (event.getSource() == highTexturesItem)
	2710	+ if (source == highTexturesItem)
2483	2711	{
2484	2712	SetTexRes(2);
2485	2713	} else
2486		- if (event.getSource() == veryhighTexturesItem)
	2714	+ if (source == veryhighTexturesItem)
2487	2715	{
2488	2716	SetTexRes(3);
2489	2717	} else
2490		- if (event.getSource() == maxTexturesItem)
	2718	+ if (source == maxTexturesItem)
2491	2719	{
2492	2720	SetTexRes(4);
2493	2721	} else
2494		- if (event.getSource() == panoTexturesItem)
	2722	+ if (source == panoTexturesItem)
2495	2723	{
2496	2724	SetTexRes(5);
2497	2725	} else
2498		- if (event.getSource() == reverseNormalsItem)
	2726	+ if (source == reverseNormalsItem)
2499	2727	{
2500	2728	ReverseNormals();
2501	2729	} else
2502		- if (event.getSource() == parseverticesItem)
	2730	+ if (source == parseverticesItem)
2503	2731	{
2504	2732	ParseVertices();
2505	2733	} else
2506		- if (event.getSource() == textureFieldItem)
	2734	+ if (source == textureFieldItem)
2507	2735	{
2508	2736	TextureVertices();
2509	2737	} else
2510		- if (event.getSource() == alignItem)
	2738	+ if (source == alignItem)
2511	2739	{
2512	2740	Align();
2513	2741	} else
2514		- if (event.getSource() == mirrorItem)
	2742	+ if (source == mirrorItem)
2515	2743	{
2516	2744	MirrorPoses();
2517	2745	} else
2518		- if (event.getSource() == reduceMorphItem)
	2746	+ if (source == reduceMorphItem)
2519	2747	{
2520	2748	MeshReduction(false);
2521	2749	} else
2522		- if (event.getSource() == reduce34MorphItem)
	2750	+ if (source == reduce34MorphItem)
2523	2751	{
2524	2752	MeshReduction(true);
2525	2753	} else
2526		- if (event.getSource() == reverseTrianglesItem)
	2754	+ if (source == reverseTrianglesItem)
2527	2755	{
2528	2756	ReverseTriangles();
2529	2757	} else
2530		- if (event.getSource() == reduceMeshItem)
	2758	+ if (source == reduceMeshItem)
2531	2759	{
2532	2760	ReduceMesh(false);
2533	2761	} else
2534		- if (event.getSource() == reduce34MeshItem)
	2762	+ if (source == reduce34MeshItem)
2535	2763	{
2536	2764	ReduceMesh(true);
2537	2765	} else
2538		- if (event.getSource() == increaseMeshItem)
	2766	+ if (source == increaseMeshItem)
2539	2767	{
2540	2768	IncreaseMesh();
2541	2769	} else
2542		- if (event.getSource() == clipMeshItem)
	2770	+ if (source == clipMeshItem)
2543	2771	{
2544	2772	ClipMesh();
2545	2773	} else
2546		- if (event.getSource() == smoothMeshItem)
	2774	+ if (source == smoothMeshItem)
2547	2775	{
2548	2776	SmoothMesh();
2549	2777	} else
2550		- if (event.getSource() == transformgeometryItem)
	2778	+ if (source == transformGeometryItem)
2551	2779	{
2552	2780	TransformGeometry();
2553	2781	} else
2554		- if (event.getSource() == resetTransformItem)
	2782	+ if (source == transformChildrenItem)
	2783	+ {
	2784	+ TransformChildren();
	2785	+ } else
	2786	+ if (source == resetTransformItem)
2555	2787	{
2556	2788	ResetTransform();
2557	2789	} else
2558		- if (event.getSource() == resetCentroidItem)
	2790	+ if (source == resetCentroidItem)
2559	2791	{
2560		- ResetCentroid();
	2792	+ ResetCentroid(true);
2561	2793	} else
2562		- if (event.getSource() == resetParentItem)
	2794	+ if (source == resetCentroidXZItem)
	2795	+ {
	2796	+ ResetCentroid(false);
	2797	+ } else
	2798	+ if (source == resetParentItem)
2563	2799	{
2564	2800	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2565	2801	{
..	..	@@ -2569,7 +2805,7 @@
2569	2805
2570	2806	refreshContents();
2571	2807	} else
2572		- if (event.getSource() == repairParentItem)
	2808	+ if (source == repairParentItem)
2573	2809	{
2574	2810	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2575	2811	{
..	..	@@ -2583,7 +2819,7 @@
2583	2819
2584	2820	refreshContents();
2585	2821	} else
2586		- if (event.getSource() == repairShadowItem)
	2822	+ if (source == repairShadowItem)
2587	2823	{
2588	2824	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2589	2825	{
..	..	@@ -2597,7 +2833,7 @@
2597	2833
2598	2834	refreshContents();
2599	2835	} else
2600		- if (event.getSource() == sortbysizeItem)
	2836	+ if (source == sortbysizeItem)
2601	2837	{
2602	2838	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2603	2839	{
..	..	@@ -2609,7 +2845,7 @@
2609	2845	ResetModel();
2610	2846	refreshContents();
2611	2847	} else
2612		- if (event.getSource() == sortbynameItem)
	2848	+ if (source == sortbynameItem)
2613	2849	{
2614	2850	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2615	2851	{
..	..	@@ -2621,7 +2857,7 @@
2621	2857	ResetModel();
2622	2858	refreshContents();
2623	2859	} else
2624		- if (event.getSource() == attachPigmentItem)
	2860	+ if (source == attachPigmentItem)
2625	2861	{
2626	2862	String texture = GetFile("Attach pigment");
2627	2863	Object3D obj;
..	..	@@ -2633,7 +2869,7 @@
2633	2869
2634	2870	refreshContents();
2635	2871	} else
2636		- if (event.getSource() == detachPigmentItem)
	2872	+ if (source == detachPigmentItem)
2637	2873	{
2638	2874	Object3D obj;
2639	2875	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2644,7 +2880,7 @@
2644	2880
2645	2881	refreshContents();
2646	2882	} else
2647		- if (event.getSource() == attachBumpItem)
	2883	+ if (source == attachBumpItem)
2648	2884	{
2649	2885	String texture = GetFile("Attach bump");
2650	2886	Object3D obj;
..	..	@@ -2656,7 +2892,7 @@
2656	2892
2657	2893	refreshContents();
2658	2894	} else
2659		- if (event.getSource() == detachBumpItem)
	2895	+ if (source == detachBumpItem)
2660	2896	{
2661	2897	Object3D obj;
2662	2898	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2667,7 +2903,7 @@
2667	2903
2668	2904	refreshContents();
2669	2905	} else
2670		- if (event.getSource() == pigmentBumpItem)
	2906	+ if (source == pigmentBumpItem)
2671	2907	{
2672	2908	Object3D obj;
2673	2909	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2678,158 +2914,221 @@
2678	2914
2679	2915	refreshContents();
2680	2916	} else
2681		- if (event.getSource() == flashSelectionButton)
	2917	+ if (source == flashSelectionButton)
2682	2918	{
2683	2919	CameraPane.flash = true;
2684	2920	refreshContents();
2685	2921	} else
2686		- if (event.getSource() == oneButton)
	2922	+ if (source == oneButton)
2687	2923	{
2688	2924	} else
2689		- if (event.getSource() == twoButton)
	2925	+ if (source == twoButton)
2690	2926	{
2691	2927	radio.layout = twoButton;
2692	2928	// bug
2693	2929	//gridPanel.setDividerLocation(1.0);
2694	2930	//bigPanel.setDividerLocation(0.0);
2695		- bigThree.remove(scenePanel);
2696		- bigThree.remove(centralPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aConstraints.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		- // aConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(centralPanel, 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();
	2931	+// bigThree.remove(scenePanel);
	2932	+// bigThree.remove(centralPanel);
	2933	+// bigThree.remove(XYZPanel);
	2934	+// aWindowConstraints.gridx = 0;
	2935	+// aWindowConstraints.gridy = 0;
	2936	+// aWindowConstraints.gridwidth = 1;
	2937	+// // aConstraints.gridheight = 3;
	2938	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2939	+// aWindowConstraints.weightx = 0;
	2940	+// aWindowConstraints.weighty = 1;
	2941	+// //bigThree.add(jtp, aWindowConstraints);
	2942	+// aWindowConstraints.weightx = 1;
	2943	+// aWindowConstraints.gridwidth = 3;
	2944	+// // aConstraints.gridheight = 3;
	2945	+// aWindowConstraints.gridx = 1;
	2946	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2947	+// bigThree.add(centralPanel, aWindowConstraints);
	2948	+// aWindowConstraints.weightx = 0;
	2949	+// aWindowConstraints.gridx = 4;
	2950	+// aWindowConstraints.gridwidth = 1;
	2951	+// // aConstraints.gridheight = 3;
	2952	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2953	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2954	+// scenePanel.setVisible(false);
	2955	+// centralPanel.setVisible(true);
	2956	+// XYZPanel.setVisible(false);
	2957	+ bigThree.ClearUI();
	2958	+ bigThree.add(centralPanel);
	2959	+ bigThree.FlushUI();
	2960	+
	2961	+ cameraView.requestFocusInWindow();
	2962	+
	2963	+// refreshContents(true);
	2964	+//
	2965	+// try
	2966	+// {
	2967	+// java.awt.Robot bot = new java.awt.Robot();
	2968	+// int mask = InputEvent.BUTTON1_MASK;
	2969	+// bot.mouseMove(100, 100);
	2970	+// bot.mousePress(mask);
	2971	+// bot.mouseRelease(mask);
	2972	+// }
	2973	+// catch (Exception e)
	2974	+// {
	2975	+//
	2976	+// }
	2977	+
2719	2978	} else
2720		- if (event.getSource() == threeButton)
	2979	+ if (source == threeButton)
2721	2980	{
2722	2981	radio.layout = threeButton;
2723		- bigThree.remove(scenePanel);
2724		- bigThree.remove(centralPanel);
2725		- bigThree.remove(XYZPanel);
2726		- aWindowConstraints.gridx = 0;
2727		- aWindowConstraints.gridy = 0;
2728		- aWindowConstraints.gridwidth = 1;
2729		- // aConstraints.gridheight = 3;
2730		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2731		- aWindowConstraints.weightx = 0;
2732		- aWindowConstraints.weighty = 1;
2733		- //bigThree.add(jtp, aWindowConstraints);
2734		- aWindowConstraints.weightx = 1;
2735		- aWindowConstraints.gridwidth = 3;
2736		- // aConstraints.gridheight = 3;
2737		- aWindowConstraints.gridx = 1;
2738		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2739		- bigThree.add(centralPanel, aWindowConstraints);
2740		- aWindowConstraints.weightx = 0;
2741		- aWindowConstraints.gridx = 4;
2742		- aWindowConstraints.gridwidth = 1;
2743		- // aConstraints.gridheight = 3;
2744		- aConstraints.fill = GridBagConstraints.VERTICAL;
2745		- bigThree.add(XYZPanel, aWindowConstraints);
2746		- bigThree.revalidate();
	2982	+
	2983	+// bigThree.remove(scenePanel);
	2984	+// bigThree.remove(centralPanel);
	2985	+// bigThree.remove(XYZPanel);
	2986	+// aWindowConstraints.gridx = 0;
	2987	+// aWindowConstraints.gridy = 0;
	2988	+// aWindowConstraints.gridwidth = 1;
	2989	+// // aConstraints.gridheight = 3;
	2990	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2991	+// aWindowConstraints.weightx = 0;
	2992	+// aWindowConstraints.weighty = 1;
	2993	+// //bigThree.add(jtp, aWindowConstraints);
	2994	+// aWindowConstraints.weightx = 1;
	2995	+// aWindowConstraints.gridwidth = 3;
	2996	+// // aConstraints.gridheight = 3;
	2997	+// aWindowConstraints.gridx = 1;
	2998	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2999	+// bigThree.add(centralPanel, aWindowConstraints);
	3000	+// aWindowConstraints.weightx = 0;
	3001	+// aWindowConstraints.gridx = 4;
	3002	+// aWindowConstraints.gridwidth = 1;
	3003	+// // aConstraints.gridheight = 3;
	3004	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3005	+// bigThree.add(XYZPanel, aWindowConstraints);
	3006	+// bigThree.validate();
	3007	+// scenePanel.setVisible(false);
	3008	+// centralPanel.setVisible(true);
	3009	+// XYZPanel.setVisible(true);
	3010	+ bigThree.ClearUI();
	3011	+ bigThree.add(centralPanel);
	3012	+ bigThree.add(XYZPanel);
	3013	+ bigThree.FlushUI();
	3014	+
	3015	+ cameraView.requestFocusInWindow();
2747	3016	} else
2748		- if (event.getSource() == fourButton)
	3017	+ if (source == fourButton)
2749	3018	{
2750	3019	radio.layout = fourButton;
2751		- bigThree.remove(scenePanel);
2752		- bigThree.remove(centralPanel);
2753		- bigThree.remove(XYZPanel);
2754		- aWindowConstraints.gridx = 0;
2755		- aWindowConstraints.gridy = 0;
2756		- aWindowConstraints.gridwidth = 1;
2757		- // aWindowConstraints.gridheight = 3;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- aWindowConstraints.weightx = 1;
2760		- aWindowConstraints.weighty = 1;
2761		- bigThree.add(scenePanel, aWindowConstraints);
2762		- aWindowConstraints.weightx = 1;
2763		- aWindowConstraints.gridwidth = 3;
2764		- // aConstraints.gridheight = 3;
2765		- aWindowConstraints.gridx = 1;
2766		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2767		- //bigThree.add(cameraPanel, aWindowConstraints);
2768		- aWindowConstraints.weightx = 0;
2769		- aWindowConstraints.gridx = 4;
2770		- aWindowConstraints.gridwidth = 1;
2771		- // aWindowConstraints.gridheight = 3;
2772		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2773		- //bigThree.add(XYZPanel, aWindowConstraints);
2774		- bigThree.revalidate();
	3020	+
	3021	+// bigThree.remove(scenePanel);
	3022	+// bigThree.remove(centralPanel);
	3023	+// bigThree.remove(XYZPanel);
	3024	+// aWindowConstraints.gridx = 0;
	3025	+// aWindowConstraints.gridy = 0;
	3026	+// aWindowConstraints.gridwidth = 1;
	3027	+// // aWindowConstraints.gridheight = 3;
	3028	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3029	+// aWindowConstraints.weightx = 1;
	3030	+// aWindowConstraints.weighty = 1;
	3031	+// bigThree.add(scenePanel, aWindowConstraints);
	3032	+// aWindowConstraints.weightx = 1;
	3033	+// aWindowConstraints.gridwidth = 3;
	3034	+// // aConstraints.gridheight = 3;
	3035	+// aWindowConstraints.gridx = 1;
	3036	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3037	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3038	+// aWindowConstraints.weightx = 0;
	3039	+// aWindowConstraints.gridx = 4;
	3040	+// aWindowConstraints.gridwidth = 1;
	3041	+// // aWindowConstraints.gridheight = 3;
	3042	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3043	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3044	+// bigThree.validate();
	3045	+// scenePanel.setVisible(true);
	3046	+// centralPanel.setVisible(false);
	3047	+// XYZPanel.setVisible(false);
	3048	+ bigThree.ClearUI();
	3049	+ bigThree.add(scenePanel);
	3050	+ bigThree.FlushUI();
	3051	+
	3052	+ cameraView.requestFocusInWindow();
2775	3053	} else
2776		- if (event.getSource() == sixButton)
	3054	+ if (source == sixButton)
2777	3055	{
2778	3056	radio.layout = sixButton;
2779		- bigThree.remove(scenePanel);
2780		- bigThree.remove(centralPanel);
2781		- bigThree.remove(XYZPanel);
2782		- aWindowConstraints.gridx = 0;
2783		- aWindowConstraints.gridy = 0;
2784		- aWindowConstraints.gridwidth = 1;
2785		- // aConstraints.gridheight = 3;
2786		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2787		- aWindowConstraints.weightx = 0;
2788		- aWindowConstraints.weighty = 1;
2789		- bigThree.add(scenePanel, aWindowConstraints);
2790		- aWindowConstraints.weightx = 1;
2791		- aWindowConstraints.gridwidth = 3;
2792		- // aWindowConstraints.gridheight = 3;
2793		- aWindowConstraints.gridx = 1;
2794		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2795		- bigThree.add(centralPanel, aWindowConstraints);
2796		- aWindowConstraints.weightx = 0;
2797		- aWindowConstraints.gridx = 4;
2798		- aWindowConstraints.gridwidth = 1;
2799		- // aWindowConstraints.gridheight = 3;
2800		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2801		- //bigThree.add(XYZPanel, aConstraints);
2802		- bigThree.revalidate();
	3057	+
	3058	+// bigThree.remove(scenePanel);
	3059	+// bigThree.remove(centralPanel);
	3060	+// bigThree.remove(XYZPanel);
	3061	+// aWindowConstraints.gridx = 0;
	3062	+// aWindowConstraints.gridy = 0;
	3063	+// aWindowConstraints.gridwidth = 1;
	3064	+// // aConstraints.gridheight = 3;
	3065	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3066	+// aWindowConstraints.weightx = 0;
	3067	+// aWindowConstraints.weighty = 1;
	3068	+// bigThree.add(scenePanel, aWindowConstraints);
	3069	+// aWindowConstraints.weightx = 1;
	3070	+// aWindowConstraints.gridwidth = 3;
	3071	+// // aWindowConstraints.gridheight = 3;
	3072	+// aWindowConstraints.gridx = 1;
	3073	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3074	+// bigThree.add(centralPanel, aWindowConstraints);
	3075	+// aWindowConstraints.weightx = 0;
	3076	+// aWindowConstraints.gridx = 4;
	3077	+// aWindowConstraints.gridwidth = 1;
	3078	+// // aWindowConstraints.gridheight = 3;
	3079	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3080	+// //bigThree.add(XYZPanel, aConstraints);
	3081	+// bigThree.validate();
	3082	+// scenePanel.setVisible(true);
	3083	+// centralPanel.setVisible(true);
	3084	+// XYZPanel.setVisible(false);
	3085	+ bigThree.ClearUI();
	3086	+ bigThree.add(scenePanel);
	3087	+ bigThree.add(centralPanel);
	3088	+ bigThree.FlushUI();
	3089	+
	3090	+ cameraView.requestFocusInWindow();
2803	3091	} else
2804		- if (event.getSource() == sevenButton)
	3092	+ if (source == sevenButton)
2805	3093	{
2806	3094	radio.layout = sevenButton;
2807		- bigThree.remove(scenePanel);
2808		- bigThree.remove(centralPanel);
2809		- bigThree.remove(XYZPanel);
2810		- aWindowConstraints.gridx = 0;
2811		- aWindowConstraints.gridy = 0;
2812		- aWindowConstraints.gridwidth = 1;
2813		- // aWindowConstraints.gridheight = 3;
2814		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2815		- aWindowConstraints.weightx = 0;
2816		- aWindowConstraints.weighty = 1;
2817		- bigThree.add(scenePanel, aWindowConstraints);
2818		- aWindowConstraints.weightx = 1;
2819		- aWindowConstraints.gridwidth = 3;
2820		- // aWindowConstraints.gridheight = 3;
2821		- aWindowConstraints.gridx = 1;
2822		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2823		- bigThree.add(centralPanel, aWindowConstraints);
2824		- aWindowConstraints.weightx = 0;
2825		- aWindowConstraints.gridx = 4;
2826		- aWindowConstraints.gridwidth = 1;
2827		- // aConstraints.gridheight = 3;
2828		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2829		- bigThree.add(XYZPanel, aWindowConstraints);
2830		- bigThree.revalidate();
	3095	+
	3096	+// bigThree.remove(scenePanel);
	3097	+// bigThree.remove(centralPanel);
	3098	+// bigThree.remove(XYZPanel);
	3099	+// aWindowConstraints.gridx = 0;
	3100	+// aWindowConstraints.gridy = 0;
	3101	+// aWindowConstraints.gridwidth = 1;
	3102	+// // aWindowConstraints.gridheight = 3;
	3103	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3104	+// aWindowConstraints.weightx = 0;
	3105	+// aWindowConstraints.weighty = 1;
	3106	+// bigThree.add(scenePanel, aWindowConstraints);
	3107	+// aWindowConstraints.weightx = 1;
	3108	+// aWindowConstraints.gridwidth = 3;
	3109	+// // aWindowConstraints.gridheight = 3;
	3110	+// aWindowConstraints.gridx = 1;
	3111	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3112	+// bigThree.add(centralPanel, aWindowConstraints);
	3113	+// aWindowConstraints.weightx = 0;
	3114	+// aWindowConstraints.gridx = 4;
	3115	+// aWindowConstraints.gridwidth = 1;
	3116	+// // aConstraints.gridheight = 3;
	3117	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3118	+// bigThree.add(XYZPanel, aWindowConstraints);
	3119	+// bigThree.validate();
	3120	+// scenePanel.setVisible(true);
	3121	+// centralPanel.setVisible(true);
	3122	+// XYZPanel.setVisible(true);
	3123	+ bigThree.ClearUI();
	3124	+ bigThree.add(scenePanel);
	3125	+ bigThree.add(centralPanel);
	3126	+ bigThree.add(XYZPanel);
	3127	+ bigThree.FlushUI();
	3128	+
	3129	+ cameraView.requestFocusInWindow();
2831	3130	} else
2832		- if (event.getSource() == rootButton)
	3131	+ if (source == rootButton)
2833	3132	{
2834	3133	Object3D obj;
2835	3134	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2839,17 +3138,24 @@
2839	3138	EditObject(obj);
2840	3139	}
2841	3140
	3141	+ cameraView.requestFocusInWindow();
2842	3142	refreshContents(true);
2843	3143	} else
2844		- if (event.getSource() == closeButton)
	3144	+ if (source == closeButton)
2845	3145	{
2846	3146	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2847	3147	cRadio ab;
2848	3148	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2849	3149	{
2850	3150	ab = (cRadio)e.nextElement();
2851		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3151	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2852	3152	{
	3153	+ // Patch to avoid bug with transparency.
	3154	+ if (!ab.hadMaterial)
	3155	+ {
	3156	+ ab.object.material = null;
	3157	+ }
	3158	+
2853	3159	buttonGroup.remove(ab);
2854	3160	radioPanel.remove(ab);
2855	3161
..	..	@@ -2860,13 +3166,15 @@
2860	3166	break;
2861	3167	}
2862	3168	}
	3169	+
	3170	+ cameraView.requestFocusInWindow();
2863	3171	refreshContents(true);
2864	3172	} else
2865		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3173	+ if (source == editItem \|\| source == editButton)
2866	3174	{
2867	3175	EditSelection(false);
2868	3176	} else
2869		- if (event.getSource() == uneditButton)
	3177	+ if (source == uneditButton)
2870	3178	{
2871	3179	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2872	3180	{
..	..	@@ -2876,14 +3184,14 @@
2876	3184	child.CloseUI();
2877	3185	listUI.remove(child);
2878	3186
2879		- child.editWindow = null; // ???????????
	3187	+ //child.editWindow = null; // ???????????
2880	3188	}
2881		- objEditor.ctrlPanel.revalidate();
	3189	+ objEditor.ctrlPanel.FlushUI();
2882	3190	//objEditor.jTree.clearSelection();
2883	3191	//objEditor.ResetSliders();
2884	3192	refreshContents(true);
2885	3193	} else
2886		- if (event.getSource() == clearPanelButton)
	3194	+ if (source == clearPanelButton)
2887	3195	{
2888	3196	assert(copy == group);
2889	3197	//copy.ClearUI();
..	..	@@ -2894,7 +3202,7 @@
2894	3202	listUI.clear();
2895	3203	refreshContents(true);
2896	3204	} else
2897		- if (event.getSource() == allParamsButton)
	3205	+ if (source == allParamsButton)
2898	3206	{
2899	3207	assert(copy == group);
2900	3208
..	..	@@ -2915,19 +3223,19 @@
2915	3223
2916	3224	refreshContents(true);
2917	3225	} else
2918		- if (event.getSource() == unselectButton)
	3226	+ if (source == unselectButton)
2919	3227	{
2920	3228	objEditor.jTree.clearSelection();
2921	3229	// ?? oct 2012 GrafreeD.clipboard.clear();
2922	3230	objEditor.ResetSliders();
2923	3231	refreshContents(true);
2924	3232	} else
2925		- if(event.getSource() instanceof cRadio)
	3233	+ if(source instanceof cRadio)
2926	3234	{
2927	3235	group.parent = keepparent;
2928	3236	group.attributes = 0;
2929	3237	//group.editWindow = null;
2930		- /cRadio/ radio = (cRadio)event.getSource();
	3238	+ /cRadio/ radio = (cRadio)source;
2931	3239	Object3D obj = radio.GetObject();
2932	3240	System.out.println("Edit " + obj);
2933	3241	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2962,7 +3270,10 @@
2962	3270	frontView.object = group;
2963	3271	sideView.object = group;
2964	3272	}
2965		- group.editWindow = this;
	3273	+
	3274	+// fix "+" issue
	3275	+ //group.editWindow = this;
	3276	+
2966	3277	/*
2967	3278	currentLayout = radio.layout;
2968	3279	if (currentLayout == null)
..	..	@@ -2974,8 +3285,23 @@
2974	3285	//group.parent = null; // ROOT
2975	3286	//group.attributes = -1;
2976	3287	ResetModel();
	3288	+
	3289	+ cameraView.requestFocusInWindow();
2977	3290	refreshContents(true);
2978		- }
	3291	+ } else if (event.getSource() == editCameraItem)
	3292	+ {
	3293	+ cameraView.ProtectCamera();
	3294	+ cameraView.repaint();
	3295	+ return;
	3296	+ } else if (event.getSource() == revertCameraItem)
	3297	+ {
	3298	+ cameraView.RevertCamera();
	3299	+ cameraView.repaint();
	3300	+ return;
	3301	+ // } else if (event.getSource() == textureButton)
	3302	+ // {
	3303	+ // return; // true;
	3304	+ }
2979	3305	else
2980	3306	{
2981	3307	//return super.action(event, arg);
..	..	@@ -2984,7 +3310,6 @@
2984	3310	}
2985	3311
2986	3312	boolean useclient = false;
2987		- cRadio radio;
2988	3313
2989	3314	void ToggleRoot()
2990	3315	{
..	..	@@ -3036,6 +3361,28 @@
3036	3361	refreshContents();
3037	3362	}
3038	3363
	3364	+ void TransformChildren()
	3365	+ {
	3366	+ Object3D obj;
	3367	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3368	+ {
	3369	+ obj = (Object3D)e.nextElement();
	3370	+ obj.KeepTextureMatrices();
	3371	+ obj.TransformChildren();
	3372	+ obj.RestoreTextureMatrices();
	3373	+
	3374	+// if (obj.parent == null)
	3375	+// {
	3376	+// System.out.println("NULL PARENT!");
	3377	+// new Exception().printStackTrace();
	3378	+// }
	3379	+// else
	3380	+// TouchTransform(obj);
	3381	+// //obj.parent.Touch();
	3382	+ }
	3383	+
	3384	+ refreshContents();
	3385	+ }
3039	3386
3040	3387	void ResetTransform()
3041	3388	{
..	..	@@ -3148,7 +3495,7 @@
3148	3495	refreshContents();
3149	3496	}
3150	3497
3151		- void ResetCentroid()
	3498	+ void ResetCentroid(boolean full)
3152	3499	{
3153	3500	Object3D obj;
3154	3501	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3163,12 +3510,16 @@
3163	3510	LA.matIdentity(Object3D.mat);
3164	3511	obj.getBounds(minima, maxima, false);
3165	3512	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3166		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3513	+ if (full)
	3514	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3167	3515	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3168	3516	obj.TransformMesh(Object3D.mat);
	3517	+
3169	3518	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3170		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3519	+ if (full)
	3520	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3171	3521	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3522	+
3172	3523	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3173	3524	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3174	3525	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3197,7 +3548,8 @@
3197	3548
3198	3549	int size = obj.MemorySize();
3199	3550
3200		- System.err.println((size/1024) + " KB is the size of " + obj);
	3551	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3552	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3201	3553	}
3202	3554	}
3203	3555	catch (Exception e)
..	..	@@ -3234,9 +3586,9 @@
3234	3586	obj = (Object3D)e.nextElement();
3235	3587
3236	3588	System.out.println("Object is: " + obj);
3237		- GrafreeD.AnalyzeObject(obj);
	3589	+ Grafreed.AnalyzeObject(obj);
3238	3590	System.out.println("Boundary rep: " + obj.bRep);
3239		- GrafreeD.AnalyzeObject(obj.bRep);
	3591	+ Grafreed.AnalyzeObject(obj.bRep);
3240	3592
3241	3593	// System.err.println((size/1024) + " KB is the size of " + obj);
3242	3594	}
..	..	@@ -3278,6 +3630,13 @@
3278	3630	void GenNormals(boolean crease)
3279	3631	{
3280	3632	group.GenNormalsS(crease);
	3633	+
	3634	+ refreshContents();
	3635	+ }
	3636	+
	3637	+ void GenNormalsMESH()
	3638	+ {
	3639	+ group.GenNormalsMeshS();
3281	3640
3282	3641	refreshContents();
3283	3642	}
..	..	@@ -3450,8 +3809,8 @@
3450	3809
3451	3810	void ParseVertices()
3452	3811	{
3453		- boolean epsequal = GrafreeD.epsequal;
3454		- GrafreeD.epsequal = true;
	3812	+ boolean epsequal = Grafreed.epsequal;
	3813	+ Grafreed.epsequal = true;
3455	3814
3456	3815	for (int i=0; i<group.selection.size(); i++)
3457	3816	{
..	..	@@ -3476,7 +3835,7 @@
3476	3835	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3477	3836	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3478	3837
3479		- g.add(GrafreeD.clipboard);
	3838	+ g.add(Grafreed.clipboard);
3480	3839
3481	3840	buffer.add(g);
3482	3841	}
..	..	@@ -3491,7 +3850,7 @@
3491	3850	makeSomething(buffer, i==group.selection.size()-1);
3492	3851	}
3493	3852
3494		- GrafreeD.epsequal = epsequal;
	3853	+ Grafreed.epsequal = epsequal;
3495	3854
3496	3855	refreshContents();
3497	3856	}
..	..	@@ -3509,7 +3868,16 @@
3509	3868	String pigment = Object3D.GetPigment(tex);
3510	3869	//String bump = Object3D.GetBump(tex);
3511	3870
3512		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3871	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3872	+
	3873	+ try
	3874	+ {
	3875	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3876	+ }
	3877	+ catch (Exception e)
	3878	+ {
	3879	+ System.err.println("FAIL: " + node);
	3880	+ }
3513	3881
3514	3882	double s = v.s;
3515	3883
..	..	@@ -3597,11 +3965,11 @@
3597	3965
3598	3966	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3599	3967
3600		- boolean random = CameraPane.RANDOM;
3601		- CameraPane.RANDOM = false; // parse all random nodes
	3968	+ boolean random = CameraPane.SWITCH;
	3969	+ CameraPane.SWITCH = false; // parse all random nodes
3602	3970	lowres.linkVerticesThis(null);
3603	3971	lowres.linkVerticesThis(sn);
3604		- CameraPane.RANDOM = random;
	3972	+ CameraPane.SWITCH = random;
3605	3973
3606	3974	System.err.flush();
3607	3975
..	..	@@ -3641,7 +4009,7 @@
3641	4009	return;
3642	4010
3643	4011	Object3D poses = group.selection.get(0);
3644		- Object3D ref = GrafreeD.clipboard.get(0);
	4012	+ Object3D ref = Grafreed.clipboard.get(0);
3645	4013
3646	4014	Object3D newgroup = new Object3D("Po:" + poses.name);
3647	4015
..	..	@@ -3835,9 +4203,9 @@
3835	4203
3836	4204	void ClipMesh()
3837	4205	{
3838		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4206	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3839	4207	{
3840		- Object3D content = GrafreeD.clipboard.get(0);
	4208	+ Object3D content = Grafreed.clipboard.get(0);
3841	4209
3842	4210	if (content instanceof cGroup && ((cGroup)content).transientlink )
3843	4211	content = ((cGroup)content).get(0);
..	..	@@ -3846,7 +4214,7 @@
3846	4214	// {
3847	4215	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3848	4216	// }
3849		- group.selection.ClipMesh(GrafreeD.clipboard);
	4217	+ group.selection.ClipMesh(Grafreed.clipboard);
3850	4218	}
3851	4219	// group.selection.ClipMesh(GrafreeD.clipboard);
3852	4220	System.out.println("DONE.");
..	..	@@ -3893,6 +4261,18 @@
3893	4261	void MarkLeaves(boolean hide)
3894	4262	{
3895	4263	group.selection.MarkLeaves(hide);
	4264	+ refreshContents();
	4265	+ }
	4266	+
	4267	+ void RewindLeaves(boolean hide)
	4268	+ {
	4269	+ group.selection.RewindLeaves(hide);
	4270	+ refreshContents();
	4271	+ }
	4272	+
	4273	+ void RandomLeaves(boolean hide)
	4274	+ {
	4275	+ group.selection.RandomLeaves(hide);
3896	4276	refreshContents();
3897	4277	}
3898	4278
..	..	@@ -3981,7 +4361,7 @@
3981	4361	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3982	4362
3983	4363	Object3D elem = (Object3D)group.selection.elementAt(i);
3984		- if(elem != group)
	4364	+ if(elem != group \|\| !newWindow)
3985	4365	{
3986	4366	// if (!(elem instanceof Composite))
3987	4367	// newWindow = false;
..	..	@@ -4071,7 +4451,6 @@
4071	4451	//case 702: // Event.LIST_DESELECT
4072	4452	group.deselectAll();
4073	4453	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4074		- objEditor.ClearInfo(); // .GetMaterial());
4075	4454	if (tps != null)
4076	4455	{
4077	4456	for (int i=0; i < tps.length; i++)
..	..	@@ -4080,29 +4459,28 @@
4080	4459
4081	4460	//if (child.parent != null)
4082	4461	//child.parent.addSelectee(child);
	4462	+ objEditor.SetMaterial(child);
4083	4463	group.addSelectee(child);
4084		- objEditor.SetMaterial(child); // .GetMaterial());
4085		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4086		- System.err.println("info : " + child.GetPath());
4087	4464	}
4088	4465	}
4089		- else
4090		- {
4091		- objEditor.SetMaterial(group); // .GetMaterial());
4092		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4093		- System.err.println("info : " + group.GetPath());
4094		- }
	4466	+// else
	4467	+// {
	4468	+// objEditor.SetMaterial(group); // .GetMaterial());
	4469	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4470	+// System.err.println("info : " + group.GetPath());
	4471	+// }
4095	4472
4096		- objEditor.SetText(); // jan 2014
4097		-
4098		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4473	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4099	4474	CameraPane.flash = true;
4100	4475
4101		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4476	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4102	4477	// a camera
4103	4478	{
4104		- CameraPane.camerachangeframe = 0; // don't refuse it
4105		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4479	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4480	+ {
	4481	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4482	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4483	+ }
4106	4484	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4107	4485	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4108	4486	}
..	..	@@ -4115,6 +4493,26 @@
4115	4493
4116	4494	freezemodel = false;
4117	4495	}
	4496	+
	4497	+ void refreshContents(boolean cp)
	4498	+ {
	4499	+ if (!Globals.MOUSEDRAGGED)
	4500	+ {
	4501	+ objEditor.ClearInfo(); // .GetMaterial());
	4502	+
	4503	+ for (int i=0; i < group.selection.Size(); i++)
	4504	+ {
	4505	+ Object3D child = (Object3D) group.selection.get(i);
	4506	+
	4507	+ objEditor.AddInfo(child, this, true);
	4508	+ System.err.println("info : " + child.GetPath());
	4509	+ }
	4510	+
	4511	+ objEditor.SetText(); // jan 2014
	4512	+ }
	4513	+
	4514	+ super.refreshContents(cp);
	4515	+ }
4118	4516
4119	4517	void linkSomething(Object3D thing)
4120	4518	{
..	..	@@ -4186,16 +4584,18 @@
4186	4584	{
4187	4585	if (group.selection.isEmpty())
4188	4586	return;
4189		- GrafreeD.clipboardIsTempGroup = false;
	4587	+
	4588	+ Grafreed.clipboardIsTempGroup = false;
4190	4589	Composite tGroup = null;
4191	4590	if (group.selection.size() > 0) // 1)
4192	4591	{
4193	4592	tGroup = new cGroup();
4194		- GrafreeD.clipboardIsTempGroup = true;
	4593	+ Grafreed.clipboardIsTempGroup = true;
4195	4594	}
4196	4595
4197	4596	if (cut)
4198	4597	{
	4598	+ Save();
4199	4599	//int indices[] = jList.getSelectedIndices();
4200	4600	//for (int i = indices.length - 1; i >= 0; i--)
4201	4601	//jList.remove(indices[i]);
..	..	@@ -4231,16 +4631,16 @@
4231	4631	//System.out.println("cut " + child);
4232	4632	//System.out.println("parent = " + child.parent);
4233	4633	// tmp.addChild(child);
4234		- if (GrafreeD.clipboardIsTempGroup)
	4634	+ if (Grafreed.clipboardIsTempGroup)
4235	4635	tGroup.add/Child/(tmp);
4236	4636	else
4237		- GrafreeD.clipboard = tmp;
	4637	+ Grafreed.clipboard = tmp;
4238	4638	}
4239	4639	else
4240		- if (GrafreeD.clipboardIsTempGroup)
	4640	+ if (Grafreed.clipboardIsTempGroup)
4241	4641	tGroup.add/Child/(child);
4242	4642	else
4243		- GrafreeD.clipboard = child;
	4643	+ Grafreed.clipboard = child;
4244	4644	}
4245	4645
4246	4646	//ResetModel();
..	..	@@ -4272,21 +4672,23 @@
4272	4672	//System.out.println("cut " + elem);
4273	4673	//System.out.println("parent = " + elem.parent);
4274	4674	// tmp.addChild(elem);
4275		- if (GrafreeD.clipboardIsTempGroup)
	4675	+ if (Grafreed.clipboardIsTempGroup)
4276	4676	tGroup.add/Child/(tmp);
4277	4677	else
4278		- GrafreeD.clipboard = tmp;
	4678	+ Grafreed.clipboard = tmp;
4279	4679	}
4280	4680	else
4281		- if (GrafreeD.clipboardIsTempGroup)
	4681	+ if (Grafreed.clipboardIsTempGroup)
4282	4682	tGroup.add/Child/(child);
4283	4683	else
4284		- GrafreeD.clipboard = child;
	4684	+ Grafreed.clipboard = child;
4285	4685	}
4286	4686
4287	4687	}
4288		- if (GrafreeD.clipboardIsTempGroup)
4289		- GrafreeD.clipboard = tGroup;
	4688	+
	4689	+ if (Grafreed.clipboardIsTempGroup)
	4690	+ Grafreed.clipboard = tGroup;
	4691	+
4290	4692	if (cut)
4291	4693	{
4292	4694	ResetModel();
..	..	@@ -4300,7 +4702,7 @@
4300	4702	// return;
4301	4703	boolean first = true;
4302	4704
4303		- if (GrafreeD.clipboardIsTempGroup)
	4705	+ if (Grafreed.clipboardIsTempGroup)
4304	4706	{
4305	4707	Composite temp;
4306	4708
..	..	@@ -4311,7 +4713,7 @@
4311	4713	temp = (Composite)Applet3D.clipboard.deepCopy();
4312	4714	*/
4313	4715	Object3D elem;
4314		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4716	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4315	4717	{
4316	4718	Object3D child = (Object3D)e.nextElement();
4317	4719
..	..	@@ -4345,21 +4747,21 @@
4345	4747	//Object3D cb = Applet3D.clipboard;
4346	4748	//temp.addChild(cb);
4347	4749	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4348		- assert(GrafreeD.clipboard.parent == null);
4349		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4350		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4351		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4352		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4750	+ assert(Grafreed.clipboard.parent == null);
	4751	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4752	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4753	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4754	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4353	4755	else
4354		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4355		- GrafreeD.clipboard.get(0).parent = keepparent;
	4756	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4757	+ Grafreed.clipboard.get(0).parent = keepparent;
4356	4758	}
4357	4759
4358	4760	ResetModel();
4359	4761	refreshContents();
4360	4762	}
4361	4763
4362		- void pasteInto(boolean copyit)
	4764	+ void pasteInto(boolean copyit, boolean clone)
4363	4765	{
4364	4766	// if (GrafreeD.clipboard == null)
4365	4767	// return;
..	..	@@ -4388,15 +4790,22 @@
4388	4790	if (copyit)
4389	4791	{
4390	4792	// paste(false);
4391		- CloneClipboard(false); // sept 2014
	4793	+ if (clone)
	4794	+ {
	4795	+ CloneClipboard(false); // sept 2014
	4796	+ }
	4797	+ else
	4798	+ {
	4799	+ paste(false);
	4800	+ }
4392	4801	}
4393	4802	else
4394	4803	{
4395	4804	boolean first = true;
4396	4805
4397		- if (GrafreeD.clipboardIsTempGroup)
	4806	+ if (Grafreed.clipboardIsTempGroup)
4398	4807	{
4399		- Composite temp = (Composite)GrafreeD.clipboard;
	4808	+ Composite temp = (Composite)Grafreed.clipboard;
4400	4809	Object3D copy;
4401	4810	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4402	4811	{
..	..	@@ -4406,7 +4815,7 @@
4406	4815	}
4407	4816	} else
4408	4817	{
4409		- linkSomething(GrafreeD.clipboard); //.get(0));
	4818	+ linkSomething(Grafreed.clipboard); //.get(0));
4410	4819	}
4411	4820	}
4412	4821	}
..	..	@@ -4811,21 +5220,6 @@
4811	5220	}
4812	5221	*/
4813	5222
4814		- void ImportGFD()
4815		- {
4816		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4817		- browser.show();
4818		- String filename = browser.getFile();
4819		- if (filename != null && filename.length() > 0)
4820		- {
4821		- String fullname = browser.getDirectory() + filename;
4822		-
4823		- //Object3D readobj =
4824		- objEditor.ReadGFD(fullname, objEditor);
4825		- //makeSomething(readobj);
4826		- }
4827		- }
4828		-
4829	5223	/*
4830	5224	public void Callback(Object obj)
4831	5225	{
..	..	@@ -4849,26 +5243,9 @@
4849	5243	}
4850	5244	*/
4851	5245
4852		- void ImportVRMLX3D()
4853		- {
4854		- if (GrafreeD.standAlone)
4855		- {
4856		- /**/
4857		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4858		- browser.show();
4859		- String filename = browser.getFile();
4860		- if (filename != null && filename.length() > 0)
4861		- {
4862		- String fullname = browser.getDirectory() + filename;
4863		- LoadVRMLX3D(fullname);
4864		- }
4865		- /**/
4866		- }
4867		- }
4868		-
4869	5246	String GetFile(String dialogName)
4870	5247	{
4871		- if (GrafreeD.standAlone)
	5248	+ if (Grafreed.standAlone)
4872	5249	{
4873	5250	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4874	5251	browser.show();
..	..	@@ -4932,10 +5309,18 @@
4932	5309	cButton flashSelectionButton;
4933	5310	cButton editButton;
4934	5311	cButton uneditButton;
	5312	+ JCheckBox allParamsButton;
4935	5313	cButton clearpanelButton;
4936		- cButton allParamsButton;
4937	5314	cButton unselectButton;
4938	5315
	5316	+ cButton minButton;
	5317	+ cButton maxButton;
	5318	+ cButton fullButton;
	5319	+ cButton undoButton;
	5320	+ cButton redoButton;
	5321	+ cButton saveButton;
	5322	+ cButton oneStepButton;
	5323	+
4939	5324	cButton screenfitButton;
4940	5325	cButton screenfitpointButton;
4941	5326	cButton snapobjectButton;
..	..	@@ -4946,14 +5331,6 @@
4946	5331	cButton closeButton;
4947	5332
4948	5333	cButton setsupportButton;
4949		-
4950		- cButton twoButton;
4951		- cButton sixButton;
4952		- cButton threeButton;
4953		- cButton sevenButton;
4954		- cButton fourButton; // full panel
4955		- cButton oneButton; // full XYZ
4956		- //cButton currentLayout;
4957	5334
4958	5335	//
4959	5336	//Composite
..	..	@@ -4966,6 +5343,8 @@
4966	5343	private MenuItem lookFromItem;
4967	5344	private MenuItem switchItem;
4968	5345	private MenuItem cutItem;
	5346	+ private MenuItem undoItem;
	5347	+ private MenuItem redoItem;
4969	5348	private MenuItem duplicateItem;
4970	5349	private MenuItem cloneItem;
4971	5350	private MenuItem cloneSupportItem;
..	..	@@ -4979,7 +5358,7 @@
4979	5358	private MenuItem linkverticesItem;
4980	5359	private MenuItem relinkverticesItem;
4981	5360	private MenuItem setMasterItem;
4982		- private MenuItem resetMeshItem;
	5361	+ private MenuItem resetAllItem;
4983	5362	private MenuItem stepAllItem;
4984	5363	private MenuItem revertMeshItem;
4985	5364	private MenuItem poseMeshItem;
..	..	@@ -4990,6 +5369,7 @@
4990	5369	private MenuItem mergeGeometriesItem;
4991	5370	private MenuItem copyItem;
4992	5371	private MenuItem pasteItem;
	5372	+ private MenuItem pasteIntoItem;
4993	5373	private MenuItem pasteLinkItem;
4994	5374	private MenuItem pasteCloneItem;
4995	5375	private MenuItem pasteExpandItem;
..	..	@@ -5028,6 +5408,10 @@
5028	5408	private MenuItem showleavesItem;
5029	5409	private MenuItem markleavesItem;
5030	5410	private MenuItem unmarkleavesItem;
	5411	+ private MenuItem rewindleavesItem;
	5412	+ private MenuItem unrewindleavesItem;
	5413	+ private MenuItem randomleavesItem;
	5414	+ private MenuItem unrandomleavesItem;
5031	5415
5032	5416	private MenuItem flipVItem;
5033	5417	private MenuItem unflipVItem;
..	..	@@ -5039,8 +5423,10 @@
5039	5423	private MenuItem panoTexturesItem;
5040	5424
5041	5425	private MenuItem resetCentroidItem;
5042		- private MenuItem transformgeometryItem;
	5426	+ private MenuItem resetCentroidXZItem;
5043	5427	private MenuItem resetTransformItem;
	5428	+ private MenuItem transformGeometryItem;
	5429	+ private MenuItem transformChildrenItem;
5044	5430	private MenuItem hideItem;
5045	5431	private MenuItem grabItem;
5046	5432	private MenuItem backItem;
..	..	@@ -5087,7 +5473,7 @@
5087	5473	private MenuItem blobItem;
5088	5474	private MenuItem latheItem;
5089	5475	private MenuItem bezierItem;
5090		- private MenuItem checkerItem;
	5476	+ private MenuItem overlayItem;
5091	5477	private MenuItem meshItem;
5092	5478	// private MenuItem meshGroupItem;
5093	5479	private MenuItem springItem;
..	..	@@ -5109,11 +5495,6 @@
5109	5495	private MenuItem doubleItem;
5110	5496	private MenuItem tripleItem;
5111	5497
5112		- private MenuItem importGFDItem;
5113		- private MenuItem importVRMLX3DItem;
5114		- private MenuItem import3DSItem;
5115		- private MenuItem importOBJItem;
5116		-
5117	5498	private MenuItem computeAOItem;
5118	5499	private MenuItem recompileItem;
5119	5500	private MenuItem editScriptItem;
..	..	@@ -5123,4 +5504,8 @@
5123	5504	private MenuItem analyzeItem;
5124	5505	private MenuItem dumpItem;
5125	5506	//boolean freezemodel = false;
	5507	+
	5508	+ Menu cameraMenu;
	5509	+ MenuItem editCameraItem;
	5510	+ MenuItem revertCameraItem;
5126	5511	}