~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,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,7 +80,13 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
77	90	SetupUI2(objEditor);
78	91	objEditor.SetupUI(true);
79	92	SetupViews(objEditor);
..	..	@@ -83,6 +96,10 @@
83	96
84	97	void CloneSelection(boolean supports)
85	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
86	103	// Object3D keep = GrafreeD.clipboard;
87	104	//Object3D obj;
88	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +110,19 @@
93	110
94	111	makeSomething(clone, i==group.selection.size()-1);
95	112	}
	113	+ Globals.REPLACEONMAKE = keep;
96	114	}
97	115
98	116	void CloneClipboard(boolean supports)
99	117	{
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));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	123	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
108	126	}
109	127
110	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +136,7 @@
118	136	// obj.support = null;
119	137	if (!supports)
120	138	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	140	obj.parent = parent;
123	141	// obj.support = support;
124	142	// clone.support = support; // aout 2013
..	..	@@ -147,30 +165,29 @@
147	165
148	166	//JTextField nameField;
149	167
150		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
151	169	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	170	+ oe.jTree = new cTree();
	171	+
163	172	Menu menu;
164	173	oe.menuBar.add(menu = new Menu("Edit"));
165	174	//editItem = menu.add(new MenuItem("Edit"));
166	175	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	183	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	184	cloneItem = menu.add(new MenuItem("Clone"));
171	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
172	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	189	cloneSupportItem.addActionListener(this);
	190	+ }
174	191	menu.add("-");
175	192	cutItem = menu.add(new MenuItem("Cut"));
176	193	cutItem.addActionListener(this);
..	..	@@ -178,27 +195,123 @@
178	195	copyItem.addActionListener(this);
179	196	pasteItem = menu.add(new MenuItem("Paste"));
180	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
181	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	203	pasteLinkItem.addActionListener(this);
183	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	205	pasteCloneItem.addActionListener(this);
185	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	207	// pasteExpandItem.addActionListener(this);
	208	+ menu.add("-");
187	209	clearItem = menu.add(new MenuItem("Clear"));
188	210	clearItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
189	215	clearAllItem = menu.add(new MenuItem("Clear All"));
190	216	clearAllItem.addActionListener(this);
	217	+ }
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
191	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
192	306	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);
	307	+ if (Globals.ADVANCED)
	308	+ {
197	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	310	revertMeshItem.addActionListener(this);
199	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	312	resetreferencesItem.addActionListener(this);
201	313	menu.add("-");
	314	+ }
202	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	316	overwriteGeoItem.addActionListener(this);
204	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +323,104 @@
210	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	324	overwriteUVItem.addActionListener(this);
212	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
213	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	329	generateMeshItem.addActionListener(this);
215	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	331	poseMeshItem.addActionListener(this);
217	332	menu.add("-");
	333	+ }
218	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	335	resetsupportItem.addActionListener(this);
220	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	337	linkverticesItem.addActionListener(this);
222	338	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	339	relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
224	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	344	setMasterItem.addActionListener(this);
	345	+ }
226	346
227	347	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
230	350	backItem = menu.add(new MenuItem("Back"));
231	351	backItem.addActionListener(this);
232	352	frontItem = menu.add(new MenuItem("Front"));
233	353	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	360	hideItem.addActionListener(this);
	361	+ }
238	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	363	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- 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);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
247	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	372	switchGeoItem.addActionListener(this);
249	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	374	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
253	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	384	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	385	+ }
257	386
258	387	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
261	390	billboardItem = menu.add(new MenuItem("Billboard"));
262	391	billboardItem.addActionListener(this);
263	392	csgItem = menu.add(new MenuItem("CSG"));
264	393	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	395	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	397	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
271	406	linkerItem = menu.add(new MenuItem("Linker"));
272	407	linkerItem.addActionListener(this);
273	408	templateItem = menu.add(new MenuItem("Template"));
274	409	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	411	pointflowItem.addActionListener(this);
	412	+ }
279	413	menu.add("-");
280	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	415	resetTransformItem.addActionListener(this);
282	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	417	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
286	424
287	425	oe.menuBar.add(menu = new Menu("Geometry"));
288	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +431,11 @@
293	431	genNormalsCADItem.addActionListener(this);
294	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	433	genNormalsMESHItem.addActionListener(this);
	434	+ if (Globals.ADVANCED)
	435	+ {
296	436	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	437	genNormalsMINEItem.addActionListener(this);
	438	+ }
298	439	stripifyItem = menu.add(new MenuItem("Stripify"));
299	440	stripifyItem.addActionListener(this);
300	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +457,34 @@
316	457	reduce34MeshItem.addActionListener(this);
317	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	459	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
323	468
324	469	oe.menuBar.add(menu = new Menu("Attributes"));
325	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
327	476	menu.add("-");
328	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	478	liveleavesItem.addActionListener(this);
330	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
332	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	484	supportleavesItem.addActionListener(this);
334	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	486	unsupportleavesItem.addActionListener(this);
	487	+ }
336	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	489	hideleavesItem.addActionListener(this);
338	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +493,14 @@
341	493	markleavesItem.addActionListener(this);
342	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
344	504	menu.add("-");
345	505	flipVItem = menu.add(new MenuItem("Flip V"));
346	506	flipVItem.addActionListener(this);
..	..	@@ -376,35 +536,41 @@
376	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	537	sortbynameItem.addActionListener(this);
378	538	menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
379	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	547	extractGeometriesItem.addActionListener(this);
381	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	549	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);
	550	+ }
387	551
388	552	oe.menuBar.add(menu = new Menu("Insert"));
389	553	buildCreateMenu(menu);
390	554
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	555	oe.menuBar.add(menu = new Menu("Tools"));
403	556	buildToolsMenu(menu);
404	557	}
405	558
	559	+
406	560	void SetupUI2(ObjEditor oe)
407	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
408	574	//new Exception().printStackTrace();
409	575
410	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,150 +599,230 @@
433	599	oe.radioPanel.add(dummyButton);
434	600	oe.buttonGroup.add(dummyButton);
435	601	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
439	605
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	606	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	607	+
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ screenfitButton.setToolTipText("Screen fit");
	625	+ screenfitButton.addActionListener(this);
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
441	660	liveCB.addItemListener(this);
442	661
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
461	668	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
	669	+
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
468	675
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
507		- screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	677	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	678
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
523		- oe.aConstraints.gridx += 1;
524		- oe.aConstraints.weighty = 0;
525		- oe.aConstraints.gridwidth = 1;
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
526	687
527		- //
528		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	689	+ twoButton.setToolTipText("Show center view only");
529	690	twoButton.addActionListener(this);
530		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
531	694	fourButton.addActionListener(this);
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	695	+ fourButton.setToolTipText("Show left panel only");
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	697	+ sixButton.setToolTipText("2-column layout left");
533	698	sixButton.addActionListener(this);
534		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ threeButton.setToolTipText("2-column layout right");
535	701	threeButton.addActionListener(this);
536		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ sevenButton.setToolTipText("3-column layout");
537	704	sevenButton.addActionListener(this);
538	705	//
539	706
540		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
541	709	rootButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ closeButton.setToolTipText("Close tab");
544	713	closeButton.addActionListener(this);
545	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
546	715	//clearButton.addActionListener(this);
547		- oe.aConstraints.gridx += 1;
548		-
549		- oe.aConstraints.gridx = 1; //
550		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
551		- editButton.addActionListener(this);
552		- oe.aConstraints.gridx += 1;
553		- oe.aConstraints.weighty = 0;
554		- oe.aConstraints.gridwidth = 1;
555	716
556		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
557	802	uneditButton.addActionListener(this);
558	803
559		- oe.aConstraints.gridx += 1;
560		- oe.aConstraints.weighty = 0;
561		- oe.aConstraints.gridwidth = 1;
562		-
563		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
564		- clearPanelButton.addActionListener(this);
565		-
566		- oe.aConstraints.gridx += 1;
567		- oe.aConstraints.weighty = 0;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
571	806	allParamsButton.addActionListener(this);
572	807
573		- oe.aConstraints.gridx += 1;
574		- oe.aConstraints.weighty = 0;
575		- oe.aConstraints.gridwidth = 1;
576		-
577		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
578	814	unselectButton.addActionListener(this);
579	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
580	826	// oe.aConstraints.gridx += 1;
581	827	// oe.aConstraints.weighty = 0;
582	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -588,40 +834,25 @@
588	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
589	835	// gcButton.addActionListener(this);
590	836
591		- oe.aConstraints.gridx = 0;
592		- oe.aConstraints.gridy += 1;
593		-
594		- //ctrlPanel.add(objList = new List(5, true));
595		- oe.aConstraints.gridwidth = 100;
596		- // oe.aConstraints.gridheight = 100;
597		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
598		- oe.aConstraints.gridheight = 1;
599		- oe.aConstraints.weighty = 0.5;
600		- oe.aConstraints.gridx = 0;
601		- JScrollPane jSP;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
602	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
603		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
604	842	ResetModel();
605		- oe.aConstraints.weighty = 0.5;
606		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
607		- oe.aConstraints.gridy += 1;
608		- oe.aConstraints.gridwidth = 1;
609		-
610		- oe.aConstraints.weighty = 0;
611		- oe.aConstraints.gridwidth = 2;
612		-
613		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
614		- colorCB.addItemListener(this);
615		- oe.aConstraints.gridx += 2;
616		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
617		- materialCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
620		- textureCB.addItemListener(this);
621		-
622		- oe.aConstraints.gridx = 0;
623		- oe.aConstraints.gridy += 1;
624	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
625	856	//jList.addListSelectionListener(this);
626	857	oe.jTree.addTreeSelectionListener(this);
627	858	//jTree.setRootVisible(false);
..	..	@@ -643,20 +874,157 @@
643	874	radio.layout = sevenButton;
644	875	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
645	876	}
	877	+
	878	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	879	+ {
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
	883	+
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
	912	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	913	+ // localCB.addItemListener(this);
	914	+
	915	+ panel.Return();
	916	+
	917	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	918	+ crowdCB.setToolTipText("Used for crowds");
	919	+ crowdCB.addItemListener(this);
	920	+
	921	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	922	+ smoothCB.setToolTipText("Snapping delay");
	923	+ smoothCB.addItemListener(this);
	924	+
	925	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	926	+ slowCB.setToolTipText("Smooth interpolation");
	927	+ slowCB.addItemListener(this);
	928	+
	929	+// constraints.gridy += 1;
	930	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	931	+// speakerMocapCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+
	935	+ if (false)
	936	+ {
	937	+ // handled in scripts
	938	+ //constraints.gridy += 1;
	939	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	940	+ speakerCameraCB.addItemListener(this);
	941	+
	942	+ //constraints.gridy += 1;
	943	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	944	+ speakerFocusCB.addItemListener(this);
	945	+
	946	+ //constraints.gridy += 1;
	947	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	948	+ smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
	950	+ }
	951	+
	952	+//constraints.gridx += 1;
	953	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	954	+// debugCB.addItemListener(this);
	955	+
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
	960	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
	962	+ oeilCB.addItemListener(this);
	963	+
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
	984	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	985	+ lookAtCB.setToolTipText("Look-at target");
	986	+ lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
	1001	+
	1002	+ }
