~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,153 +574,120 @@
433	574	oe.radioPanel.add(dummyButton);
434	575	oe.buttonGroup.add(dummyButton);
435	576	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	577	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	578
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
	579	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	580	+ //minButton.setToolTipText("Minimize window");
	581	+ //minButton.addActionListener(this);
	582	+
	583	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	584	+ maxButton.setToolTipText("Maximize window");
	585	+ maxButton.addActionListener(this);
	586	+
	587	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ fullButton.setToolTipText("Full-screen window");
	589	+ fullButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ undoButton.setToolTipText("Undo changes");
	593	+ undoButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ redoButton.setToolTipText("Redo changes");
	597	+ redoButton.addActionListener(this);
	598	+
	599	+ oe.toolbarPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ saveButton.setToolTipText("Save changes");
	601	+ saveButton.addActionListener(this);
	602	+
	603	+ oe.toolbarPanel.add(liveCB = GetCheckBox("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	604	+ liveCB.setToolTipText("Enable animation");
441	605	liveCB.addItemListener(this);
442	606
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	607	+ oe.toolbarPanel.add(fastCB = GetCheckBox("icons/runfast.png", CameraPane.FAST)); //, constraints);
	608	+ fastCB.setToolTipText("Fast mode");
461	609	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	610	+
	611	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ oneStepButton.setToolTipText("Animate one step forward");
	613	+ oneStepButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(trackCB = GetCheckBox("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	616	+ trackCB.setToolTipText("Enable tracking");
503	617	trackCB.addItemListener(this);
504	618
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	619	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ screenfitButton.setToolTipText("Screen fit");
507	621	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	622	+
509	623	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	624	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	625
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
	626	+ if (Globals.ADVANCED)
	627	+ {
	628	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	629	+ snapobjectButton.addActionListener(this);
	630	+ snapobjectButton.setToolTipText("Snap Object");
	631	+ }
	632	+
	633	+ oe.toolbarPanel.add(flashSelectionButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ flashSelectionButton.setToolTipText("Highlight selection");
522	635	flashSelectionButton.addActionListener(this);
523	636
524		- oe.toolbarPanel.add(new cButton(" ", false));
	637	+ oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525	638
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	639	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	640	+ twoButton.setToolTipText("Show center view only");
532	641	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	642	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	643	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	644	+ fourButton.setToolTipText("Show left panel only");
	645	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	646	+ sixButton.setToolTipText("2-column layout left");
536	647	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	648	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ threeButton.setToolTipText("2-column layout right");
538	650	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	652	+ sevenButton.setToolTipText("3-column layout");
540	653	sevenButton.addActionListener(this);
541	654	//
542	655
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ rootButton.setToolTipText("Edit selection in new tab");
544	658	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	659	+
	660	+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ closeButton.setToolTipText("Close tab");
547	662	closeButton.addActionListener(this);
548	663	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	664	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551	665
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
	666	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ editButton.setToolTipText("Edit selection");
554	668	editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	669
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	670	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ uneditButton.setToolTipText("Unedit selection");
560	672	uneditButton.addActionListener(this);
561	673
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- 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");
574	676	allParamsButton.addActionListener(this);
575	677
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- 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");
581	684	unselectButton.addActionListener(this);
582	685
	686	+ editCommandsPanel.preferredHeight = 1;
	687	+
	688	+// oe.treePanel.add(commandsPanel);
	689	+// oe.treePanel.Return();
	690	+
583	691	// oe.aConstraints.gridx += 1;
584	692	// oe.aConstraints.weighty = 0;
585	693	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +699,37 @@
591	699	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	700	// gcButton.addActionListener(this);
593	701
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	702	+ cGridBag jSPPanel = new cGridBag();
	703	+
	704	+ JScrollPane jSP;
605	705	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- 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);
607	707	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
	708	+
	709	+ oe.treePanel.add(jSPPanel);
	710	+ oe.treePanel.Return();
612	711
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- 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");
617	716	colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- 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");
620	720	materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- 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");
623	724	textureCB.addItemListener(this);
624	725
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
	726	+ copyOptionsPanel.preferredHeight = 1;
	727	+ oe.treePanel.add(copyOptionsPanel);
	728	+ oe.treePanel.Return();
627	729
	730	+// mainPanel.setDividerLocation(0.5); //1.0);
	731	+// mainPanel.setResizeWeight(0.5);
	732	+
628	733	//jList.addListSelectionListener(this);
629	734	oe.jTree.addTreeSelectionListener(this);
630	735	//jTree.setRootVisible(false);
..	..	@@ -646,10 +751,102 @@
646	751	radio.layout = sevenButton;
647	752	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	753	}
	754	+
	755	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	756	+ {
	757	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	758	+ boxCB.setToolTipText("Display bounding boxes");
	759	+ boxCB.addItemListener(this);
	760	+
	761	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	762	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	763	+ zoomBoxCB.addItemListener(this);
	764	+
	765	+ if (true) // Globals.ADVANCED)
	766	+ {
	767	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	768	+ supportCB.setToolTipText("Enable rigging");
	769	+ supportCB.addItemListener(this);
	770	+
	771	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	772	+ // localCB.addItemListener(this);
	773	+
	774	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	775	+ crowdCB.setToolTipText("Used for crowds");
	776	+ crowdCB.addItemListener(this);
	777	+
	778	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	779	+ smoothCB.setToolTipText("Snapping delay");
	780	+ smoothCB.addItemListener(this);
	781	+
	782	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	783	+ slowCB.setToolTipText("Smooth interpolation");
	784	+ slowCB.addItemListener(this);
	785	+
	786	+// constraints.gridy += 1;
	787	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	788	+// speakerMocapCB.addItemListener(this);
	789	+
	790	+ if (false)
	791	+ {
	792	+ // handled in scripts
	793	+ //constraints.gridy += 1;
	794	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	795	+ speakerCameraCB.addItemListener(this);
	796	+
	797	+ //constraints.gridy += 1;
	798	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	799	+ speakerFocusCB.addItemListener(this);
	800	+
	801	+ //constraints.gridy += 1;
	802	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	803	+ smoothfocusCB.addItemListener(this);
	804	+ }
	805	+
	806	+//constraints.gridx += 1;
	807	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	808	+// debugCB.addItemListener(this);
	809	+
	810	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	811	+ oeilCB.setToolTipText("Move camera when tracking target");
	812	+ oeilCB.addItemListener(this);
	813	+
	814	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	815	+ shadowCB.setToolTipText("Compute shadows when live");
	816	+ shadowCB.addItemListener(this);
	817	+
	818	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	819	+ autosaveCB.setToolTipText("Auto-save on structure change");
	820	+ autosaveCB.addItemListener(this);
	821	+
	822	+ if (Globals.ADVANCED)
	823	+ {
	824	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	825	+ lookAtCB.setToolTipText("Look-at target");
	826	+ lookAtCB.addItemListener(this);
	827	+ }
	828	+
	829	+ }
	830	+
	831	+ cGridBag fill = new cGridBag();
	832	+
	833	+ fill.preferredHeight = 200;
	834	+
	835	+ panel.add(fill);
	836	+
	837	+ }
649	838
650	839	void EditObject(Object3D obj)
651	840	{
652	841	cRadio radioButton = new cRadio(obj.name);
	842	+
	843	+ // Patch to avoid bug with transparency.
	844	+ radioButton.hadMaterial = obj.material != null;
	845	+ if (!radioButton.hadMaterial)
	846	+ {
	847	+ obj.material = new cMaterial();
	848	+ }
	849	+
653	850	radioButton.SetObject(obj);
654	851	radioButton.layout = sevenButton;
655	852	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -658,8 +855,11 @@
658	855	buttonGroup.add(radioButton);
659	856	radioButton.doClick();
660	857	}
	858	+
661	859	void SetupViews(ObjEditor oe)
662	860	{
	861	+ theFrame = this;
	862	+
663	863	oe.SetupViews();
664	864
665	865	System.out.println("SetupViews");
..	..	@@ -668,22 +868,26 @@
668	868	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	869	}
670	870
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	871	+ cCheckBox liveCB;
	872	+ cCheckBox supportCB;
	873	+ cCheckBox localCB;
	874	+ cCheckBox crowdCB;
	875	+ cCheckBox smoothCB;
	876	+ cCheckBox fastCB;
	877	+ cCheckBox slowCB;
	878	+ cCheckBox boxCB;
	879	+ cCheckBox zoomBoxCB;
	880	+ cCheckBox trackCB;
	881	+ cCheckBox smoothfocusCB;
681	882	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	883	+ cCheckBox speakerCameraCB;
	884	+ cCheckBox speakerFocusCB;
	885	+ cCheckBox debugCB;
	886	+
	887	+ cCheckBox oeilCB;
	888	+ cCheckBox shadowCB;
	889	+ cCheckBox autosaveCB;
	890	+ cCheckBox lookAtCB;
687	891
688	892	// static int COLOR = 1;
689	893	// static int MATERIAL = 2;
..	..	@@ -691,9 +895,9 @@
691	895
692	896	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	897
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	898	+ cCheckBox colorCB;
	899	+ cCheckBox materialCB;
	900	+ cCheckBox textureCB;
697	901
698	902	public void itemStateChanged(ItemEvent e)
699	903	{
..	..	@@ -721,6 +925,7 @@
721	925	} else if(e.getSource() == liveCB)
722	926	{
723	927	cameraView.ToggleLive();
	928	+ refreshContents(false);
724	929	}
725	930	else if(e.getSource() == supportCB)
726	931	{
..	..	@@ -756,6 +961,10 @@
756	961	cameraView.repaint();
757	962	// refreshContents();
758	963	}
	964	+ else if(e.getSource() == zoomBoxCB)
	965	+ {
	966	+ cameraView.ToggleZoomBoxMode();
	967	+ }
759	968	else if(e.getSource() == smoothfocusCB)
760	969	{
761	970	cameraView.ToggleSmoothFocus();
..	..	@@ -780,6 +989,14 @@
780	989	else if(e.getSource() == oeilCB)
781	990	{
782	991	cameraView.ToggleOeil();
	992	+ }
	993	+ else if(e.getSource() == shadowCB)
	994	+ {
	995	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	996	+ }
	997	+ else if(e.getSource() == autosaveCB)
	998	+ {
	999	+ Globals.SAVEONMAKE ^= true;
783	1000	}
784	1001	else if(e.getSource() == lookAtCB)
785	1002	{
..	..	@@ -869,7 +1086,9 @@
869	1086	// objEditor.DropFile((java.io.File[]) object, true);
870	1087	// return;
871	1088	// }
872		- if (string.charAt(0) == '/')
	1089	+
	1090	+ // File path for Mac and Windows
	1091	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1092	{
874	1093	// file(s)
875	1094	String[] names = string.split("\n");
..	..	@@ -896,7 +1115,7 @@
896	1115
897	1116	flashIt = false;
898	1117	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1118	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1119	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1120
902	1121	if (group.selection.size() == 1)
..	..	@@ -923,11 +1142,11 @@
923	1142	{
924	1143	loadClipboard(true);
925	1144	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
	1145	+ pasteInto(false, false);
927	1146	} else {
928	1147	loadClipboard(false);
929	1148	objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
	1149	+ pasteInto(false, false); // true); // ???
931	1150	}
932	1151	}
933	1152	public void dropActionChanged(DropTargetDragEvent dtde)
..	..	@@ -1049,27 +1268,33 @@
1049	1268	kleinItem.addActionListener(this);
1050	1269	particleItem = menu.add(new MenuItem("Particle system"));
1051	1270	particleItem.addActionListener(this);
	1271	+ if (Globals.ADVANCED)
	1272	+ {
1052	1273	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1274	ragdollItem.addActionListener(this);
1054	1275	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1276	ragdoll2Item.addActionListener(this);
	1277	+ }
1056	1278	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1279	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1280	meshItem.addActionListener(this);
1059	1281	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1282	// meshGroupItem.addActionListener(this);
	1283	+ if (Globals.ADVANCED)
	1284	+ {
1061	1285	springItem = menu.add(new MenuItem("Spring"));
1062	1286	springItem.addActionListener(this);
1063	1287	flagItem = menu.add(new MenuItem("Flag"));
1064	1288	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1289	blobItem = menu.add(new MenuItem("Blob"));
1070	1290	blobItem.addActionListener(this);
1071	1291	latheItem = menu.add(new MenuItem("Lathe"));
1072	1292	latheItem.addActionListener(this);
	1293	+ }
	1294	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1295	+ bezierItem.addActionListener(this);
	1296	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1297	+ overlayItem.addActionListener(this);
1073	1298	lightItem = menu.add(new MenuItem("Light"));
1074	1299	lightItem.addActionListener(this);
1075	1300	menu.add("-");
..	..	@@ -1079,39 +1304,44 @@
1079	1304	loopItem.addActionListener(this);
1080	1305	doubleItem = menu.add(new MenuItem("Fork"));
1081	1306	doubleItem.addActionListener(this);
	1307	+ if (Globals.ADVANCED)
	1308	+ {
1082	1309	tripleItem = menu.add(new MenuItem("Trident"));
1083	1310	tripleItem.addActionListener(this);
	1311	+ }
1084	1312	}
1085	1313
1086	1314	void buildToolsMenu(Menu menu)
1087	1315	{
1088	1316	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1317	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1318	+ animationItem.setState(Globals.ANIMATION);
1091	1319
1092	1320	menu.add("-");
1093	1321	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1322	parseverticesItem.addActionListener(this);
1095	1323	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1324	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1325	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1326	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1327	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1328	reduceMorphItem.addActionListener(this);
1103	1329	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1330	reduce34MorphItem.addActionListener(this);
1105		-
	1331	+ menu.add("-");
1106	1332	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1333	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1334
	1335	+ if (Globals.ADVANCED)
	1336	+ {
	1337	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1338	+ mirrorItem.addActionListener(this);
	1339	+ menu.add("-");
1110	1340	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1341	memoryItem.addActionListener(this);
1112	1342	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1343	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1344	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1345	dumpItem.addActionListener(this);
1116	1346	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1347	// pathItem.addActionListener(this);
..	..	@@ -1129,6 +1359,7 @@
1129	1359	menu.add("-");
1130	1360	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1131	1361	editScriptItem.addActionListener(this);
	1362	+ }
1132	1363	}
1133	1364
1134	1365	void ScreenFit()
..	..	@@ -1251,6 +1482,7 @@
1251	1482	shadow.material = new cMaterial(obj.material);
1252	1483	shadow.material.diffuse = 0.0001f;
1253	1484	shadow.material.specular = 0.0001f;
	1485	+ //shadow.projectedVertices[1].x = 300;
1254	1486
1255	1487	makeSomething(shadow);
1256	1488	}
..	..	@@ -1457,9 +1689,9 @@
1457	1689
1458	1690	void Overwrite(int mask)
1459	1691	{
1460		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1692	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1461	1693	{
1462		- Object3D content = GrafreeD.clipboard.get(0);
	1694	+ Object3D content = Grafreed.clipboard.get(0);
1463	1695
1464	1696	if (content instanceof cGroup && ((cGroup)content).transientlink )
1465	1697	content = ((cGroup)content).get(0);
..	..	@@ -1482,6 +1714,7 @@
1482	1714	//
1483	1715	public void actionPerformed(ActionEvent event) // , Object arg)
1484	1716	{
	1717	+ Object source = event.getSource();
1485	1718	/*
1486	1719	if (event.getSource() == nameField)
1487	1720	{
..	..	@@ -1493,11 +1726,11 @@
1493	1726	}
1494	1727	else
1495	1728	*/
1496		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1729	+ if (source == lookAtItem \|\| source == lookFromItem)
1497	1730	{
1498	1731	ScreenFit();
1499	1732	} else
1500		- if (event.getSource() == switchItem)
	1733	+ if (source == switchItem)
1501	1734	{
1502	1735	cVector v1 = new cVector();
1503	1736	cVector v2 = new cVector();
..	..	@@ -1506,11 +1739,11 @@
1506	1739	objEditor.cameraView.renderCamera.setAim(v2, v1);
1507	1740	objEditor.cameraView.repaint();
1508	1741	} else
1509		- if (event.getSource() == rectoidItem)
	1742	+ if (source == rectoidItem)
1510	1743	{
1511	1744	makeSomething(new Box());
1512	1745	} else
1513		- if (event.getSource() == particleItem)
	1746	+ if (source == particleItem)
1514	1747	{
1515	1748	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1516	1749	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1531,9 +1764,9 @@
1531	1764	applyExample(particleGeom, "SMOKE");
1532	1765	makeSomething(particleGeom);
1533	1766	} else
1534		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1767	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1535	1768	{
1536		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1769	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1537	1770
1538	1771	ragdoll.toParent = LA.newMatrix();
1539	1772	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1551,7 +1784,7 @@
1551	1784	} else
1552	1785	/*
1553	1786	*/
1554		- if (event.getSource() == heightFieldItem)
	1787	+ if (source == heightFieldItem)
1555	1788	{
1556	1789	Object3D obj = new Object3D();
1557	1790
..	..	@@ -1589,31 +1822,31 @@
1589	1822
1590	1823	makeSomething(obj);
1591	1824	} else
1592		- if (event.getSource() == gridItem)
	1825	+ if (source == gridItem)
1593	1826	{
1594	1827	makeSomething(new Grid());
1595	1828	} else
1596		- if (event.getSource() == ellipsoidItem)
	1829	+ if (source == ellipsoidItem)
1597	1830	{
1598	1831	makeSomething(new Sphere());
1599	1832	} else
1600		- if (event.getSource() == coneItem)
	1833	+ if (source == coneItem)
1601	1834	{
1602	1835	makeSomething(new Cone());
1603	1836	} else
1604		- if (event.getSource() == torusItem)
	1837	+ if (source == torusItem)
1605	1838	{
1606	1839	makeSomething(new Torus());
1607	1840	} else
1608		- if (event.getSource() == superItem)
	1841	+ if (source == superItem)
1609	1842	{
1610	1843	makeSomething(new Superellipsoid());
1611	1844	} else
1612		- if (event.getSource() == kleinItem)
	1845	+ if (source == kleinItem)
1613	1846	{
1614	1847	makeSomething(new Klein());
1615	1848	} else
1616		- if (event.getSource() == blobItem)
	1849	+ if (source == blobItem)
1617	1850	{
1618	1851	Blob blob = new Blob();
1619	1852	BlobComponent comp = new BlobComponent();
..	..	@@ -1621,15 +1854,15 @@
1621	1854	//blob.retile();
1622	1855	makeSomething(blob);
1623	1856	} else
1624		- if (event.getSource() == latheItem)
	1857	+ if (source == latheItem)
1625	1858	{
1626	1859	makeSomething(new Lathe());
1627	1860	} else
1628		- if (event.getSource() == bezierItem)
	1861	+ if (source == bezierItem)
1629	1862	{
1630	1863	makeSomething(new BezierSurface());
1631	1864	} else
1632		- if (event.getSource() == checkerItem)
	1865	+ if (source == overlayItem)
1633	1866	{
1634	1867	/*
1635	1868	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1644,7 +1877,7 @@
1644	1877	*/
1645	1878	makeSomething(new Checker());
1646	1879	} else
1647		- if (event.getSource() == meshItem)
	1880	+ if (source == meshItem)
1648	1881	{
1649	1882	Object3D itemtomake = new Object3D();
1650	1883	Object3D child;
..	..	@@ -1665,35 +1898,35 @@
1665	1898	makeSomething(child);
1666	1899	}
1667	1900	} else
1668		- if (event.getSource() == springItem)
	1901	+ if (source == springItem)
1669	1902	{
1670	1903	cSpring s = new cSpring();
1671	1904	s.setup();
1672	1905	makeSomething(s);
1673	1906	} else
1674		- if (event.getSource() == flagItem)
	1907	+ if (source == flagItem)
1675	1908	{
1676	1909	cSpring s = new cFlag();
1677	1910	s.setup();
1678	1911	makeSomething(s);
1679	1912	} else
1680		- if (event.getSource() == lightItem)
	1913	+ if (source == lightItem)
1681	1914	{
1682	1915	makeSomething(new Light());
1683	1916	} else
1684		- if (event.getSource() == csgItem)
	1917	+ if (source == csgItem)
1685	1918	{
1686	1919	group(new CSG());
1687	1920	} else
1688		- if (event.getSource() == templateItem)
	1921	+ if (source == templateItem)
1689	1922	{
1690	1923	group(new cTemplate());
1691	1924	} else
1692		- if (event.getSource() == attributeItem)
	1925	+ if (source == attributeItem)
1693	1926	{
1694	1927	makeSomething(new Attribute());
1695	1928	} else
1696		- if (event.getSource() == pointflowItem)
	1929	+ if (source == pointflowItem)
1697	1930	{
1698	1931	makeSomething(new PointFlow());
1699	1932	} else
..	..	@@ -1705,7 +1938,7 @@
1705	1938	} else
1706	1939	*/
1707	1940
1708		- if (event.getSource() == superLoopItem)
	1941	+ if (source == superLoopItem)
1709	1942	{
1710	1943	Composite g = new cGroup();
1711	1944	for (int i=0; i<15; i++)
..	..	@@ -1727,7 +1960,7 @@
1727	1960
1728	1961	group(g);
1729	1962	} else
1730		- if (event.getSource() == loopItem)
	1963	+ if (source == loopItem)
1731	1964	{
1732	1965	Composite csg = new GroupLeaf();
1733	1966	csg.count = 5;
..	..	@@ -1736,7 +1969,7 @@
1736	1969	csg.addChild(child);
1737	1970	child.addChild(csg);
1738	1971	} else
1739		- if (event.getSource() == doubleItem)
	1972	+ if (source == doubleItem)
1740	1973	{
1741	1974	Composite csg = new GroupLeaf();
1742	1975	csg.count = 5;
..	..	@@ -1748,7 +1981,7 @@
1748	1981	csg.addChild(child);
1749	1982	child.addChild(csg);
1750	1983	} else
1751		- if (event.getSource() == tripleItem)
	1984	+ if (source == tripleItem)
1752	1985	{
1753	1986	Composite csg = new GroupLeaf();
1754	1987	csg.count = 4;
..	..	@@ -1763,71 +1996,83 @@
1763	1996	csg.addChild(child);
1764	1997	child.addChild(csg);
1765	1998	} else
1766		-
1767		- if (event.getSource() == importGFDItem)
1768		- {
1769		- ImportGFD();
1770		- } else
1771		- if (event.getSource() == importVRMLX3DItem)
1772		- {
1773		- ImportVRMLX3D();
1774		- } else
1775		- if (event.getSource() == import3DSItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1778		- } else
1779		- if (event.getSource() == importOBJItem)
1780		- {
1781		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1782		- } else
1783		- if (event.getSource() == computeAOItem)
	1999	+ if (source == computeAOItem)
1784	2000	{
1785	2001	Globals.drawMode = CameraPane.OCCLUSION;
1786	2002	Globals.theRenderer.repaint();
1787	2003	} else
1788		- if (event.getSource() == recompileItem)
	2004	+ if (source == recompileItem)
1789	2005	{
1790	2006	Recompile();
1791	2007	refreshContents();
1792	2008	} else
1793		- if (event.getSource() == editScriptItem)
	2009	+ if (source == editScriptItem)
1794	2010	{
1795	2011	OpenDialog();
1796	2012	refreshContents();
1797	2013	} else
1798		- if (event.getSource() == invariantsItem)
	2014	+ if (source == invariantsItem)
1799	2015	{
1800	2016	System.out.println("Invariants:");
1801		- GrafreeD.grafreeD.universe.invariants();
	2017	+ Grafreed.grafreeD.universe.invariants();
1802	2018	} else
1803		- if (event.getSource() == memoryItem)
	2019	+ if (source == memoryItem)
1804	2020	{
1805	2021	//System.out.println("Invariants:");
1806	2022	PrintMemory();
1807	2023	} else
1808		- if (event.getSource() == pathItem)
	2024	+ if (source == pathItem)
1809	2025	{
1810	2026	PrintPath();
1811	2027	} else
1812		- if (event.getSource() == analyzeItem)
	2028	+ if (source == analyzeItem)
1813	2029	{
1814	2030	AnalyzeObject();
1815	2031	} else
1816		- if (event.getSource() == dumpItem)
	2032	+ if (source == dumpItem)
1817	2033	{
1818	2034	DumpObject();
1819	2035	} else
1820		- if (event.getSource() == screenfitButton)
	2036	+ if (source == minButton)
	2037	+ {
	2038	+ Minimize();
	2039	+ } else
	2040	+ if (source == maxButton)
	2041	+ {
	2042	+ Maximize();
	2043	+ } else
	2044	+ if (source == fullButton)
	2045	+ {
	2046	+ ToggleFullScreen();
	2047	+ } else
	2048	+ if (source == undoButton)
	2049	+ {
	2050	+ Undo();
	2051	+ } else
	2052	+ if (source == redoButton)
	2053	+ {
	2054	+ Redo();
	2055	+ } else
	2056	+ if (source == saveButton)
	2057	+ {
	2058	+ Save();
	2059	+ } else
	2060	+ if (source == oneStepButton)
	2061	+ {
	2062	+ Globals.ONESTEP = true;
	2063	+ cameraView.repaint();
	2064	+ } else
	2065	+ if (source == screenfitButton)
1821	2066	{
1822	2067	//Reload(lastConverter, lastFilename, true);
1823	2068	ScreenFit();
1824	2069	} else
1825		- if (event.getSource() == screenfitpointButton)
	2070	+ if (source == screenfitpointButton)
1826	2071	{
1827	2072	//Reload(lastConverter, lastFilename, true);
1828	2073	ScreenFitPoint();
1829	2074	} else
1830		- if (event.getSource() == snapobjectButton)
	2075	+ if (source == snapobjectButton)
1831	2076	{
1832	2077	//Reload(lastConverter, lastFilename, true);
1833	2078	SnapObject();
..	..	@@ -1838,13 +2083,13 @@
1838	2083	// Recompile();
1839	2084	// refreshContents();
1840	2085	// } else
1841		- if (event.getSource() == gcButton)
	2086	+ if (source == gcButton)
1842	2087	{
1843	2088	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2089	System.gc();
1845	2090	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1846	2091	} else
1847		- if (event.getSource() == editLeafItem)
	2092	+ if (source == editLeafItem)
1848	2093	{
1849	2094	Object3D obj;
1850	2095	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1858,62 +2103,74 @@
1858	2103	}
1859	2104	refreshContents(true);
1860	2105	} else
1861		- if (event.getSource() == openWindowItem)
	2106	+ if (source == openWindowItem)
1862	2107	{
1863	2108	EditSelection(true);
1864	2109	} else
1865		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2110	+ if (source == cutItem \|\| source == clearButton)
1866	2111	{
1867	2112	loadClipboard(true);
1868	2113	} else
1869		- if (event.getSource() == duplicateItem)
	2114	+ if (source == undoItem)
1870	2115	{
1871		- Object3D keep = GrafreeD.clipboard;
	2116	+ Undo();
	2117	+ } else
	2118	+ if (source == redoItem)
	2119	+ {
	2120	+ Redo();
	2121	+ } else
	2122	+ if (source == duplicateItem)
	2123	+ {
	2124	+ Object3D keep = Grafreed.clipboard;
1872	2125	loadClipboard(false);
1873	2126	paste(false);
1874		- GrafreeD.clipboard = keep;
	2127	+ Grafreed.clipboard = keep;
1875	2128	} else
1876		- if (event.getSource() == cloneItem)
	2129	+ if (source == cloneItem)
1877	2130	{
1878	2131	CloneSelection(false);
1879	2132	} else
1880		- if (event.getSource() == cloneSupportItem)
	2133	+ if (source == cloneSupportItem)
1881	2134	{
1882	2135	CloneSelection(true);
1883	2136	} else
1884		- if (event.getSource() == copyItem)
	2137	+ if (source == copyItem)
1885	2138	{
1886	2139	loadClipboard(false);
1887	2140	} else
1888		- if (event.getSource() == pasteItem)
	2141	+ if (source == pasteItem)
1889	2142	{
1890	2143	paste(false);
1891	2144	} else
1892		- if (event.getSource() == pasteLinkItem)
	2145	+ if (source == pasteIntoItem)
1893	2146	{
1894		- pasteInto(false);
	2147	+ pasteInto(true, false);
1895	2148	} else
1896		- if (event.getSource() == pasteCloneItem)
	2149	+ if (source == pasteLinkItem)
1897	2150	{
1898		- pasteInto(true);
	2151	+ pasteInto(false, false);
1899	2152	} else
1900		- if (event.getSource() == pasteExpandItem)
	2153	+ if (source == pasteCloneItem)
	2154	+ {
	2155	+ pasteInto(true, true);
	2156	+ } else
	2157	+ if (source == pasteExpandItem)
1901	2158	{
1902	2159	paste(true);
1903	2160	} else
1904		- if (event.getSource() == synchronizeItem)
	2161	+ if (source == synchronizeItem)
1905	2162	{
1906	2163	Overwrite(Object3D.TRANSFORM);
1907	2164	} else
1908		- if (event.getSource() == overwriteNameItem)
	2165	+ if (source == overwriteNameItem)
1909	2166	{
1910	2167	Overwrite(Object3D.NAME);
1911	2168	} else
1912		- if (event.getSource() == overwriteUVItem)
	2169	+ if (source == overwriteUVItem)
1913	2170	{
1914	2171	Overwrite(Object3D.UV);
1915	2172	} else
1916		- if (event.getSource() == overwriteMatItem)
	2173	+ if (source == overwriteMatItem)
1917	2174	{
1918	2175	/* july 2015
1919	2176	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1933,7 +2190,7 @@
1933	2190
1934	2191	Overwrite(dropAttributes);
1935	2192	}
1936		- if (event.getSource() == overwriteGeoItem)
	2193	+ if (source == overwriteGeoItem)
1937	2194	{
1938	2195	Overwrite(Object3D.GEOMETRY);
1939	2196	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1950,7 +2207,7 @@
1950	2207	// refreshContents();
1951	2208	// }
1952	2209	} else
1953		- if (event.getSource() == generateMeshItem)
	2210	+ if (source == generateMeshItem)
1954	2211	{
1955	2212	//if (group.selection.size() == 1)
1956	2213	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1961,7 +2218,7 @@
1961	2218	ResetModel();
1962	2219	refreshContents();
1963	2220	} else
1964		- if (event.getSource() == extractGeometriesItem)
	2221	+ if (source == extractGeometriesItem)
1965	2222	{
1966	2223	boolean one = false;
1967	2224
..	..	@@ -1988,7 +2245,7 @@
1988	2245	ResetModel();
1989	2246	refreshContents();
1990	2247	} else
1991		- if (event.getSource() == cloneGeometriesItem)
	2248	+ if (source == cloneGeometriesItem)
1992	2249	{
1993	2250	boolean one = false;
1994	2251
..	..	@@ -2014,7 +2271,7 @@
2014	2271	ResetModel();
2015	2272	refreshContents();
2016	2273	} else
2017		- if (event.getSource() == shareGeometriesItem)
	2274	+ if (source == shareGeometriesItem)
2018	2275	{
2019	2276	boolean one = false;
2020	2277
..	..	@@ -2044,7 +2301,7 @@
2044	2301	refreshContents();
2045	2302	}
2046	2303	} else
2047		- if (event.getSource() == mergeGeometriesItem)
	2304	+ if (source == mergeGeometriesItem)
2048	2305	{
2049	2306	boolean one = false;
2050	2307
..	..	@@ -2074,7 +2331,7 @@
2074	2331	ResetModel();
2075	2332	refreshContents();
2076	2333	} else
2077		- if (event.getSource() == linkverticesItem)
	2334	+ if (source == linkverticesItem)
2078	2335	{
2079	2336	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2080	2337	// {
..	..	@@ -2087,9 +2344,9 @@
2087	2344	// group.selection.get(0).setMasterThis(content); // should be identity
2088	2345	// refreshContents();
2089	2346	// }
2090		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2347	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2091	2348	{
2092		- Object3D content = GrafreeD.clipboard.get(0);
	2349	+ Object3D content = Grafreed.clipboard.get(0);
2093	2350
2094	2351	if (content instanceof cGroup && ((cGroup)content).transientlink )
2095	2352	content = ((cGroup)content).get(0);
..	..	@@ -2097,38 +2354,38 @@
2097	2354	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2098	2355	for (int i=0; i<group.selection.size(); i++)
2099	2356	{
2100		- boolean random = CameraPane.RANDOM;
2101		- CameraPane.RANDOM = false; // parse all random nodes
	2357	+ boolean random = CameraPane.SWITCH;
	2358	+ CameraPane.SWITCH = false; // parse all random nodes
2102	2359	group.selection.get(i).linkVerticesThis(content);
2103	2360	// group.selection.get(i).setMasterThis(content); // should be identity
2104		- CameraPane.RANDOM = random;
	2361	+ CameraPane.SWITCH = random;
2105	2362	}
2106	2363	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2107	2364	refreshContents();
2108	2365	}
2109	2366	} else
2110		- if (event.getSource() == resetsupportItem)
	2367	+ if (source == resetsupportItem)
2111	2368	{
2112	2369	for (int i=0; i<group.selection.size(); i++)
2113	2370	{
2114		- boolean random = CameraPane.RANDOM;
2115		- CameraPane.RANDOM = false; // parse all random nodes
	2371	+ boolean random = CameraPane.SWITCH;
	2372	+ CameraPane.SWITCH = false; // parse all random nodes
2116	2373	group.selection.get(i).linkVerticesThis(null);
2117		- CameraPane.RANDOM = random;
	2374	+ CameraPane.SWITCH = random;
2118	2375	}
2119	2376
2120	2377	refreshContents();
2121	2378	} else
2122		- if (event.getSource() == relinkverticesItem)
	2379	+ if (source == relinkverticesItem)
2123	2380	{
2124		- boolean random = CameraPane.RANDOM;
2125		- CameraPane.RANDOM = false; // parse all random nodes
	2381	+ boolean random = CameraPane.SWITCH;
	2382	+ CameraPane.SWITCH = false; // parse all random nodes
2126	2383	group.selection.RelinkToSupport();
2127		- CameraPane.RANDOM = random;
	2384	+ CameraPane.SWITCH = random;
2128	2385
2129	2386	refreshContents();
2130	2387	} else
2131		- if (event.getSource() == resetreferencesItem)
	2388	+ if (source == resetreferencesItem)
2132	2389	{
2133	2390	for (int i=0; i<group.selection.size(); i++)
2134	2391	{
..	..	@@ -2137,11 +2394,11 @@
2137	2394
2138	2395	refreshContents();
2139	2396	} else
2140		- if (event.getSource() == setMasterItem)
	2397	+ if (source == setMasterItem)
2141	2398	{
2142		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2399	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2143	2400	{
2144		- Object3D content = GrafreeD.clipboard.get(0);
	2401	+ Object3D content = Grafreed.clipboard.get(0);
2145	2402
2146	2403	if (content instanceof cGroup && ((cGroup)content).transientlink )
2147	2404	content = ((cGroup)content).get(0);
..	..	@@ -2150,13 +2407,13 @@
2150	2407	refreshContents();
2151	2408	}
2152	2409	} else
2153		- if (event.getSource() == poseMeshItem)
	2410	+ if (source == poseMeshItem)
2154	2411	{
2155	2412	if (group.selection.size() == 1)
2156	2413	{
2157		- if (GrafreeD.clipboard.size() == 1)
	2414	+ if (Grafreed.clipboard.size() == 1)
2158	2415	{
2159		- Object3D content = GrafreeD.clipboard.get(0);
	2416	+ Object3D content = Grafreed.clipboard.get(0);
2160	2417
2161	2418	if (content instanceof cGroup && ((cGroup)content).transientlink )
2162	2419	content = ((cGroup)content).get(0);
..	..	@@ -2169,19 +2426,19 @@
2169	2426	}
2170	2427
2171	2428	} else
2172		- if (event.getSource() == revertMeshItem)
	2429	+ if (source == revertMeshItem)
2173	2430	{
2174	2431	RevertMeshes();
2175	2432	} else
2176		- if (event.getSource() == resetMeshItem)
	2433	+ if (source == resetAllItem)
2177	2434	{
2178	2435	ResetAll();
2179	2436	} else
2180		- if (event.getSource() == stepAllItem)
	2437	+ if (source == stepAllItem)
2181	2438	{
2182	2439	StepAll();
2183	2440	} else
2184		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2441	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2185	2442	{
2186	2443	//int indices[] = jList.getSelectedIndices();
2187	2444	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2189,46 +2446,46 @@
2189	2446
2190	2447	ClearSelection(false);
2191	2448	} else
2192		- if (event.getSource() == clearAllItem)
	2449	+ if (source == clearAllItem)
2193	2450	{
2194	2451	ClearSelection(true);
2195	2452	} else
2196		- if (event.getSource() == grabItem)
	2453	+ if (source == grabItem)
2197	2454	{
2198	2455	group(new cGroup(), true);
2199	2456	} else
2200		- if (event.getSource() == hideItem)
	2457	+ if (source == hideItem)
2201	2458	{
2202	2459	group(new HiddenObject());
2203	2460	} else
2204		- if (event.getSource() == frontItem)
	2461	+ if (source == frontItem)
2205	2462	{
2206	2463	front();
2207	2464	} else
2208		- if (event.getSource() == backItem)
	2465	+ if (source == backItem)
2209	2466	{
2210	2467	back();
2211	2468	} else
2212		- if (event.getSource() == cameraItem)
	2469	+ if (source == cameraItem)
2213	2470	{
2214	2471	makeSomething(new Camera());
2215	2472	} else
2216		- if (event.getSource() == compositeItem)
	2473	+ if (source == compositeItem)
2217	2474	{
2218	2475	group(new Composite());
2219	2476	} else
2220		- if (event.getSource() == randomItem)
	2477	+ if (source == randomItem)
2221	2478	{
2222	2479	RandomNode random = new RandomNode();
2223	2480	group(random);
2224	2481	if (random.size() > 0)
2225		- random.name = random.get(0).name + "Rnd";
	2482	+ random.name = random.get(0).name + "Switch";
2226	2483	} else
2227		- if (event.getSource() == physicsItem)
	2484	+ if (source == physicsItem)
2228	2485	{
2229	2486	group(new PhysicsNode());
2230	2487	} else
2231		- if (event.getSource() == frameselectorItem)
	2488	+ if (source == frameselectorItem)
2232	2489	{
2233	2490	for (int i=0; i<group.selection.size(); i++)
2234	2491	{
..	..	@@ -2240,7 +2497,7 @@
2240	2497	ResetModel();
2241	2498	refreshContents();
2242	2499	} else
2243		- if (event.getSource() == switchGeoItem)
	2500	+ if (source == switchGeoItem)
2244	2501	{
2245	2502	for (int i=0; i<group.selection.size(); i++)
2246	2503	{
..	..	@@ -2252,7 +2509,7 @@
2252	2509	ResetModel();
2253	2510	refreshContents();
2254	2511	} else
2255		- if (event.getSource() == switchTransfoItem)
	2512	+ if (source == switchTransfoItem)
2256	2513	{
2257	2514	for (int i=0; i<group.selection.size(); i++)
2258	2515	{
..	..	@@ -2264,7 +2521,7 @@
2264	2521	ResetModel();
2265	2522	refreshContents();
2266	2523	} else
2267		- if (event.getSource() == morphItem)
	2524	+ if (source == morphItem)
2268	2525	{
2269	2526	for (int i=0; i<group.selection.size(); i++)
2270	2527	{
..	..	@@ -2276,7 +2533,7 @@
2276	2533	ResetModel();
2277	2534	refreshContents();
2278	2535	} else
2279		- if (event.getSource() == scriptNodeItem)
	2536	+ if (source == scriptNodeItem)
2280	2537	{
2281	2538	boolean atleastone = false;
2282	2539
..	..	@@ -2315,31 +2572,31 @@
2315	2572	}
2316	2573	}
2317	2574	} else
2318		- if (event.getSource() == linkerItem)
	2575	+ if (source == linkerItem)
2319	2576	{
2320	2577	group(new cLinker());
2321	2578	} else
2322		- if (event.getSource() == textureItem)
	2579	+ if (source == textureItem)
2323	2580	{
2324	2581	group(new TextureNode());
2325	2582	} else
2326		- if (event.getSource() == billboardItem)
	2583	+ if (source == billboardItem)
2327	2584	{
2328	2585	group(new BillboardNode());
2329	2586	} else
2330		- if (event.getSource() == shadowXItem)
	2587	+ if (source == shadowXItem)
2331	2588	{
2332	2589	CastShadow(0);
2333	2590	} else
2334		- if (event.getSource() == shadowYItem)
	2591	+ if (source == shadowYItem)
2335	2592	{
2336	2593	CastShadow(1);
2337	2594	} else
2338		- if (event.getSource() == shadowZItem)
	2595	+ if (source == shadowZItem)
2339	2596	{
2340	2597	CastShadow(2);
2341	2598	} else
2342		- if (event.getSource() == ungroupItem)
	2599	+ if (source == ungroupItem)
2343	2600	{
2344	2601	//ungroup();
2345	2602	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2351,179 +2608,203 @@
2351	2608
2352	2609	refreshContents();
2353	2610	} else
2354		- if (event.getSource() == genUVItem)
	2611	+ if (source == genUVItem)
2355	2612	{
2356	2613	GenUV();
2357	2614	} else
2358		- if (event.getSource() == genNormalsCADItem)
	2615	+ if (source == genNormalsCADItem)
2359	2616	{
2360	2617	GenNormals(true);
2361	2618	} else
2362		- if (event.getSource() == genNormalsMESHItem)
	2619	+ if (source == genNormalsMESHItem)
2363	2620	{
2364		- GenNormals(true); // TODO
	2621	+ GenNormalsMESH();
2365	2622	} else
2366		- if (event.getSource() == genNormalsORGANItem)
	2623	+ if (source == genNormalsORGANItem)
2367	2624	{
2368	2625	GenNormals(false);
2369	2626	} else
2370		- if (event.getSource() == genNormalsMINEItem)
	2627	+ if (source == genNormalsMINEItem)
2371	2628	{
2372	2629	GenNormalsMINE();
2373	2630	} else
2374		- if (event.getSource() == stripifyItem)
	2631	+ if (source == stripifyItem)
2375	2632	{
2376	2633	Stripify();
2377	2634	} else
2378		- if (event.getSource() == unstripifyItem)
	2635	+ if (source == unstripifyItem)
2379	2636	{
2380	2637	Unstripify();
2381	2638	} else
2382		- if (event.getSource() == trimItem)
	2639	+ if (source == trimItem)
2383	2640	{
2384	2641	Trim();
2385	2642	} else
2386		- if (event.getSource() == untrimItem)
	2643	+ if (source == untrimItem)
2387	2644	{
2388	2645	Untrim();
2389	2646	} else
2390		- if (event.getSource() == clearColorsItem)
	2647	+ if (source == clearColorsItem)
2391	2648	{
2392	2649	ClearColors();
2393	2650	} else
2394		- if (event.getSource() == clearMaterialsItem)
	2651	+ if (source == clearMaterialsItem)
2395	2652	{
2396	2653	ClearMaterials();
2397	2654	} else
2398		- if (event.getSource() == liveleavesItem)
	2655	+ if (source == liveleavesItem)
2399	2656	{
2400	2657	LiveLeaves(true);
2401	2658	} else
2402		- if (event.getSource() == unliveleavesItem)
	2659	+ if (source == unliveleavesItem)
2403	2660	{
2404	2661	LiveLeaves(false);
2405	2662	} else
2406		- if (event.getSource() == supportleavesItem)
	2663	+ if (source == supportleavesItem)
2407	2664	{
2408	2665	SupportLeaves(true);
2409	2666	} else
2410		- if (event.getSource() == unsupportleavesItem)
	2667	+ if (source == unsupportleavesItem)
2411	2668	{
2412	2669	SupportLeaves(false);
2413	2670	} else
2414		- if (event.getSource() == hideleavesItem)
	2671	+ if (source == hideleavesItem)
2415	2672	{
2416	2673	HideLeaves(true);
2417	2674	} else
2418		- if (event.getSource() == showleavesItem)
	2675	+ if (source == showleavesItem)
2419	2676	{
2420	2677	HideLeaves(false);
2421	2678	} else
2422		- if (event.getSource() == markleavesItem)
	2679	+ if (source == markleavesItem)
2423	2680	{
2424	2681	MarkLeaves(true);
2425	2682	} else
2426		- if (event.getSource() == unmarkleavesItem)
	2683	+ if (source == unmarkleavesItem)
2427	2684	{
2428	2685	MarkLeaves(false);
2429	2686	} else
2430		- if (event.getSource() == flipVItem)
	2687	+ if (source == rewindleavesItem)
	2688	+ {
	2689	+ RewindLeaves(true);
	2690	+ } else
	2691	+ if (source == unrewindleavesItem)
	2692	+ {
	2693	+ RewindLeaves(false);
	2694	+ } else
	2695	+ if (source == randomleavesItem)
	2696	+ {
	2697	+ RandomLeaves(true);
	2698	+ } else
	2699	+ if (source == unrandomleavesItem)
	2700	+ {
	2701	+ RandomLeaves(false);
	2702	+ } else
	2703	+ if (source == flipVItem)
2431	2704	{
2432	2705	FlipV(true);
2433	2706	} else
2434		- if (event.getSource() == unflipVItem)
	2707	+ if (source == unflipVItem)
2435	2708	{
2436	2709	FlipV(false);
2437	2710	} else
2438		- if (event.getSource() == lowTexturesItem)
	2711	+ if (source == lowTexturesItem)
2439	2712	{
2440	2713	SetTexRes(0);
2441	2714	} else
2442		- if (event.getSource() == normalTexturesItem)
	2715	+ if (source == normalTexturesItem)
2443	2716	{
2444	2717	SetTexRes(1);
2445	2718	} else
2446		- if (event.getSource() == highTexturesItem)
	2719	+ if (source == highTexturesItem)
2447	2720	{
2448	2721	SetTexRes(2);
2449	2722	} else
2450		- if (event.getSource() == veryhighTexturesItem)
	2723	+ if (source == veryhighTexturesItem)
2451	2724	{
2452	2725	SetTexRes(3);
2453	2726	} else
2454		- if (event.getSource() == maxTexturesItem)
	2727	+ if (source == maxTexturesItem)
2455	2728	{
2456	2729	SetTexRes(4);
2457	2730	} else
2458		- if (event.getSource() == panoTexturesItem)
	2731	+ if (source == panoTexturesItem)
2459	2732	{
2460	2733	SetTexRes(5);
2461	2734	} else
2462		- if (event.getSource() == reverseNormalsItem)
	2735	+ if (source == reverseNormalsItem)
2463	2736	{
2464	2737	ReverseNormals();
2465	2738	} else
2466		- if (event.getSource() == parseverticesItem)
	2739	+ if (source == parseverticesItem)
2467	2740	{
2468	2741	ParseVertices();
2469	2742	} else
2470		- if (event.getSource() == textureFieldItem)
	2743	+ if (source == textureFieldItem)
2471	2744	{
2472	2745	TextureVertices();
2473	2746	} else
2474		- if (event.getSource() == alignItem)
	2747	+ if (source == alignItem)
2475	2748	{
2476	2749	Align();
2477	2750	} else
2478		- if (event.getSource() == mirrorItem)
	2751	+ if (source == mirrorItem)
2479	2752	{
2480	2753	MirrorPoses();
2481	2754	} else
2482		- if (event.getSource() == reduceMorphItem)
	2755	+ if (source == reduceMorphItem)
2483	2756	{
2484	2757	MeshReduction(false);
2485	2758	} else
2486		- if (event.getSource() == reduce34MorphItem)
	2759	+ if (source == reduce34MorphItem)
2487	2760	{
2488	2761	MeshReduction(true);
2489	2762	} else
2490		- if (event.getSource() == reverseTrianglesItem)
	2763	+ if (source == reverseTrianglesItem)
2491	2764	{
2492	2765	ReverseTriangles();
2493	2766	} else
2494		- if (event.getSource() == reduceMeshItem)
	2767	+ if (source == reduceMeshItem)
2495	2768	{
2496	2769	ReduceMesh(false);
2497	2770	} else
2498		- if (event.getSource() == reduce34MeshItem)
	2771	+ if (source == reduce34MeshItem)
2499	2772	{
2500	2773	ReduceMesh(true);
2501	2774	} else
2502		- if (event.getSource() == increaseMeshItem)
	2775	+ if (source == increaseMeshItem)
2503	2776	{
2504	2777	IncreaseMesh();
2505	2778	} else
2506		- if (event.getSource() == clipMeshItem)
	2779	+ if (source == clipMeshItem)
2507	2780	{
2508	2781	ClipMesh();
2509	2782	} else
2510		- if (event.getSource() == smoothMeshItem)
	2783	+ if (source == smoothMeshItem)
2511	2784	{
2512	2785	SmoothMesh();
2513	2786	} else
2514		- if (event.getSource() == transformgeometryItem)
	2787	+ if (source == transformGeometryItem)
2515	2788	{
2516	2789	TransformGeometry();
2517	2790	} else
2518		- if (event.getSource() == resetTransformItem)
	2791	+ if (source == transformChildrenItem)
	2792	+ {
	2793	+ TransformChildren();
	2794	+ } else
	2795	+ if (source == resetTransformItem)
2519	2796	{
2520	2797	ResetTransform();
2521	2798	} else
2522		- if (event.getSource() == resetCentroidItem)
	2799	+ if (source == resetCentroidItem)
2523	2800	{
2524		- ResetCentroid();
	2801	+ ResetCentroid(true);
2525	2802	} else
2526		- if (event.getSource() == resetParentItem)
	2803	+ if (source == resetCentroidXZItem)
	2804	+ {
	2805	+ ResetCentroid(false);
	2806	+ } else
	2807	+ if (source == resetParentItem)
2527	2808	{
2528	2809	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2529	2810	{
..	..	@@ -2533,7 +2814,7 @@
2533	2814
2534	2815	refreshContents();
2535	2816	} else
2536		- if (event.getSource() == repairParentItem)
	2817	+ if (source == repairParentItem)
2537	2818	{
2538	2819	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2539	2820	{
..	..	@@ -2547,7 +2828,7 @@
2547	2828
2548	2829	refreshContents();
2549	2830	} else
2550		- if (event.getSource() == repairShadowItem)
	2831	+ if (source == repairShadowItem)
2551	2832	{
2552	2833	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2553	2834	{
..	..	@@ -2561,7 +2842,7 @@
2561	2842
2562	2843	refreshContents();
2563	2844	} else
2564		- if (event.getSource() == sortbysizeItem)
	2845	+ if (source == sortbysizeItem)
2565	2846	{
2566	2847	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2848	{
..	..	@@ -2573,7 +2854,7 @@
2573	2854	ResetModel();
2574	2855	refreshContents();
2575	2856	} else
2576		- if (event.getSource() == sortbynameItem)
	2857	+ if (source == sortbynameItem)
2577	2858	{
2578	2859	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2579	2860	{
..	..	@@ -2585,7 +2866,7 @@
2585	2866	ResetModel();
2586	2867	refreshContents();
2587	2868	} else
2588		- if (event.getSource() == attachPigmentItem)
	2869	+ if (source == attachPigmentItem)
2589	2870	{
2590	2871	String texture = GetFile("Attach pigment");
2591	2872	Object3D obj;
..	..	@@ -2597,7 +2878,7 @@
2597	2878
2598	2879	refreshContents();
2599	2880	} else
2600		- if (event.getSource() == detachPigmentItem)
	2881	+ if (source == detachPigmentItem)
2601	2882	{
2602	2883	Object3D obj;
2603	2884	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2608,7 +2889,7 @@
2608	2889
2609	2890	refreshContents();
2610	2891	} else
2611		- if (event.getSource() == attachBumpItem)
	2892	+ if (source == attachBumpItem)
2612	2893	{
2613	2894	String texture = GetFile("Attach bump");
2614	2895	Object3D obj;
..	..	@@ -2620,7 +2901,7 @@
2620	2901
2621	2902	refreshContents();
2622	2903	} else
2623		- if (event.getSource() == detachBumpItem)
	2904	+ if (source == detachBumpItem)
2624	2905	{
2625	2906	Object3D obj;
2626	2907	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2631,7 +2912,7 @@
2631	2912
2632	2913	refreshContents();
2633	2914	} else
2634		- if (event.getSource() == pigmentBumpItem)
	2915	+ if (source == pigmentBumpItem)
2635	2916	{
2636	2917	Object3D obj;
2637	2918	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2642,158 +2923,221 @@
2642	2923
2643	2924	refreshContents();
2644	2925	} else
2645		- if (event.getSource() == flashSelectionButton)
	2926	+ if (source == flashSelectionButton)
2646	2927	{
2647	2928	CameraPane.flash = true;
2648	2929	refreshContents();
2649	2930	} else
2650		- if (event.getSource() == oneButton)
	2931	+ if (source == oneButton)
2651	2932	{
2652	2933	} else
2653		- if (event.getSource() == twoButton)
	2934	+ if (source == twoButton)
2654	2935	{
2655	2936	radio.layout = twoButton;
2656	2937	// bug
2657	2938	//gridPanel.setDividerLocation(1.0);
2658	2939	//bigPanel.setDividerLocation(0.0);
2659		- bigThree.remove(scenePanel);
2660		- bigThree.remove(centralPanel);
2661		- bigThree.remove(XYZPanel);
2662		- aWindowConstraints.gridx = 0;
2663		- aWindowConstraints.gridy = 0;
2664		- aWindowConstraints.gridwidth = 1;
2665		- // aConstraints.gridheight = 3;
2666		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2667		- aWindowConstraints.weightx = 0;
2668		- aWindowConstraints.weighty = 1;
2669		- //bigThree.add(jtp, aWindowConstraints);
2670		- aWindowConstraints.weightx = 1;
2671		- aWindowConstraints.gridwidth = 3;
2672		- // aConstraints.gridheight = 3;
2673		- aWindowConstraints.gridx = 1;
2674		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2675		- bigThree.add(centralPanel, aWindowConstraints);
2676		- aWindowConstraints.weightx = 0;
2677		- aWindowConstraints.gridx = 4;
2678		- aWindowConstraints.gridwidth = 1;
2679		- // aConstraints.gridheight = 3;
2680		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2681		- //bigThree.add(XYZPanel, aWindowConstraints);
2682		- bigThree.revalidate();
	2940	+// bigThree.remove(scenePanel);
	2941	+// bigThree.remove(centralPanel);
	2942	+// bigThree.remove(XYZPanel);
	2943	+// aWindowConstraints.gridx = 0;
	2944	+// aWindowConstraints.gridy = 0;
	2945	+// aWindowConstraints.gridwidth = 1;
	2946	+// // aConstraints.gridheight = 3;
	2947	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2948	+// aWindowConstraints.weightx = 0;
	2949	+// aWindowConstraints.weighty = 1;
	2950	+// //bigThree.add(jtp, aWindowConstraints);
	2951	+// aWindowConstraints.weightx = 1;
	2952	+// aWindowConstraints.gridwidth = 3;
	2953	+// // aConstraints.gridheight = 3;
	2954	+// aWindowConstraints.gridx = 1;
	2955	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	2956	+// bigThree.add(centralPanel, aWindowConstraints);
	2957	+// aWindowConstraints.weightx = 0;
	2958	+// aWindowConstraints.gridx = 4;
	2959	+// aWindowConstraints.gridwidth = 1;
	2960	+// // aConstraints.gridheight = 3;
	2961	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	2962	+// //bigThree.add(XYZPanel, aWindowConstraints);
	2963	+// scenePanel.setVisible(false);
	2964	+// centralPanel.setVisible(true);
	2965	+// XYZPanel.setVisible(false);
	2966	+ bigThree.ClearUI();
	2967	+ bigThree.add(centralPanel);
	2968	+ bigThree.FlushUI();
	2969	+
	2970	+ cameraView.requestFocusInWindow();
	2971	+
	2972	+// refreshContents(true);
	2973	+//
	2974	+// try
	2975	+// {
	2976	+// java.awt.Robot bot = new java.awt.Robot();
	2977	+// int mask = InputEvent.BUTTON1_MASK;
	2978	+// bot.mouseMove(100, 100);
	2979	+// bot.mousePress(mask);
	2980	+// bot.mouseRelease(mask);
	2981	+// }
	2982	+// catch (Exception e)
	2983	+// {
	2984	+//
	2985	+// }
	2986	+
2683	2987	} else
2684		- if (event.getSource() == threeButton)
	2988	+ if (source == threeButton)
2685	2989	{
2686	2990	radio.layout = threeButton;
2687		- bigThree.remove(scenePanel);
2688		- bigThree.remove(centralPanel);
2689		- bigThree.remove(XYZPanel);
2690		- aWindowConstraints.gridx = 0;
2691		- aWindowConstraints.gridy = 0;
2692		- aWindowConstraints.gridwidth = 1;
2693		- // aConstraints.gridheight = 3;
2694		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2695		- aWindowConstraints.weightx = 0;
2696		- aWindowConstraints.weighty = 1;
2697		- //bigThree.add(jtp, aWindowConstraints);
2698		- aWindowConstraints.weightx = 1;
2699		- aWindowConstraints.gridwidth = 3;
2700		- // aConstraints.gridheight = 3;
2701		- aWindowConstraints.gridx = 1;
2702		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2703		- bigThree.add(centralPanel, aWindowConstraints);
2704		- aWindowConstraints.weightx = 0;
2705		- aWindowConstraints.gridx = 4;
2706		- aWindowConstraints.gridwidth = 1;
2707		- // aConstraints.gridheight = 3;
2708		- aConstraints.fill = GridBagConstraints.VERTICAL;
2709		- bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	2991	+
	2992	+// bigThree.remove(scenePanel);
	2993	+// bigThree.remove(centralPanel);
	2994	+// bigThree.remove(XYZPanel);
	2995	+// aWindowConstraints.gridx = 0;
	2996	+// aWindowConstraints.gridy = 0;
	2997	+// aWindowConstraints.gridwidth = 1;
	2998	+// // aConstraints.gridheight = 3;
	2999	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3000	+// aWindowConstraints.weightx = 0;
	3001	+// aWindowConstraints.weighty = 1;
	3002	+// //bigThree.add(jtp, aWindowConstraints);
	3003	+// aWindowConstraints.weightx = 1;
	3004	+// aWindowConstraints.gridwidth = 3;
	3005	+// // aConstraints.gridheight = 3;
	3006	+// aWindowConstraints.gridx = 1;
	3007	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3008	+// bigThree.add(centralPanel, aWindowConstraints);
	3009	+// aWindowConstraints.weightx = 0;
	3010	+// aWindowConstraints.gridx = 4;
	3011	+// aWindowConstraints.gridwidth = 1;
	3012	+// // aConstraints.gridheight = 3;
	3013	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3014	+// bigThree.add(XYZPanel, aWindowConstraints);
	3015	+// bigThree.validate();
	3016	+// scenePanel.setVisible(false);
	3017	+// centralPanel.setVisible(true);
	3018	+// XYZPanel.setVisible(true);
	3019	+ bigThree.ClearUI();
	3020	+ bigThree.add(centralPanel);
	3021	+ bigThree.add(XYZPanel);
	3022	+ bigThree.FlushUI();
	3023	+
	3024	+ cameraView.requestFocusInWindow();
2711	3025	} else
2712		- if (event.getSource() == fourButton)
	3026	+ if (source == fourButton)
2713	3027	{
2714	3028	radio.layout = fourButton;
2715		- bigThree.remove(scenePanel);
2716		- bigThree.remove(centralPanel);
2717		- bigThree.remove(XYZPanel);
2718		- aWindowConstraints.gridx = 0;
2719		- aWindowConstraints.gridy = 0;
2720		- aWindowConstraints.gridwidth = 1;
2721		- // aWindowConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2723		- aWindowConstraints.weightx = 1;
2724		- aWindowConstraints.weighty = 1;
2725		- bigThree.add(scenePanel, aWindowConstraints);
2726		- aWindowConstraints.weightx = 1;
2727		- aWindowConstraints.gridwidth = 3;
2728		- // aConstraints.gridheight = 3;
2729		- aWindowConstraints.gridx = 1;
2730		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2731		- //bigThree.add(cameraPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aWindowConstraints.gridheight = 3;
2736		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2737		- //bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3029	+
	3030	+// bigThree.remove(scenePanel);
	3031	+// bigThree.remove(centralPanel);
	3032	+// bigThree.remove(XYZPanel);
	3033	+// aWindowConstraints.gridx = 0;
	3034	+// aWindowConstraints.gridy = 0;
	3035	+// aWindowConstraints.gridwidth = 1;
	3036	+// // aWindowConstraints.gridheight = 3;
	3037	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3038	+// aWindowConstraints.weightx = 1;
	3039	+// aWindowConstraints.weighty = 1;
	3040	+// bigThree.add(scenePanel, aWindowConstraints);
	3041	+// aWindowConstraints.weightx = 1;
	3042	+// aWindowConstraints.gridwidth = 3;
	3043	+// // aConstraints.gridheight = 3;
	3044	+// aWindowConstraints.gridx = 1;
	3045	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3046	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3047	+// aWindowConstraints.weightx = 0;
	3048	+// aWindowConstraints.gridx = 4;
	3049	+// aWindowConstraints.gridwidth = 1;
	3050	+// // aWindowConstraints.gridheight = 3;
	3051	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3052	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3053	+// bigThree.validate();
	3054	+// scenePanel.setVisible(true);
	3055	+// centralPanel.setVisible(false);
	3056	+// XYZPanel.setVisible(false);
	3057	+ bigThree.ClearUI();
	3058	+ bigThree.add(scenePanel);
	3059	+ bigThree.FlushUI();
	3060	+
	3061	+ cameraView.requestFocusInWindow();
2739	3062	} else
2740		- if (event.getSource() == sixButton)
	3063	+ if (source == sixButton)
2741	3064	{
2742	3065	radio.layout = sixButton;
2743		- bigThree.remove(scenePanel);
2744		- bigThree.remove(centralPanel);
2745		- bigThree.remove(XYZPanel);
2746		- aWindowConstraints.gridx = 0;
2747		- aWindowConstraints.gridy = 0;
2748		- aWindowConstraints.gridwidth = 1;
2749		- // aConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2751		- aWindowConstraints.weightx = 0;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aWindowConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- bigThree.add(centralPanel, aWindowConstraints);
2760		- aWindowConstraints.weightx = 0;
2761		- aWindowConstraints.gridx = 4;
2762		- aWindowConstraints.gridwidth = 1;
2763		- // aWindowConstraints.gridheight = 3;
2764		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2765		- //bigThree.add(XYZPanel, aConstraints);
2766		- bigThree.revalidate();
	3066	+
	3067	+// bigThree.remove(scenePanel);
	3068	+// bigThree.remove(centralPanel);
	3069	+// bigThree.remove(XYZPanel);
	3070	+// aWindowConstraints.gridx = 0;
	3071	+// aWindowConstraints.gridy = 0;
	3072	+// aWindowConstraints.gridwidth = 1;
	3073	+// // aConstraints.gridheight = 3;
	3074	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3075	+// aWindowConstraints.weightx = 0;
	3076	+// aWindowConstraints.weighty = 1;
	3077	+// bigThree.add(scenePanel, aWindowConstraints);
	3078	+// aWindowConstraints.weightx = 1;
	3079	+// aWindowConstraints.gridwidth = 3;
	3080	+// // aWindowConstraints.gridheight = 3;
	3081	+// aWindowConstraints.gridx = 1;
	3082	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3083	+// bigThree.add(centralPanel, aWindowConstraints);
	3084	+// aWindowConstraints.weightx = 0;
	3085	+// aWindowConstraints.gridx = 4;
	3086	+// aWindowConstraints.gridwidth = 1;
	3087	+// // aWindowConstraints.gridheight = 3;
	3088	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3089	+// //bigThree.add(XYZPanel, aConstraints);
	3090	+// bigThree.validate();
	3091	+// scenePanel.setVisible(true);
	3092	+// centralPanel.setVisible(true);
	3093	+// XYZPanel.setVisible(false);
	3094	+ bigThree.ClearUI();
	3095	+ bigThree.add(scenePanel);
	3096	+ bigThree.add(centralPanel);
	3097	+ bigThree.FlushUI();
	3098	+
	3099	+ cameraView.requestFocusInWindow();
2767	3100	} else
2768		- if (event.getSource() == sevenButton)
	3101	+ if (source == sevenButton)
2769	3102	{
2770	3103	radio.layout = sevenButton;
2771		- bigThree.remove(scenePanel);
2772		- bigThree.remove(centralPanel);
2773		- bigThree.remove(XYZPanel);
2774		- aWindowConstraints.gridx = 0;
2775		- aWindowConstraints.gridy = 0;
2776		- aWindowConstraints.gridwidth = 1;
2777		- // aWindowConstraints.gridheight = 3;
2778		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2779		- aWindowConstraints.weightx = 0;
2780		- aWindowConstraints.weighty = 1;
2781		- bigThree.add(scenePanel, aWindowConstraints);
2782		- aWindowConstraints.weightx = 1;
2783		- aWindowConstraints.gridwidth = 3;
2784		- // aWindowConstraints.gridheight = 3;
2785		- aWindowConstraints.gridx = 1;
2786		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2787		- bigThree.add(centralPanel, aWindowConstraints);
2788		- aWindowConstraints.weightx = 0;
2789		- aWindowConstraints.gridx = 4;
2790		- aWindowConstraints.gridwidth = 1;
2791		- // aConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- bigThree.add(XYZPanel, aWindowConstraints);
2794		- bigThree.revalidate();
	3104	+
	3105	+// bigThree.remove(scenePanel);
	3106	+// bigThree.remove(centralPanel);
	3107	+// bigThree.remove(XYZPanel);
	3108	+// aWindowConstraints.gridx = 0;
	3109	+// aWindowConstraints.gridy = 0;
	3110	+// aWindowConstraints.gridwidth = 1;
	3111	+// // aWindowConstraints.gridheight = 3;
	3112	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3113	+// aWindowConstraints.weightx = 0;
	3114	+// aWindowConstraints.weighty = 1;
	3115	+// bigThree.add(scenePanel, aWindowConstraints);
	3116	+// aWindowConstraints.weightx = 1;
	3117	+// aWindowConstraints.gridwidth = 3;
	3118	+// // aWindowConstraints.gridheight = 3;
	3119	+// aWindowConstraints.gridx = 1;
	3120	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3121	+// bigThree.add(centralPanel, aWindowConstraints);
	3122	+// aWindowConstraints.weightx = 0;
	3123	+// aWindowConstraints.gridx = 4;
	3124	+// aWindowConstraints.gridwidth = 1;
	3125	+// // aConstraints.gridheight = 3;
	3126	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3127	+// bigThree.add(XYZPanel, aWindowConstraints);
	3128	+// bigThree.validate();
	3129	+// scenePanel.setVisible(true);
	3130	+// centralPanel.setVisible(true);
	3131	+// XYZPanel.setVisible(true);
	3132	+ bigThree.ClearUI();
	3133	+ bigThree.add(scenePanel);
	3134	+ bigThree.add(centralPanel);
	3135	+ bigThree.add(XYZPanel);
	3136	+ bigThree.FlushUI();
	3137	+
	3138	+ cameraView.requestFocusInWindow();
2795	3139	} else
2796		- if (event.getSource() == rootButton)
	3140	+ if (source == rootButton)
2797	3141	{
2798	3142	Object3D obj;
2799	3143	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2803,34 +3147,44 @@
2803	3147	EditObject(obj);
2804	3148	}
2805	3149
	3150	+ cameraView.requestFocusInWindow();
2806	3151	refreshContents(true);
2807	3152	} else
2808		- if (event.getSource() == closeButton)
	3153	+ if (source == closeButton)
2809	3154	{
2810	3155	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2811	3156	cRadio ab;
2812	3157	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2813	3158	{
2814	3159	ab = (cRadio)e.nextElement();
2815		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3160	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2816	3161	{
	3162	+ // Patch to avoid bug with transparency.
	3163	+ if (!ab.hadMaterial)
	3164	+ {
	3165	+ ab.object.material = null;
	3166	+ }
	3167	+
2817	3168	buttonGroup.remove(ab);
2818	3169	radioPanel.remove(ab);
2819	3170
2820		- ab.GetObject().editWindow = null;
	3171	+ //ab.GetObject().editWindow = null;
	3172	+ ab.GetObject().manipWindow = null;
2821	3173	// ab.GetObject().objectUI = null; // ?????????
2822	3174
2823	3175	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2824	3176	break;
2825	3177	}
2826	3178	}
	3179	+
	3180	+ cameraView.requestFocusInWindow();
2827	3181	refreshContents(true);
2828	3182	} else
2829		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3183	+ if (source == editItem \|\| source == editButton)
2830	3184	{
2831	3185	EditSelection(false);
2832	3186	} else
2833		- if (event.getSource() == uneditButton)
	3187	+ if (source == uneditButton)
2834	3188	{
2835	3189	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2836	3190	{
..	..	@@ -2840,14 +3194,14 @@
2840	3194	child.CloseUI();
2841	3195	listUI.remove(child);
2842	3196
2843		- child.editWindow = null; // ???????????
	3197	+ //child.editWindow = null; // ???????????
2844	3198	}
2845		- objEditor.ctrlPanel.revalidate();
	3199	+ objEditor.ctrlPanel.FlushUI();
2846	3200	//objEditor.jTree.clearSelection();
2847	3201	//objEditor.ResetSliders();
2848	3202	refreshContents(true);
2849	3203	} else
2850		- if (event.getSource() == clearPanelButton)
	3204	+ if (source == clearPanelButton)
2851	3205	{
2852	3206	assert(copy == group);
2853	3207	//copy.ClearUI();
..	..	@@ -2858,7 +3212,7 @@
2858	3212	listUI.clear();
2859	3213	refreshContents(true);
2860	3214	} else
2861		- if (event.getSource() == allParamsButton)
	3215	+ if (source == allParamsButton)
2862	3216	{
2863	3217	assert(copy == group);
2864	3218
..	..	@@ -2879,19 +3233,19 @@
2879	3233
2880	3234	refreshContents(true);
2881	3235	} else
2882		- if (event.getSource() == unselectButton)
	3236	+ if (source == unselectButton)
2883	3237	{
2884	3238	objEditor.jTree.clearSelection();
2885	3239	// ?? oct 2012 GrafreeD.clipboard.clear();
2886	3240	objEditor.ResetSliders();
2887	3241	refreshContents(true);
2888	3242	} else
2889		- if(event.getSource() instanceof cRadio)
	3243	+ if(source instanceof cRadio)
2890	3244	{
2891	3245	group.parent = keepparent;
2892	3246	group.attributes = 0;
2893	3247	//group.editWindow = null;
2894		- /cRadio/ radio = (cRadio)event.getSource();
	3248	+ /cRadio/ radio = (cRadio)source;
2895	3249	Object3D obj = radio.GetObject();
2896	3250	System.out.println("Edit " + obj);
2897	3251	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2926,7 +3280,11 @@
2926	3280	frontView.object = group;
2927	3281	sideView.object = group;
2928	3282	}
2929		- group.editWindow = this;
	3283	+
	3284	+// fix "+" issue
	3285	+ //group.editWindow = this;
	3286	+ group.manipWindow = this;
	3287	+
2930	3288	/*
2931	3289	currentLayout = radio.layout;
2932	3290	if (currentLayout == null)
..	..	@@ -2938,8 +3296,23 @@
2938	3296	//group.parent = null; // ROOT
2939	3297	//group.attributes = -1;
2940	3298	ResetModel();
	3299	+
	3300	+ cameraView.requestFocusInWindow();
2941	3301	refreshContents(true);
2942		- }
	3302	+ } else if (event.getSource() == editCameraItem)
	3303	+ {
	3304	+ cameraView.ProtectCamera();
	3305	+ cameraView.repaint();
	3306	+ return;
	3307	+ } else if (event.getSource() == revertCameraItem)
	3308	+ {
	3309	+ cameraView.RevertCamera();
	3310	+ cameraView.repaint();
	3311	+ return;
	3312	+ // } else if (event.getSource() == textureButton)
	3313	+ // {
	3314	+ // return; // true;
	3315	+ }
2943	3316	else
2944	3317	{
2945	3318	//return super.action(event, arg);
..	..	@@ -2948,7 +3321,6 @@
2948	3321	}
2949	3322
2950	3323	boolean useclient = false;
2951		- cRadio radio;
2952	3324
2953	3325	void ToggleRoot()
2954	3326	{
..	..	@@ -3000,6 +3372,28 @@
3000	3372	refreshContents();
3001	3373	}
3002	3374
	3375	+ void TransformChildren()
	3376	+ {
	3377	+ Object3D obj;
	3378	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3379	+ {
	3380	+ obj = (Object3D)e.nextElement();
	3381	+ obj.KeepTextureMatrices();
	3382	+ obj.TransformChildren();
	3383	+ obj.RestoreTextureMatrices();
	3384	+
	3385	+// if (obj.parent == null)
	3386	+// {
	3387	+// System.out.println("NULL PARENT!");
	3388	+// new Exception().printStackTrace();
	3389	+// }
	3390	+// else
	3391	+// TouchTransform(obj);
	3392	+// //obj.parent.Touch();
	3393	+ }
	3394	+
	3395	+ refreshContents();
	3396	+ }
3003	3397
3004	3398	void ResetTransform()
3005	3399	{
..	..	@@ -3112,7 +3506,7 @@
3112	3506	refreshContents();
3113	3507	}
3114	3508
3115		- void ResetCentroid()
	3509	+ void ResetCentroid(boolean full)
3116	3510	{
3117	3511	Object3D obj;
3118	3512	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3127,12 +3521,16 @@
3127	3521	LA.matIdentity(Object3D.mat);
3128	3522	obj.getBounds(minima, maxima, false);
3129	3523	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3130		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3524	+ if (full)
	3525	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3131	3526	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3132	3527	obj.TransformMesh(Object3D.mat);
	3528	+
3133	3529	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3134		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3530	+ if (full)
	3531	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3135	3532	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3533	+
3136	3534	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3137	3535	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3138	3536	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3161,7 +3559,8 @@
3161	3559
3162	3560	int size = obj.MemorySize();
3163	3561
3164		- System.err.println((size/1024) + " KB is the size of " + obj);
	3562	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3563	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3165	3564	}
3166	3565	}
3167	3566	catch (Exception e)
..	..	@@ -3198,9 +3597,9 @@
3198	3597	obj = (Object3D)e.nextElement();
3199	3598
3200	3599	System.out.println("Object is: " + obj);
3201		- GrafreeD.AnalyzeObject(obj);
	3600	+ Grafreed.AnalyzeObject(obj);
3202	3601	System.out.println("Boundary rep: " + obj.bRep);
3203		- GrafreeD.AnalyzeObject(obj.bRep);
	3602	+ Grafreed.AnalyzeObject(obj.bRep);
3204	3603
3205	3604	// System.err.println((size/1024) + " KB is the size of " + obj);
3206	3605	}
..	..	@@ -3242,6 +3641,13 @@
3242	3641	void GenNormals(boolean crease)
3243	3642	{
3244	3643	group.GenNormalsS(crease);
	3644	+
	3645	+ refreshContents();
	3646	+ }
	3647	+
	3648	+ void GenNormalsMESH()
	3649	+ {
	3650	+ group.GenNormalsMeshS();
3245	3651
3246	3652	refreshContents();
3247	3653	}
..	..	@@ -3414,8 +3820,8 @@
3414	3820
3415	3821	void ParseVertices()
3416	3822	{
3417		- boolean epsequal = GrafreeD.epsequal;
3418		- GrafreeD.epsequal = true;
	3823	+ boolean epsequal = Grafreed.epsequal;
	3824	+ Grafreed.epsequal = true;
3419	3825
3420	3826	for (int i=0; i<group.selection.size(); i++)
3421	3827	{
..	..	@@ -3440,7 +3846,7 @@
3440	3846	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3441	3847	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3442	3848
3443		- g.add(GrafreeD.clipboard);
	3849	+ g.add(Grafreed.clipboard);
3444	3850
3445	3851	buffer.add(g);
3446	3852	}
..	..	@@ -3455,7 +3861,7 @@
3455	3861	makeSomething(buffer, i==group.selection.size()-1);
3456	3862	}
3457	3863
3458		- GrafreeD.epsequal = epsequal;
	3864	+ Grafreed.epsequal = epsequal;
3459	3865
3460	3866	refreshContents();
3461	3867	}
..	..	@@ -3473,7 +3879,16 @@
3473	3879	String pigment = Object3D.GetPigment(tex);
3474	3880	//String bump = Object3D.GetBump(tex);
3475	3881
3476		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3882	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3883	+
	3884	+ try
	3885	+ {
	3886	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3887	+ }
	3888	+ catch (Exception e)
	3889	+ {
	3890	+ System.err.println("FAIL: " + node);
	3891	+ }
3477	3892
3478	3893	double s = v.s;
3479	3894
..	..	@@ -3561,11 +3976,11 @@
3561	3976
3562	3977	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3563	3978
3564		- boolean random = CameraPane.RANDOM;
3565		- CameraPane.RANDOM = false; // parse all random nodes
	3979	+ boolean random = CameraPane.SWITCH;
	3980	+ CameraPane.SWITCH = false; // parse all random nodes
3566	3981	lowres.linkVerticesThis(null);
3567	3982	lowres.linkVerticesThis(sn);
3568		- CameraPane.RANDOM = random;
	3983	+ CameraPane.SWITCH = random;
3569	3984
3570	3985	System.err.flush();
3571	3986
..	..	@@ -3605,7 +4020,7 @@
3605	4020	return;
3606	4021
3607	4022	Object3D poses = group.selection.get(0);
3608		- Object3D ref = GrafreeD.clipboard.get(0);
	4023	+ Object3D ref = Grafreed.clipboard.get(0);
3609	4024
3610	4025	Object3D newgroup = new Object3D("Po:" + poses.name);
3611	4026
..	..	@@ -3799,9 +4214,9 @@
3799	4214
3800	4215	void ClipMesh()
3801	4216	{
3802		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4217	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3803	4218	{
3804		- Object3D content = GrafreeD.clipboard.get(0);
	4219	+ Object3D content = Grafreed.clipboard.get(0);
3805	4220
3806	4221	if (content instanceof cGroup && ((cGroup)content).transientlink )
3807	4222	content = ((cGroup)content).get(0);
..	..	@@ -3810,7 +4225,7 @@
3810	4225	// {
3811	4226	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3812	4227	// }
3813		- group.selection.ClipMesh(GrafreeD.clipboard);
	4228	+ group.selection.ClipMesh(Grafreed.clipboard);
3814	4229	}
3815	4230	// group.selection.ClipMesh(GrafreeD.clipboard);
3816	4231	System.out.println("DONE.");
..	..	@@ -3857,6 +4272,18 @@
3857	4272	void MarkLeaves(boolean hide)
3858	4273	{
3859	4274	group.selection.MarkLeaves(hide);
	4275	+ refreshContents();
	4276	+ }
	4277	+
	4278	+ void RewindLeaves(boolean hide)
	4279	+ {
	4280	+ group.selection.RewindLeaves(hide);
	4281	+ refreshContents();
	4282	+ }
	4283	+
	4284	+ void RandomLeaves(boolean hide)
	4285	+ {
	4286	+ group.selection.RandomLeaves(hide);
3860	4287	refreshContents();
3861	4288	}
3862	4289
..	..	@@ -3945,7 +4372,7 @@
3945	4372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3946	4373
3947	4374	Object3D elem = (Object3D)group.selection.elementAt(i);
3948		- if(elem != group)
	4375	+ if(elem != group \|\| !newWindow)
3949	4376	{
3950	4377	// if (!(elem instanceof Composite))
3951	4378	// newWindow = false;
..	..	@@ -4035,7 +4462,6 @@
4035	4462	//case 702: // Event.LIST_DESELECT
4036	4463	group.deselectAll();
4037	4464	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4038		- objEditor.ClearInfo(); // .GetMaterial());
4039	4465	if (tps != null)
4040	4466	{
4041	4467	for (int i=0; i < tps.length; i++)
..	..	@@ -4044,29 +4470,28 @@
4044	4470
4045	4471	//if (child.parent != null)
4046	4472	//child.parent.addSelectee(child);
	4473	+ objEditor.SetMaterial(child);
4047	4474	group.addSelectee(child);
4048		- objEditor.SetMaterial(child); // .GetMaterial());
4049		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4050		- System.err.println("info : " + child.GetPath());
4051	4475	}
4052	4476	}
4053		- else
4054		- {
4055		- objEditor.SetMaterial(group); // .GetMaterial());
4056		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4057		- System.err.println("info : " + group.GetPath());
4058		- }
	4477	+// else
	4478	+// {
	4479	+// objEditor.SetMaterial(group); // .GetMaterial());
	4480	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4481	+// System.err.println("info : " + group.GetPath());
	4482	+// }
4059	4483
4060		- objEditor.SetText(); // jan 2014
4061		-
4062		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4484	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4063	4485	CameraPane.flash = true;
4064	4486
4065		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4487	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4066	4488	// a camera
4067	4489	{
4068		- CameraPane.camerachangeframe = 0; // don't refuse it
4069		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4490	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4491	+ {
	4492	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4493	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4494	+ }
4070	4495	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4071	4496	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4072	4497	}
..	..	@@ -4079,6 +4504,26 @@
4079	4504
4080	4505	freezemodel = false;
4081	4506	}
	4507	+
	4508	+ void refreshContents(boolean cp)
	4509	+ {
	4510	+ if (!Globals.MOUSEDRAGGED)
	4511	+ {
	4512	+ objEditor.ClearInfo(); // .GetMaterial());
	4513	+
	4514	+ for (int i=0; i < group.selection.Size(); i++)
	4515	+ {
	4516	+ Object3D child = (Object3D) group.selection.get(i);
	4517	+
	4518	+ objEditor.AddInfo(child, this, true);
	4519	+ System.err.println("info : " + child.GetPath());
	4520	+ }
	4521	+
	4522	+ objEditor.SetText(); // jan 2014
	4523	+ }
	4524	+
	4525	+ super.refreshContents(cp);
	4526	+ }
4082	4527
4083	4528	void linkSomething(Object3D thing)
4084	4529	{
..	..	@@ -4150,16 +4595,19 @@
4150	4595	{
4151	4596	if (group.selection.isEmpty())
4152	4597	return;
4153		- GrafreeD.clipboardIsTempGroup = false;
	4598	+
	4599	+ Grafreed.clipboardIsTempGroup = false;
4154	4600	Composite tGroup = null;
4155	4601	if (group.selection.size() > 0) // 1)
4156	4602	{
4157	4603	tGroup = new cGroup();
4158		- GrafreeD.clipboardIsTempGroup = true;
	4604	+ Grafreed.clipboardIsTempGroup = true;
4159	4605	}
4160	4606
4161	4607	if (cut)
4162	4608	{
	4609	+ if (Globals.SAVEONMAKE)
	4610	+ Save();
4163	4611	//int indices[] = jList.getSelectedIndices();
4164	4612	//for (int i = indices.length - 1; i >= 0; i--)
4165	4613	//jList.remove(indices[i]);
..	..	@@ -4195,16 +4643,16 @@
4195	4643	//System.out.println("cut " + child);
4196	4644	//System.out.println("parent = " + child.parent);
4197	4645	// tmp.addChild(child);
4198		- if (GrafreeD.clipboardIsTempGroup)
	4646	+ if (Grafreed.clipboardIsTempGroup)
4199	4647	tGroup.add/Child/(tmp);
4200	4648	else
4201		- GrafreeD.clipboard = tmp;
	4649	+ Grafreed.clipboard = tmp;
4202	4650	}
4203	4651	else
4204		- if (GrafreeD.clipboardIsTempGroup)
	4652	+ if (Grafreed.clipboardIsTempGroup)
4205	4653	tGroup.add/Child/(child);
4206	4654	else
4207		- GrafreeD.clipboard = child;
	4655	+ Grafreed.clipboard = child;
4208	4656	}
4209	4657
4210	4658	//ResetModel();
..	..	@@ -4236,21 +4684,23 @@
4236	4684	//System.out.println("cut " + elem);
4237	4685	//System.out.println("parent = " + elem.parent);
4238	4686	// tmp.addChild(elem);
4239		- if (GrafreeD.clipboardIsTempGroup)
	4687	+ if (Grafreed.clipboardIsTempGroup)
4240	4688	tGroup.add/Child/(tmp);
4241	4689	else
4242		- GrafreeD.clipboard = tmp;
	4690	+ Grafreed.clipboard = tmp;
4243	4691	}
4244	4692	else
4245		- if (GrafreeD.clipboardIsTempGroup)
	4693	+ if (Grafreed.clipboardIsTempGroup)
4246	4694	tGroup.add/Child/(child);
4247	4695	else
4248		- GrafreeD.clipboard = child;
	4696	+ Grafreed.clipboard = child;
4249	4697	}
4250	4698
4251	4699	}
4252		- if (GrafreeD.clipboardIsTempGroup)
4253		- GrafreeD.clipboard = tGroup;
	4700	+
	4701	+ if (Grafreed.clipboardIsTempGroup)
	4702	+ Grafreed.clipboard = tGroup;
	4703	+
4254	4704	if (cut)
4255	4705	{
4256	4706	ResetModel();
..	..	@@ -4264,7 +4714,7 @@
4264	4714	// return;
4265	4715	boolean first = true;
4266	4716
4267		- if (GrafreeD.clipboardIsTempGroup)
	4717	+ if (Grafreed.clipboardIsTempGroup)
4268	4718	{
4269	4719	Composite temp;
4270	4720
..	..	@@ -4275,7 +4725,7 @@
4275	4725	temp = (Composite)Applet3D.clipboard.deepCopy();
4276	4726	*/
4277	4727	Object3D elem;
4278		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4728	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4279	4729	{
4280	4730	Object3D child = (Object3D)e.nextElement();
4281	4731
..	..	@@ -4309,21 +4759,21 @@
4309	4759	//Object3D cb = Applet3D.clipboard;
4310	4760	//temp.addChild(cb);
4311	4761	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4312		- assert(GrafreeD.clipboard.parent == null);
4313		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4314		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4315		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4316		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4762	+ assert(Grafreed.clipboard.parent == null);
	4763	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4764	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4765	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4766	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4317	4767	else
4318		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4319		- GrafreeD.clipboard.get(0).parent = keepparent;
	4768	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4769	+ Grafreed.clipboard.get(0).parent = keepparent;
4320	4770	}
4321	4771
4322	4772	ResetModel();
4323	4773	refreshContents();
4324	4774	}
4325	4775
4326		- void pasteInto(boolean copyit)
	4776	+ void pasteInto(boolean copyit, boolean clone)
4327	4777	{
4328	4778	// if (GrafreeD.clipboard == null)
4329	4779	// return;
..	..	@@ -4352,15 +4802,22 @@
4352	4802	if (copyit)
4353	4803	{
4354	4804	// paste(false);
4355		- CloneClipboard(false); // sept 2014
	4805	+ if (clone)
	4806	+ {
	4807	+ CloneClipboard(false); // sept 2014
	4808	+ }
	4809	+ else
	4810	+ {
	4811	+ paste(false);
	4812	+ }
4356	4813	}
4357	4814	else
4358	4815	{
4359	4816	boolean first = true;
4360	4817
4361		- if (GrafreeD.clipboardIsTempGroup)
	4818	+ if (Grafreed.clipboardIsTempGroup)
4362	4819	{
4363		- Composite temp = (Composite)GrafreeD.clipboard;
	4820	+ Composite temp = (Composite)Grafreed.clipboard;
4364	4821	Object3D copy;
4365	4822	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4366	4823	{
..	..	@@ -4370,7 +4827,7 @@
4370	4827	}
4371	4828	} else
4372	4829	{
4373		- linkSomething(GrafreeD.clipboard); //.get(0));
	4830	+ linkSomething(Grafreed.clipboard); //.get(0));
4374	4831	}
4375	4832	}
4376	4833	}
..	..	@@ -4775,21 +5232,6 @@
4775	5232	}
4776	5233	*/
4777	5234
4778		- void ImportGFD()
4779		- {
4780		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4781		- browser.show();
4782		- String filename = browser.getFile();
4783		- if (filename != null && filename.length() > 0)
4784		- {
4785		- String fullname = browser.getDirectory() + filename;
4786		-
4787		- //Object3D readobj =
4788		- objEditor.ReadGFD(fullname, objEditor);
4789		- //makeSomething(readobj);
4790		- }
4791		- }
4792		-
4793	5235	/*
4794	5236	public void Callback(Object obj)
4795	5237	{
..	..	@@ -4813,26 +5255,9 @@
4813	5255	}
4814	5256	*/
4815	5257
4816		- void ImportVRMLX3D()
4817		- {
4818		- if (GrafreeD.standAlone)
4819		- {
4820		- /**/
4821		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4822		- browser.show();
4823		- String filename = browser.getFile();
4824		- if (filename != null && filename.length() > 0)
4825		- {
4826		- String fullname = browser.getDirectory() + filename;
4827		- LoadVRMLX3D(fullname);
4828		- }
4829		- /**/
4830		- }
4831		- }
4832		-
4833	5258	String GetFile(String dialogName)
4834	5259	{
4835		- if (GrafreeD.standAlone)
	5260	+ if (Grafreed.standAlone)
4836	5261	{
4837	5262	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4838	5263	browser.show();
..	..	@@ -4896,10 +5321,18 @@
4896	5321	cButton flashSelectionButton;
4897	5322	cButton editButton;
4898	5323	cButton uneditButton;
	5324	+ JCheckBox allParamsButton;
4899	5325	cButton clearpanelButton;
4900		- cButton allParamsButton;
4901	5326	cButton unselectButton;
4902	5327
	5328	+ cButton minButton;
	5329	+ cButton maxButton;
	5330	+ cButton fullButton;
	5331	+ cButton undoButton;
	5332	+ cButton redoButton;
	5333	+ cButton saveButton;
	5334	+ cButton oneStepButton;
	5335	+
4903	5336	cButton screenfitButton;
4904	5337	cButton screenfitpointButton;
4905	5338	cButton snapobjectButton;
..	..	@@ -4910,14 +5343,6 @@
4910	5343	cButton closeButton;
4911	5344
4912	5345	cButton setsupportButton;
4913		-
4914		- cButton twoButton;
4915		- cButton sixButton;
4916		- cButton threeButton;
4917		- cButton sevenButton;
4918		- cButton fourButton; // full panel
4919		- cButton oneButton; // full XYZ
4920		- //cButton currentLayout;
4921	5346
4922	5347	//
4923	5348	//Composite
..	..	@@ -4930,6 +5355,8 @@
4930	5355	private MenuItem lookFromItem;
4931	5356	private MenuItem switchItem;
4932	5357	private MenuItem cutItem;
	5358	+ private MenuItem undoItem;
	5359	+ private MenuItem redoItem;
4933	5360	private MenuItem duplicateItem;
4934	5361	private MenuItem cloneItem;
4935	5362	private MenuItem cloneSupportItem;
..	..	@@ -4943,7 +5370,7 @@
4943	5370	private MenuItem linkverticesItem;
4944	5371	private MenuItem relinkverticesItem;
4945	5372	private MenuItem setMasterItem;
4946		- private MenuItem resetMeshItem;
	5373	+ private MenuItem resetAllItem;
4947	5374	private MenuItem stepAllItem;
4948	5375	private MenuItem revertMeshItem;
4949	5376	private MenuItem poseMeshItem;
..	..	@@ -4954,6 +5381,7 @@
4954	5381	private MenuItem mergeGeometriesItem;
4955	5382	private MenuItem copyItem;
4956	5383	private MenuItem pasteItem;
	5384	+ private MenuItem pasteIntoItem;
4957	5385	private MenuItem pasteLinkItem;
4958	5386	private MenuItem pasteCloneItem;
4959	5387	private MenuItem pasteExpandItem;
..	..	@@ -4992,6 +5420,10 @@
4992	5420	private MenuItem showleavesItem;
4993	5421	private MenuItem markleavesItem;
4994	5422	private MenuItem unmarkleavesItem;
	5423	+ private MenuItem rewindleavesItem;
	5424	+ private MenuItem unrewindleavesItem;
	5425	+ private MenuItem randomleavesItem;
	5426	+ private MenuItem unrandomleavesItem;
4995	5427
4996	5428	private MenuItem flipVItem;
4997	5429	private MenuItem unflipVItem;
..	..	@@ -5003,8 +5435,10 @@
5003	5435	private MenuItem panoTexturesItem;
5004	5436
5005	5437	private MenuItem resetCentroidItem;
5006		- private MenuItem transformgeometryItem;
	5438	+ private MenuItem resetCentroidXZItem;
5007	5439	private MenuItem resetTransformItem;
	5440	+ private MenuItem transformGeometryItem;
	5441	+ private MenuItem transformChildrenItem;
5008	5442	private MenuItem hideItem;
5009	5443	private MenuItem grabItem;
5010	5444	private MenuItem backItem;
..	..	@@ -5051,7 +5485,7 @@
5051	5485	private MenuItem blobItem;
5052	5486	private MenuItem latheItem;
5053	5487	private MenuItem bezierItem;
5054		- private MenuItem checkerItem;
	5488	+ private MenuItem overlayItem;
5055	5489	private MenuItem meshItem;
5056	5490	// private MenuItem meshGroupItem;
5057	5491	private MenuItem springItem;
..	..	@@ -5073,11 +5507,6 @@
5073	5507	private MenuItem doubleItem;
5074	5508	private MenuItem tripleItem;
5075	5509
5076		- private MenuItem importGFDItem;
5077		- private MenuItem importVRMLX3DItem;
5078		- private MenuItem import3DSItem;
5079		- private MenuItem importOBJItem;
5080		-
5081	5510	private MenuItem computeAOItem;
5082	5511	private MenuItem recompileItem;
5083	5512	private MenuItem editScriptItem;
..	..	@@ -5087,4 +5516,8 @@
5087	5516	private MenuItem analyzeItem;
5088	5517	private MenuItem dumpItem;
5089	5518	//boolean freezemodel = false;
	5519	+
	5520	+ Menu cameraMenu;
	5521	+ MenuItem editCameraItem;
	5522	+ MenuItem revertCameraItem;
5090	5523	}