~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,131 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
	153	+ oe.jTree = new cTree();
	154	+
	155	+ Menu menu;
	156	+ oe.menuBar.add(menu = new Menu("Edit"));
	157	+ //editItem = menu.add(new MenuItem("Edit"));
	158	+ //editItem.addActionListener(this);
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
	166	+ duplicateItem.addActionListener(this);
	167	+ cloneItem = menu.add(new MenuItem("Clone"));
	168	+ cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
	171	+ cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
	172	+ cloneSupportItem.addActionListener(this);
	173	+ }
	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	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
	185	+ pasteLinkItem = menu.add(new MenuItem("Paste link"));
	186	+ pasteLinkItem.addActionListener(this);
	187	+ pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	188	+ pasteCloneItem.addActionListener(this);
	189	+// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	190	+// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
	192	+ clearItem = menu.add(new MenuItem("Clear"));
	193	+ clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
	198	+ clearAllItem = menu.add(new MenuItem("Clear All"));
	199	+ clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ revertCameraItem.addActionListener(this);
	209	+
	210	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+ toggleFullScreenItem.addItemListener(this);
	212	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+ cameraMenu.add("-");
	214	+
	215	+ cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+ toggleTextureItem.addItemListener(this);
	217	+ toggleTextureItem.setState(CameraPane.textureon);
	218	+
	219	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+ toggleSwitchItem.addItemListener(this);
	221	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
	237	+
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
152	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154	278	//cameraMenu.add(switchItem = new MenuItem("Reverse View"));
..	..	@@ -160,45 +284,17 @@
160	284	lookAtItem.addActionListener(this);
161	285	//lookFromItem.addActinoListener(this);
162	286	//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		-
	287	+ }
	288	+
192	289	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);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,19 +306,26 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228	331	grabItem = menu.add(new MenuItem("Grab"));
..	..	@@ -233,27 +336,38 @@
233	336	frontItem.addActionListener(this);
234	337	compositeItem = menu.add(new MenuItem("Composite"));
235	338	compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
	347	+
240	348	menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
	349	+
	350	+ randomItem = menu.add(new MenuItem("Switch node"));
242	351	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);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255	368	cameraItem = menu.add(new MenuItem("Camera"));
256	369	cameraItem.addActionListener(this);
	370	+ }
257	371
258	372	oe.menuBar.add(menu = new Menu("Object"));
259	373	textureItem = menu.add(new MenuItem("Texture"));
..	..	@@ -262,27 +376,35 @@
262	376	billboardItem.addActionListener(this);
263	377	csgItem = menu.add(new MenuItem("CSG"));
264	378	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	379	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	380	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	381	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	382	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	383	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	384	shadowZItem.addActionListener(this);
	385	+ if (Globals.ADVANCED)
	386	+ {
	387	+ menu.add("-");
271	388	linkerItem = menu.add(new MenuItem("Linker"));
272	389	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	390	attributeItem = menu.add(new MenuItem("Attribute"));
276	391	attributeItem.addActionListener(this);
	392	+ templateItem = menu.add(new MenuItem("Template"));
	393	+ templateItem.addActionListener(this);
277	394	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	395	pointflowItem.addActionListener(this);
	396	+ }
279	397	menu.add("-");
280	398	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	399	resetTransformItem.addActionListener(this);
282	400	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	401	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	402	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	403	+ resetCentroidXZItem.addActionListener(this);
	404	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	405	+ transformGeometryItem.addActionListener(this);
	406	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	407	+ transformChildrenItem.addActionListener(this);
286	408
287	409	oe.menuBar.add(menu = new Menu("Geometry"));
288	410	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +415,11 @@
293	415	genNormalsCADItem.addActionListener(this);
294	416	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	417	genNormalsMESHItem.addActionListener(this);
	418	+ if (Globals.ADVANCED)
	419	+ {
296	420	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	421	genNormalsMINEItem.addActionListener(this);
	422	+ }
298	423	stripifyItem = menu.add(new MenuItem("Stripify"));
299	424	stripifyItem.addActionListener(this);
300	425	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +441,34 @@
316	441	reduce34MeshItem.addActionListener(this);
317	442	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	443	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	444	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	445	clipMeshItem.addActionListener(this);
	446	+
	447	+ if (Globals.ADVANCED)
	448	+ {
	449	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	450	+ smoothMeshItem.addActionListener(this);
	451	+ }
323	452
324	453	oe.menuBar.add(menu = new Menu("Attributes"));
325	454	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	455	clearMaterialsItem.addActionListener(this);
	456	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	457	+ resetAllItem.addActionListener(this);
	458	+ stepAllItem = menu.add(new MenuItem("Step All"));
	459	+ stepAllItem.addActionListener(this);
327	460	menu.add("-");
328	461	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	462	liveleavesItem.addActionListener(this);
330	463	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	464	unliveleavesItem.addActionListener(this);
	465	+ if (Globals.ADVANCED)
	466	+ {
332	467	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	468	supportleavesItem.addActionListener(this);
334	469	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	470	unsupportleavesItem.addActionListener(this);
	471	+ }
336	472	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	473	hideleavesItem.addActionListener(this);
338	474	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +477,14 @@
341	477	markleavesItem.addActionListener(this);
342	478	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	479	unmarkleavesItem.addActionListener(this);
	480	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	481	+ rewindleavesItem.addActionListener(this);
	482	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	483	+ unrewindleavesItem.addActionListener(this);
	484	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	485	+ randomleavesItem.addActionListener(this);
	486	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	487	+ unrandomleavesItem.addActionListener(this);
344	488	menu.add("-");
345	489	flipVItem = menu.add(new MenuItem("Flip V"));
346	490	flipVItem.addActionListener(this);
..	..	@@ -376,35 +520,40 @@
376	520	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	521	sortbynameItem.addActionListener(this);
378	522	menu.add("-");
	523	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	524	+ shareGeometriesItem.addActionListener(this);
	525	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	526	+ mergeGeometriesItem.addActionListener(this);
	527	+ if (Globals.ADVANCED)
	528	+ {
	529	+ // Pretty much the same as duplicate and clone.
379	530	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	531	extractGeometriesItem.addActionListener(this);
381	532	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	533	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);
	534	+ }
387	535
388	536	oe.menuBar.add(menu = new Menu("Insert"));
389	537	buildCreateMenu(menu);
390	538
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	539	oe.menuBar.add(menu = new Menu("Tools"));
403	540	buildToolsMenu(menu);
404	541	}
405	542
406	543	void SetupUI2(ObjEditor oe)
407	544	{
	545	+ // June 2019
	546	+ if (oe == null)
	547	+ {
	548	+ //super.SetupUI2(this);
	549	+ //return;
	550	+ }
	551	+
	552	+ if (copy != group)
	553	+ {
	554	+ //super.SetupUI2(this);
	555	+ }
	556	+
408	557	//new Exception().printStackTrace();
409	558
410	559	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,176 +582,171 @@
433	582	oe.radioPanel.add(dummyButton);
434	583	oe.buttonGroup.add(dummyButton);
435	584	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	585	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
441		- liveCB.setToolTipText("Enabled animation");
	587	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	588	+ //minButton.setToolTipText("Minimize window");
	589	+ //minButton.addActionListener(this);
	590	+
	591	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	592	+ maxButton.setToolTipText("Maximize window");
	593	+ maxButton.addActionListener(this);
	594	+
	595	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ fullButton.setToolTipText("Full-screen window");
	597	+ fullButton.addActionListener(this);
	598	+
	599	+ oe.toolboxPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	600	+ undoButton.setToolTipText("Undo changes");
	601	+ undoButton.addActionListener(this);
	602	+
	603	+ oe.toolboxPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	604	+ redoButton.setToolTipText("Redo changes");
	605	+ redoButton.addActionListener(this);
	606	+
	607	+ oe.toolboxPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ saveButton.setToolTipText("Save changes");
	609	+ saveButton.addActionListener(this);
	610	+
	611	+ oe.toolboxPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	612	+ liveCB.setToolTipText("Enable animation");
442	613	liveCB.addItemListener(this);
443	614
444		- oe.aConstraints.gridx += 1;
445		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	615	+ oe.toolboxPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ oneStepButton.setToolTipText("Animate one step forward");
	617	+ oneStepButton.addActionListener(this);
	618	+
	619	+ oe.toolboxPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
446	620	fastCB.setToolTipText("Fast mode");
447	621	fastCB.addItemListener(this);
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
450		- supportCB.setToolTipText("Enabled rigging");
451		- supportCB.addItemListener(this);
452		-
453		- // oe.aConstraints.gridx += 1;
454		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
455		- // localCB.addItemListener(this);
456		-
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
459		- crowdCB.setToolTipText("Used for crowds");
460		- crowdCB.addItemListener(this);
461		-
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
464		- smoothCB.setToolTipText("Snapping delay");
465		- smoothCB.addItemListener(this);
466		-
467		- oe.aConstraints.gridx += 1;
468		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
469		- slowCB.setToolTipText("Smooth interpolation");
470		- slowCB.addItemListener(this);
471		- oe.aConstraints.gridx += 1;
472		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
473		- boxCB.setToolTipText("Display bounding boxes");
474		- boxCB.addItemListener(this);
475		- oe.aConstraints.gridx += 1;
476		- oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
477		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
478		- zoomBoxCB.addItemListener(this);
479		-
480		-// oe.aConstraints.gridx += 1;
481		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
482		-// speakerMocapCB.addItemListener(this);
483		-
484		- if (false)
485		- {
486		- // handled in scripts
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
489		- speakerCameraCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
493		- speakerFocusCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
497		- smoothfocusCB.addItemListener(this);
498		- }
499		-
500		-//oe.aConstraints.gridx += 1;
501		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
502		-// debugCB.addItemListener(this);
503		-
504		- oe.aConstraints.gridx += 1;
505		- oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
506		- oeilCB.addItemListener(this);
507		-
508		- oe.aConstraints.gridx += 1;
509		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
510		- lookAtCB.setToolTipText("Look-at target");
511		- lookAtCB.addItemListener(this);
512		-
513		- oe.aConstraints.gridx += 1;
514		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
	622	+
	623	+ oe.toolboxPanel.Return();
	624	+
	625	+ oe.toolboxPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
515	626	trackCB.setToolTipText("Enable tracking");
516	627	trackCB.addItemListener(this);
517	628
518		- oe.aConstraints.gridx += 1;
519		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	629	+ oe.toolboxPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	630	screenfitButton.setToolTipText("Screen fit");
521	631	screenfitButton.addActionListener(this);
522		- oe.aConstraints.gridx += 1;
	632	+
523	633	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
524	634	// screenfitpointButton.addActionListener(this);
525		-// oe.aConstraints.gridx += 1;
526		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
527		- snapobjectButton.addActionListener(this);
528		- snapobjectButton.setToolTipText("Snap Object");
529		- oe.aConstraints.gridx += 1;
530	635
531		- //aConstraints.gridx = 0;
532		- //aConstraints.gridy += 1;
533		- oe.aConstraints.weighty = 0;
534		- oe.aConstraints.gridwidth = 1;
535		-
536		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
537		- flashSelectionButton.setToolTipText("Show selection");
	636	+ if (Globals.ADVANCED)
	637	+ {
	638	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ snapobjectButton.addActionListener(this);
	640	+ snapobjectButton.setToolTipText("Snap Object");
	641	+ }
	642	+
	643	+ oe.toolboxPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	644	+ flashSelectionButton.setToolTipText("Highlight selection");
538	645	flashSelectionButton.addActionListener(this);
539	646
540		- oe.toolbarPanel.add(new cButton(" ", false));
	647	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
541	648
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545		-
546		- //
547		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	649	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
548	650	twoButton.setToolTipText("Show center view only");
549	651	twoButton.addActionListener(this);
550		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	652	+ this.fullscreenLayout = twoButton;
	653	+
	654	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
551	655	fourButton.addActionListener(this);
552	656	fourButton.setToolTipText("Show left panel only");
553		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
554	658	sixButton.setToolTipText("2-column layout left");
555	659	sixButton.addActionListener(this);
556		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	660	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
557	661	threeButton.setToolTipText("2-column layout right");
558	662	threeButton.addActionListener(this);
559		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	663	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560	664	sevenButton.setToolTipText("3-column layout");
561	665	sevenButton.addActionListener(this);
562	666	//
563	667
564		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
565		- rootButton.setToolTipText("Edit object in new tab");
	668	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	669	+ rootButton.setToolTipText("Edit selection in new tab");
566	670	rootButton.addActionListener(this);
567		- oe.aConstraints.gridx += 1;
568		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	671	+
	672	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	673	closeButton.setToolTipText("Close tab");
570	674	closeButton.addActionListener(this);
571	675	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
572	676	//clearButton.addActionListener(this);
573		- oe.aConstraints.gridx += 1;
574		-
575		- oe.aConstraints.gridx = 1; //
576		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
577		- editButton.addActionListener(this);
578		- oe.aConstraints.gridx += 1;
579		- oe.aConstraints.weighty = 0;
580		- oe.aConstraints.gridwidth = 1;
581	677
582		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	678	+ // INSERT
	679	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ gridButton.setToolTipText("Create grid");
	681	+ gridButton.addActionListener(this);
	682	+
	683	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ boxButton.setToolTipText("Create box");
	685	+ boxButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ sphereButton.setToolTipText("Create sphere");
	689	+ sphereButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.Return();
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
	711	+
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	717	+ overlayButton.setToolTipText("Create overlay");
	718	+ overlayButton.addActionListener(this);
	719	+
	720	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ lightButton.setToolTipText("Create light");
	722	+ lightButton.addActionListener(this);
	723	+
	724	+ // EDIT panel
	725	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	726	+ editButton.setToolTipText("Edit selection");
	727	+ editButton.addActionListener(this);
	728	+
	729	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	730	+ uneditButton.setToolTipText("Unedit selection");
583	731	uneditButton.addActionListener(this);
584	732
585		- oe.aConstraints.gridx += 1;
586		- oe.aConstraints.weighty = 0;
587		- oe.aConstraints.gridwidth = 1;
588		-
589		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
590		- clearPanelButton.addActionListener(this);
591		-
592		- oe.aConstraints.gridx += 1;
593		- oe.aConstraints.weighty = 0;
594		- oe.aConstraints.gridwidth = 1;
595		-
596		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	733	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	734	+ allParamsButton.setToolTipText("Edit all params");
597	735	allParamsButton.addActionListener(this);
598	736
599		- oe.aConstraints.gridx += 1;
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 1;
602		-
603		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	737	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ clearPanelButton.setToolTipText("Clear edit panel");
	739	+ clearPanelButton.addActionListener(this);
	740	+
	741	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	742	+ unselectButton.setToolTipText("Unselect");
604	743	unselectButton.addActionListener(this);
605	744
	745	+ editCommandsPanel.preferredHeight = 1;
	746	+
	747	+// oe.treePanel.add(commandsPanel);
	748	+// oe.treePanel.Return();
	749	+
606	750	// oe.aConstraints.gridx += 1;
607	751	// oe.aConstraints.weighty = 0;
608	752	// oe.aConstraints.gridwidth = 1;
..	..	@@ -614,40 +758,37 @@
614	758	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
615	759	// gcButton.addActionListener(this);
616	760
617		- oe.aConstraints.gridx = 0;
618		- oe.aConstraints.gridy += 1;
619		-
620		- //ctrlPanel.add(objList = new List(5, true));
621		- oe.aConstraints.gridwidth = 100;
622		- // oe.aConstraints.gridheight = 100;
623		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
624		- oe.aConstraints.gridheight = 1;
625		- oe.aConstraints.weighty = 0.5;
626		- oe.aConstraints.gridx = 0;
627		- JScrollPane jSP;
	761	+ cGridBag jSPPanel = new cGridBag();
	762	+
	763	+ JScrollPane jSP;
628	764	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
629		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	765	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
630	766	ResetModel();
631		- oe.aConstraints.weighty = 0.5;
632		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
633		- oe.aConstraints.gridy += 1;
634		- oe.aConstraints.gridwidth = 1;
	767	+
	768	+ oe.treePanel.add(jSPPanel);
	769	+ oe.treePanel.Return();
635	770
636		- oe.aConstraints.weighty = 0;
637		- oe.aConstraints.gridwidth = 2;
638		-
639		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
	771	+ cGridBag copyOptionsPanel = new cGridBag();
	772	+
	773	+ copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	774	+ colorCB.setToolTipText("Copy color when dropped");
640	775	colorCB.addItemListener(this);
641		- oe.aConstraints.gridx += 2;
642		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
	776	+
	777	+ copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	778	+ materialCB.setToolTipText("Copy material when dropped");
643	779	materialCB.addItemListener(this);
644		- oe.aConstraints.gridx += 2;
645		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
	780	+
	781	+ copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	782	+ textureCB.setToolTipText("Copy texture when dropped");
646	783	textureCB.addItemListener(this);
647	784
648		- oe.aConstraints.gridx = 0;
649		- oe.aConstraints.gridy += 1;
	785	+ copyOptionsPanel.preferredHeight = 1;
	786	+ oe.treePanel.add(copyOptionsPanel);
	787	+ oe.treePanel.Return();
650	788
	789	+// mainPanel.setDividerLocation(0.5); //1.0);
	790	+// mainPanel.setResizeWeight(0.5);
	791	+
651	792	//jList.addListSelectionListener(this);
652	793	oe.jTree.addTreeSelectionListener(this);
653	794	//jTree.setRootVisible(false);
..	..	@@ -669,10 +810,102 @@
669	810	radio.layout = sevenButton;
670	811	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
671	812	}
	813	+
	814	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	815	+ {
	816	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	817	+ boxCB.setToolTipText("Display bounding boxes");
	818	+ boxCB.addItemListener(this);
	819	+
	820	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	821	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	822	+ zoomBoxCB.addItemListener(this);
	823	+
	824	+ if (true) // Globals.ADVANCED)
	825	+ {
	826	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	827	+ supportCB.setToolTipText("Enable rigging");
	828	+ supportCB.addItemListener(this);
	829	+
	830	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	831	+ // localCB.addItemListener(this);
	832	+
	833	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	834	+ crowdCB.setToolTipText("Used for crowds");
	835	+ crowdCB.addItemListener(this);
	836	+
	837	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	838	+ smoothCB.setToolTipText("Snapping delay");
	839	+ smoothCB.addItemListener(this);
	840	+
	841	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	842	+ slowCB.setToolTipText("Smooth interpolation");
	843	+ slowCB.addItemListener(this);
	844	+
	845	+// constraints.gridy += 1;
	846	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	847	+// speakerMocapCB.addItemListener(this);
	848	+
	849	+ if (false)
	850	+ {
	851	+ // handled in scripts
	852	+ //constraints.gridy += 1;
	853	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	854	+ speakerCameraCB.addItemListener(this);
	855	+
	856	+ //constraints.gridy += 1;
	857	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	858	+ speakerFocusCB.addItemListener(this);
	859	+
	860	+ //constraints.gridy += 1;
	861	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	862	+ smoothfocusCB.addItemListener(this);
	863	+ }
	864	+
	865	+//constraints.gridx += 1;
	866	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	867	+// debugCB.addItemListener(this);
	868	+
	869	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	870	+ oeilCB.setToolTipText("Move camera when tracking target");
	871	+ oeilCB.addItemListener(this);
	872	+
	873	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	874	+ shadowCB.setToolTipText("Compute shadows when live");
	875	+ shadowCB.addItemListener(this);
	876	+
	877	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	878	+ autosaveCB.setToolTipText("Auto-save on structure change");
	879	+ autosaveCB.addItemListener(this);
	880	+
	881	+ if (Globals.ADVANCED)
	882	+ {
	883	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	884	+ lookAtCB.setToolTipText("Look-at target");
	885	+ lookAtCB.addItemListener(this);
	886	+ }
	887	+
	888	+ }
	889	+
	890	+ cGridBag fill = new cGridBag();
	891	+
	892	+ fill.preferredHeight = 200;
	893	+
	894	+ panel.add(fill);
	895	+
	896	+ }