646	1003
647	1004	void EditObject(Object3D obj)
648	1005	{
649		- cRadio dummyButton = new cRadio(obj.name);
650		- dummyButton.SetObject(obj);
651		- dummyButton.layout = sevenButton;
652		- dummyButton.SetCamera(cameraView.renderCamera, false);
653		- dummyButton.addActionListener(this);
654		- radioPanel.add(dummyButton);
655		- buttonGroup.add(dummyButton);
656		- dummyButton.doClick();
	1006	+ cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
	1015	+ radioButton.SetObject(obj);
	1016	+ radioButton.layout = sevenButton;
	1017	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1018	+ radioButton.addActionListener(this);
	1019	+ radioPanel.add(radioButton);
	1020	+ buttonGroup.add(radioButton);
	1021	+ radioButton.doClick();
657	1022	}
	1023	+
658	1024	void SetupViews(ObjEditor oe)
659	1025	{
	1026	+ theFrame = this;
	1027	+
660	1028	oe.SetupViews();
661	1029
662	1030	System.out.println("SetupViews");
..	..	@@ -665,22 +1033,28 @@
665	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
666	1034	}
667	1035
668		- JCheckBox liveCB;
669		- JCheckBox supportCB;
670		- JCheckBox localCB;
671		- JCheckBox crowdCB;
672		- JCheckBox smoothCB;
673		- JCheckBox fastCB;
674		- JCheckBox slowCB;
675		- JCheckBox boxCB;
676		- JCheckBox trackCB;
677		- JCheckBox smoothfocusCB;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
678	1049	// JCheckBox speakerMocapCB;
679		- JCheckBox speakerCameraCB;
680		- JCheckBox speakerFocusCB;
681		- JCheckBox debugCB;
682		- JCheckBox oeilCB;
683		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
684	1058
685	1059	// static int COLOR = 1;
686	1060	// static int MATERIAL = 2;
..	..	@@ -688,9 +1062,9 @@
688	1062
689	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
690	1064
691		- JCheckBox colorCB;
692		- JCheckBox materialCB;
693		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
694	1068
695	1069	public void itemStateChanged(ItemEvent e)
696	1070	{
..	..	@@ -715,10 +1089,10 @@
715	1089	dropAttributes \|= Object3D.TEXTURE;
716	1090	else
717	1091	dropAttributes &= ~Object3D.TEXTURE;
718		- }
719		- else if(e.getSource() == liveCB)
	1092	+ } else if(e.getSource() == liveCB)
720	1093	{
721	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
722	1096	}
723	1097	else if(e.getSource() == supportCB)
724	1098	{
..	..	@@ -754,6 +1128,10 @@
754	1128	cameraView.repaint();
755	1129	// refreshContents();
756	1130	}
	1131	+ else if(e.getSource() == zoomBoxCB)
	1132	+ {
	1133	+ cameraView.ToggleZoomBoxMode();
	1134	+ }
757	1135	else if(e.getSource() == smoothfocusCB)
758	1136	{
759	1137	cameraView.ToggleSmoothFocus();
..	..	@@ -779,6 +1157,18 @@
779	1157	{
780	1158	cameraView.ToggleOeil();
781	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
782	1172	else if(e.getSource() == lookAtCB)
783	1173	{
784	1174	cameraView.ToggleLookAt();
..	..	@@ -795,7 +1185,8 @@
795	1185
796	1186	/**/
797	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
798		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
799	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
800	1191	// We can't move the root node or an empty selection
801	1192	return;
..	..	@@ -858,8 +1249,6 @@
858	1249	}
859	1250	}
860	1251
861		- String string = (String) object;
862		-
863	1252	System.out.println("Transfer = " + object + "; drop : " + target);
864	1253	// if( object instanceof java.io.File[])
865	1254	// {
..	..	@@ -867,7 +1256,11 @@
867	1256	// objEditor.DropFile((java.io.File[]) object, true);
868	1257	// return;
869	1258	// }
870		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
871	1264	{
872	1265	// file(s)
873	1266	String[] names = string.split("\n");
..	..	@@ -894,7 +1287,7 @@
894	1287
895	1288	flashIt = false;
896	1289	CameraPane pane = (CameraPane) target;
897		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
898	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
899	1292
900	1293	if (group.selection.size() == 1)
..	..	@@ -910,23 +1303,33 @@
910	1303
911	1304	assert target == objEditor.jTree;
912	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
913	1307	try {
914		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
915	1309	} catch (Exception e) {
916	1310	System.out.println("destinationPath : " + destinationPath);
917	1311	return;
918	1312	}
919	1313
920		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
921	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
922	1325	loadClipboard(true);
923	1326	objEditor.jTree.setSelectionPath(destinationPath);
924		- pasteInto(false);
925		- } else {
926		- loadClipboard(false);
927		- objEditor.jTree.setSelectionPath(destinationPath);
928		- pasteInto(false); // true); // ???
929		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
930	1333	}
931	1334	public void dropActionChanged(DropTargetDragEvent dtde)
932	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1031,85 +1434,107 @@
1031	1434	{
1032	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1033	1436	//heightFieldItem.addActionListener(this);
1034		- gridItem = menu.add(new MenuItem("Grid"));
1035		- gridItem.addActionListener(this);
1036		- rectoidItem = menu.add(new MenuItem("Box"));
1037		- rectoidItem.addActionListener(this);
1038		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1039		- ellipsoidItem.addActionListener(this);
1040		- coneItem = menu.add(new MenuItem("Cone"));
1041		- coneItem.addActionListener(this);
1042		- torusItem = menu.add(new MenuItem("Torus"));
1043		- torusItem.addActionListener(this);
1044		- superItem = menu.add(new MenuItem("Superellipsoid"));
1045		- superItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1046	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1047	1456	kleinItem.addActionListener(this);
1048		- particleItem = menu.add(new MenuItem("Particle system"));
1049		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1050	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1051	1464	ragdollItem.addActionListener(this);
1052	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1053	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1054	1468	menu.add("-");
1055		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1056	1470	meshItem.addActionListener(this);
1057	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1058	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1059	1475	springItem = menu.add(new MenuItem("Spring"));
1060	1476	springItem.addActionListener(this);
1061	1477	flagItem = menu.add(new MenuItem("Flag"));
1062	1478	flagItem.addActionListener(this);
1063		- bezierItem = menu.add(new MenuItem("Patch"));
1064		- bezierItem.addActionListener(this);
1065		- checkerItem = menu.add(new MenuItem("Checker"));
1066		- checkerItem.addActionListener(this);
1067	1479	blobItem = menu.add(new MenuItem("Blob"));
1068	1480	blobItem.addActionListener(this);
1069	1481	latheItem = menu.add(new MenuItem("Lathe"));
1070	1482	latheItem.addActionListener(this);
1071		- lightItem = menu.add(new MenuItem("Light"));
1072		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1073	1490	menu.add("-");
1074	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1075	1492	//superLoopItem.addActionListener(this);
1076		- loopItem = menu.add(new MenuItem("Loop"));
1077		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1078	1495	doubleItem = menu.add(new MenuItem("Fork"));
1079	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1080	1499	tripleItem = menu.add(new MenuItem("Trident"));
1081	1500	tripleItem.addActionListener(this);
	1501	+ }
1082	1502	}
1083	1503
1084	1504	void buildToolsMenu(Menu menu)
1085	1505	{
1086	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1087	1507	animationItem.addItemListener(this);
1088		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1089	1512
1090	1513	menu.add("-");
1091	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1092	1515	parseverticesItem.addActionListener(this);
1093	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1094	1517	textureFieldItem.addActionListener(this);
1095		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1096	1519	alignItem.addActionListener(this);
1097		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1098		- mirrorItem.addActionListener(this);
1099	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1100	1521	reduceMorphItem.addActionListener(this);
1101	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1102	1523	reduce34MorphItem.addActionListener(this);
1103		-
1104		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1105		- computeAOItem.addActionListener(this);
1106	1524	menu.add("-");
1107		-
1108	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1109	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1110	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1111	1536	analyzeItem.addActionListener(this);
1112		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1113	1538	dumpItem.addActionListener(this);
1114	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1115	1540	// pathItem.addActionListener(this);
..	..	@@ -1118,6 +1543,8 @@
1118	1543	resetParentItem.addActionListener(this);
1119	1544	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1120	1545	repairParentItem.addActionListener(this);
	1546	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1547	+ repairShadowItem.addActionListener(this);
1121	1548	menu.add(invariantsItem = new MenuItem("Invariants"));
1122	1549	invariantsItem.addActionListener(this);
1123	1550	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1125,6 +1552,7 @@
1125	1552	menu.add("-");
1126	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1127	1554	editScriptItem.addActionListener(this);
	1555	+ }
1128	1556	}
1129	1557
1130	1558	void ScreenFit()
..	..	@@ -1247,9 +1675,24 @@
1247	1675	shadow.material = new cMaterial(obj.material);
1248	1676	shadow.material.diffuse = 0.0001f;
1249	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1250	1679
1251	1680	makeSomething(shadow);
1252	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1253	1696
1254	1697	/**
1255	1698	* applyExample
..	..	@@ -1453,9 +1896,9 @@
1453	1896
1454	1897	void Overwrite(int mask)
1455	1898	{
1456		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1457	1900	{
1458		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1459	1902
1460	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1461	1904	content = ((cGroup)content).get(0);
..	..	@@ -1478,6 +1921,7 @@
1478	1921	//
1479	1922	public void actionPerformed(ActionEvent event) // , Object arg)
1480	1923	{
	1924	+ Object source = event.getSource();
1481	1925	/*
1482	1926	if (event.getSource() == nameField)
1483	1927	{
..	..	@@ -1489,11 +1933,11 @@
1489	1933	}
1490	1934	else
1491	1935	*/
1492		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1936	+ if (source == lookAtItem \|\| source == lookFromItem)
1493	1937	{
1494	1938	ScreenFit();
1495	1939	} else
1496		- if (event.getSource() == switchItem)
	1940	+ if (source == switchViewItem)
1497	1941	{
1498	1942	cVector v1 = new cVector();
1499	1943	cVector v2 = new cVector();
..	..	@@ -1502,11 +1946,11 @@
1502	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1503	1947	objEditor.cameraView.repaint();
1504	1948	} else
1505		- if (event.getSource() == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1506	1950	{
1507	1951	makeSomething(new Box());
1508	1952	} else
1509		- if (event.getSource() == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1510	1954	{
1511	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1512	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1527,9 +1971,9 @@
1527	1971	applyExample(particleGeom, "SMOKE");
1528	1972	makeSomething(particleGeom);
1529	1973	} else
1530		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1974	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1531	1975	{
1532		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1976	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1533	1977
1534	1978	ragdoll.toParent = LA.newMatrix();
1535	1979	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1547,7 +1991,7 @@
1547	1991	} else
1548	1992	/*
1549	1993	*/
1550		- if (event.getSource() == heightFieldItem)
	1994	+ if (source == heightFieldItem)
1551	1995	{
1552	1996	Object3D obj = new Object3D();
1553	1997
..	..	@@ -1585,31 +2029,31 @@
1585	2029
1586	2030	makeSomething(obj);
1587	2031	} else
1588		- if (event.getSource() == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1589	2033	{
1590	2034	makeSomething(new Grid());
1591	2035	} else
1592		- if (event.getSource() == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1593	2037	{
1594	2038	makeSomething(new Sphere());
1595	2039	} else
1596		- if (event.getSource() == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1597	2041	{
1598	2042	makeSomething(new Cone());
1599	2043	} else
1600		- if (event.getSource() == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1601	2045	{
1602	2046	makeSomething(new Torus());
1603	2047	} else
1604		- if (event.getSource() == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1605	2049	{
1606	2050	makeSomething(new Superellipsoid());
1607	2051	} else
1608		- if (event.getSource() == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1609	2053	{
1610	2054	makeSomething(new Klein());
1611	2055	} else
1612		- if (event.getSource() == blobItem)
	2056	+ if (source == blobItem)
1613	2057	{
1614	2058	Blob blob = new Blob();
1615	2059	BlobComponent comp = new BlobComponent();
..	..	@@ -1617,15 +2061,15 @@
1617	2061	//blob.retile();
1618	2062	makeSomething(blob);
1619	2063	} else
1620		- if (event.getSource() == latheItem)
	2064	+ if (source == latheItem)
1621	2065	{
1622	2066	makeSomething(new Lathe());
1623	2067	} else
1624		- if (event.getSource() == bezierItem)
	2068	+ if (source == bezierItem)
1625	2069	{
1626	2070	makeSomething(new BezierSurface());
1627	2071	} else
1628		- if (event.getSource() == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1629	2073	{
1630	2074	/*
1631	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1640,7 +2084,7 @@
1640	2084	*/
1641	2085	makeSomething(new Checker());
1642	2086	} else
1643		- if (event.getSource() == meshItem)
	2087	+ if (source == meshItem)
1644	2088	{
1645	2089	Object3D itemtomake = new Object3D();
1646	2090	Object3D child;
..	..	@@ -1661,35 +2105,35 @@
1661	2105	makeSomething(child);
1662	2106	}
1663	2107	} else
1664		- if (event.getSource() == springItem)
	2108	+ if (source == springItem)
1665	2109	{
1666	2110	cSpring s = new cSpring();
1667	2111	s.setup();
1668	2112	makeSomething(s);
1669	2113	} else
1670		- if (event.getSource() == flagItem)
	2114	+ if (source == flagItem)
1671	2115	{
1672	2116	cSpring s = new cFlag();
1673	2117	s.setup();
1674	2118	makeSomething(s);
1675	2119	} else
1676		- if (event.getSource() == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1677	2121	{
1678	2122	makeSomething(new Light());
1679	2123	} else
1680		- if (event.getSource() == csgItem)
	2124	+ if (source == csgItem)
1681	2125	{
1682	2126	group(new CSG());
1683	2127	} else
1684		- if (event.getSource() == templateItem)
	2128	+ if (source == templateItem)
1685	2129	{
1686	2130	group(new cTemplate());
1687	2131	} else
1688		- if (event.getSource() == attributeItem)
	2132	+ if (source == attributeItem)
1689	2133	{
1690	2134	makeSomething(new Attribute());
1691	2135	} else
1692		- if (event.getSource() == pointflowItem)
	2136	+ if (source == pointflowItem)
1693	2137	{
1694	2138	makeSomething(new PointFlow());
1695	2139	} else
..	..	@@ -1701,7 +2145,7 @@
1701	2145	} else
1702	2146	*/
1703	2147
1704		- if (event.getSource() == superLoopItem)
	2148	+ if (source == superLoopItem)
1705	2149	{
1706	2150	Composite g = new cGroup();
1707	2151	for (int i=0; i<15; i++)
..	..	@@ -1723,30 +2167,30 @@
1723	2167
1724	2168	group(g);
1725	2169	} else
1726		- if (event.getSource() == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1727	2171	{
1728	2172	Composite csg = new GroupLeaf();
1729	2173	csg.count = 5;
1730	2174	group(csg);
1731		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1732	2176	csg.addChild(child);
1733	2177	child.addChild(csg);
1734	2178	} else
1735		- if (event.getSource() == doubleItem)
	2179	+ if (source == doubleItem)
1736	2180	{
1737		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1738	2182	csg.count = 5;
1739	2183	group(csg);
1740		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1741	2185	csg.addChild(child);
1742	2186	child.addChild(csg);
1743		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1744	2188	csg.addChild(child);
1745	2189	child.addChild(csg);
1746	2190	} else
1747		- if (event.getSource() == tripleItem)
	2191	+ if (source == tripleItem)
1748	2192	{
1749		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1750	2194	csg.count = 4;
1751	2195	group(csg);
1752	2196	Composite child = new cGroup();
..	..	@@ -1759,73 +2203,98 @@
1759	2203	csg.addChild(child);
1760	2204	child.addChild(csg);
1761	2205	} else
1762		-
1763		- if (event.getSource() == importGFDItem)
	2206	+ if (source == computeAOItem)
1764	2207	{
1765		- ImportGFD();
	2208	+ Globals.drawMode = CameraPane.OCCLUSION;
	2209	+ Globals.theRenderer.repaint();
1766	2210	} else
1767		- if (event.getSource() == importVRMLX3DItem)
1768		- {
1769		- ImportVRMLX3D();
1770		- } else
1771		- if (event.getSource() == import3DSItem)
1772		- {
1773		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1774		- } else
1775		- if (event.getSource() == importOBJItem)
1776		- {
1777		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1778		- } else
1779		- if (event.getSource() == computeAOItem)
1780		- {
1781		- CameraPane.drawMode = CameraPane.OCCLUSION;
1782		- CameraPane.theRenderer.repaint();
1783		- } else
1784		- if (event.getSource() == recompileItem)
	2211	+ if (source == recompileItem)
1785	2212	{
1786	2213	Recompile();
1787	2214	refreshContents();
1788	2215	} else
1789		- if (event.getSource() == editScriptItem)
	2216	+ if (source == editScriptItem)
1790	2217	{
1791	2218	OpenDialog();
1792	2219	refreshContents();
1793	2220	} else
1794		- if (event.getSource() == invariantsItem)
	2221	+ if (source == invariantsItem)
1795	2222	{
1796	2223	System.out.println("Invariants:");
1797		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1798	2225	} else
1799		- if (event.getSource() == memoryItem)
	2226	+ if (source == memoryItem)
1800	2227	{
1801	2228	//System.out.println("Invariants:");
1802	2229	PrintMemory();
1803	2230	} else
1804		- if (event.getSource() == pathItem)
	2231	+ if (source == pathItem)
1805	2232	{
1806	2233	PrintPath();
1807	2234	} else
1808		- if (event.getSource() == analyzeItem)
	2235	+ if (source == analyzeItem)
1809	2236	{
1810	2237	AnalyzeObject();
1811	2238	} else
1812		- if (event.getSource() == dumpItem)
	2239	+ if (source == dumpItem)
1813	2240	{
1814	2241	DumpObject();
1815	2242	} else
1816		- if (event.getSource() == screenfitButton)
	2243	+ if (source == minButton)
1817	2244	{
1818		- //Reload(lastConverter, lastFilename, true);
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
	2288	+ if (source == screenfitButton)
	2289	+ {
1819	2290	ScreenFit();
1820	2291	} else
1821		- if (event.getSource() == screenfitpointButton)
	2292	+ if (source == screenfitpointButton)
1822	2293	{
1823		- //Reload(lastConverter, lastFilename, true);
1824	2294	ScreenFitPoint();
1825	2295	} else
1826		- if (event.getSource() == snapobjectButton)
	2296	+ if (source == snapobjectButton)
1827	2297	{
1828		- //Reload(lastConverter, lastFilename, true);
1829	2298	SnapObject();
1830	2299	} else
1831	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1834,13 +2303,13 @@
1834	2303	// Recompile();
1835	2304	// refreshContents();
1836	2305	// } else
1837		- if (event.getSource() == gcButton)
	2306	+ if (source == gcButton)
1838	2307	{
1839	2308	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1840	2309	System.gc();
1841	2310	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2311	} else
1843		- if (event.getSource() == editLeafItem)
	2312	+ if (source == editLeafItem)
1844	2313	{
1845	2314	Object3D obj;
1846	2315	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1854,62 +2323,74 @@
1854	2323	}
1855	2324	refreshContents(true);
1856	2325	} else
1857		- if (event.getSource() == openWindowItem)
	2326	+ if (source == openWindowItem)
1858	2327	{
1859	2328	EditSelection(true);
1860	2329	} else
1861		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2330	+ if (source == cutItem \|\| source == clearButton)
1862	2331	{
1863	2332	loadClipboard(true);
1864	2333	} else
1865		- if (event.getSource() == duplicateItem)
	2334	+ if (source == undoItem)
1866	2335	{
1867		- Object3D keep = GrafreeD.clipboard;
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
	2342	+ if (source == duplicateItem)
	2343	+ {
	2344	+ Object3D keep = Grafreed.clipboard;
1868	2345	loadClipboard(false);
1869	2346	paste(false);
1870		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1871	2348	} else
1872		- if (event.getSource() == cloneItem)
	2349	+ if (source == cloneItem)
1873	2350	{
1874	2351	CloneSelection(false);
1875	2352	} else
1876		- if (event.getSource() == cloneSupportItem)
	2353	+ if (source == cloneSupportItem)
1877	2354	{
1878	2355	CloneSelection(true);
1879	2356	} else
1880		- if (event.getSource() == copyItem)
	2357	+ if (source == copyItem)
1881	2358	{
1882	2359	loadClipboard(false);
1883	2360	} else
1884		- if (event.getSource() == pasteItem)
	2361	+ if (source == pasteItem)
1885	2362	{
1886	2363	paste(false);
1887	2364	} else
1888		- if (event.getSource() == pasteLinkItem)
	2365	+ if (source == pasteIntoItem)
1889	2366	{
1890		- pasteInto(false);
	2367	+ pasteInto(true, false);
1891	2368	} else
1892		- if (event.getSource() == pasteCloneItem)
	2369	+ if (source == pasteLinkItem)
1893	2370	{
1894		- pasteInto(true);
	2371	+ pasteInto(false, false);
1895	2372	} else
1896		- if (event.getSource() == pasteExpandItem)
	2373	+ if (source == pasteCloneItem)
	2374	+ {
	2375	+ pasteInto(true, true);
	2376	+ } else
	2377	+ if (source == pasteExpandItem)
1897	2378	{
1898	2379	paste(true);
1899	2380	} else
1900		- if (event.getSource() == synchronizeItem)
	2381	+ if (source == synchronizeItem)
1901	2382	{
1902	2383	Overwrite(Object3D.TRANSFORM);
1903	2384	} else
1904		- if (event.getSource() == overwriteNameItem)
	2385	+ if (source == overwriteNameItem)
1905	2386	{
1906	2387	Overwrite(Object3D.NAME);
1907	2388	} else
1908		- if (event.getSource() == overwriteUVItem)
	2389	+ if (source == overwriteUVItem)
1909	2390	{
1910	2391	Overwrite(Object3D.UV);
1911	2392	} else
1912		- if (event.getSource() == overwriteMatItem)
	2393	+ if (source == overwriteMatItem)
1913	2394	{
1914	2395	/* july 2015
1915	2396	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1929,7 +2410,7 @@
1929	2410
1930	2411	Overwrite(dropAttributes);
1931	2412	}
1932		- if (event.getSource() == overwriteGeoItem)
	2413	+ if (source == overwriteGeoItem)
1933	2414	{
1934	2415	Overwrite(Object3D.GEOMETRY);
1935	2416	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1946,7 +2427,7 @@
1946	2427	// refreshContents();
1947	2428	// }
1948	2429	} else
1949		- if (event.getSource() == generateMeshItem)
	2430	+ if (source == generateMeshItem)
1950	2431	{
1951	2432	//if (group.selection.size() == 1)
1952	2433	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1957,7 +2438,7 @@
1957	2438	ResetModel();
1958	2439	refreshContents();
1959	2440	} else
1960		- if (event.getSource() == extractGeometriesItem)
	2441	+ if (source == extractGeometriesItem)
1961	2442	{
1962	2443	boolean one = false;
1963	2444
..	..	@@ -1984,7 +2465,7 @@
1984	2465	ResetModel();
1985	2466	refreshContents();
1986	2467	} else
1987		- if (event.getSource() == cloneGeometriesItem)
	2468	+ if (source == cloneGeometriesItem)
1988	2469	{
1989	2470	boolean one = false;
1990	2471
..	..	@@ -2010,7 +2491,7 @@
2010	2491	ResetModel();
2011	2492	refreshContents();
2012	2493	} else
2013		- if (event.getSource() == shareGeometriesItem)
	2494	+ if (source == shareGeometriesItem)
2014	2495	{
2015	2496	boolean one = false;
2016	2497
..	..	@@ -2040,7 +2521,7 @@
2040	2521	refreshContents();
2041	2522	}
2042	2523	} else
2043		- if (event.getSource() == mergeGeometriesItem)
	2524	+ if (source == mergeGeometriesItem)
2044	2525	{
2045	2526	boolean one = false;
2046	2527
..	..	@@ -2070,7 +2551,7 @@
2070	2551	ResetModel();
2071	2552	refreshContents();
2072	2553	} else
2073		- if (event.getSource() == linkverticesItem)
	2554	+ if (source == linkverticesItem)
2074	2555	{
2075	2556	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2076	2557	// {
..	..	@@ -2083,48 +2564,48 @@
2083	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2084	2565	// refreshContents();
2085	2566	// }
2086		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2087	2568	{
2088		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2089	2570
2090	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2091	2572	content = ((cGroup)content).get(0);
2092	2573
2093		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2574	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2094	2575	for (int i=0; i<group.selection.size(); i++)
2095	2576	{
2096		- boolean random = CameraPane.RANDOM;
2097		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2098	2579	group.selection.get(i).linkVerticesThis(content);
2099	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2100		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2101	2582	}
2102		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2583	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2103	2584	refreshContents();
2104	2585	}
2105	2586	} else
2106		- if (event.getSource() == resetsupportItem)
	2587	+ if (source == resetsupportItem)
2107	2588	{
2108	2589	for (int i=0; i<group.selection.size(); i++)
2109	2590	{
2110		- boolean random = CameraPane.RANDOM;
2111		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2112	2593	group.selection.get(i).linkVerticesThis(null);
2113		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2114	2595	}
2115	2596
2116	2597	refreshContents();
2117	2598	} else
2118		- if (event.getSource() == relinkverticesItem)
	2599	+ if (source == relinkverticesItem)
2119	2600	{
2120		- boolean random = CameraPane.RANDOM;
2121		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2122	2603	group.selection.RelinkToSupport();
2123		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2124	2605
2125	2606	refreshContents();
2126	2607	} else
2127		- if (event.getSource() == resetreferencesItem)
	2608	+ if (source == resetreferencesItem)
2128	2609	{
2129	2610	for (int i=0; i<group.selection.size(); i++)
2130	2611	{
..	..	@@ -2133,11 +2614,11 @@
2133	2614
2134	2615	refreshContents();
2135	2616	} else
2136		- if (event.getSource() == setMasterItem)
	2617	+ if (source == setMasterItem)
2137	2618	{
2138		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2139	2620	{
2140		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2141	2622
2142	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2143	2624	content = ((cGroup)content).get(0);
..	..	@@ -2146,13 +2627,13 @@
2146	2627	refreshContents();
2147	2628	}
2148	2629	} else
2149		- if (event.getSource() == poseMeshItem)
	2630	+ if (source == poseMeshItem)
2150	2631	{
2151	2632	if (group.selection.size() == 1)
2152	2633	{
2153		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2154	2635	{
2155		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2156	2637
2157	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2158	2639	content = ((cGroup)content).get(0);
..	..	@@ -2165,19 +2646,19 @@
2165	2646	}
2166	2647
2167	2648	} else
2168		- if (event.getSource() == revertMeshItem)
	2649	+ if (source == revertMeshItem)
2169	2650	{
2170	2651	RevertMeshes();
2171	2652	} else
2172		- if (event.getSource() == resetMeshItem)
	2653	+ if (source == resetAllItem)
2173	2654	{
2174	2655	ResetAll();
2175	2656	} else
2176		- if (event.getSource() == stepAllItem)
	2657	+ if (source == stepAllItem)
2177	2658	{
2178	2659	StepAll();
2179	2660	} else
2180		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2661	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2181	2662	{
2182	2663	//int indices[] = jList.getSelectedIndices();
2183	2664	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2185,46 +2666,46 @@
2185	2666
2186	2667	ClearSelection(false);
2187	2668	} else
2188		- if (event.getSource() == clearAllItem)
	2669	+ if (source == clearAllItem)
2189	2670	{
2190	2671	ClearSelection(true);
2191	2672	} else
2192		- if (event.getSource() == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2193	2674	{
2194		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2195	2676	} else
2196		- if (event.getSource() == hideItem)
	2677	+ if (source == hideItem)
2197	2678	{
2198	2679	group(new HiddenObject());
2199	2680	} else
2200		- if (event.getSource() == frontItem)
	2681	+ if (source == frontItem)
2201	2682	{
2202	2683	front();
2203	2684	} else
2204		- if (event.getSource() == backItem)
	2685	+ if (source == backItem)
2205	2686	{
2206	2687	back();
2207	2688	} else
2208		- if (event.getSource() == cameraItem)
	2689	+ if (source == cameraItem)
2209	2690	{
2210	2691	makeSomething(new Camera());
2211	2692	} else
2212		- if (event.getSource() == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2213	2694	{
2214	2695	group(new Composite());
2215	2696	} else
2216		- if (event.getSource() == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2217	2698	{
2218	2699	RandomNode random = new RandomNode();
2219	2700	group(random);
2220	2701	if (random.size() > 0)
2221		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2222	2703	} else
2223		- if (event.getSource() == physicsItem)
	2704	+ if (source == physicsItem)
2224	2705	{
2225	2706	group(new PhysicsNode());
2226	2707	} else
2227		- if (event.getSource() == frameselectorItem)
	2708	+ if (source == frameselectorItem)
2228	2709	{
2229	2710	for (int i=0; i<group.selection.size(); i++)
2230	2711	{
..	..	@@ -2236,7 +2717,7 @@
2236	2717	ResetModel();
2237	2718	refreshContents();
2238	2719	} else
2239		- if (event.getSource() == switchGeoItem)
	2720	+ if (source == switchGeoItem)
2240	2721	{
2241	2722	for (int i=0; i<group.selection.size(); i++)
2242	2723	{
..	..	@@ -2248,7 +2729,7 @@
2248	2729	ResetModel();
2249	2730	refreshContents();
2250	2731	} else
2251		- if (event.getSource() == switchTransfoItem)
	2732	+ if (source == switchTransfoItem)
2252	2733	{
2253	2734	for (int i=0; i<group.selection.size(); i++)
2254	2735	{
..	..	@@ -2260,7 +2741,7 @@
2260	2741	ResetModel();
2261	2742	refreshContents();
2262	2743	} else
2263		- if (event.getSource() == morphItem)
	2744	+ if (source == morphItem)
2264	2745	{
2265	2746	for (int i=0; i<group.selection.size(); i++)
2266	2747	{
..	..	@@ -2272,7 +2753,7 @@
2272	2753	ResetModel();
2273	2754	refreshContents();
2274	2755	} else
2275		- if (event.getSource() == scriptNodeItem)
	2756	+ if (source == scriptNodeItem)
2276	2757	{
2277	2758	boolean atleastone = false;
2278	2759
..	..	@@ -2311,215 +2792,252 @@
2311	2792	}
2312	2793	}
2313	2794	} else
2314		- if (event.getSource() == linkerItem)
	2795	+ if (source == linkerItem)
2315	2796	{
2316	2797	group(new cLinker());
2317	2798	} else
2318		- if (event.getSource() == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2319	2800	{
2320	2801	group(new TextureNode());
2321	2802	} else
2322		- if (event.getSource() == billboardItem)
	2803	+ if (source == billboardItem)
2323	2804	{
2324	2805	group(new BillboardNode());
2325	2806	} else
2326		- if (event.getSource() == shadowXItem)
	2807	+ if (source == shadowXItem)
2327	2808	{
2328	2809	CastShadow(0);
2329	2810	} else
2330		- if (event.getSource() == shadowYItem)
	2811	+ if (source == shadowYItem)
2331	2812	{
2332	2813	CastShadow(1);
2333	2814	} else
2334		- if (event.getSource() == shadowZItem)
	2815	+ if (source == shadowZItem)
2335	2816	{
2336	2817	CastShadow(2);
2337	2818	} else
2338		- if (event.getSource() == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2339	2820	{
2340		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2341	2823	for (int i=0; i<group.selection.size(); i++)
2342	2824	{
2343		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2344	2830	}
2345	2831
2346		- ClearSelection(false);
2347		-
2348		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2349	2843	} else
2350		- if (event.getSource() == genUVItem)
	2844	+ if (source == genUVItem)
2351	2845	{
2352	2846	GenUV();
2353	2847	} else
2354		- if (event.getSource() == genNormalsCADItem)
	2848	+ if (source == genNormalsCADItem)
2355	2849	{
2356	2850	GenNormals(true);
2357	2851	} else
2358		- if (event.getSource() == genNormalsMESHItem)
	2852	+ if (source == genNormalsMESHItem)
2359	2853	{
2360		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2361	2855	} else
2362		- if (event.getSource() == genNormalsORGANItem)
	2856	+ if (source == genNormalsORGANItem)
2363	2857	{
2364	2858	GenNormals(false);
2365	2859	} else
2366		- if (event.getSource() == genNormalsMINEItem)
	2860	+ if (source == genNormalsMINEItem)
2367	2861	{
2368	2862	GenNormalsMINE();
2369	2863	} else
2370		- if (event.getSource() == stripifyItem)
	2864	+ if (source == stripifyItem)
2371	2865	{
2372	2866	Stripify();
2373	2867	} else
2374		- if (event.getSource() == unstripifyItem)
	2868	+ if (source == unstripifyItem)
2375	2869	{
2376	2870	Unstripify();
2377	2871	} else
2378		- if (event.getSource() == trimItem)
	2872	+ if (source == trimItem)
2379	2873	{
2380	2874	Trim();
2381	2875	} else
2382		- if (event.getSource() == untrimItem)
	2876	+ if (source == untrimItem)
2383	2877	{
2384	2878	Untrim();
2385	2879	} else
2386		- if (event.getSource() == clearColorsItem)
	2880	+ if (source == clearColorsItem)
2387	2881	{
2388	2882	ClearColors();
2389	2883	} else
2390		- if (event.getSource() == clearMaterialsItem)
	2884	+ if (source == clearMaterialsItem)
2391	2885	{
2392	2886	ClearMaterials();
2393	2887	} else
2394		- if (event.getSource() == liveleavesItem)
	2888	+ if (source == liveleavesItem)
2395	2889	{
2396	2890	LiveLeaves(true);
2397	2891	} else
2398		- if (event.getSource() == unliveleavesItem)
	2892	+ if (source == unliveleavesItem)
2399	2893	{
2400	2894	LiveLeaves(false);
2401	2895	} else
2402		- if (event.getSource() == supportleavesItem)
	2896	+ if (source == supportleavesItem)
2403	2897	{
2404	2898	SupportLeaves(true);
2405	2899	} else
2406		- if (event.getSource() == unsupportleavesItem)
	2900	+ if (source == unsupportleavesItem)
2407	2901	{
2408	2902	SupportLeaves(false);
2409	2903	} else
2410		- if (event.getSource() == hideleavesItem)
	2904	+ if (source == hideleavesItem)
2411	2905	{
2412	2906	HideLeaves(true);
2413	2907	} else
2414		- if (event.getSource() == showleavesItem)
	2908	+ if (source == showleavesItem)
2415	2909	{
2416	2910	HideLeaves(false);
2417	2911	} else
2418		- if (event.getSource() == markleavesItem)
	2912	+ if (source == markleavesItem)
2419	2913	{
2420	2914	MarkLeaves(true);
2421	2915	} else
2422		- if (event.getSource() == unmarkleavesItem)
	2916	+ if (source == unmarkleavesItem)
2423	2917	{
2424	2918	MarkLeaves(false);
2425	2919	} else
2426		- if (event.getSource() == flipVItem)
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
	2935	+ } else
	2936	+ if (source == flipVItem)
2427	2937	{
2428	2938	FlipV(true);
2429	2939	} else
2430		- if (event.getSource() == unflipVItem)
	2940	+ if (source == unflipVItem)
2431	2941	{
2432	2942	FlipV(false);
2433	2943	} else
2434		- if (event.getSource() == lowTexturesItem)
	2944	+ if (source == lowTexturesItem)
2435	2945	{
2436	2946	SetTexRes(0);
2437	2947	} else
2438		- if (event.getSource() == normalTexturesItem)
	2948	+ if (source == normalTexturesItem)
2439	2949	{
2440	2950	SetTexRes(1);
2441	2951	} else
2442		- if (event.getSource() == highTexturesItem)
	2952	+ if (source == highTexturesItem)
2443	2953	{
2444	2954	SetTexRes(2);
2445	2955	} else
2446		- if (event.getSource() == veryhighTexturesItem)
	2956	+ if (source == veryhighTexturesItem)
2447	2957	{
2448	2958	SetTexRes(3);
2449	2959	} else
2450		- if (event.getSource() == maxTexturesItem)
	2960	+ if (source == maxTexturesItem)
2451	2961	{
2452	2962	SetTexRes(4);
2453	2963	} else
2454		- if (event.getSource() == panoTexturesItem)
	2964	+ if (source == panoTexturesItem)
2455	2965	{
2456	2966	SetTexRes(5);
2457	2967	} else
2458		- if (event.getSource() == reverseNormalsItem)
	2968	+ if (source == reverseNormalsItem)
2459	2969	{
2460	2970	ReverseNormals();
2461	2971	} else
2462		- if (event.getSource() == parseverticesItem)
	2972	+ if (source == parseverticesItem)
2463	2973	{
2464	2974	ParseVertices();
2465	2975	} else
2466		- if (event.getSource() == textureFieldItem)
	2976	+ if (source == textureFieldItem)
2467	2977	{
2468	2978	TextureVertices();
2469	2979	} else
2470		- if (event.getSource() == alignItem)
	2980	+ if (source == alignItem)
2471	2981	{
2472	2982	Align();
2473	2983	} else
2474		- if (event.getSource() == mirrorItem)
	2984	+ if (source == mirrorItem)
2475	2985	{
2476	2986	MirrorPoses();
2477	2987	} else
2478		- if (event.getSource() == reduceMorphItem)
	2988	+ if (source == reduceMorphItem)
2479	2989	{
2480	2990	MeshReduction(false);
2481	2991	} else
2482		- if (event.getSource() == reduce34MorphItem)
	2992	+ if (source == reduce34MorphItem)
2483	2993	{
2484	2994	MeshReduction(true);
2485	2995	} else
2486		- if (event.getSource() == reverseTrianglesItem)
	2996	+ if (source == reverseTrianglesItem)
2487	2997	{
2488	2998	ReverseTriangles();
2489	2999	} else
2490		- if (event.getSource() == reduceMeshItem)
	3000	+ if (source == reduceMeshItem)
2491	3001	{
2492	3002	ReduceMesh(false);
2493	3003	} else
2494		- if (event.getSource() == reduce34MeshItem)
	3004	+ if (source == reduce34MeshItem)
2495	3005	{
2496	3006	ReduceMesh(true);
2497	3007	} else
2498		- if (event.getSource() == increaseMeshItem)
	3008	+ if (source == increaseMeshItem)
2499	3009	{
2500	3010	IncreaseMesh();
2501	3011	} else
2502		- if (event.getSource() == clipMeshItem)
	3012	+ if (source == clipMeshItem)
2503	3013	{
2504	3014	ClipMesh();
2505	3015	} else
2506		- if (event.getSource() == smoothMeshItem)
	3016	+ if (source == smoothMeshItem)
2507	3017	{
2508	3018	SmoothMesh();
2509	3019	} else
2510		- if (event.getSource() == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2511	3021	{
2512	3022	TransformGeometry();
2513	3023	} else
2514		- if (event.getSource() == resetTransformItem)
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
	3027	+ } else
	3028	+ if (source == resetTransformItem)
2515	3029	{
2516	3030	ResetTransform();
2517	3031	} else
2518		- if (event.getSource() == resetCentroidItem)
	3032	+ if (source == resetCentroidItem)
2519	3033	{
2520		- ResetCentroid();
	3034	+ ResetCentroid(true);
2521	3035	} else
2522		- if (event.getSource() == resetParentItem)
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
	3039	+ } else
	3040	+ if (source == resetParentItem)
2523	3041	{
2524	3042	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2525	3043	{
..	..	@@ -2529,7 +3047,7 @@
2529	3047
2530	3048	refreshContents();
2531	3049	} else
2532		- if (event.getSource() == repairParentItem)
	3050	+ if (source == repairParentItem)
2533	3051	{
2534	3052	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2535	3053	{
..	..	@@ -2543,7 +3061,21 @@
2543	3061
2544	3062	refreshContents();
2545	3063	} else
2546		- if (event.getSource() == sortbysizeItem)
	3064	+ if (source == repairShadowItem)
	3065	+ {
	3066	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3067	+ {
	3068	+ Object3D obj = (Object3D)e.nextElement();
	3069	+ obj.RepairShadow();
	3070	+// for (int i=0; i<obj.size(); i++)
	3071	+// {
	3072	+// obj.get(i).parent = obj;
	3073	+// }
	3074	+ }
	3075	+
	3076	+ refreshContents();
	3077	+ } else
	3078	+ if (source == sortbysizeItem)
2547	3079	{
2548	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2549	3081	{
..	..	@@ -2555,7 +3087,7 @@
2555	3087	ResetModel();
2556	3088	refreshContents();
2557	3089	} else
2558		- if (event.getSource() == sortbynameItem)
	3090	+ if (source == sortbynameItem)
2559	3091	{
2560	3092	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3093	{
..	..	@@ -2567,7 +3099,7 @@
2567	3099	ResetModel();
2568	3100	refreshContents();
2569	3101	} else
2570		- if (event.getSource() == attachPigmentItem)
	3102	+ if (source == attachPigmentItem)
2571	3103	{
2572	3104	String texture = GetFile("Attach pigment");
2573	3105	Object3D obj;
..	..	@@ -2579,7 +3111,7 @@
2579	3111
2580	3112	refreshContents();
2581	3113	} else
2582		- if (event.getSource() == detachPigmentItem)
	3114	+ if (source == detachPigmentItem)
2583	3115	{
2584	3116	Object3D obj;
2585	3117	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2590,7 +3122,7 @@
2590	3122
2591	3123	refreshContents();
2592	3124	} else
2593		- if (event.getSource() == attachBumpItem)
	3125	+ if (source == attachBumpItem)
2594	3126	{
2595	3127	String texture = GetFile("Attach bump");
2596	3128	Object3D obj;
..	..	@@ -2602,7 +3134,7 @@
2602	3134
2603	3135	refreshContents();
2604	3136	} else
2605		- if (event.getSource() == detachBumpItem)
	3137	+ if (source == detachBumpItem)
2606	3138	{
2607	3139	Object3D obj;
2608	3140	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2613,7 +3145,7 @@
2613	3145
2614	3146	refreshContents();
2615	3147	} else
2616		- if (event.getSource() == pigmentBumpItem)
	3148	+ if (source == pigmentBumpItem)
2617	3149	{
2618	3150	Object3D obj;
2619	3151	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2624,158 +3156,237 @@
2624	3156
2625	3157	refreshContents();
2626	3158	} else
2627		- if (event.getSource() == flashSelectionButton)
	3159	+ if (source == flashSelectionButton)
2628	3160	{
2629	3161	CameraPane.flash = true;
2630	3162	refreshContents();
2631	3163	} else
2632		- if (event.getSource() == oneButton)
	3164	+ if (source == oneButton)
2633	3165	{
2634	3166	} else
2635		- if (event.getSource() == twoButton)
	3167	+ if (source == twoButton)
2636	3168	{
2637	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2638	3174	// bug
2639	3175	//gridPanel.setDividerLocation(1.0);
2640	3176	//bigPanel.setDividerLocation(0.0);
2641		- bigThree.remove(scenePanel);
2642		- bigThree.remove(cameraPanel);
2643		- bigThree.remove(XYZPanel);
2644		- aWindowConstraints.gridx = 0;
2645		- aWindowConstraints.gridy = 0;
2646		- aWindowConstraints.gridwidth = 1;
2647		- // aConstraints.gridheight = 3;
2648		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2649		- aWindowConstraints.weightx = 0;
2650		- aWindowConstraints.weighty = 1;
2651		- //bigThree.add(jtp, aWindowConstraints);
2652		- aWindowConstraints.weightx = 1;
2653		- aWindowConstraints.gridwidth = 3;
2654		- // aConstraints.gridheight = 3;
2655		- aWindowConstraints.gridx = 1;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- bigThree.add(cameraPanel, aWindowConstraints);
2658		- aWindowConstraints.weightx = 0;
2659		- aWindowConstraints.gridx = 4;
2660		- aWindowConstraints.gridwidth = 1;
2661		- // aConstraints.gridheight = 3;
2662		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2663		- //bigThree.add(XYZPanel, aWindowConstraints);
2664		- bigThree.revalidate();
	3177	+// bigThree.remove(scenePanel);
	3178	+// bigThree.remove(centralPanel);
	3179	+// bigThree.remove(XYZPanel);
	3180	+// aWindowConstraints.gridx = 0;
	3181	+// aWindowConstraints.gridy = 0;
	3182	+// aWindowConstraints.gridwidth = 1;
	3183	+// // aConstraints.gridheight = 3;
	3184	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3185	+// aWindowConstraints.weightx = 0;
	3186	+// aWindowConstraints.weighty = 1;
	3187	+// //bigThree.add(jtp, aWindowConstraints);
	3188	+// aWindowConstraints.weightx = 1;
	3189	+// aWindowConstraints.gridwidth = 3;
	3190	+// // aConstraints.gridheight = 3;
	3191	+// aWindowConstraints.gridx = 1;
	3192	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3193	+// bigThree.add(centralPanel, aWindowConstraints);
	3194	+// aWindowConstraints.weightx = 0;
	3195	+// aWindowConstraints.gridx = 4;
	3196	+// aWindowConstraints.gridwidth = 1;
	3197	+// // aConstraints.gridheight = 3;
	3198	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3199	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3200	+// scenePanel.setVisible(false);
	3201	+// centralPanel.setVisible(true);
	3202	+// XYZPanel.setVisible(false);
	3203	+ bigThree.ClearUI();
	3204	+ bigThree.add(centralPanel);
	3205	+ bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2665	3224	} else
2666		- if (event.getSource() == threeButton)
	3225	+ if (source == threeButton)
2667	3226	{
2668	3227	radio.layout = threeButton;
2669		- bigThree.remove(scenePanel);
2670		- bigThree.remove(cameraPanel);
2671		- bigThree.remove(XYZPanel);
2672		- aWindowConstraints.gridx = 0;
2673		- aWindowConstraints.gridy = 0;
2674		- aWindowConstraints.gridwidth = 1;
2675		- // aConstraints.gridheight = 3;
2676		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2677		- aWindowConstraints.weightx = 0;
2678		- aWindowConstraints.weighty = 1;
2679		- //bigThree.add(jtp, aWindowConstraints);
2680		- aWindowConstraints.weightx = 1;
2681		- aWindowConstraints.gridwidth = 3;
2682		- // aConstraints.gridheight = 3;
2683		- aWindowConstraints.gridx = 1;
2684		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2685		- bigThree.add(cameraPanel, aWindowConstraints);
2686		- aWindowConstraints.weightx = 0;
2687		- aWindowConstraints.gridx = 4;
2688		- aWindowConstraints.gridwidth = 1;
2689		- // aConstraints.gridheight = 3;
2690		- aConstraints.fill = GridBagConstraints.VERTICAL;
2691		- bigThree.add(XYZPanel, aWindowConstraints);
2692		- bigThree.revalidate();
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
	3231	+
	3232	+// bigThree.remove(scenePanel);
	3233	+// bigThree.remove(centralPanel);
	3234	+// bigThree.remove(XYZPanel);
	3235	+// aWindowConstraints.gridx = 0;
	3236	+// aWindowConstraints.gridy = 0;
	3237	+// aWindowConstraints.gridwidth = 1;
	3238	+// // aConstraints.gridheight = 3;
	3239	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3240	+// aWindowConstraints.weightx = 0;
	3241	+// aWindowConstraints.weighty = 1;
	3242	+// //bigThree.add(jtp, aWindowConstraints);
	3243	+// aWindowConstraints.weightx = 1;
	3244	+// aWindowConstraints.gridwidth = 3;
	3245	+// // aConstraints.gridheight = 3;
	3246	+// aWindowConstraints.gridx = 1;
	3247	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3248	+// bigThree.add(centralPanel, aWindowConstraints);
	3249	+// aWindowConstraints.weightx = 0;
	3250	+// aWindowConstraints.gridx = 4;
	3251	+// aWindowConstraints.gridwidth = 1;
	3252	+// // aConstraints.gridheight = 3;
	3253	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3254	+// bigThree.add(XYZPanel, aWindowConstraints);
	3255	+// bigThree.validate();
	3256	+// scenePanel.setVisible(false);
	3257	+// centralPanel.setVisible(true);
	3258	+// XYZPanel.setVisible(true);
	3259	+ bigThree.ClearUI();
	3260	+ bigThree.add(centralPanel);
	3261	+ bigThree.add(XYZPanel);
	3262	+ bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2693	3265	} else
2694		- if (event.getSource() == fourButton)
	3266	+ if (source == fourButton)
2695	3267	{
2696	3268	radio.layout = fourButton;
2697		- bigThree.remove(scenePanel);
2698		- bigThree.remove(cameraPanel);
2699		- bigThree.remove(XYZPanel);
2700		- aWindowConstraints.gridx = 0;
2701		- aWindowConstraints.gridy = 0;
2702		- aWindowConstraints.gridwidth = 1;
2703		- // aWindowConstraints.gridheight = 3;
2704		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2705		- aWindowConstraints.weightx = 1;
2706		- aWindowConstraints.weighty = 1;
2707		- bigThree.add(scenePanel, aWindowConstraints);
2708		- aWindowConstraints.weightx = 1;
2709		- aWindowConstraints.gridwidth = 3;
2710		- // aConstraints.gridheight = 3;
2711		- aWindowConstraints.gridx = 1;
2712		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2713		- //bigThree.add(cameraPanel, aWindowConstraints);
2714		- aWindowConstraints.weightx = 0;
2715		- aWindowConstraints.gridx = 4;
2716		- aWindowConstraints.gridwidth = 1;
2717		- // aWindowConstraints.gridheight = 3;
2718		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2719		- //bigThree.add(XYZPanel, aWindowConstraints);
2720		- bigThree.revalidate();
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
	3272	+
	3273	+// bigThree.remove(scenePanel);
	3274	+// bigThree.remove(centralPanel);
	3275	+// bigThree.remove(XYZPanel);
	3276	+// aWindowConstraints.gridx = 0;
	3277	+// aWindowConstraints.gridy = 0;
	3278	+// aWindowConstraints.gridwidth = 1;
	3279	+// // aWindowConstraints.gridheight = 3;
	3280	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3281	+// aWindowConstraints.weightx = 1;
	3282	+// aWindowConstraints.weighty = 1;
	3283	+// bigThree.add(scenePanel, aWindowConstraints);
	3284	+// aWindowConstraints.weightx = 1;
	3285	+// aWindowConstraints.gridwidth = 3;
	3286	+// // aConstraints.gridheight = 3;
	3287	+// aWindowConstraints.gridx = 1;
	3288	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3289	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3290	+// aWindowConstraints.weightx = 0;
	3291	+// aWindowConstraints.gridx = 4;
	3292	+// aWindowConstraints.gridwidth = 1;
	3293	+// // aWindowConstraints.gridheight = 3;
	3294	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3295	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3296	+// bigThree.validate();
	3297	+// scenePanel.setVisible(true);
	3298	+// centralPanel.setVisible(false);
	3299	+// XYZPanel.setVisible(false);
	3300	+ bigThree.ClearUI();
	3301	+ bigThree.add(scenePanel);
	3302	+ bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2721	3305	} else
2722		- if (event.getSource() == sixButton)
	3306	+ if (source == sixButton)
2723	3307	{
2724	3308	radio.layout = sixButton;
2725		- bigThree.remove(scenePanel);
2726		- bigThree.remove(cameraPanel);
2727		- bigThree.remove(XYZPanel);
2728		- aWindowConstraints.gridx = 0;
2729		- aWindowConstraints.gridy = 0;
2730		- aWindowConstraints.gridwidth = 1;
2731		- // aConstraints.gridheight = 3;
2732		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2733		- aWindowConstraints.weightx = 0;
2734		- aWindowConstraints.weighty = 1;
2735		- bigThree.add(scenePanel, aWindowConstraints);
2736		- aWindowConstraints.weightx = 1;
2737		- aWindowConstraints.gridwidth = 3;
2738		- // aWindowConstraints.gridheight = 3;
2739		- aWindowConstraints.gridx = 1;
2740		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2741		- bigThree.add(cameraPanel, aWindowConstraints);
2742		- aWindowConstraints.weightx = 0;
2743		- aWindowConstraints.gridx = 4;
2744		- aWindowConstraints.gridwidth = 1;
2745		- // aWindowConstraints.gridheight = 3;
2746		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2747		- //bigThree.add(XYZPanel, aConstraints);
2748		- bigThree.revalidate();
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
	3312	+
	3313	+// bigThree.remove(scenePanel);
	3314	+// bigThree.remove(centralPanel);
	3315	+// bigThree.remove(XYZPanel);
	3316	+// aWindowConstraints.gridx = 0;
	3317	+// aWindowConstraints.gridy = 0;
	3318	+// aWindowConstraints.gridwidth = 1;
	3319	+// // aConstraints.gridheight = 3;
	3320	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3321	+// aWindowConstraints.weightx = 0;
	3322	+// aWindowConstraints.weighty = 1;
	3323	+// bigThree.add(scenePanel, aWindowConstraints);
	3324	+// aWindowConstraints.weightx = 1;
	3325	+// aWindowConstraints.gridwidth = 3;
	3326	+// // aWindowConstraints.gridheight = 3;
	3327	+// aWindowConstraints.gridx = 1;
	3328	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3329	+// bigThree.add(centralPanel, aWindowConstraints);
	3330	+// aWindowConstraints.weightx = 0;
	3331	+// aWindowConstraints.gridx = 4;
	3332	+// aWindowConstraints.gridwidth = 1;
	3333	+// // aWindowConstraints.gridheight = 3;
	3334	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3335	+// //bigThree.add(XYZPanel, aConstraints);
	3336	+// bigThree.validate();
	3337	+// scenePanel.setVisible(true);
	3338	+// centralPanel.setVisible(true);
	3339	+// XYZPanel.setVisible(false);
	3340	+ bigThree.ClearUI();
	3341	+ bigThree.add(scenePanel);
	3342	+ bigThree.add(centralPanel);
	3343	+ bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2749	3346	} else
2750		- if (event.getSource() == sevenButton)
	3347	+ if (source == sevenButton)
2751	3348	{
2752	3349	radio.layout = sevenButton;
2753		- bigThree.remove(scenePanel);
2754		- bigThree.remove(cameraPanel);
2755		- bigThree.remove(XYZPanel);
2756		- aWindowConstraints.gridx = 0;
2757		- aWindowConstraints.gridy = 0;
2758		- aWindowConstraints.gridwidth = 1;
2759		- // aWindowConstraints.gridheight = 3;
2760		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2761		- aWindowConstraints.weightx = 0;
2762		- aWindowConstraints.weighty = 1;
2763		- bigThree.add(scenePanel, aWindowConstraints);
2764		- aWindowConstraints.weightx = 1;
2765		- aWindowConstraints.gridwidth = 3;
2766		- // aWindowConstraints.gridheight = 3;
2767		- aWindowConstraints.gridx = 1;
2768		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2769		- bigThree.add(cameraPanel, aWindowConstraints);
2770		- aWindowConstraints.weightx = 0;
2771		- aWindowConstraints.gridx = 4;
2772		- aWindowConstraints.gridwidth = 1;
2773		- // aConstraints.gridheight = 3;
2774		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2775		- bigThree.add(XYZPanel, aWindowConstraints);
2776		- bigThree.revalidate();
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
	3353	+
	3354	+// bigThree.remove(scenePanel);
	3355	+// bigThree.remove(centralPanel);
	3356	+// bigThree.remove(XYZPanel);
	3357	+// aWindowConstraints.gridx = 0;
	3358	+// aWindowConstraints.gridy = 0;
	3359	+// aWindowConstraints.gridwidth = 1;
	3360	+// // aWindowConstraints.gridheight = 3;
	3361	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3362	+// aWindowConstraints.weightx = 0;
	3363	+// aWindowConstraints.weighty = 1;
	3364	+// bigThree.add(scenePanel, aWindowConstraints);
	3365	+// aWindowConstraints.weightx = 1;
	3366	+// aWindowConstraints.gridwidth = 3;
	3367	+// // aWindowConstraints.gridheight = 3;
	3368	+// aWindowConstraints.gridx = 1;
	3369	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3370	+// bigThree.add(centralPanel, aWindowConstraints);
	3371	+// aWindowConstraints.weightx = 0;
	3372	+// aWindowConstraints.gridx = 4;
	3373	+// aWindowConstraints.gridwidth = 1;
	3374	+// // aConstraints.gridheight = 3;
	3375	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3376	+// bigThree.add(XYZPanel, aWindowConstraints);
	3377	+// bigThree.validate();
	3378	+// scenePanel.setVisible(true);
	3379	+// centralPanel.setVisible(true);
	3380	+// XYZPanel.setVisible(true);
	3381	+ bigThree.ClearUI();
	3382	+ bigThree.add(scenePanel);
	3383	+ bigThree.add(centralPanel);
	3384	+ bigThree.add(XYZPanel);
	3385	+ bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2777	3388	} else
2778		- if (event.getSource() == rootButton)
	3389	+ if (source == rootButton)
2779	3390	{
2780	3391	Object3D obj;
2781	3392	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2785,66 +3396,84 @@
2785	3396	EditObject(obj);
2786	3397	}
2787	3398
	3399	+ cameraView.requestFocusInWindow();
2788	3400	refreshContents(true);
2789	3401	} else
2790		- if (event.getSource() == closeButton)
	3402	+ if (source == closeButton)
2791	3403	{
2792	3404	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2793	3405	cRadio ab;
2794	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2795	3407	{
2796	3408	ab = (cRadio)e.nextElement();
2797		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2798	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2799	3417	buttonGroup.remove(ab);
2800	3418	radioPanel.remove(ab);
2801	3419
2802		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2803	3422	// ab.GetObject().objectUI = null; // ?????????
2804	3423
2805	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2806	3425	break;
2807	3426	}
2808	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2809	3430	refreshContents(true);
2810	3431	} else
2811		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3432	+ if (source == editItem \|\| source == editButton)
2812	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2813	3440	EditSelection(false);
2814	3441	} else
2815		- if (event.getSource() == uneditButton)
	3442	+ if (source == uneditButton)
2816	3443	{
2817	3444	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2818	3445	{
2819	3446	Object3D child = (Object3D)e.nextElement();
2820	3447	if(child.editWindow != null)
2821	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2822	3450	child.CloseUI();
2823	3451	listUI.remove(child);
2824	3452
2825		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2826	3454	}
2827		- objEditor.ctrlPanel.revalidate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2828	3456	//objEditor.jTree.clearSelection();
2829	3457	//objEditor.ResetSliders();
2830	3458	refreshContents(true);
2831	3459	} else
2832		- if (event.getSource() == clearPanelButton)
	3460	+ if (source == clearPanelButton)
2833	3461	{
2834	3462	assert(copy == group);
2835	3463	//copy.ClearUI();
2836	3464	for (Object3D obj : listUI)
2837	3465	{
	3466	+ obj.pinned = false;
2838	3467	obj.CloseUI();
2839	3468	}
2840	3469	listUI.clear();
2841	3470	refreshContents(true);
2842	3471	} else
2843		- if (event.getSource() == allParamsButton)
	3472	+ if (source == allParamsButton)
2844	3473	{
2845	3474	assert(copy == group);
2846	3475
2847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2848	3477
2849	3478	for (Object3D obj : listUI)
2850	3479	{
..	..	@@ -2861,19 +3490,19 @@
2861	3490
2862	3491	refreshContents(true);
2863	3492	} else
2864		- if (event.getSource() == unselectButton)
	3493	+ if (source == unselectButton)
2865	3494	{
2866	3495	objEditor.jTree.clearSelection();
2867	3496	// ?? oct 2012 GrafreeD.clipboard.clear();
2868	3497	objEditor.ResetSliders();
2869	3498	refreshContents(true);
2870	3499	} else
2871		- if(event.getSource() instanceof cRadio)
	3500	+ if(source instanceof cRadio)
2872	3501	{
2873	3502	group.parent = keepparent;
2874	3503	group.attributes = 0;
2875	3504	//group.editWindow = null;
2876		- /cRadio/ radio = (cRadio)event.getSource();
	3505	+ /cRadio/ radio = (cRadio)source;
2877	3506	Object3D obj = radio.GetObject();
2878	3507	System.out.println("Edit " + obj);
2879	3508	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2893,7 +3522,10 @@
2893	3522	}
2894	3523
2895	3524	copy = group;
2896		- //CameraPane.theRenderer.object = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
	3528	+ //Globals.theRenderer.object = group;
2897	3529	if(!useclient)
2898	3530	{
2899	3531	cameraView.renderCamera = radio.camera;
..	..	@@ -2902,25 +3534,52 @@
2902	3534	cameraView.cameras[cameraView.cameracount] = radio.camera;
2903	3535	cameraView.targetLookAt.set(radio.camera.lookAt);
2904	3536	cameraView.object = group;
2905		- cameraView.lighttouched = true;
	3537	+ //cameraView.lighttouched = true;
	3538	+ Globals.lighttouched = true;
2906	3539	topView.object = group;
2907	3540	frontView.object = group;
2908	3541	sideView.object = group;
2909	3542	}
2910		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2911	3548	/*
2912	3549	currentLayout = radio.layout;
2913	3550	if (currentLayout == null)
2914	3551	currentLayout = sevenButton;
2915	3552	*/
2916	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
2917	3561	keepparent = group.parent;
2918	3562	// PARENT = NULL or not???
2919	3563	//group.parent = null; // ROOT
2920	3564	//group.attributes = -1;
2921	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
2922	3568	refreshContents(true);
2923		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
2924	3583	else
2925	3584	{
2926	3585	//return super.action(event, arg);
..	..	@@ -2929,7 +3588,6 @@
2929	3588	}
2930	3589
2931	3590	boolean useclient = false;
2932		- cRadio radio;
2933	3591
2934	3592	void ToggleRoot()
2935	3593	{
..	..	@@ -2938,7 +3596,7 @@
2938	3596	if (useclient)
2939	3597	{
2940	3598	cameraView.object = client;
2941		- cameraView.lighttouched = true;
	3599	+ Globals.lighttouched = true;
2942	3600	//topView.object = client;
2943	3601	//frontView.object = client;
2944	3602	//sideView.object = client;
..	..	@@ -2946,7 +3604,7 @@
2946	3604	else
2947	3605	{
2948	3606	cameraView.object = group;
2949		- cameraView.lighttouched = true;
	3607	+ Globals.lighttouched = true;
2950	3608	//topView.object = group;
2951	3609	//frontView.object = group;
2952	3610	//sideView.object = group;
..	..	@@ -2981,6 +3639,28 @@
2981	3639	refreshContents();
2982	3640	}
2983	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
2984	3664
2985	3665	void ResetTransform()
2986	3666	{
..	..	@@ -3093,7 +3773,7 @@
3093	3773	refreshContents();
3094	3774	}
3095	3775
3096		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3097	3777	{
3098	3778	Object3D obj;
3099	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3108,12 +3788,16 @@
3108	3788	LA.matIdentity(Object3D.mat);
3109	3789	obj.getBounds(minima, maxima, false);
3110	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3111		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3112	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3113	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3114	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3115		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3116	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3117	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3118	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3119	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3142,7 +3826,8 @@
3142	3826
3143	3827	int size = obj.MemorySize();
3144	3828
3145		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3146	3831	}
3147	3832	}
3148	3833	catch (Exception e)
..	..	@@ -3179,9 +3864,9 @@
3179	3864	obj = (Object3D)e.nextElement();
3180	3865
3181	3866	System.out.println("Object is: " + obj);
3182		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3183	3868	System.out.println("Boundary rep: " + obj.bRep);
3184		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3185	3870
3186	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3187	3872	}
..	..	@@ -3223,6 +3908,13 @@
3223	3908	void GenNormals(boolean crease)
3224	3909	{
3225	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3226	3918
3227	3919	refreshContents();
3228	3920	}
..	..	@@ -3395,8 +4087,8 @@
3395	4087
3396	4088	void ParseVertices()
3397	4089	{
3398		- boolean epsequal = GrafreeD.epsequal;
3399		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3400	4092
3401	4093	for (int i=0; i<group.selection.size(); i++)
3402	4094	{
..	..	@@ -3421,7 +4113,7 @@
3421	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3422	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3423	4115
3424		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3425	4117
3426	4118	buffer.add(g);
3427	4119	}
..	..	@@ -3436,7 +4128,7 @@
3436	4128	makeSomething(buffer, i==group.selection.size()-1);
3437	4129	}
3438	4130
3439		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3440	4132
3441	4133	refreshContents();
3442	4134	}
..	..	@@ -3454,7 +4146,16 @@
3454	4146	String pigment = Object3D.GetPigment(tex);
3455	4147	//String bump = Object3D.GetBump(tex);
3456	4148
3457		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3458	4159
3459	4160	double s = v.s;
3460	4161
..	..	@@ -3542,11 +4243,11 @@
3542	4243
3543	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3544	4245
3545		- boolean random = CameraPane.RANDOM;
3546		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3547	4248	lowres.linkVerticesThis(null);
3548	4249	lowres.linkVerticesThis(sn);
3549		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3550	4251
3551	4252	System.err.flush();
3552	4253
..	..	@@ -3586,7 +4287,7 @@
3586	4287	return;
3587	4288
3588	4289	Object3D poses = group.selection.get(0);
3589		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3590	4291
3591	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3592	4293
..	..	@@ -3755,7 +4456,7 @@
3755	4456	group.selection.RelinkToSupport(); // july 2014
3756	4457	System.out.println("DONE.");
3757	4458	refreshContents();
3758		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4459	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3759	4460	}
3760	4461
3761	4462	void ReduceMesh(boolean reduction34)
..	..	@@ -3780,9 +4481,9 @@
3780	4481
3781	4482	void ClipMesh()
3782	4483	{
3783		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3784	4485	{
3785		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3786	4487
3787	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3788	4489	content = ((cGroup)content).get(0);
..	..	@@ -3791,7 +4492,7 @@
3791	4492	// {
3792	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3793	4494	// }
3794		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3795	4496	}
3796	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3797	4498	System.out.println("DONE.");
..	..	@@ -3838,6 +4539,18 @@
3838	4539	void MarkLeaves(boolean hide)
3839	4540	{
3840	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3841	4554	refreshContents();
3842	4555	}
3843	4556
..	..	@@ -3912,10 +4625,6 @@
3912	4625	// }
3913	4626	// }
3914	4627
3915		- static boolean allparams = true;
3916		-
3917		- static Vector<Object3D> listUI = new Vector<Object3D>();
3918		-
3919	4628	void EditSelection(boolean newWindow)
3920	4629	{
3921	4630	// aConstraints.gridy = 0;
..	..	@@ -3923,10 +4632,10 @@
3923	4632	{
3924	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3925	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3926		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3927	4636
3928	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
3929		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
3930	4639	{
3931	4640	// if (!(elem instanceof Composite))
3932	4641	// newWindow = false;
..	..	@@ -4008,7 +4717,8 @@
4008	4717	//new Exception().printStackTrace();
4009	4718
4010	4719	freezemodel = true;
4011		-
	4720	+ ClearUnpinned();
	4721	+
4012	4722	/**/
4013	4723	//switch (event.id)
4014	4724	{
..	..	@@ -4016,7 +4726,6 @@
4016	4726	//case 702: // Event.LIST_DESELECT
4017	4727	group.deselectAll();
4018	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4019		- objEditor.ClearInfo(); // .GetMaterial());
4020	4729	if (tps != null)
4021	4730	{
4022	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4025,33 +4734,39 @@
4025	4734
4026	4735	//if (child.parent != null)
4027	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4028	4738	group.addSelectee(child);
4029		- objEditor.SetMaterial(child); // .GetMaterial());
4030		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4031		- System.err.println("info : " + child.GetPath());
4032	4739	}
4033	4740	}
4034		- else
4035		- {
4036		- objEditor.SetMaterial(group); // .GetMaterial());
4037		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4038		- System.err.println("info : " + group.GetPath());
4039		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
4040	4747
4041		- objEditor.SetText(); // jan 2014
4042		-
4043		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4044	4749	CameraPane.flash = true;
4045	4750
4046		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4047	4752	// a camera
4048	4753	{
4049		- CameraPane.camerachangeframe = 0; // don't refuse it
4050		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4051		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4052		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
	4759	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4760	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4053	4761	}
4054	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4055	4770	refreshContents();
4056	4771	//return true;
4057	4772	}
..	..	@@ -4060,6 +4775,35 @@
4060	4775
4061	4776	freezemodel = false;
4062	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4063	4807
4064	4808	void linkSomething(Object3D thing)
4065	4809	{
..	..	@@ -4131,16 +4875,19 @@
4131	4875	{
4132	4876	if (group.selection.isEmpty())
4133	4877	return;
4134		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4135	4880	Composite tGroup = null;
4136	4881	if (group.selection.size() > 0) // 1)
4137	4882	{
4138	4883	tGroup = new cGroup();
4139		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4140	4885	}
4141	4886
4142	4887	if (cut)
4143	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4144	4891	//int indices[] = jList.getSelectedIndices();
4145	4892	//for (int i = indices.length - 1; i >= 0; i--)
4146	4893	//jList.remove(indices[i]);
..	..	@@ -4176,16 +4923,16 @@
4176	4923	//System.out.println("cut " + child);
4177	4924	//System.out.println("parent = " + child.parent);
4178	4925	// tmp.addChild(child);
4179		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4180	4927	tGroup.add/Child/(tmp);
4181	4928	else
4182		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4183	4930	}
4184	4931	else
4185		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4186	4933	tGroup.add/Child/(child);
4187	4934	else
4188		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4189	4936	}
4190	4937
4191	4938	//ResetModel();
..	..	@@ -4217,21 +4964,23 @@
4217	4964	//System.out.println("cut " + elem);
4218	4965	//System.out.println("parent = " + elem.parent);
4219	4966	// tmp.addChild(elem);
4220		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4221	4968	tGroup.add/Child/(tmp);
4222	4969	else
4223		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4224	4971	}
4225	4972	else
4226		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4227	4974	tGroup.add/Child/(child);
4228	4975	else
4229		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4230	4977	}
4231	4978
4232	4979	}
4233		- if (GrafreeD.clipboardIsTempGroup)
4234		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4235	4984	if (cut)
4236	4985	{
4237	4986	ResetModel();
..	..	@@ -4241,11 +4990,15 @@
4241	4990
4242	4991	void paste(boolean expand)
4243	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4244	4997	// if (GrafreeD.clipboard == null)
4245	4998	// return;
4246	4999	boolean first = true;
4247	5000
4248		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4249	5002	{
4250	5003	Composite temp;
4251	5004
..	..	@@ -4256,7 +5009,7 @@
4256	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4257	5010	*/
4258	5011	Object3D elem;
4259		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4260	5013	{
4261	5014	Object3D child = (Object3D)e.nextElement();
4262	5015
..	..	@@ -4290,21 +5043,22 @@
4290	5043	//Object3D cb = Applet3D.clipboard;
4291	5044	//temp.addChild(cb);
4292	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4293		- assert(GrafreeD.clipboard.parent == null);
4294		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4295		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4296		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4297		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4298	5051	else
4299		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4300		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4301	5054	}
4302	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4303	5057	ResetModel();
4304	5058	refreshContents();
4305	5059	}
4306	5060
4307		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4308	5062	{
4309	5063	// if (GrafreeD.clipboard == null)
4310	5064	// return;
..	..	@@ -4333,15 +5087,22 @@
4333	5087	if (copyit)
4334	5088	{
4335	5089	// paste(false);
4336		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4337	5098	}
4338	5099	else
4339	5100	{
4340	5101	boolean first = true;
4341	5102
4342		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4343	5104	{
4344		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4345	5106	Object3D copy;
4346	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4347	5108	{
..	..	@@ -4351,7 +5112,7 @@
4351	5112	}
4352	5113	} else
4353	5114	{
4354		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4355	5116	}
4356	5117	}
4357	5118	}
..	..	@@ -4428,6 +5189,10 @@
4428	5189
4429	5190	void group(Object3D csg, boolean grab)
4430	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4431	5196	if (//false) // why??
4432	5197	!group.selection.isEmpty())
4433	5198	{
..	..	@@ -4541,10 +5306,15 @@
4541	5306	//node.add(csg);
4542	5307	//makeSomething(node);
4543	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4544	5310	}
4545	5311
4546	5312	void Ungroup(Object3D g)
4547	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4548	5318	if (g instanceof HiddenObject)
4549	5319	{
4550	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4561,6 +5331,7 @@
4561	5331	objEditor.makeSomething(g.get(i), false);
4562	5332	}
4563	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4564	5335	}
4565	5336
4566	5337	void ungroup()
..	..	@@ -4756,21 +5527,6 @@
4756	5527	}
4757	5528	*/
4758	5529
4759		- void ImportGFD()
4760		- {
4761		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4762		- browser.show();
4763		- String filename = browser.getFile();
4764		- if (filename != null && filename.length() > 0)
4765		- {
4766		- String fullname = browser.getDirectory() + filename;
4767		-
4768		- //Object3D readobj =
4769		- objEditor.ReadGFD(fullname, objEditor);
4770		- //makeSomething(readobj);
4771		- }
4772		- }
4773		-
4774	5530	/*
4775	5531	public void Callback(Object obj)
4776	5532	{
..	..	@@ -4794,26 +5550,9 @@
4794	5550	}
4795	5551	*/
4796	5552
4797		- void ImportVRMLX3D()
4798		- {
4799		- if (GrafreeD.standAlone)
4800		- {
4801		- /**/
4802		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4803		- browser.show();
4804		- String filename = browser.getFile();
4805		- if (filename != null && filename.length() > 0)
4806		- {
4807		- String fullname = browser.getDirectory() + filename;
4808		- LoadVRMLX3D(fullname);
4809		- }
4810		- /**/
4811		- }
4812		- }
4813		-
4814	5553	String GetFile(String dialogName)
4815	5554	{
4816		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4817	5556	{
4818	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4819	5558	browser.show();
..	..	@@ -4877,10 +5616,33 @@
4877	5616	cButton flashSelectionButton;
4878	5617	cButton editButton;
4879	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4880	5620	cButton clearpanelButton;
4881		- cButton allParamsButton;
4882	5621	cButton unselectButton;
4883	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4884	5646	cButton screenfitButton;
4885	5647	cButton screenfitpointButton;
4886	5648	cButton snapobjectButton;
..	..	@@ -4892,14 +5654,6 @@
4892	5654
4893	5655	cButton setsupportButton;
4894	5656
4895		- cButton twoButton;
4896		- cButton sixButton;
4897		- cButton threeButton;
4898		- cButton sevenButton;
4899		- cButton fourButton; // full panel
4900		- cButton oneButton; // full XYZ
4901		- //cButton currentLayout;
4902		-
4903	5657	//
4904	5658	//Composite
4905	5659	Object3D // to do !!
..	..	@@ -4909,9 +5663,11 @@
4909	5663	//JTree jTree;
4910	5664	private MenuItem lookAtItem;
4911	5665	private MenuItem lookFromItem;
4912		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4913	5667	private MenuItem cutItem;
4914		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4915	5671	private MenuItem cloneItem;
4916	5672	private MenuItem cloneSupportItem;
4917	5673	private MenuItem overwriteGeoItem;
..	..	@@ -4924,7 +5680,7 @@
4924	5680	private MenuItem linkverticesItem;
4925	5681	private MenuItem relinkverticesItem;
4926	5682	private MenuItem setMasterItem;
4927		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
4928	5684	private MenuItem stepAllItem;
4929	5685	private MenuItem revertMeshItem;
4930	5686	private MenuItem poseMeshItem;
..	..	@@ -4935,6 +5691,7 @@
4935	5691	private MenuItem mergeGeometriesItem;
4936	5692	private MenuItem copyItem;
4937	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
4938	5695	private MenuItem pasteLinkItem;
4939	5696	private MenuItem pasteCloneItem;
4940	5697	private MenuItem pasteExpandItem;
..	..	@@ -4973,6 +5730,10 @@
4973	5730	private MenuItem showleavesItem;
4974	5731	private MenuItem markleavesItem;
4975	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
4976	5737
4977	5738	private MenuItem flipVItem;
4978	5739	private MenuItem unflipVItem;
..	..	@@ -4984,15 +5745,17 @@
4984	5745	private MenuItem panoTexturesItem;
4985	5746
4986	5747	private MenuItem resetCentroidItem;
4987		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
4988	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
4989	5752	private MenuItem hideItem;
4990	5753	private MenuItem grabItem;
4991	5754	private MenuItem backItem;
4992	5755	private MenuItem frontItem;
4993	5756	private MenuItem cameraItem;
4994	5757	private MenuItem compositeItem;
4995		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
4996	5759	private MenuItem physicsItem;
4997	5760	private MenuItem frameselectorItem;
4998	5761	private MenuItem scriptNodeItem;
..	..	@@ -5007,6 +5770,7 @@
5007	5770
5008	5771	private MenuItem resetParentItem;
5009	5772	private MenuItem repairParentItem;
	5773	+ private MenuItem repairShadowItem;
5010	5774	private MenuItem sortbysizeItem;
5011	5775	private MenuItem sortbynameItem;
5012	5776
..	..	@@ -5031,7 +5795,7 @@
5031	5795	private MenuItem blobItem;
5032	5796	private MenuItem latheItem;
5033	5797	private MenuItem bezierItem;
5034		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5035	5799	private MenuItem meshItem;
5036	5800	// private MenuItem meshGroupItem;
5037	5801	private MenuItem springItem;
..	..	@@ -5053,11 +5817,6 @@
5053	5817	private MenuItem doubleItem;
5054	5818	private MenuItem tripleItem;
5055	5819
5056		- private MenuItem importGFDItem;
5057		- private MenuItem importVRMLX3DItem;
5058		- private MenuItem import3DSItem;
5059		- private MenuItem importOBJItem;
5060		-
5061	5820	private MenuItem computeAOItem;
5062	5821	private MenuItem recompileItem;
5063	5822	private MenuItem editScriptItem;
..	..	@@ -5067,4 +5826,8 @@
5067	5826	private MenuItem analyzeItem;
5068	5827	private MenuItem dumpItem;
5069	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5070	5833	}