672	897
673	898	void EditObject(Object3D obj)
674	899	{
675	900	cRadio radioButton = new cRadio(obj.name);
	901	+
	902	+ // Patch to avoid bug with transparency.
	903	+ radioButton.hadMaterial = obj.material != null;
	904	+ if (!radioButton.hadMaterial)
	905	+ {
	906	+ obj.material = new cMaterial();
	907	+ }
	908	+
676	909	radioButton.SetObject(obj);
677	910	radioButton.layout = sevenButton;
678	911	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -681,8 +914,11 @@
681	914	buttonGroup.add(radioButton);
682	915	radioButton.doClick();
683	916	}
	917	+
684	918	void SetupViews(ObjEditor oe)
685	919	{
	920	+ theFrame = this;
	921	+
686	922	oe.SetupViews();
687	923
688	924	System.out.println("SetupViews");
..	..	@@ -691,23 +927,26 @@
691	927	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
692	928	}
693	929
694		- JCheckBox liveCB;
695		- JCheckBox supportCB;
696		- JCheckBox localCB;
697		- JCheckBox crowdCB;
698		- JCheckBox smoothCB;
699		- JCheckBox fastCB;
700		- JCheckBox slowCB;
701		- JCheckBox boxCB;
702		- JCheckBox zoomBoxCB;
703		- JCheckBox trackCB;
704		- JCheckBox smoothfocusCB;
	930	+ cToggleButton liveCB;
	931	+ cCheckBox supportCB;
	932	+ cCheckBox localCB;
	933	+ cCheckBox crowdCB;
	934	+ cCheckBox smoothCB;
	935	+ cToggleButton fastCB;
	936	+ cCheckBox slowCB;
	937	+ cCheckBox boxCB;
	938	+ cCheckBox zoomBoxCB;
	939	+ cToggleButton trackCB;
	940	+ cCheckBox smoothfocusCB;
705	941	// JCheckBox speakerMocapCB;
706		- JCheckBox speakerCameraCB;
707		- JCheckBox speakerFocusCB;
708		- JCheckBox debugCB;
709		- JCheckBox oeilCB;
710		- JCheckBox lookAtCB;
	942	+ cCheckBox speakerCameraCB;
	943	+ cCheckBox speakerFocusCB;
	944	+ cCheckBox debugCB;
	945	+
	946	+ cCheckBox oeilCB;
	947	+ cCheckBox shadowCB;
	948	+ cCheckBox autosaveCB;
	949	+ cCheckBox lookAtCB;
711	950
712	951	// static int COLOR = 1;
713	952	// static int MATERIAL = 2;
..	..	@@ -715,9 +954,9 @@
715	954
716	955	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
717	956
718		- JCheckBox colorCB;
719		- JCheckBox materialCB;
720		- JCheckBox textureCB;
	957	+ cCheckBox colorCB;
	958	+ cCheckBox materialCB;
	959	+ cCheckBox textureCB;
721	960
722	961	public void itemStateChanged(ItemEvent e)
723	962	{
..	..	@@ -745,6 +984,7 @@
745	984	} else if(e.getSource() == liveCB)
746	985	{
747	986	cameraView.ToggleLive();
	987	+ refreshContents(false);
748	988	}
749	989	else if(e.getSource() == supportCB)
750	990	{
..	..	@@ -809,6 +1049,14 @@
809	1049	{
810	1050	cameraView.ToggleOeil();
811	1051	}
	1052	+ else if(e.getSource() == shadowCB)
	1053	+ {
	1054	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1055	+ }
	1056	+ else if(e.getSource() == autosaveCB)
	1057	+ {
	1058	+ Globals.SAVEONMAKE ^= true;
	1059	+ }
812	1060	else if(e.getSource() == lookAtCB)
813	1061	{
814	1062	cameraView.ToggleLookAt();
..	..	@@ -825,7 +1073,8 @@
825	1073
826	1074	/**/
827	1075	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
828		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1076	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1077	+ TreePath path = objEditor.jTree.getSelectionPath();
829	1078	if ((path == null) \|\| (path.getPathCount() <= 1)) {
830	1079	// We can't move the root node or an empty selection
831	1080	return;
..	..	@@ -897,7 +1146,9 @@
897	1146	// objEditor.DropFile((java.io.File[]) object, true);
898	1147	// return;
899	1148	// }
900		- if (string.charAt(0) == '/')
	1149	+
	1150	+ // File path for Mac and Windows
	1151	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
901	1152	{
902	1153	// file(s)
903	1154	String[] names = string.split("\n");
..	..	@@ -924,7 +1175,7 @@
924	1175
925	1176	flashIt = false;
926	1177	CameraPane pane = (CameraPane) target;
927		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1178	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
928	1179	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
929	1180
930	1181	if (group.selection.size() == 1)
..	..	@@ -947,16 +1198,16 @@
947	1198	return;
948	1199	}
949	1200
950		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
951		- {
	1201	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1202	+// {
952	1203	loadClipboard(true);
953	1204	objEditor.jTree.setSelectionPath(destinationPath);
954		- pasteInto(false);
955		- } else {
956		- loadClipboard(false);
957		- objEditor.jTree.setSelectionPath(destinationPath);
958		- pasteInto(false); // true); // ???
959		- }
	1205	+ pasteInto(false, false);
	1206	+// } else {
	1207	+// loadClipboard(false);
	1208	+// objEditor.jTree.setSelectionPath(destinationPath);
	1209	+// pasteInto(false, false); // true); // ???
	1210	+// }
960	1211	}
961	1212	public void dropActionChanged(DropTargetDragEvent dtde)
962	1213	// Called if the user has modified the current drop gesture
..	..	@@ -1077,27 +1328,33 @@
1077	1328	kleinItem.addActionListener(this);
1078	1329	particleItem = menu.add(new MenuItem("Particle system"));
1079	1330	particleItem.addActionListener(this);
	1331	+ if (Globals.ADVANCED)
	1332	+ {
1080	1333	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1081	1334	ragdollItem.addActionListener(this);
1082	1335	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1083	1336	ragdoll2Item.addActionListener(this);
	1337	+ }
1084	1338	menu.add("-");
1085		- meshItem = menu.add(new MenuItem("Mesh"));
	1339	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1086	1340	meshItem.addActionListener(this);
1087	1341	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1088	1342	// meshGroupItem.addActionListener(this);
	1343	+ if (Globals.ADVANCED)
	1344	+ {
1089	1345	springItem = menu.add(new MenuItem("Spring"));
1090	1346	springItem.addActionListener(this);
1091	1347	flagItem = menu.add(new MenuItem("Flag"));
1092	1348	flagItem.addActionListener(this);
1093		- bezierItem = menu.add(new MenuItem("Patch"));
1094		- bezierItem.addActionListener(this);
1095		- checkerItem = menu.add(new MenuItem("Checker"));
1096		- checkerItem.addActionListener(this);
1097	1349	blobItem = menu.add(new MenuItem("Blob"));
1098	1350	blobItem.addActionListener(this);
1099	1351	latheItem = menu.add(new MenuItem("Lathe"));
1100	1352	latheItem.addActionListener(this);
	1353	+ }
	1354	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1355	+ bezierItem.addActionListener(this);
	1356	+ overlayItem = menu.add(new MenuItem("Overlay"));
	1357	+ overlayItem.addActionListener(this);
1101	1358	lightItem = menu.add(new MenuItem("Light"));
1102	1359	lightItem.addActionListener(this);
1103	1360	menu.add("-");
..	..	@@ -1107,39 +1364,44 @@
1107	1364	loopItem.addActionListener(this);
1108	1365	doubleItem = menu.add(new MenuItem("Fork"));
1109	1366	doubleItem.addActionListener(this);
	1367	+ if (Globals.ADVANCED)
	1368	+ {
1110	1369	tripleItem = menu.add(new MenuItem("Trident"));
1111	1370	tripleItem.addActionListener(this);
	1371	+ }
1112	1372	}
1113	1373
1114	1374	void buildToolsMenu(Menu menu)
1115	1375	{
1116	1376	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1117	1377	animationItem.addItemListener(this);
1118		- animationItem.setState(CameraPane.ANIMATION);
	1378	+ animationItem.setState(Globals.ANIMATION);
1119	1379
1120	1380	menu.add("-");
1121	1381	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1122	1382	parseverticesItem.addActionListener(this);
1123	1383	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1124	1384	textureFieldItem.addActionListener(this);
1125		- alignItem = menu.add(new MenuItem("Align"));
	1385	+ alignItem = menu.add(new MenuItem("Align Objects"));
1126	1386	alignItem.addActionListener(this);
1127		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1128		- mirrorItem.addActionListener(this);
1129	1387	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1130	1388	reduceMorphItem.addActionListener(this);
1131	1389	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1132	1390	reduce34MorphItem.addActionListener(this);
1133		-
	1391	+ menu.add("-");
1134	1392	menu.add(computeAOItem = new MenuItem("Compute AO"));
1135	1393	computeAOItem.addActionListener(this);
1136		- menu.add("-");
1137	1394
	1395	+ if (Globals.ADVANCED)
	1396	+ {
	1397	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1398	+ mirrorItem.addActionListener(this);
	1399	+ menu.add("-");
1138	1400	menu.add(memoryItem = new MenuItem("Memory Usage"));
1139	1401	memoryItem.addActionListener(this);
1140	1402	menu.add(analyzeItem = new MenuItem("Analyze"));
1141	1403	analyzeItem.addActionListener(this);
1142		- menu.add(dumpItem = new MenuItem("Dump"));
	1404	+ menu.add(dumpItem = new MenuItem("Print"));
1143	1405	dumpItem.addActionListener(this);
1144	1406	// menu.add(pathItem = new MenuItem("From-to path"));
1145	1407	// pathItem.addActionListener(this);
..	..	@@ -1157,6 +1419,7 @@
1157	1419	menu.add("-");
1158	1420	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1159	1421	editScriptItem.addActionListener(this);
	1422	+ }
1160	1423	}
1161	1424
1162	1425	void ScreenFit()
..	..	@@ -1279,6 +1542,7 @@
1279	1542	shadow.material = new cMaterial(obj.material);
1280	1543	shadow.material.diffuse = 0.0001f;
1281	1544	shadow.material.specular = 0.0001f;
	1545	+ //shadow.projectedVertices[1].x = 300;
1282	1546
1283	1547	makeSomething(shadow);
1284	1548	}
..	..	@@ -1485,9 +1749,9 @@
1485	1749
1486	1750	void Overwrite(int mask)
1487	1751	{
1488		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1752	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1489	1753	{
1490		- Object3D content = GrafreeD.clipboard.get(0);
	1754	+ Object3D content = Grafreed.clipboard.get(0);
1491	1755
1492	1756	if (content instanceof cGroup && ((cGroup)content).transientlink )
1493	1757	content = ((cGroup)content).get(0);
..	..	@@ -1510,6 +1774,7 @@
1510	1774	//
1511	1775	public void actionPerformed(ActionEvent event) // , Object arg)
1512	1776	{
	1777	+ Object source = event.getSource();
1513	1778	/*
1514	1779	if (event.getSource() == nameField)
1515	1780	{
..	..	@@ -1521,11 +1786,11 @@
1521	1786	}
1522	1787	else
1523	1788	*/
1524		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1789	+ if (source == lookAtItem \|\| source == lookFromItem)
1525	1790	{
1526	1791	ScreenFit();
1527	1792	} else
1528		- if (event.getSource() == switchItem)
	1793	+ if (source == switchItem)
1529	1794	{
1530	1795	cVector v1 = new cVector();
1531	1796	cVector v2 = new cVector();
..	..	@@ -1534,11 +1799,11 @@
1534	1799	objEditor.cameraView.renderCamera.setAim(v2, v1);
1535	1800	objEditor.cameraView.repaint();
1536	1801	} else
1537		- if (event.getSource() == rectoidItem)
	1802	+ if (source == rectoidItem \|\| source == boxButton)
1538	1803	{
1539	1804	makeSomething(new Box());
1540	1805	} else
1541		- if (event.getSource() == particleItem)
	1806	+ if (source == particleItem \|\| source == particlesButton)
1542	1807	{
1543	1808	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1544	1809	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1559,9 +1824,9 @@
1559	1824	applyExample(particleGeom, "SMOKE");
1560	1825	makeSomething(particleGeom);
1561	1826	} else
1562		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1827	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1563	1828	{
1564		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1829	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1565	1830
1566	1831	ragdoll.toParent = LA.newMatrix();
1567	1832	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1579,7 +1844,7 @@
1579	1844	} else
1580	1845	/*
1581	1846	*/
1582		- if (event.getSource() == heightFieldItem)
	1847	+ if (source == heightFieldItem)
1583	1848	{
1584	1849	Object3D obj = new Object3D();
1585	1850
..	..	@@ -1617,31 +1882,31 @@
1617	1882
1618	1883	makeSomething(obj);
1619	1884	} else
1620		- if (event.getSource() == gridItem)
	1885	+ if (source == gridItem \|\| source == gridButton)
1621	1886	{
1622	1887	makeSomething(new Grid());
1623	1888	} else
1624		- if (event.getSource() == ellipsoidItem)
	1889	+ if (source == ellipsoidItem \|\| source == sphereButton)
1625	1890	{
1626	1891	makeSomething(new Sphere());
1627	1892	} else
1628		- if (event.getSource() == coneItem)
	1893	+ if (source == coneItem \|\| source == coneButton)
1629	1894	{
1630	1895	makeSomething(new Cone());
1631	1896	} else
1632		- if (event.getSource() == torusItem)
	1897	+ if (source == torusItem \|\| source == torusButton)
1633	1898	{
1634	1899	makeSomething(new Torus());
1635	1900	} else
1636		- if (event.getSource() == superItem)
	1901	+ if (source == superItem \|\| source == superButton)
1637	1902	{
1638	1903	makeSomething(new Superellipsoid());
1639	1904	} else
1640		- if (event.getSource() == kleinItem)
	1905	+ if (source == kleinItem \|\| source == kleinButton)
1641	1906	{
1642	1907	makeSomething(new Klein());
1643	1908	} else
1644		- if (event.getSource() == blobItem)
	1909	+ if (source == blobItem)
1645	1910	{
1646	1911	Blob blob = new Blob();
1647	1912	BlobComponent comp = new BlobComponent();
..	..	@@ -1649,15 +1914,15 @@
1649	1914	//blob.retile();
1650	1915	makeSomething(blob);
1651	1916	} else
1652		- if (event.getSource() == latheItem)
	1917	+ if (source == latheItem)
1653	1918	{
1654	1919	makeSomething(new Lathe());
1655	1920	} else
1656		- if (event.getSource() == bezierItem)
	1921	+ if (source == bezierItem)
1657	1922	{
1658	1923	makeSomething(new BezierSurface());
1659	1924	} else
1660		- if (event.getSource() == checkerItem)
	1925	+ if (source == overlayItem \|\| source == overlayButton)
1661	1926	{
1662	1927	/*
1663	1928	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1672,7 +1937,7 @@
1672	1937	*/
1673	1938	makeSomething(new Checker());
1674	1939	} else
1675		- if (event.getSource() == meshItem)
	1940	+ if (source == meshItem)
1676	1941	{
1677	1942	Object3D itemtomake = new Object3D();
1678	1943	Object3D child;
..	..	@@ -1693,35 +1958,35 @@
1693	1958	makeSomething(child);
1694	1959	}
1695	1960	} else
1696		- if (event.getSource() == springItem)
	1961	+ if (source == springItem)
1697	1962	{
1698	1963	cSpring s = new cSpring();
1699	1964	s.setup();
1700	1965	makeSomething(s);
1701	1966	} else
1702		- if (event.getSource() == flagItem)
	1967	+ if (source == flagItem)
1703	1968	{
1704	1969	cSpring s = new cFlag();
1705	1970	s.setup();
1706	1971	makeSomething(s);
1707	1972	} else
1708		- if (event.getSource() == lightItem)
	1973	+ if (source == lightItem \|\| source == lightButton)
1709	1974	{
1710	1975	makeSomething(new Light());
1711	1976	} else
1712		- if (event.getSource() == csgItem)
	1977	+ if (source == csgItem)
1713	1978	{
1714	1979	group(new CSG());
1715	1980	} else
1716		- if (event.getSource() == templateItem)
	1981	+ if (source == templateItem)
1717	1982	{
1718	1983	group(new cTemplate());
1719	1984	} else
1720		- if (event.getSource() == attributeItem)
	1985	+ if (source == attributeItem)
1721	1986	{
1722	1987	makeSomething(new Attribute());
1723	1988	} else
1724		- if (event.getSource() == pointflowItem)
	1989	+ if (source == pointflowItem)
1725	1990	{
1726	1991	makeSomething(new PointFlow());
1727	1992	} else
..	..	@@ -1733,7 +1998,7 @@
1733	1998	} else
1734	1999	*/
1735	2000
1736		- if (event.getSource() == superLoopItem)
	2001	+ if (source == superLoopItem)
1737	2002	{
1738	2003	Composite g = new cGroup();
1739	2004	for (int i=0; i<15; i++)
..	..	@@ -1755,7 +2020,7 @@
1755	2020
1756	2021	group(g);
1757	2022	} else
1758		- if (event.getSource() == loopItem)
	2023	+ if (source == loopItem)
1759	2024	{
1760	2025	Composite csg = new GroupLeaf();
1761	2026	csg.count = 5;
..	..	@@ -1764,7 +2029,7 @@
1764	2029	csg.addChild(child);
1765	2030	child.addChild(csg);
1766	2031	} else
1767		- if (event.getSource() == doubleItem)
	2032	+ if (source == doubleItem)
1768	2033	{
1769	2034	Composite csg = new GroupLeaf();
1770	2035	csg.count = 5;
..	..	@@ -1776,7 +2041,7 @@
1776	2041	csg.addChild(child);
1777	2042	child.addChild(csg);
1778	2043	} else
1779		- if (event.getSource() == tripleItem)
	2044	+ if (source == tripleItem)
1780	2045	{
1781	2046	Composite csg = new GroupLeaf();
1782	2047	csg.count = 4;
..	..	@@ -1791,71 +2056,83 @@
1791	2056	csg.addChild(child);
1792	2057	child.addChild(csg);
1793	2058	} else
1794		-
1795		- if (event.getSource() == importGFDItem)
1796		- {
1797		- ImportGFD();
1798		- } else
1799		- if (event.getSource() == importVRMLX3DItem)
1800		- {
1801		- ImportVRMLX3D();
1802		- } else
1803		- if (event.getSource() == import3DSItem)
1804		- {
1805		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1806		- } else
1807		- if (event.getSource() == importOBJItem)
1808		- {
1809		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1810		- } else
1811		- if (event.getSource() == computeAOItem)
	2059	+ if (source == computeAOItem)
1812	2060	{
1813	2061	Globals.drawMode = CameraPane.OCCLUSION;
1814	2062	Globals.theRenderer.repaint();
1815	2063	} else
1816		- if (event.getSource() == recompileItem)
	2064	+ if (source == recompileItem)
1817	2065	{
1818	2066	Recompile();
1819	2067	refreshContents();
1820	2068	} else
1821		- if (event.getSource() == editScriptItem)
	2069	+ if (source == editScriptItem)
1822	2070	{
1823	2071	OpenDialog();
1824	2072	refreshContents();
1825	2073	} else
1826		- if (event.getSource() == invariantsItem)
	2074	+ if (source == invariantsItem)
1827	2075	{
1828	2076	System.out.println("Invariants:");
1829		- GrafreeD.grafreeD.universe.invariants();
	2077	+ Grafreed.grafreeD.universe.invariants();
1830	2078	} else
1831		- if (event.getSource() == memoryItem)
	2079	+ if (source == memoryItem)
1832	2080	{
1833	2081	//System.out.println("Invariants:");
1834	2082	PrintMemory();
1835	2083	} else
1836		- if (event.getSource() == pathItem)
	2084	+ if (source == pathItem)
1837	2085	{
1838	2086	PrintPath();
1839	2087	} else
1840		- if (event.getSource() == analyzeItem)
	2088	+ if (source == analyzeItem)
1841	2089	{
1842	2090	AnalyzeObject();
1843	2091	} else
1844		- if (event.getSource() == dumpItem)
	2092	+ if (source == dumpItem)
1845	2093	{
1846	2094	DumpObject();
1847	2095	} else
1848		- if (event.getSource() == screenfitButton)
	2096	+ if (source == minButton)
	2097	+ {
	2098	+ Minimize();
	2099	+ } else
	2100	+ if (source == maxButton)
	2101	+ {
	2102	+ Maximize();
	2103	+ } else
	2104	+ if (source == fullButton)
	2105	+ {
	2106	+ ToggleFullScreen();
	2107	+ } else
	2108	+ if (source == undoButton)
	2109	+ {
	2110	+ Undo();
	2111	+ } else
	2112	+ if (source == redoButton)
	2113	+ {
	2114	+ Redo();
	2115	+ } else
	2116	+ if (source == saveButton)
	2117	+ {
	2118	+ Save();
	2119	+ } else
	2120	+ if (source == oneStepButton)
	2121	+ {
	2122	+ Globals.ONESTEP = true;
	2123	+ cameraView.repaint();
	2124	+ } else
	2125	+ if (source == screenfitButton)
1849	2126	{
1850	2127	//Reload(lastConverter, lastFilename, true);
1851	2128	ScreenFit();
1852	2129	} else
1853		- if (event.getSource() == screenfitpointButton)
	2130	+ if (source == screenfitpointButton)
1854	2131	{
1855	2132	//Reload(lastConverter, lastFilename, true);
1856	2133	ScreenFitPoint();
1857	2134	} else
1858		- if (event.getSource() == snapobjectButton)
	2135	+ if (source == snapobjectButton)
1859	2136	{
1860	2137	//Reload(lastConverter, lastFilename, true);
1861	2138	SnapObject();
..	..	@@ -1866,13 +2143,13 @@
1866	2143	// Recompile();
1867	2144	// refreshContents();
1868	2145	// } else
1869		- if (event.getSource() == gcButton)
	2146	+ if (source == gcButton)
1870	2147	{
1871	2148	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1872	2149	System.gc();
1873	2150	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1874	2151	} else
1875		- if (event.getSource() == editLeafItem)
	2152	+ if (source == editLeafItem)
1876	2153	{
1877	2154	Object3D obj;
1878	2155	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1886,62 +2163,74 @@
1886	2163	}
1887	2164	refreshContents(true);
1888	2165	} else
1889		- if (event.getSource() == openWindowItem)
	2166	+ if (source == openWindowItem)
1890	2167	{
1891	2168	EditSelection(true);
1892	2169	} else
1893		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2170	+ if (source == cutItem \|\| source == clearButton)
1894	2171	{
1895	2172	loadClipboard(true);
1896	2173	} else
1897		- if (event.getSource() == duplicateItem)
	2174	+ if (source == undoItem)
1898	2175	{
1899		- Object3D keep = GrafreeD.clipboard;
	2176	+ Undo();
	2177	+ } else
	2178	+ if (source == redoItem)
	2179	+ {
	2180	+ Redo();
	2181	+ } else
	2182	+ if (source == duplicateItem)
	2183	+ {
	2184	+ Object3D keep = Grafreed.clipboard;
1900	2185	loadClipboard(false);
1901	2186	paste(false);
1902		- GrafreeD.clipboard = keep;
	2187	+ Grafreed.clipboard = keep;
1903	2188	} else
1904		- if (event.getSource() == cloneItem)
	2189	+ if (source == cloneItem)
1905	2190	{
1906	2191	CloneSelection(false);
1907	2192	} else
1908		- if (event.getSource() == cloneSupportItem)
	2193	+ if (source == cloneSupportItem)
1909	2194	{
1910	2195	CloneSelection(true);
1911	2196	} else
1912		- if (event.getSource() == copyItem)
	2197	+ if (source == copyItem)
1913	2198	{
1914	2199	loadClipboard(false);
1915	2200	} else
1916		- if (event.getSource() == pasteItem)
	2201	+ if (source == pasteItem)
1917	2202	{
1918	2203	paste(false);
1919	2204	} else
1920		- if (event.getSource() == pasteLinkItem)
	2205	+ if (source == pasteIntoItem)
1921	2206	{
1922		- pasteInto(false);
	2207	+ pasteInto(true, false);
1923	2208	} else
1924		- if (event.getSource() == pasteCloneItem)
	2209	+ if (source == pasteLinkItem)
1925	2210	{
1926		- pasteInto(true);
	2211	+ pasteInto(false, false);
1927	2212	} else
1928		- if (event.getSource() == pasteExpandItem)
	2213	+ if (source == pasteCloneItem)
	2214	+ {
	2215	+ pasteInto(true, true);
	2216	+ } else
	2217	+ if (source == pasteExpandItem)
1929	2218	{
1930	2219	paste(true);
1931	2220	} else
1932		- if (event.getSource() == synchronizeItem)
	2221	+ if (source == synchronizeItem)
1933	2222	{
1934	2223	Overwrite(Object3D.TRANSFORM);
1935	2224	} else
1936		- if (event.getSource() == overwriteNameItem)
	2225	+ if (source == overwriteNameItem)
1937	2226	{
1938	2227	Overwrite(Object3D.NAME);
1939	2228	} else
1940		- if (event.getSource() == overwriteUVItem)
	2229	+ if (source == overwriteUVItem)
1941	2230	{
1942	2231	Overwrite(Object3D.UV);
1943	2232	} else
1944		- if (event.getSource() == overwriteMatItem)
	2233	+ if (source == overwriteMatItem)
1945	2234	{
1946	2235	/* july 2015
1947	2236	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1961,7 +2250,7 @@
1961	2250
1962	2251	Overwrite(dropAttributes);
1963	2252	}
1964		- if (event.getSource() == overwriteGeoItem)
	2253	+ if (source == overwriteGeoItem)
1965	2254	{
1966	2255	Overwrite(Object3D.GEOMETRY);
1967	2256	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1978,7 +2267,7 @@
1978	2267	// refreshContents();
1979	2268	// }
1980	2269	} else
1981		- if (event.getSource() == generateMeshItem)
	2270	+ if (source == generateMeshItem)
1982	2271	{
1983	2272	//if (group.selection.size() == 1)
1984	2273	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1989,7 +2278,7 @@
1989	2278	ResetModel();
1990	2279	refreshContents();
1991	2280	} else
1992		- if (event.getSource() == extractGeometriesItem)
	2281	+ if (source == extractGeometriesItem)
1993	2282	{
1994	2283	boolean one = false;
1995	2284
..	..	@@ -2016,7 +2305,7 @@
2016	2305	ResetModel();
2017	2306	refreshContents();
2018	2307	} else
2019		- if (event.getSource() == cloneGeometriesItem)
	2308	+ if (source == cloneGeometriesItem)
2020	2309	{
2021	2310	boolean one = false;
2022	2311
..	..	@@ -2042,7 +2331,7 @@
2042	2331	ResetModel();
2043	2332	refreshContents();
2044	2333	} else
2045		- if (event.getSource() == shareGeometriesItem)
	2334	+ if (source == shareGeometriesItem)
2046	2335	{
2047	2336	boolean one = false;
2048	2337
..	..	@@ -2072,7 +2361,7 @@
2072	2361	refreshContents();
2073	2362	}
2074	2363	} else
2075		- if (event.getSource() == mergeGeometriesItem)
	2364	+ if (source == mergeGeometriesItem)
2076	2365	{
2077	2366	boolean one = false;
2078	2367
..	..	@@ -2102,7 +2391,7 @@
2102	2391	ResetModel();
2103	2392	refreshContents();
2104	2393	} else
2105		- if (event.getSource() == linkverticesItem)
	2394	+ if (source == linkverticesItem)
2106	2395	{
2107	2396	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2108	2397	// {
..	..	@@ -2115,9 +2404,9 @@
2115	2404	// group.selection.get(0).setMasterThis(content); // should be identity
2116	2405	// refreshContents();
2117	2406	// }
2118		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2407	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2119	2408	{
2120		- Object3D content = GrafreeD.clipboard.get(0);
	2409	+ Object3D content = Grafreed.clipboard.get(0);
2121	2410
2122	2411	if (content instanceof cGroup && ((cGroup)content).transientlink )
2123	2412	content = ((cGroup)content).get(0);
..	..	@@ -2125,38 +2414,38 @@
2125	2414	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2126	2415	for (int i=0; i<group.selection.size(); i++)
2127	2416	{
2128		- boolean random = CameraPane.RANDOM;
2129		- CameraPane.RANDOM = false; // parse all random nodes
	2417	+ boolean random = CameraPane.SWITCH;
	2418	+ CameraPane.SWITCH = false; // parse all random nodes
2130	2419	group.selection.get(i).linkVerticesThis(content);
2131	2420	// group.selection.get(i).setMasterThis(content); // should be identity
2132		- CameraPane.RANDOM = random;
	2421	+ CameraPane.SWITCH = random;
2133	2422	}
2134	2423	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2135	2424	refreshContents();
2136	2425	}
2137	2426	} else
2138		- if (event.getSource() == resetsupportItem)
	2427	+ if (source == resetsupportItem)
2139	2428	{
2140	2429	for (int i=0; i<group.selection.size(); i++)
2141	2430	{
2142		- boolean random = CameraPane.RANDOM;
2143		- CameraPane.RANDOM = false; // parse all random nodes
	2431	+ boolean random = CameraPane.SWITCH;
	2432	+ CameraPane.SWITCH = false; // parse all random nodes
2144	2433	group.selection.get(i).linkVerticesThis(null);
2145		- CameraPane.RANDOM = random;
	2434	+ CameraPane.SWITCH = random;
2146	2435	}
2147	2436
2148	2437	refreshContents();
2149	2438	} else
2150		- if (event.getSource() == relinkverticesItem)
	2439	+ if (source == relinkverticesItem)
2151	2440	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2441	+ boolean random = CameraPane.SWITCH;
	2442	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2443	group.selection.RelinkToSupport();
2155		- CameraPane.RANDOM = random;
	2444	+ CameraPane.SWITCH = random;
2156	2445
2157	2446	refreshContents();
2158	2447	} else
2159		- if (event.getSource() == resetreferencesItem)
	2448	+ if (source == resetreferencesItem)
2160	2449	{
2161	2450	for (int i=0; i<group.selection.size(); i++)
2162	2451	{
..	..	@@ -2165,11 +2454,11 @@
2165	2454
2166	2455	refreshContents();
2167	2456	} else
2168		- if (event.getSource() == setMasterItem)
	2457	+ if (source == setMasterItem)
2169	2458	{
2170		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2459	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2171	2460	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2461	+ Object3D content = Grafreed.clipboard.get(0);
2173	2462
2174	2463	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2464	content = ((cGroup)content).get(0);
..	..	@@ -2178,13 +2467,13 @@
2178	2467	refreshContents();
2179	2468	}
2180	2469	} else
2181		- if (event.getSource() == poseMeshItem)
	2470	+ if (source == poseMeshItem)
2182	2471	{
2183	2472	if (group.selection.size() == 1)
2184	2473	{
2185		- if (GrafreeD.clipboard.size() == 1)
	2474	+ if (Grafreed.clipboard.size() == 1)
2186	2475	{
2187		- Object3D content = GrafreeD.clipboard.get(0);
	2476	+ Object3D content = Grafreed.clipboard.get(0);
2188	2477
2189	2478	if (content instanceof cGroup && ((cGroup)content).transientlink )
2190	2479	content = ((cGroup)content).get(0);
..	..	@@ -2197,19 +2486,19 @@
2197	2486	}
2198	2487
2199	2488	} else
2200		- if (event.getSource() == revertMeshItem)
	2489	+ if (source == revertMeshItem)
2201	2490	{
2202	2491	RevertMeshes();
2203	2492	} else
2204		- if (event.getSource() == resetMeshItem)
	2493	+ if (source == resetAllItem)
2205	2494	{
2206	2495	ResetAll();
2207	2496	} else
2208		- if (event.getSource() == stepAllItem)
	2497	+ if (source == stepAllItem)
2209	2498	{
2210	2499	StepAll();
2211	2500	} else
2212		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2501	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2213	2502	{
2214	2503	//int indices[] = jList.getSelectedIndices();
2215	2504	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2217,46 +2506,46 @@
2217	2506
2218	2507	ClearSelection(false);
2219	2508	} else
2220		- if (event.getSource() == clearAllItem)
	2509	+ if (source == clearAllItem)
2221	2510	{
2222	2511	ClearSelection(true);
2223	2512	} else
2224		- if (event.getSource() == grabItem)
	2513	+ if (source == grabItem)
2225	2514	{
2226	2515	group(new cGroup(), true);
2227	2516	} else
2228		- if (event.getSource() == hideItem)
	2517	+ if (source == hideItem)
2229	2518	{
2230	2519	group(new HiddenObject());
2231	2520	} else
2232		- if (event.getSource() == frontItem)
	2521	+ if (source == frontItem)
2233	2522	{
2234	2523	front();
2235	2524	} else
2236		- if (event.getSource() == backItem)
	2525	+ if (source == backItem)
2237	2526	{
2238	2527	back();
2239	2528	} else
2240		- if (event.getSource() == cameraItem)
	2529	+ if (source == cameraItem)
2241	2530	{
2242	2531	makeSomething(new Camera());
2243	2532	} else
2244		- if (event.getSource() == compositeItem)
	2533	+ if (source == compositeItem)
2245	2534	{
2246	2535	group(new Composite());
2247	2536	} else
2248		- if (event.getSource() == randomItem)
	2537	+ if (source == randomItem)
2249	2538	{
2250	2539	RandomNode random = new RandomNode();
2251	2540	group(random);
2252	2541	if (random.size() > 0)
2253		- random.name = random.get(0).name + "Rnd";
	2542	+ random.name = random.get(0).name + "Switch";
2254	2543	} else
2255		- if (event.getSource() == physicsItem)
	2544	+ if (source == physicsItem)
2256	2545	{
2257	2546	group(new PhysicsNode());
2258	2547	} else
2259		- if (event.getSource() == frameselectorItem)
	2548	+ if (source == frameselectorItem)
2260	2549	{
2261	2550	for (int i=0; i<group.selection.size(); i++)
2262	2551	{
..	..	@@ -2268,7 +2557,7 @@
2268	2557	ResetModel();
2269	2558	refreshContents();
2270	2559	} else
2271		- if (event.getSource() == switchGeoItem)
	2560	+ if (source == switchGeoItem)
2272	2561	{
2273	2562	for (int i=0; i<group.selection.size(); i++)
2274	2563	{
..	..	@@ -2280,7 +2569,7 @@
2280	2569	ResetModel();
2281	2570	refreshContents();
2282	2571	} else
2283		- if (event.getSource() == switchTransfoItem)
	2572	+ if (source == switchTransfoItem)
2284	2573	{
2285	2574	for (int i=0; i<group.selection.size(); i++)
2286	2575	{
..	..	@@ -2292,7 +2581,7 @@
2292	2581	ResetModel();
2293	2582	refreshContents();
2294	2583	} else
2295		- if (event.getSource() == morphItem)
	2584	+ if (source == morphItem)
2296	2585	{
2297	2586	for (int i=0; i<group.selection.size(); i++)
2298	2587	{
..	..	@@ -2304,7 +2593,7 @@
2304	2593	ResetModel();
2305	2594	refreshContents();
2306	2595	} else
2307		- if (event.getSource() == scriptNodeItem)
	2596	+ if (source == scriptNodeItem)
2308	2597	{
2309	2598	boolean atleastone = false;
2310	2599
..	..	@@ -2343,31 +2632,31 @@
2343	2632	}
2344	2633	}
2345	2634	} else
2346		- if (event.getSource() == linkerItem)
	2635	+ if (source == linkerItem)
2347	2636	{
2348	2637	group(new cLinker());
2349	2638	} else
2350		- if (event.getSource() == textureItem)
	2639	+ if (source == textureItem)
2351	2640	{
2352	2641	group(new TextureNode());
2353	2642	} else
2354		- if (event.getSource() == billboardItem)
	2643	+ if (source == billboardItem)
2355	2644	{
2356	2645	group(new BillboardNode());
2357	2646	} else
2358		- if (event.getSource() == shadowXItem)
	2647	+ if (source == shadowXItem)
2359	2648	{
2360	2649	CastShadow(0);
2361	2650	} else
2362		- if (event.getSource() == shadowYItem)
	2651	+ if (source == shadowYItem)
2363	2652	{
2364	2653	CastShadow(1);
2365	2654	} else
2366		- if (event.getSource() == shadowZItem)
	2655	+ if (source == shadowZItem)
2367	2656	{
2368	2657	CastShadow(2);
2369	2658	} else
2370		- if (event.getSource() == ungroupItem)
	2659	+ if (source == ungroupItem \|\| source == ungroupButton)
2371	2660	{
2372	2661	//ungroup();
2373	2662	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2379,179 +2668,203 @@
2379	2668
2380	2669	refreshContents();
2381	2670	} else
2382		- if (event.getSource() == genUVItem)
	2671	+ if (source == genUVItem)
2383	2672	{
2384	2673	GenUV();
2385	2674	} else
2386		- if (event.getSource() == genNormalsCADItem)
	2675	+ if (source == genNormalsCADItem)
2387	2676	{
2388	2677	GenNormals(true);
2389	2678	} else
2390		- if (event.getSource() == genNormalsMESHItem)
	2679	+ if (source == genNormalsMESHItem)
2391	2680	{
2392		- GenNormals(true); // TODO
	2681	+ GenNormalsMESH();
2393	2682	} else
2394		- if (event.getSource() == genNormalsORGANItem)
	2683	+ if (source == genNormalsORGANItem)
2395	2684	{
2396	2685	GenNormals(false);
2397	2686	} else
2398		- if (event.getSource() == genNormalsMINEItem)
	2687	+ if (source == genNormalsMINEItem)
2399	2688	{
2400	2689	GenNormalsMINE();
2401	2690	} else
2402		- if (event.getSource() == stripifyItem)
	2691	+ if (source == stripifyItem)
2403	2692	{
2404	2693	Stripify();
2405	2694	} else
2406		- if (event.getSource() == unstripifyItem)
	2695	+ if (source == unstripifyItem)
2407	2696	{
2408	2697	Unstripify();
2409	2698	} else
2410		- if (event.getSource() == trimItem)
	2699	+ if (source == trimItem)
2411	2700	{
2412	2701	Trim();
2413	2702	} else
2414		- if (event.getSource() == untrimItem)
	2703	+ if (source == untrimItem)
2415	2704	{
2416	2705	Untrim();
2417	2706	} else
2418		- if (event.getSource() == clearColorsItem)
	2707	+ if (source == clearColorsItem)
2419	2708	{
2420	2709	ClearColors();
2421	2710	} else
2422		- if (event.getSource() == clearMaterialsItem)
	2711	+ if (source == clearMaterialsItem)
2423	2712	{
2424	2713	ClearMaterials();
2425	2714	} else
2426		- if (event.getSource() == liveleavesItem)
	2715	+ if (source == liveleavesItem)
2427	2716	{
2428	2717	LiveLeaves(true);
2429	2718	} else
2430		- if (event.getSource() == unliveleavesItem)
	2719	+ if (source == unliveleavesItem)
2431	2720	{
2432	2721	LiveLeaves(false);
2433	2722	} else
2434		- if (event.getSource() == supportleavesItem)
	2723	+ if (source == supportleavesItem)
2435	2724	{
2436	2725	SupportLeaves(true);
2437	2726	} else
2438		- if (event.getSource() == unsupportleavesItem)
	2727	+ if (source == unsupportleavesItem)
2439	2728	{
2440	2729	SupportLeaves(false);
2441	2730	} else
2442		- if (event.getSource() == hideleavesItem)
	2731	+ if (source == hideleavesItem)
2443	2732	{
2444	2733	HideLeaves(true);
2445	2734	} else
2446		- if (event.getSource() == showleavesItem)
	2735	+ if (source == showleavesItem)
2447	2736	{
2448	2737	HideLeaves(false);
2449	2738	} else
2450		- if (event.getSource() == markleavesItem)
	2739	+ if (source == markleavesItem)
2451	2740	{
2452	2741	MarkLeaves(true);
2453	2742	} else
2454		- if (event.getSource() == unmarkleavesItem)
	2743	+ if (source == unmarkleavesItem)
2455	2744	{
2456	2745	MarkLeaves(false);
2457	2746	} else
2458		- if (event.getSource() == flipVItem)
	2747	+ if (source == rewindleavesItem)
	2748	+ {
	2749	+ RewindLeaves(true);
	2750	+ } else
	2751	+ if (source == unrewindleavesItem)
	2752	+ {
	2753	+ RewindLeaves(false);
	2754	+ } else
	2755	+ if (source == randomleavesItem)
	2756	+ {
	2757	+ RandomLeaves(true);
	2758	+ } else
	2759	+ if (source == unrandomleavesItem)
	2760	+ {
	2761	+ RandomLeaves(false);
	2762	+ } else
	2763	+ if (source == flipVItem)
2459	2764	{
2460	2765	FlipV(true);
2461	2766	} else
2462		- if (event.getSource() == unflipVItem)
	2767	+ if (source == unflipVItem)
2463	2768	{
2464	2769	FlipV(false);
2465	2770	} else
2466		- if (event.getSource() == lowTexturesItem)
	2771	+ if (source == lowTexturesItem)
2467	2772	{
2468	2773	SetTexRes(0);
2469	2774	} else
2470		- if (event.getSource() == normalTexturesItem)
	2775	+ if (source == normalTexturesItem)
2471	2776	{
2472	2777	SetTexRes(1);
2473	2778	} else
2474		- if (event.getSource() == highTexturesItem)
	2779	+ if (source == highTexturesItem)
2475	2780	{
2476	2781	SetTexRes(2);
2477	2782	} else
2478		- if (event.getSource() == veryhighTexturesItem)
	2783	+ if (source == veryhighTexturesItem)
2479	2784	{
2480	2785	SetTexRes(3);
2481	2786	} else
2482		- if (event.getSource() == maxTexturesItem)
	2787	+ if (source == maxTexturesItem)
2483	2788	{
2484	2789	SetTexRes(4);
2485	2790	} else
2486		- if (event.getSource() == panoTexturesItem)
	2791	+ if (source == panoTexturesItem)
2487	2792	{
2488	2793	SetTexRes(5);
2489	2794	} else
2490		- if (event.getSource() == reverseNormalsItem)
	2795	+ if (source == reverseNormalsItem)
2491	2796	{
2492	2797	ReverseNormals();
2493	2798	} else
2494		- if (event.getSource() == parseverticesItem)
	2799	+ if (source == parseverticesItem)
2495	2800	{
2496	2801	ParseVertices();
2497	2802	} else
2498		- if (event.getSource() == textureFieldItem)
	2803	+ if (source == textureFieldItem)
2499	2804	{
2500	2805	TextureVertices();
2501	2806	} else
2502		- if (event.getSource() == alignItem)
	2807	+ if (source == alignItem)
2503	2808	{
2504	2809	Align();
2505	2810	} else
2506		- if (event.getSource() == mirrorItem)
	2811	+ if (source == mirrorItem)
2507	2812	{
2508	2813	MirrorPoses();
2509	2814	} else
2510		- if (event.getSource() == reduceMorphItem)
	2815	+ if (source == reduceMorphItem)
2511	2816	{
2512	2817	MeshReduction(false);
2513	2818	} else
2514		- if (event.getSource() == reduce34MorphItem)
	2819	+ if (source == reduce34MorphItem)
2515	2820	{
2516	2821	MeshReduction(true);
2517	2822	} else
2518		- if (event.getSource() == reverseTrianglesItem)
	2823	+ if (source == reverseTrianglesItem)
2519	2824	{
2520	2825	ReverseTriangles();
2521	2826	} else
2522		- if (event.getSource() == reduceMeshItem)
	2827	+ if (source == reduceMeshItem)
2523	2828	{
2524	2829	ReduceMesh(false);
2525	2830	} else
2526		- if (event.getSource() == reduce34MeshItem)
	2831	+ if (source == reduce34MeshItem)
2527	2832	{
2528	2833	ReduceMesh(true);
2529	2834	} else
2530		- if (event.getSource() == increaseMeshItem)
	2835	+ if (source == increaseMeshItem)
2531	2836	{
2532	2837	IncreaseMesh();
2533	2838	} else
2534		- if (event.getSource() == clipMeshItem)
	2839	+ if (source == clipMeshItem)
2535	2840	{
2536	2841	ClipMesh();
2537	2842	} else
2538		- if (event.getSource() == smoothMeshItem)
	2843	+ if (source == smoothMeshItem)
2539	2844	{
2540	2845	SmoothMesh();
2541	2846	} else
2542		- if (event.getSource() == transformgeometryItem)
	2847	+ if (source == transformGeometryItem)
2543	2848	{
2544	2849	TransformGeometry();
2545	2850	} else
2546		- if (event.getSource() == resetTransformItem)
	2851	+ if (source == transformChildrenItem)
	2852	+ {
	2853	+ TransformChildren();
	2854	+ } else
	2855	+ if (source == resetTransformItem)
2547	2856	{
2548	2857	ResetTransform();
2549	2858	} else
2550		- if (event.getSource() == resetCentroidItem)
	2859	+ if (source == resetCentroidItem)
2551	2860	{
2552		- ResetCentroid();
	2861	+ ResetCentroid(true);
2553	2862	} else
2554		- if (event.getSource() == resetParentItem)
	2863	+ if (source == resetCentroidXZItem)
	2864	+ {
	2865	+ ResetCentroid(false);
	2866	+ } else
	2867	+ if (source == resetParentItem)
2555	2868	{
2556	2869	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2557	2870	{
..	..	@@ -2561,7 +2874,7 @@
2561	2874
2562	2875	refreshContents();
2563	2876	} else
2564		- if (event.getSource() == repairParentItem)
	2877	+ if (source == repairParentItem)
2565	2878	{
2566	2879	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2567	2880	{
..	..	@@ -2575,7 +2888,7 @@
2575	2888
2576	2889	refreshContents();
2577	2890	} else
2578		- if (event.getSource() == repairShadowItem)
	2891	+ if (source == repairShadowItem)
2579	2892	{
2580	2893	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2581	2894	{
..	..	@@ -2589,7 +2902,7 @@
2589	2902
2590	2903	refreshContents();
2591	2904	} else
2592		- if (event.getSource() == sortbysizeItem)
	2905	+ if (source == sortbysizeItem)
2593	2906	{
2594	2907	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2595	2908	{
..	..	@@ -2601,7 +2914,7 @@
2601	2914	ResetModel();
2602	2915	refreshContents();
2603	2916	} else
2604		- if (event.getSource() == sortbynameItem)
	2917	+ if (source == sortbynameItem)
2605	2918	{
2606	2919	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2607	2920	{
..	..	@@ -2613,7 +2926,7 @@
2613	2926	ResetModel();
2614	2927	refreshContents();
2615	2928	} else
2616		- if (event.getSource() == attachPigmentItem)
	2929	+ if (source == attachPigmentItem)
2617	2930	{
2618	2931	String texture = GetFile("Attach pigment");
2619	2932	Object3D obj;
..	..	@@ -2625,7 +2938,7 @@
2625	2938
2626	2939	refreshContents();
2627	2940	} else
2628		- if (event.getSource() == detachPigmentItem)
	2941	+ if (source == detachPigmentItem)
2629	2942	{
2630	2943	Object3D obj;
2631	2944	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2636,7 +2949,7 @@
2636	2949
2637	2950	refreshContents();
2638	2951	} else
2639		- if (event.getSource() == attachBumpItem)
	2952	+ if (source == attachBumpItem)
2640	2953	{
2641	2954	String texture = GetFile("Attach bump");
2642	2955	Object3D obj;
..	..	@@ -2648,7 +2961,7 @@
2648	2961
2649	2962	refreshContents();
2650	2963	} else
2651		- if (event.getSource() == detachBumpItem)
	2964	+ if (source == detachBumpItem)
2652	2965	{
2653	2966	Object3D obj;
2654	2967	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2659,7 +2972,7 @@
2659	2972
2660	2973	refreshContents();
2661	2974	} else
2662		- if (event.getSource() == pigmentBumpItem)
	2975	+ if (source == pigmentBumpItem)
2663	2976	{
2664	2977	Object3D obj;
2665	2978	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2670,158 +2983,237 @@
2670	2983
2671	2984	refreshContents();
2672	2985	} else
2673		- if (event.getSource() == flashSelectionButton)
	2986	+ if (source == flashSelectionButton)
2674	2987	{
2675	2988	CameraPane.flash = true;
2676	2989	refreshContents();
2677	2990	} else
2678		- if (event.getSource() == oneButton)
	2991	+ if (source == oneButton)
2679	2992	{
2680	2993	} else
2681		- if (event.getSource() == twoButton)
	2994	+ if (source == twoButton)
2682	2995	{
2683	2996	radio.layout = twoButton;
	2997	+
	2998	+ if (CameraPane.FULLSCREEN)
	2999	+ fullscreenLayout = radio.layout;
	3000	+
2684	3001	// bug
2685	3002	//gridPanel.setDividerLocation(1.0);
2686	3003	//bigPanel.setDividerLocation(0.0);
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		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2709		- //bigThree.add(XYZPanel, aWindowConstraints);
2710		- bigThree.revalidate();
	3004	+// bigThree.remove(scenePanel);
	3005	+// bigThree.remove(centralPanel);
	3006	+// bigThree.remove(XYZPanel);
	3007	+// aWindowConstraints.gridx = 0;
	3008	+// aWindowConstraints.gridy = 0;
	3009	+// aWindowConstraints.gridwidth = 1;
	3010	+// // aConstraints.gridheight = 3;
	3011	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3012	+// aWindowConstraints.weightx = 0;
	3013	+// aWindowConstraints.weighty = 1;
	3014	+// //bigThree.add(jtp, aWindowConstraints);
	3015	+// aWindowConstraints.weightx = 1;
	3016	+// aWindowConstraints.gridwidth = 3;
	3017	+// // aConstraints.gridheight = 3;
	3018	+// aWindowConstraints.gridx = 1;
	3019	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3020	+// bigThree.add(centralPanel, aWindowConstraints);
	3021	+// aWindowConstraints.weightx = 0;
	3022	+// aWindowConstraints.gridx = 4;
	3023	+// aWindowConstraints.gridwidth = 1;
	3024	+// // aConstraints.gridheight = 3;
	3025	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3026	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3027	+// scenePanel.setVisible(false);
	3028	+// centralPanel.setVisible(true);
	3029	+// XYZPanel.setVisible(false);
	3030	+ bigThree.ClearUI();
	3031	+ bigThree.add(centralPanel);
	3032	+ bigThree.FlushUI();
	3033	+
	3034	+ cameraView.requestFocusInWindow();
	3035	+
	3036	+// refreshContents(true);
	3037	+//
	3038	+// try
	3039	+// {
	3040	+// java.awt.Robot bot = new java.awt.Robot();
	3041	+// int mask = InputEvent.BUTTON1_MASK;
	3042	+// bot.mouseMove(100, 100);
	3043	+// bot.mousePress(mask);
	3044	+// bot.mouseRelease(mask);
	3045	+// }
	3046	+// catch (Exception e)
	3047	+// {
	3048	+//
	3049	+// }
	3050	+
2711	3051	} else
2712		- if (event.getSource() == threeButton)
	3052	+ if (source == threeButton)
2713	3053	{
2714	3054	radio.layout = threeButton;
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		- // aConstraints.gridheight = 3;
2722		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2723		- aWindowConstraints.weightx = 0;
2724		- aWindowConstraints.weighty = 1;
2725		- //bigThree.add(jtp, 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(centralPanel, aWindowConstraints);
2732		- aWindowConstraints.weightx = 0;
2733		- aWindowConstraints.gridx = 4;
2734		- aWindowConstraints.gridwidth = 1;
2735		- // aConstraints.gridheight = 3;
2736		- aConstraints.fill = GridBagConstraints.VERTICAL;
2737		- bigThree.add(XYZPanel, aWindowConstraints);
2738		- bigThree.revalidate();
	3055	+
	3056	+ if (CameraPane.FULLSCREEN)
	3057	+ fullscreenLayout = radio.layout;
	3058	+
	3059	+// bigThree.remove(scenePanel);
	3060	+// bigThree.remove(centralPanel);
	3061	+// bigThree.remove(XYZPanel);
	3062	+// aWindowConstraints.gridx = 0;
	3063	+// aWindowConstraints.gridy = 0;
	3064	+// aWindowConstraints.gridwidth = 1;
	3065	+// // aConstraints.gridheight = 3;
	3066	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3067	+// aWindowConstraints.weightx = 0;
	3068	+// aWindowConstraints.weighty = 1;
	3069	+// //bigThree.add(jtp, aWindowConstraints);
	3070	+// aWindowConstraints.weightx = 1;
	3071	+// aWindowConstraints.gridwidth = 3;
	3072	+// // aConstraints.gridheight = 3;
	3073	+// aWindowConstraints.gridx = 1;
	3074	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3075	+// bigThree.add(centralPanel, aWindowConstraints);
	3076	+// aWindowConstraints.weightx = 0;
	3077	+// aWindowConstraints.gridx = 4;
	3078	+// aWindowConstraints.gridwidth = 1;
	3079	+// // aConstraints.gridheight = 3;
	3080	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3081	+// bigThree.add(XYZPanel, aWindowConstraints);
	3082	+// bigThree.validate();
	3083	+// scenePanel.setVisible(false);
	3084	+// centralPanel.setVisible(true);
	3085	+// XYZPanel.setVisible(true);
	3086	+ bigThree.ClearUI();
	3087	+ bigThree.add(centralPanel);
	3088	+ bigThree.add(XYZPanel);
	3089	+ bigThree.FlushUI();
	3090	+
	3091	+ cameraView.requestFocusInWindow();
2739	3092	} else
2740		- if (event.getSource() == fourButton)
	3093	+ if (source == fourButton)
2741	3094	{
2742	3095	radio.layout = fourButton;
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		- // aWindowConstraints.gridheight = 3;
2750		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2751		- aWindowConstraints.weightx = 1;
2752		- aWindowConstraints.weighty = 1;
2753		- bigThree.add(scenePanel, aWindowConstraints);
2754		- aWindowConstraints.weightx = 1;
2755		- aWindowConstraints.gridwidth = 3;
2756		- // aConstraints.gridheight = 3;
2757		- aWindowConstraints.gridx = 1;
2758		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2759		- //bigThree.add(cameraPanel, 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, aWindowConstraints);
2766		- bigThree.revalidate();
	3096	+
	3097	+ if (CameraPane.FULLSCREEN)
	3098	+ fullscreenLayout = radio.layout;
	3099	+
	3100	+// bigThree.remove(scenePanel);
	3101	+// bigThree.remove(centralPanel);
	3102	+// bigThree.remove(XYZPanel);
	3103	+// aWindowConstraints.gridx = 0;
	3104	+// aWindowConstraints.gridy = 0;
	3105	+// aWindowConstraints.gridwidth = 1;
	3106	+// // aWindowConstraints.gridheight = 3;
	3107	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3108	+// aWindowConstraints.weightx = 1;
	3109	+// aWindowConstraints.weighty = 1;
	3110	+// bigThree.add(scenePanel, aWindowConstraints);
	3111	+// aWindowConstraints.weightx = 1;
	3112	+// aWindowConstraints.gridwidth = 3;
	3113	+// // aConstraints.gridheight = 3;
	3114	+// aWindowConstraints.gridx = 1;
	3115	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3116	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3117	+// aWindowConstraints.weightx = 0;
	3118	+// aWindowConstraints.gridx = 4;
	3119	+// aWindowConstraints.gridwidth = 1;
	3120	+// // aWindowConstraints.gridheight = 3;
	3121	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3122	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3123	+// bigThree.validate();
	3124	+// scenePanel.setVisible(true);
	3125	+// centralPanel.setVisible(false);
	3126	+// XYZPanel.setVisible(false);
	3127	+ bigThree.ClearUI();
	3128	+ bigThree.add(scenePanel);
	3129	+ bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
2767	3132	} else
2768		- if (event.getSource() == sixButton)
	3133	+ if (source == sixButton)
2769	3134	{
2770	3135	radio.layout = sixButton;
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		- // aConstraints.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		- // aWindowConstraints.gridheight = 3;
2792		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2793		- //bigThree.add(XYZPanel, aConstraints);
2794		- bigThree.revalidate();
	3136	+
	3137	+ if (CameraPane.FULLSCREEN)
	3138	+ fullscreenLayout = radio.layout;
	3139	+
	3140	+// bigThree.remove(scenePanel);
	3141	+// bigThree.remove(centralPanel);
	3142	+// bigThree.remove(XYZPanel);
	3143	+// aWindowConstraints.gridx = 0;
	3144	+// aWindowConstraints.gridy = 0;
	3145	+// aWindowConstraints.gridwidth = 1;
	3146	+// // aConstraints.gridheight = 3;
	3147	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3148	+// aWindowConstraints.weightx = 0;
	3149	+// aWindowConstraints.weighty = 1;
	3150	+// bigThree.add(scenePanel, aWindowConstraints);
	3151	+// aWindowConstraints.weightx = 1;
	3152	+// aWindowConstraints.gridwidth = 3;
	3153	+// // aWindowConstraints.gridheight = 3;
	3154	+// aWindowConstraints.gridx = 1;
	3155	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3156	+// bigThree.add(centralPanel, aWindowConstraints);
	3157	+// aWindowConstraints.weightx = 0;
	3158	+// aWindowConstraints.gridx = 4;
	3159	+// aWindowConstraints.gridwidth = 1;
	3160	+// // aWindowConstraints.gridheight = 3;
	3161	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3162	+// //bigThree.add(XYZPanel, aConstraints);
	3163	+// bigThree.validate();
	3164	+// scenePanel.setVisible(true);
	3165	+// centralPanel.setVisible(true);
	3166	+// XYZPanel.setVisible(false);
	3167	+ bigThree.ClearUI();
	3168	+ bigThree.add(scenePanel);
	3169	+ bigThree.add(centralPanel);
	3170	+ bigThree.FlushUI();
	3171	+
	3172	+ cameraView.requestFocusInWindow();
2795	3173	} else
2796		- if (event.getSource() == sevenButton)
	3174	+ if (source == sevenButton)
2797	3175	{
2798	3176	radio.layout = sevenButton;
2799		- bigThree.remove(scenePanel);
2800		- bigThree.remove(centralPanel);
2801		- bigThree.remove(XYZPanel);
2802		- aWindowConstraints.gridx = 0;
2803		- aWindowConstraints.gridy = 0;
2804		- aWindowConstraints.gridwidth = 1;
2805		- // aWindowConstraints.gridheight = 3;
2806		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2807		- aWindowConstraints.weightx = 0;
2808		- aWindowConstraints.weighty = 1;
2809		- bigThree.add(scenePanel, aWindowConstraints);
2810		- aWindowConstraints.weightx = 1;
2811		- aWindowConstraints.gridwidth = 3;
2812		- // aWindowConstraints.gridheight = 3;
2813		- aWindowConstraints.gridx = 1;
2814		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2815		- bigThree.add(centralPanel, aWindowConstraints);
2816		- aWindowConstraints.weightx = 0;
2817		- aWindowConstraints.gridx = 4;
2818		- aWindowConstraints.gridwidth = 1;
2819		- // aConstraints.gridheight = 3;
2820		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2821		- bigThree.add(XYZPanel, aWindowConstraints);
2822		- bigThree.revalidate();
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
	3180	+
	3181	+// bigThree.remove(scenePanel);
	3182	+// bigThree.remove(centralPanel);
	3183	+// bigThree.remove(XYZPanel);
	3184	+// aWindowConstraints.gridx = 0;
	3185	+// aWindowConstraints.gridy = 0;
	3186	+// aWindowConstraints.gridwidth = 1;
	3187	+// // aWindowConstraints.gridheight = 3;
	3188	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3189	+// aWindowConstraints.weightx = 0;
	3190	+// aWindowConstraints.weighty = 1;
	3191	+// bigThree.add(scenePanel, aWindowConstraints);
	3192	+// aWindowConstraints.weightx = 1;
	3193	+// aWindowConstraints.gridwidth = 3;
	3194	+// // aWindowConstraints.gridheight = 3;
	3195	+// aWindowConstraints.gridx = 1;
	3196	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3197	+// bigThree.add(centralPanel, aWindowConstraints);
	3198	+// aWindowConstraints.weightx = 0;
	3199	+// aWindowConstraints.gridx = 4;
	3200	+// aWindowConstraints.gridwidth = 1;
	3201	+// // aConstraints.gridheight = 3;
	3202	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3203	+// bigThree.add(XYZPanel, aWindowConstraints);
	3204	+// bigThree.validate();
	3205	+// scenePanel.setVisible(true);
	3206	+// centralPanel.setVisible(true);
	3207	+// XYZPanel.setVisible(true);
	3208	+ bigThree.ClearUI();
	3209	+ bigThree.add(scenePanel);
	3210	+ bigThree.add(centralPanel);
	3211	+ bigThree.add(XYZPanel);
	3212	+ bigThree.FlushUI();
	3213	+
	3214	+ cameraView.requestFocusInWindow();
2823	3215	} else
2824		- if (event.getSource() == rootButton)
	3216	+ if (source == rootButton)
2825	3217	{
2826	3218	Object3D obj;
2827	3219	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2831,34 +3223,44 @@
2831	3223	EditObject(obj);
2832	3224	}
2833	3225
	3226	+ cameraView.requestFocusInWindow();
2834	3227	refreshContents(true);
2835	3228	} else
2836		- if (event.getSource() == closeButton)
	3229	+ if (source == closeButton)
2837	3230	{
2838	3231	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2839	3232	cRadio ab;
2840	3233	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2841	3234	{
2842	3235	ab = (cRadio)e.nextElement();
2843		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3236	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2844	3237	{
	3238	+ // Patch to avoid bug with transparency.
	3239	+ if (!ab.hadMaterial)
	3240	+ {
	3241	+ ab.object.material = null;
	3242	+ }
	3243	+
2845	3244	buttonGroup.remove(ab);
2846	3245	radioPanel.remove(ab);
2847	3246
2848		- ab.GetObject().editWindow = null;
	3247	+ //ab.GetObject().editWindow = null;
	3248	+ ab.GetObject().manipWindow = null;
2849	3249	// ab.GetObject().objectUI = null; // ?????????
2850	3250
2851	3251	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2852	3252	break;
2853	3253	}
2854	3254	}
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2855	3257	refreshContents(true);
2856	3258	} else
2857		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3259	+ if (source == editItem \|\| source == editButton)
2858	3260	{
2859	3261	EditSelection(false);
2860	3262	} else
2861		- if (event.getSource() == uneditButton)
	3263	+ if (source == uneditButton)
2862	3264	{
2863	3265	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2864	3266	{
..	..	@@ -2868,14 +3270,14 @@
2868	3270	child.CloseUI();
2869	3271	listUI.remove(child);
2870	3272
2871		- child.editWindow = null; // ???????????
	3273	+ //child.editWindow = null; // ???????????
2872	3274	}
2873		- objEditor.ctrlPanel.revalidate();
	3275	+ objEditor.ctrlPanel.FlushUI();
2874	3276	//objEditor.jTree.clearSelection();
2875	3277	//objEditor.ResetSliders();
2876	3278	refreshContents(true);
2877	3279	} else
2878		- if (event.getSource() == clearPanelButton)
	3280	+ if (source == clearPanelButton)
2879	3281	{
2880	3282	assert(copy == group);
2881	3283	//copy.ClearUI();
..	..	@@ -2886,7 +3288,7 @@
2886	3288	listUI.clear();
2887	3289	refreshContents(true);
2888	3290	} else
2889		- if (event.getSource() == allParamsButton)
	3291	+ if (source == allParamsButton)
2890	3292	{
2891	3293	assert(copy == group);
2892	3294
..	..	@@ -2907,19 +3309,19 @@
2907	3309
2908	3310	refreshContents(true);
2909	3311	} else
2910		- if (event.getSource() == unselectButton)
	3312	+ if (source == unselectButton)
2911	3313	{
2912	3314	objEditor.jTree.clearSelection();
2913	3315	// ?? oct 2012 GrafreeD.clipboard.clear();
2914	3316	objEditor.ResetSliders();
2915	3317	refreshContents(true);
2916	3318	} else
2917		- if(event.getSource() instanceof cRadio)
	3319	+ if(source instanceof cRadio)
2918	3320	{
2919	3321	group.parent = keepparent;
2920	3322	group.attributes = 0;
2921	3323	//group.editWindow = null;
2922		- /cRadio/ radio = (cRadio)event.getSource();
	3324	+ /cRadio/ radio = (cRadio)source;
2923	3325	Object3D obj = radio.GetObject();
2924	3326	System.out.println("Edit " + obj);
2925	3327	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2954,7 +3356,11 @@
2954	3356	frontView.object = group;
2955	3357	sideView.object = group;
2956	3358	}
2957		- group.editWindow = this;
	3359	+
	3360	+// fix "+" issue
	3361	+ //group.editWindow = this;
	3362	+ group.manipWindow = this;
	3363	+
2958	3364	/*
2959	3365	currentLayout = radio.layout;
2960	3366	if (currentLayout == null)
..	..	@@ -2966,8 +3372,23 @@
2966	3372	//group.parent = null; // ROOT
2967	3373	//group.attributes = -1;
2968	3374	ResetModel();
	3375	+
	3376	+ cameraView.requestFocusInWindow();
2969	3377	refreshContents(true);
2970		- }
	3378	+ } else if (event.getSource() == editCameraItem)
	3379	+ {
	3380	+ cameraView.ProtectCamera();
	3381	+ cameraView.repaint();
	3382	+ return;
	3383	+ } else if (event.getSource() == revertCameraItem)
	3384	+ {
	3385	+ cameraView.RevertCamera();
	3386	+ cameraView.repaint();
	3387	+ return;
	3388	+ // } else if (event.getSource() == textureButton)
	3389	+ // {
	3390	+ // return; // true;
	3391	+ }
2971	3392	else
2972	3393	{
2973	3394	//return super.action(event, arg);
..	..	@@ -2976,7 +3397,6 @@
2976	3397	}
2977	3398
2978	3399	boolean useclient = false;
2979		- cRadio radio;
2980	3400
2981	3401	void ToggleRoot()
2982	3402	{
..	..	@@ -3028,6 +3448,28 @@
3028	3448	refreshContents();
3029	3449	}
3030	3450
	3451	+ void TransformChildren()
	3452	+ {
	3453	+ Object3D obj;
	3454	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3455	+ {
	3456	+ obj = (Object3D)e.nextElement();
	3457	+ obj.KeepTextureMatrices();
	3458	+ obj.TransformChildren();
	3459	+ obj.RestoreTextureMatrices();
	3460	+
	3461	+// if (obj.parent == null)
	3462	+// {
	3463	+// System.out.println("NULL PARENT!");
	3464	+// new Exception().printStackTrace();
	3465	+// }
	3466	+// else
	3467	+// TouchTransform(obj);
	3468	+// //obj.parent.Touch();
	3469	+ }
	3470	+
	3471	+ refreshContents();
	3472	+ }
3031	3473
3032	3474	void ResetTransform()
3033	3475	{
..	..	@@ -3140,7 +3582,7 @@
3140	3582	refreshContents();
3141	3583	}
3142	3584
3143		- void ResetCentroid()
	3585	+ void ResetCentroid(boolean full)
3144	3586	{
3145	3587	Object3D obj;
3146	3588	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3155,12 +3597,16 @@
3155	3597	LA.matIdentity(Object3D.mat);
3156	3598	obj.getBounds(minima, maxima, false);
3157	3599	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3158		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3600	+ if (full)
	3601	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3159	3602	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3160	3603	obj.TransformMesh(Object3D.mat);
	3604	+
3161	3605	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3162		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3606	+ if (full)
	3607	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3163	3608	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3609	+
3164	3610	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3165	3611	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3166	3612	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3189,7 +3635,8 @@
3189	3635
3190	3636	int size = obj.MemorySize();
3191	3637
3192		- System.err.println((size/1024) + " KB is the size of " + obj);
	3638	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3639	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3193	3640	}
3194	3641	}
3195	3642	catch (Exception e)
..	..	@@ -3226,9 +3673,9 @@
3226	3673	obj = (Object3D)e.nextElement();
3227	3674
3228	3675	System.out.println("Object is: " + obj);
3229		- GrafreeD.AnalyzeObject(obj);
	3676	+ Grafreed.AnalyzeObject(obj);
3230	3677	System.out.println("Boundary rep: " + obj.bRep);
3231		- GrafreeD.AnalyzeObject(obj.bRep);
	3678	+ Grafreed.AnalyzeObject(obj.bRep);
3232	3679
3233	3680	// System.err.println((size/1024) + " KB is the size of " + obj);
3234	3681	}
..	..	@@ -3270,6 +3717,13 @@
3270	3717	void GenNormals(boolean crease)
3271	3718	{
3272	3719	group.GenNormalsS(crease);
	3720	+
	3721	+ refreshContents();
	3722	+ }
	3723	+
	3724	+ void GenNormalsMESH()
	3725	+ {
	3726	+ group.GenNormalsMeshS();
3273	3727
3274	3728	refreshContents();
3275	3729	}
..	..	@@ -3442,8 +3896,8 @@
3442	3896
3443	3897	void ParseVertices()
3444	3898	{
3445		- boolean epsequal = GrafreeD.epsequal;
3446		- GrafreeD.epsequal = true;
	3899	+ boolean epsequal = Grafreed.epsequal;
	3900	+ Grafreed.epsequal = true;
3447	3901
3448	3902	for (int i=0; i<group.selection.size(); i++)
3449	3903	{
..	..	@@ -3468,7 +3922,7 @@
3468	3922	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3469	3923	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3470	3924
3471		- g.add(GrafreeD.clipboard);
	3925	+ g.add(Grafreed.clipboard);
3472	3926
3473	3927	buffer.add(g);
3474	3928	}
..	..	@@ -3483,7 +3937,7 @@
3483	3937	makeSomething(buffer, i==group.selection.size()-1);
3484	3938	}
3485	3939
3486		- GrafreeD.epsequal = epsequal;
	3940	+ Grafreed.epsequal = epsequal;
3487	3941
3488	3942	refreshContents();
3489	3943	}
..	..	@@ -3501,7 +3955,16 @@
3501	3955	String pigment = Object3D.GetPigment(tex);
3502	3956	//String bump = Object3D.GetBump(tex);
3503	3957
3504		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3958	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	3959	+
	3960	+ try
	3961	+ {
	3962	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	3963	+ }
	3964	+ catch (Exception e)
	3965	+ {
	3966	+ System.err.println("FAIL: " + node);
	3967	+ }
3505	3968
3506	3969	double s = v.s;
3507	3970
..	..	@@ -3589,11 +4052,11 @@
3589	4052
3590	4053	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3591	4054
3592		- boolean random = CameraPane.RANDOM;
3593		- CameraPane.RANDOM = false; // parse all random nodes
	4055	+ boolean random = CameraPane.SWITCH;
	4056	+ CameraPane.SWITCH = false; // parse all random nodes
3594	4057	lowres.linkVerticesThis(null);
3595	4058	lowres.linkVerticesThis(sn);
3596		- CameraPane.RANDOM = random;
	4059	+ CameraPane.SWITCH = random;
3597	4060
3598	4061	System.err.flush();
3599	4062
..	..	@@ -3633,7 +4096,7 @@
3633	4096	return;
3634	4097
3635	4098	Object3D poses = group.selection.get(0);
3636		- Object3D ref = GrafreeD.clipboard.get(0);
	4099	+ Object3D ref = Grafreed.clipboard.get(0);
3637	4100
3638	4101	Object3D newgroup = new Object3D("Po:" + poses.name);
3639	4102
..	..	@@ -3827,9 +4290,9 @@
3827	4290
3828	4291	void ClipMesh()
3829	4292	{
3830		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4293	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3831	4294	{
3832		- Object3D content = GrafreeD.clipboard.get(0);
	4295	+ Object3D content = Grafreed.clipboard.get(0);
3833	4296
3834	4297	if (content instanceof cGroup && ((cGroup)content).transientlink )
3835	4298	content = ((cGroup)content).get(0);
..	..	@@ -3838,7 +4301,7 @@
3838	4301	// {
3839	4302	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3840	4303	// }
3841		- group.selection.ClipMesh(GrafreeD.clipboard);
	4304	+ group.selection.ClipMesh(Grafreed.clipboard);
3842	4305	}
3843	4306	// group.selection.ClipMesh(GrafreeD.clipboard);
3844	4307	System.out.println("DONE.");
..	..	@@ -3885,6 +4348,18 @@
3885	4348	void MarkLeaves(boolean hide)
3886	4349	{
3887	4350	group.selection.MarkLeaves(hide);
	4351	+ refreshContents();
	4352	+ }
	4353	+
	4354	+ void RewindLeaves(boolean hide)
	4355	+ {
	4356	+ group.selection.RewindLeaves(hide);
	4357	+ refreshContents();
	4358	+ }
	4359	+
	4360	+ void RandomLeaves(boolean hide)
	4361	+ {
	4362	+ group.selection.RandomLeaves(hide);
3888	4363	refreshContents();
3889	4364	}
3890	4365
..	..	@@ -3970,10 +4445,10 @@
3970	4445	{
3971	4446	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3972	4447	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3973		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4448	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3974	4449
3975	4450	Object3D elem = (Object3D)group.selection.elementAt(i);
3976		- if(elem != group)
	4451	+ if(elem != group \|\| !newWindow)
3977	4452	{
3978	4453	// if (!(elem instanceof Composite))
3979	4454	// newWindow = false;
..	..	@@ -4063,7 +4538,6 @@
4063	4538	//case 702: // Event.LIST_DESELECT
4064	4539	group.deselectAll();
4065	4540	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4066		- objEditor.ClearInfo(); // .GetMaterial());
4067	4541	if (tps != null)
4068	4542	{
4069	4543	for (int i=0; i < tps.length; i++)
..	..	@@ -4072,29 +4546,28 @@
4072	4546
4073	4547	//if (child.parent != null)
4074	4548	//child.parent.addSelectee(child);
	4549	+ objEditor.SetMaterial(child);
4075	4550	group.addSelectee(child);
4076		- objEditor.SetMaterial(child); // .GetMaterial());
4077		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4078		- System.err.println("info : " + child.GetPath());
4079	4551	}
4080	4552	}
4081		- else
4082		- {
4083		- objEditor.SetMaterial(group); // .GetMaterial());
4084		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4085		- System.err.println("info : " + group.GetPath());
4086		- }
	4553	+// else
	4554	+// {
	4555	+// objEditor.SetMaterial(group); // .GetMaterial());
	4556	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4557	+// System.err.println("info : " + group.GetPath());
	4558	+// }
4087	4559
4088		- objEditor.SetText(); // jan 2014
4089		-
4090		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4560	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4091	4561	CameraPane.flash = true;
4092	4562
4093		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4563	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4094	4564	// a camera
4095	4565	{
4096		- CameraPane.camerachangeframe = 0; // don't refuse it
4097		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4566	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4567	+ {
	4568	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4569	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4570	+ }
4098	4571	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4099	4572	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4100	4573	}
..	..	@@ -4107,6 +4580,26 @@
4107	4580
4108	4581	freezemodel = false;
4109	4582	}
	4583	+
	4584	+ void refreshContents(boolean cp)
	4585	+ {
	4586	+ if (!Globals.MOUSEDRAGGED)
	4587	+ {
	4588	+ objEditor.ClearInfo(); // .GetMaterial());
	4589	+
	4590	+ for (int i=0; i < group.selection.Size(); i++)
	4591	+ {
	4592	+ Object3D child = (Object3D) group.selection.get(i);
	4593	+
	4594	+ objEditor.AddInfo(child, this, true);
	4595	+ System.err.println("info : " + child.GetPath());
	4596	+ }
	4597	+
	4598	+ objEditor.SetText(); // jan 2014
	4599	+ }
	4600	+
	4601	+ super.refreshContents(cp);
	4602	+ }
4110	4603
4111	4604	void linkSomething(Object3D thing)
4112	4605	{
..	..	@@ -4178,16 +4671,19 @@
4178	4671	{
4179	4672	if (group.selection.isEmpty())
4180	4673	return;
4181		- GrafreeD.clipboardIsTempGroup = false;
	4674	+
	4675	+ Grafreed.clipboardIsTempGroup = false;
4182	4676	Composite tGroup = null;
4183	4677	if (group.selection.size() > 0) // 1)
4184	4678	{
4185	4679	tGroup = new cGroup();
4186		- GrafreeD.clipboardIsTempGroup = true;
	4680	+ Grafreed.clipboardIsTempGroup = true;
4187	4681	}
4188	4682
4189	4683	if (cut)
4190	4684	{
	4685	+ if (Globals.SAVEONMAKE)
	4686	+ Save();
4191	4687	//int indices[] = jList.getSelectedIndices();
4192	4688	//for (int i = indices.length - 1; i >= 0; i--)
4193	4689	//jList.remove(indices[i]);
..	..	@@ -4223,16 +4719,16 @@
4223	4719	//System.out.println("cut " + child);
4224	4720	//System.out.println("parent = " + child.parent);
4225	4721	// tmp.addChild(child);
4226		- if (GrafreeD.clipboardIsTempGroup)
	4722	+ if (Grafreed.clipboardIsTempGroup)
4227	4723	tGroup.add/Child/(tmp);
4228	4724	else
4229		- GrafreeD.clipboard = tmp;
	4725	+ Grafreed.clipboard = tmp;
4230	4726	}
4231	4727	else
4232		- if (GrafreeD.clipboardIsTempGroup)
	4728	+ if (Grafreed.clipboardIsTempGroup)
4233	4729	tGroup.add/Child/(child);
4234	4730	else
4235		- GrafreeD.clipboard = child;
	4731	+ Grafreed.clipboard = child;
4236	4732	}
4237	4733
4238	4734	//ResetModel();
..	..	@@ -4264,21 +4760,23 @@
4264	4760	//System.out.println("cut " + elem);
4265	4761	//System.out.println("parent = " + elem.parent);
4266	4762	// tmp.addChild(elem);
4267		- if (GrafreeD.clipboardIsTempGroup)
	4763	+ if (Grafreed.clipboardIsTempGroup)
4268	4764	tGroup.add/Child/(tmp);
4269	4765	else
4270		- GrafreeD.clipboard = tmp;
	4766	+ Grafreed.clipboard = tmp;
4271	4767	}
4272	4768	else
4273		- if (GrafreeD.clipboardIsTempGroup)
	4769	+ if (Grafreed.clipboardIsTempGroup)
4274	4770	tGroup.add/Child/(child);
4275	4771	else
4276		- GrafreeD.clipboard = child;
	4772	+ Grafreed.clipboard = child;
4277	4773	}
4278	4774
4279	4775	}
4280		- if (GrafreeD.clipboardIsTempGroup)
4281		- GrafreeD.clipboard = tGroup;
	4776	+
	4777	+ if (Grafreed.clipboardIsTempGroup)
	4778	+ Grafreed.clipboard = tGroup;
	4779	+
4282	4780	if (cut)
4283	4781	{
4284	4782	ResetModel();
..	..	@@ -4292,7 +4790,7 @@
4292	4790	// return;
4293	4791	boolean first = true;
4294	4792
4295		- if (GrafreeD.clipboardIsTempGroup)
	4793	+ if (Grafreed.clipboardIsTempGroup)
4296	4794	{
4297	4795	Composite temp;
4298	4796
..	..	@@ -4303,7 +4801,7 @@
4303	4801	temp = (Composite)Applet3D.clipboard.deepCopy();
4304	4802	*/
4305	4803	Object3D elem;
4306		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4804	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4307	4805	{
4308	4806	Object3D child = (Object3D)e.nextElement();
4309	4807
..	..	@@ -4337,21 +4835,21 @@
4337	4835	//Object3D cb = Applet3D.clipboard;
4338	4836	//temp.addChild(cb);
4339	4837	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4340		- assert(GrafreeD.clipboard.parent == null);
4341		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4342		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4343		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4344		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4838	+ assert(Grafreed.clipboard.parent == null);
	4839	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4840	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4841	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4842	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4345	4843	else
4346		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4347		- GrafreeD.clipboard.get(0).parent = keepparent;
	4844	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4845	+ Grafreed.clipboard.get(0).parent = keepparent;
4348	4846	}
4349	4847
4350	4848	ResetModel();
4351	4849	refreshContents();
4352	4850	}
4353	4851
4354		- void pasteInto(boolean copyit)
	4852	+ void pasteInto(boolean copyit, boolean clone)
4355	4853	{
4356	4854	// if (GrafreeD.clipboard == null)
4357	4855	// return;
..	..	@@ -4380,15 +4878,22 @@
4380	4878	if (copyit)
4381	4879	{
4382	4880	// paste(false);
4383		- CloneClipboard(false); // sept 2014
	4881	+ if (clone)
	4882	+ {
	4883	+ CloneClipboard(false); // sept 2014
	4884	+ }
	4885	+ else
	4886	+ {
	4887	+ paste(false);
	4888	+ }
4384	4889	}
4385	4890	else
4386	4891	{
4387	4892	boolean first = true;
4388	4893
4389		- if (GrafreeD.clipboardIsTempGroup)
	4894	+ if (Grafreed.clipboardIsTempGroup)
4390	4895	{
4391		- Composite temp = (Composite)GrafreeD.clipboard;
	4896	+ Composite temp = (Composite)Grafreed.clipboard;
4392	4897	Object3D copy;
4393	4898	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4394	4899	{
..	..	@@ -4398,7 +4903,7 @@
4398	4903	}
4399	4904	} else
4400	4905	{
4401		- linkSomething(GrafreeD.clipboard); //.get(0));
	4906	+ linkSomething(Grafreed.clipboard); //.get(0));
4402	4907	}
4403	4908	}
4404	4909	}
..	..	@@ -4803,21 +5308,6 @@
4803	5308	}
4804	5309	*/
4805	5310
4806		- void ImportGFD()
4807		- {
4808		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4809		- browser.show();
4810		- String filename = browser.getFile();
4811		- if (filename != null && filename.length() > 0)
4812		- {
4813		- String fullname = browser.getDirectory() + filename;
4814		-
4815		- //Object3D readobj =
4816		- objEditor.ReadGFD(fullname, objEditor);
4817		- //makeSomething(readobj);
4818		- }
4819		- }
4820		-
4821	5311	/*
4822	5312	public void Callback(Object obj)
4823	5313	{
..	..	@@ -4841,26 +5331,9 @@
4841	5331	}
4842	5332	*/
4843	5333
4844		- void ImportVRMLX3D()
4845		- {
4846		- if (GrafreeD.standAlone)
4847		- {
4848		- /**/
4849		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4850		- browser.show();
4851		- String filename = browser.getFile();
4852		- if (filename != null && filename.length() > 0)
4853		- {
4854		- String fullname = browser.getDirectory() + filename;
4855		- LoadVRMLX3D(fullname);
4856		- }
4857		- /**/
4858		- }
4859		- }
4860		-
4861	5334	String GetFile(String dialogName)
4862	5335	{
4863		- if (GrafreeD.standAlone)
	5336	+ if (Grafreed.standAlone)
4864	5337	{
4865	5338	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4866	5339	browser.show();
..	..	@@ -4924,10 +5397,33 @@
4924	5397	cButton flashSelectionButton;
4925	5398	cButton editButton;
4926	5399	cButton uneditButton;
	5400	+ JCheckBox allParamsButton;
4927	5401	cButton clearpanelButton;
4928		- cButton allParamsButton;
4929	5402	cButton unselectButton;
4930	5403
	5404	+ cButton minButton;
	5405	+ cButton maxButton;
	5406	+ cButton fullButton;
	5407	+ cButton undoButton;
	5408	+ cButton redoButton;
	5409	+ cButton saveButton;
	5410	+ cButton oneStepButton;
	5411	+
	5412	+ cButton groupButton;
	5413	+ cButton ungroupButton;
	5414	+ cButton compositeButton;
	5415	+
	5416	+ cButton gridButton;
	5417	+ cButton boxButton;
	5418	+ cButton sphereButton;
	5419	+ cButton coneButton;
	5420	+ cButton torusButton;
	5421	+ cButton superButton;
	5422	+ cButton kleinButton;
	5423	+ cButton particlesButton;
	5424	+ cButton overlayButton;
	5425	+ cButton lightButton;
	5426	+
4931	5427	cButton screenfitButton;
4932	5428	cButton screenfitpointButton;
4933	5429	cButton snapobjectButton;
..	..	@@ -4938,14 +5434,6 @@
4938	5434	cButton closeButton;
4939	5435
4940	5436	cButton setsupportButton;
4941		-
4942		- cButton twoButton;
4943		- cButton sixButton;
4944		- cButton threeButton;
4945		- cButton sevenButton;
4946		- cButton fourButton; // full panel
4947		- cButton oneButton; // full XYZ
4948		- //cButton currentLayout;
4949	5437
4950	5438	//
4951	5439	//Composite
..	..	@@ -4958,7 +5446,9 @@
4958	5446	private MenuItem lookFromItem;
4959	5447	private MenuItem switchItem;
4960	5448	private MenuItem cutItem;
4961		- private MenuItem duplicateItem;
	5449	+ private MenuItem undoItem;
	5450	+ private MenuItem redoItem;
	5451	+ private JMenuItem duplicateItem;
4962	5452	private MenuItem cloneItem;
4963	5453	private MenuItem cloneSupportItem;
4964	5454	private MenuItem overwriteGeoItem;
..	..	@@ -4971,7 +5461,7 @@
4971	5461	private MenuItem linkverticesItem;
4972	5462	private MenuItem relinkverticesItem;
4973	5463	private MenuItem setMasterItem;
4974		- private MenuItem resetMeshItem;
	5464	+ private MenuItem resetAllItem;
4975	5465	private MenuItem stepAllItem;
4976	5466	private MenuItem revertMeshItem;
4977	5467	private MenuItem poseMeshItem;
..	..	@@ -4982,6 +5472,7 @@
4982	5472	private MenuItem mergeGeometriesItem;
4983	5473	private MenuItem copyItem;
4984	5474	private MenuItem pasteItem;
	5475	+ private MenuItem pasteIntoItem;
4985	5476	private MenuItem pasteLinkItem;
4986	5477	private MenuItem pasteCloneItem;
4987	5478	private MenuItem pasteExpandItem;
..	..	@@ -5020,6 +5511,10 @@
5020	5511	private MenuItem showleavesItem;
5021	5512	private MenuItem markleavesItem;
5022	5513	private MenuItem unmarkleavesItem;
	5514	+ private MenuItem rewindleavesItem;
	5515	+ private MenuItem unrewindleavesItem;
	5516	+ private MenuItem randomleavesItem;
	5517	+ private MenuItem unrandomleavesItem;
5023	5518
5024	5519	private MenuItem flipVItem;
5025	5520	private MenuItem unflipVItem;
..	..	@@ -5031,8 +5526,10 @@
5031	5526	private MenuItem panoTexturesItem;
5032	5527
5033	5528	private MenuItem resetCentroidItem;
5034		- private MenuItem transformgeometryItem;
	5529	+ private MenuItem resetCentroidXZItem;
5035	5530	private MenuItem resetTransformItem;
	5531	+ private MenuItem transformGeometryItem;
	5532	+ private MenuItem transformChildrenItem;
5036	5533	private MenuItem hideItem;
5037	5534	private MenuItem grabItem;
5038	5535	private MenuItem backItem;
..	..	@@ -5079,7 +5576,7 @@
5079	5576	private MenuItem blobItem;
5080	5577	private MenuItem latheItem;
5081	5578	private MenuItem bezierItem;
5082		- private MenuItem checkerItem;
	5579	+ private MenuItem overlayItem;
5083	5580	private MenuItem meshItem;
5084	5581	// private MenuItem meshGroupItem;
5085	5582	private MenuItem springItem;
..	..	@@ -5101,11 +5598,6 @@
5101	5598	private MenuItem doubleItem;
5102	5599	private MenuItem tripleItem;
5103	5600
5104		- private MenuItem importGFDItem;
5105		- private MenuItem importVRMLX3DItem;
5106		- private MenuItem import3DSItem;
5107		- private MenuItem importOBJItem;
5108		-
5109	5601	private MenuItem computeAOItem;
5110	5602	private MenuItem recompileItem;
5111	5603	private MenuItem editScriptItem;
..	..	@@ -5115,4 +5607,8 @@
5115	5607	private MenuItem analyzeItem;
5116	5608	private MenuItem dumpItem;
5117	5609	//boolean freezemodel = false;
	5610	+
	5611	+ Menu cameraMenu;
	5612	+ MenuItem editCameraItem;
	5613	+ MenuItem revertCameraItem;
5118	5614	}